remove start point from services
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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');
|
||||
|
||||
Reference in New Issue
Block a user