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

Merge branch 'feature/Receipt' into 'feature/DamageTest'

Browse Source 
seperate relation for road patrol cartable

See merge request witelgroup/rms_v2!74
This commit is contained in:
amirghasempoor
2025-02-19 06:01:41 +00:00
parent e219df00bc 5634827103
commit 2ce6d73f24
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/V3/Dashboard/RoadItemsProjectController.php
View File

@@ -273,16 +273,16 @@ class RoadItemsProjectController extends Controller
public function roadItemMachine(RoadItemsProject $roadItemsProject): JsonResponse public function roadItemMachine(RoadItemsProject $roadItemsProject): JsonResponse
{ {
return $this->successResponse($roadItemsProject->load('cmmsMachines:id,machine_code,car_name,plak_number')); return $this->successResponse($roadItemsProject->cmmsMachines()->get(['cmms_machines.id', 'cmms_machines.machine_code', 'cmms_machines.car_name', 'cmms_machines.plak_number']));
} }
public function roadItemRahdar(RoadItemsProject $roadItemsProject): JsonResponse public function roadItemRahdar(RoadItemsProject $roadItemsProject): JsonResponse
{ {
return $this->successResponse($roadItemsProject->load('rahdaran:id,name,code')); return $this->successResponse($roadItemsProject->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code']));
} }
public function roadItemFile(RoadItemsProject $roadItemsProject): JsonResponse public function roadItemFile(RoadItemsProject $roadItemsProject): JsonResponse
{ {
return $this->successResponse($roadItemsProject->load('files')); return $this->successResponse($roadItemsProject->files()->get(['path']));
} }
} }

4
app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php
View File

@@ -331,11 +331,11 @@ class RoadPatrolProjectController extends Controller
public function roadPatrolMachine(RoadPatrol $roadPatrol): JsonResponse public function roadPatrolMachine(RoadPatrol $roadPatrol): JsonResponse
{ {
return $this->successResponse($roadPatrol->load('cmmsMachines:id,machine_code,car_name,plak_number')); return $this->successResponse($roadPatrol->cmmsMachines()->get(['cmms_machines.id', 'cmms_machines.machine_code', 'cmms_machines.car_name', 'cmms_machines.plak_number']));
} }
public function roadPatrolRahdar(RoadPatrol $roadPatrol): JsonResponse public function roadPatrolRahdar(RoadPatrol $roadPatrol): JsonResponse
{ {
return $this->successResponse($roadPatrol->load('rahdaran:id,name,code')); return $this->successResponse($roadPatrol->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code']));
} }
} }