Compare commits
6 Commits
ec1358e85f
...
feature/Ad
| Author | SHA1 | Date | |
|---|---|---|---|
| 235111ee57 | |||
| ccacb2f916 | |||
| aeb58ed27f | |||
| 2f3ebf5808 | |||
| e0edcf6db2 | |||
| 893edea5a9 |
@@ -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';
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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';
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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');
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -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');
|
||||
|
||||
Reference in New Issue
Block a user