diff --git a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php index df45df4c..f93419ae 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php @@ -19,7 +19,7 @@ class RequestPortalController extends Controller public function index(Request $request, RequestPortalService $requestPortalService): JsonResponse { - return response()->json($requestPortalService->datatable($request)); + return response()->json($requestPortalService->datatable($request)); } public function store(StoreRequest $request): JsonResponse diff --git a/app/Services/Cartables/Mission/RequestPortalService.php b/app/Services/Cartables/Mission/RequestPortalService.php index daac3cdd..01d7cf76 100644 --- a/app/Services/Cartables/Mission/RequestPortalService.php +++ b/app/Services/Cartables/Mission/RequestPortalService.php @@ -18,12 +18,12 @@ class RequestPortalService $fields = [ 'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name', 'description', 'requested_machines', 'type', 'start_date', - 'end_date', 'request_date', 'start_point', 'end_point', + 'end_date', 'request_date', 'end_point', ]; $query = Mission::query(); if ($user->hasPermissionTo('manage-request-portal-city')) { - $query->where('edarate_shahri_id', '=', $user->edarate_shahri_id); + $query->where('edare_shahri_id', '=', $user->edarate_shahri_id); } elseif ($user->hasPermissionTo('manage-request-portal-province')) { $query->where('province_id', '=', $user->province_id); diff --git a/app/Services/Cartables/Mission/TransportationUnitService.php b/app/Services/Cartables/Mission/TransportationUnitService.php index a8059658..3462e2b2 100644 --- a/app/Services/Cartables/Mission/TransportationUnitService.php +++ b/app/Services/Cartables/Mission/TransportationUnitService.php @@ -15,7 +15,7 @@ class TransportationUnitService $fields = [ 'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name', 'description', 'requested_machines', 'type', 'start_date', - 'end_date', 'request_date', 'start_point', 'end_point', + 'end_date', 'request_date', 'end_point', ]; $query = Mission::query() diff --git a/routes/v3.php b/routes/v3.php index e8b552bb..72d96e4d 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -431,6 +431,7 @@ Route::prefix('missions') ->name('missions.') ->group(function () { Route::name('requestPortal.') + ->prefix('request_portal') ->middleware('permission:manage-request-portal-city|manage-request-portal-province|manage-request-portal-country') ->controller(RequestPortalController::class) ->group(function () { @@ -441,6 +442,7 @@ Route::prefix('missions') Route::delete('/{mission}', 'destroy')->name('destroy'); }); Route::name('transportationUnit.') + ->prefix('transportation_unit') ->controller(TransportationUnitController::class) ->group(function () { Route::get('/', 'index')->name('index');