RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add transportation routes

Browse Source
This commit is contained in:
amirghasempoor
2025-05-20 09:50:10 +03:30
parent 5c2901f33a
commit 057ed49fd1
13 changed files with 91 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Services/Cartables/Mission/RequestPortalService.php
View File

@@ -15,20 +15,26 @@ class RequestPortalService
public function datatable(Request $request)
{
$user = auth()->user();
$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',
];
$query = Mission::query();
if ($user->hasPermissionTo('mission-manage-city')) {
if ($user->hasPermissionTo('manage-request-portal-city')) {
$query->where('edarate_shahri_id', '=', $user->edarate_shahri_id);
}
elseif ($user->hasPermissionTo('mission-manage-province')) {
elseif ($user->hasPermissionTo('manage-request-portal-province')) {
$query->where('province_id', '=', $user->province_id);
}
return DataTableFacade::run(
$query,
$request,
allowedFilters: ['*'],
allowedSortings: ['*']
allowedSortings: ['*'],
allowedSelects: $fields
);
}
}

4
app/Services/Cartables/Mission/TransportationUnitService.php
View File

@@ -14,8 +14,8 @@ class TransportationUnitService
{
$fields = [
'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
'description', 'requested_machine_type', 'requested_machine_numbers', 'type',
'start_date', 'end_date', 'request_date', 'start_point', 'end_point',
'description', 'requested_machines', 'type', 'start_date',
'end_date', 'request_date', 'start_point', 'end_point',
];
$query = Mission::query()