6 Commits

4 changed files with 35 additions and 4 deletions

View File

@@ -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';
}
/**

View File

@@ -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';
}
/**

View File

@@ -0,0 +1,29 @@
<?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');
});
}
};

View File

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