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

Merge pull request #109 from witelgroup/feature/NoProcess

Browse Source 
add station layer
This commit is contained in:
Amir Ghasempoor
2025-12-22 10:17:40 +03:30
committed by GitHub
parent ef40af0661 8abfd32be8
commit 3fa6e97b5b
11 changed files with 118 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Services/Cartables/Mission/ControlUnitService.php
View File

@@ -16,11 +16,21 @@ class ControlUnitService
public function dataTable(Request $request)
{
$query = Mission::query()
->whereIn('state_id', [
$user = Auth::user();
$query = Mission::query()->whereIn('state_id', [
MissionStates::PENDING_CONFIRMATION->value, MissionStates::START_MISSION->value
])
->where('edare_shahri_id', '=', Auth::user()->edarate_shahri_id);
]);
if ($user->hasPermissionTo('manage-control-unit-station')) {
$query->where('station_id', '=', $user->station_id);
}
elseif ($user->hasPermissionTo('manage-control-unit-city')) {
$query->where('city_id', '=', $user->city_id);
}
elseif ($user->hasPermissionTo('manage-control-unit-province')) {
$query->where('province_id', '=', $user->province_id);
}
return DataTableFacade::run(
$query,

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

@@ -17,8 +17,11 @@ class RequestPortalService
$user = auth()->user();
$query = Mission::query();
if ($user->hasPermissionTo('manage-request-portal-city')) {
$query->where('edare_shahri_id', '=', $user->edarate_shahri_id);
if ($user->hasPermissionTo('manage-request-portal-station')) {
$query->where('station_id', '=', $user->station_id);
}
elseif ($user->hasPermissionTo('manage-request-portal-city')) {
$query->where('city_id', '=', $user->city_id);
}
elseif ($user->hasPermissionTo('manage-request-portal-province')) {
$query->where('province_id', '=', $user->province_id);

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

@@ -12,9 +12,19 @@ class TransportationUnitService
{
public function dataTable(Request $request)
{
$query = Mission::query()
->whereIn('state_id', [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value])
->where('edare_shahri_id', '=', Auth::user()->edarate_shahri_id);
$user = Auth::user();
$query = Mission::query()->whereIn('state_id', [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value]);
if ($user->hasPermissionTo('manage-transportation-unit-station')) {
$query->where('station_id', '=', $user->station_id);
}
elseif ($user->hasPermissionTo('manage-transportation-unit-city')) {
$query->where('city_id', '=', $user->city_id);
}
elseif ($user->hasPermissionTo('manage-transportation-unit-province')) {
$query->where('province_id', '=', $user->province_id);
}
return DataTableFacade::run(
$query,