Skip to content

Commit

Permalink
Fix ApprovalCollector constant references (CO-2967)
Browse files Browse the repository at this point in the history
  • Loading branch information
Benn Oshrin committed Mar 7, 2026
1 parent 940a406 commit ed3eaf8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
use App\Controller\StandardEnrollerController;
use App\Lib\Util\DeliveryUtilities;
use Cake\ORM\TableRegistry;
use \App\Lib\Enum\StatusEnum;
use \App\Lib\Enum\PetitionStatusEnum;

class ApprovalCollectorsController extends StandardEnrollerController {
protected array $paginate = [
Expand Down Expand Up @@ -72,11 +72,11 @@ public function dispatch(string $id) {
petitionId: $petition->id,
approvalCollectorId: (int)$id,
approverPersonId: $this->RegistryAuth->getPersonID($coId),
approved: $approved == StatusEnum::Approved,
approved: $approved == PetitionStatusEnum::Approved,
comment: $comment
);

if($approved != StatusEnum::Approved) {
if($approved != PetitionStatusEnum::Approved) {
// If we have a denial Message Template, send the notification to the enrollee
// email address. We don't currently support using a Notification, since in most
// cases the Enrollee will not have a Person record yet. (There are some edge
Expand Down Expand Up @@ -130,7 +130,7 @@ public function dispatch(string $id) {
return $this->finishStep(
enrollmentFlowStepId: $cfg->enrollment_flow_step_id,
petitionId: $petition->id,
comment: __d('core_enroller', 'result.ApprovalCollectors.' . ($approved == StatusEnum::Approved ? 'approved' : 'denied'))
comment: __d('core_enroller', 'result.ApprovalCollectors.' . ($approved == PetitionStatusEnum::Approved ? 'approved' : 'denied'))
);
}
catch(\Exception $e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

declare(strict_types = 1);

use \App\Lib\Enum\StatusEnum;
use \App\Lib\Enum\PetitionStatusEnum;

print $this->element('flash', []);

Expand All @@ -49,15 +49,15 @@ $this->Field->enableFormEditMode();
print $this->Form->radio(
'approved',
[
StatusEnum::Approved => __d('enumeration', 'StatusEnum.'.StatusEnum::Approved),
StatusEnum::Denied => __d('enumeration', 'StatusEnum.'.StatusEnum::Denied)
PetitionStatusEnum::Approved => __d('enumeration', 'PetitionStatusEnum.'.PetitionStatusEnum::Approved),
PetitionStatusEnum::Denied => __d('enumeration', 'PetitionStatusEnum.'.PetitionStatusEnum::Denied)
],
[
'value' => !empty($petition_approvals)
? ($petition_approvals['approved'] === true
? StatusEnum::Approved
? PetitionStatusEnum::Approved
: ($petition_approvals['approved'] === false
? StatusEnum::Denied
? PetitionStatusEnum::Denied
: ""))
: ""
]
Expand Down

0 comments on commit ed3eaf8

Please sign in to comment.