Merge branch 'main' of rms-develop-main-branch-26-23-5.bundle

Reviewed-on: #7

app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php

@@ -15,8 +15,7 @@ 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
-            || $this->user()?->username === 'witel';
+        return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id && $this->mission->state_id == MissionStates::REQUEST_CREATED->value;
     }
 
     /**

app/Http/Requests/V3/Mission/TransportaionUnit/DeallocateRequest.php

@@ -14,8 +14,7 @@ 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])
-            || $this->user()?->username === 'witel';
+            in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value]);
     }
 
     /**

database/migrations/2026_05_30_093222_add_driver_to_missions_table.php

@@ -1,29 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('missions', function (Blueprint $table) {
-            $table->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');
-        });
-    }
-};

routes/v3.php

@@ -538,7 +538,7 @@ Route::prefix('missions')
             });
         Route::prefix('report_violation')
             ->name('reportsViolation.')
-            ->middleware(['permission:mission-report-province|mission-report-country'])
+            ->middleware(['permission:mission-report-province|permission:mission-report-country'])
             ->controller(ReportViolationController::class)
             ->group(function () {
                 Route::get('/country_activity', 'countryActivity')->name('countryActivity');
@@ -548,7 +548,7 @@ Route::prefix('missions')
             });
         Route::prefix('report_taradod')
             ->name('reportsTaradod.')
-            ->middleware(['permission:mission-report-province|mission-report-country'])
+            ->middleware(['permission:mission-report-province|permission:mission-report-country'])
             ->controller(ReportTradodController::class)
             ->group(function () {
                 Route::get('/country_activity', 'countryActivity')->name('countryActivity');