diff --git a/app/plugins/CoreEnroller/src/Controller/ApprovalCollectorsController.php b/app/plugins/CoreEnroller/src/Controller/ApprovalCollectorsController.php index 680a78838..cda414ae2 100644 --- a/app/plugins/CoreEnroller/src/Controller/ApprovalCollectorsController.php +++ b/app/plugins/CoreEnroller/src/Controller/ApprovalCollectorsController.php @@ -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 = [ @@ -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 @@ -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) { diff --git a/app/plugins/CoreEnroller/templates/ApprovalCollectors/dispatch.inc b/app/plugins/CoreEnroller/templates/ApprovalCollectors/dispatch.inc index 2837b5bdc..bf30ecb1c 100644 --- a/app/plugins/CoreEnroller/templates/ApprovalCollectors/dispatch.inc +++ b/app/plugins/CoreEnroller/templates/ApprovalCollectors/dispatch.inc @@ -27,7 +27,7 @@ declare(strict_types = 1); -use \App\Lib\Enum\StatusEnum; +use \App\Lib\Enum\PetitionStatusEnum; print $this->element('flash', []); @@ -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 : "")) : "" ]