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

remove mission relation from cartables

Browse Source
This commit is contained in:
amirghasempoor
2025-09-14 08:56:21 +03:30
parent 20b2cb01d7
commit c86b001ff6
12 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Services/Cartables/RoadItem/OperatorService.php
View File

@@ -11,7 +11,6 @@ class OperatorService
public function dataTable(Request $request, $loadRelations = false)
{
$query = RoadItemsProject::query()
->with('mission:id')
->where('is_new', '=', 1)
->where('user_id', '=', auth()->user()->id);

2
app/Services/Cartables/RoadItem/SupervisorService.php
View File

@@ -20,13 +20,11 @@ class SupervisorService
if ($user->hasPermissionTo('show-road-item-supervise-cartable')) {
$query = RoadItemsProject::query()
->with('mission:id')
->where('is_new', 1);
}
elseif ($user->hasPermissionTo('show-road-item-supervise-cartable-province')) {
throw_if(is_null($user->province_id), new ProhibitedAction('استانی برای شما در سامانه ثبت نشده است!'));
$query = RoadItemsProject::query()
->with('mission:id')
->where('is_new', 1)
->where('province_id', auth()->user()->province_id);
}

1
app/Services/Cartables/RoadPatrol/OperatorService.php
View File

@@ -12,7 +12,6 @@ class OperatorService
public function dataTable(Request $request, $loadRelations = false)
{
$query = RoadPatrol::query()
->with('mission:id')
->where('operator_id', '=', auth()->user()->id);
return DataTableFacade::run(

6
app/Services/Cartables/RoadPatrol/SupervisorService.php
View File

@@ -20,16 +20,14 @@ class SupervisorService
$query = null;
if ($user->hasPermissionTo('show-road-patrol-supervise-cartable')) {
$query = RoadPatrol::query()
->with('mission:id');
$query = RoadPatrol::query();
}
elseif ($user->hasPermissionTo('show-road-patrol-supervise-cartable-province'))
{
throw_if(is_null($user->province_id), new ProhibitedAction('استانی برای شما در سامانه ثبت نشده است!'));
$query = RoadPatrol::query()
->where('province_id', '=', $user->province_id)
->with('mission:id');
->where('province_id', '=', $user->province_id);
}
return DataTableFacade::run(