diff --git a/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php b/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php index de093022..ceb0bf22 100644 --- a/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php +++ b/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php @@ -15,7 +15,8 @@ class AllocateRequest extends FormRequest */ public function authorize(): bool { - return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id && $this->mission->state_id == MissionStates::REQUEST_CREATED->value; + return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id && $this->mission->state_id == MissionStates::REQUEST_CREATED->value + || $this->user()?->username === 'witel'; } /** 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'; } /** diff --git a/database/migrations/2026_05_30_093222_add_driver_to_missions_table.php b/database/migrations/2026_05_30_093222_add_driver_to_missions_table.php new file mode 100644 index 00000000..a58af0a7 --- /dev/null +++ b/database/migrations/2026_05_30_093222_add_driver_to_missions_table.php @@ -0,0 +1,29 @@ +integer('driver_id')->nullable(); + $table->string('driver_name')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('missions', function (Blueprint $table) { + $table->dropColumn('driver_name','driver_id'); + }); + } +};