From ccacb2f91693d2757dc366ccf7404b9ba55a76c6 Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Wed, 10 Jun 2026 11:07:06 +0330 Subject: [PATCH] fix code for confilict --- .../V3/Dashboard/Mission/RequestPortalController.php | 1 - .../V3/Mission/TransportaionUnit/DeallocateRequest.php | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php index e706efcc..9a3d5d50 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php @@ -16,7 +16,6 @@ use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest; use App\Http\Traits\ApiResponse; use App\Models\CMMSMachine; use App\Models\Mission; -use App\Models\Rahdaran; use App\Models\RahdariPoint; use App\Models\RoadObserved; use App\Services\Cartables\Mission\RequestPortalService; diff --git a/app/Http/Requests/V3/Mission/TransportaionUnit/DeallocateRequest.php b/app/Http/Requests/V3/Mission/TransportaionUnit/DeallocateRequest.php index e2d94deb..e0504aa2 100644 --- a/app/Http/Requests/V3/Mission/TransportaionUnit/DeallocateRequest.php +++ b/app/Http/Requests/V3/Mission/TransportaionUnit/DeallocateRequest.php @@ -14,7 +14,8 @@ class DeallocateRequest extends FormRequest public function authorize(): bool { return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id && - in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value]); + in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value]) + || $this->user()?->username === 'witel'; } /**