diff --git a/app/Http/Controllers/V3/Dashboard/RoadItemsProjectController.php b/app/Http/Controllers/V3/Dashboard/RoadItemsProjectController.php index f2ee6e08..0cf834d3 100644 --- a/app/Http/Controllers/V3/Dashboard/RoadItemsProjectController.php +++ b/app/Http/Controllers/V3/Dashboard/RoadItemsProjectController.php @@ -273,16 +273,16 @@ class RoadItemsProjectController extends Controller 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 { - 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 { - return $this->successResponse($roadItemsProject->load('files')); + return $this->successResponse($roadItemsProject->files()->get(['path'])); } } diff --git a/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php b/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php index 7493b980..dd1f9f32 100644 --- a/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php +++ b/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php @@ -331,11 +331,11 @@ class RoadPatrolProjectController extends Controller 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 { - return $this->successResponse($roadPatrol->load('rahdaran:id,name,code')); + return $this->successResponse($roadPatrol->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code'])); } }