diff --git a/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php b/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php index 721fec88..228bf825 100644 --- a/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php +++ b/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php @@ -226,6 +226,6 @@ class RoadMaintenanceStationController extends Controller public function giveListToFms(): JsonResponse { - return $this->successResponse(RahdariPoint::all(['id', 'name', 'lat', 'lng', 'area'])); + return $this->successResponse(RahdariPoint::all(['id', 'province_id', 'province_name', 'city_id', 'city_name', 'name', 'lat', 'lng', 'area'])); } } diff --git a/app/Models/MissionViolation.php b/app/Models/MissionViolation.php index cb947151..ad94c62a 100644 --- a/app/Models/MissionViolation.php +++ b/app/Models/MissionViolation.php @@ -17,8 +17,8 @@ class MissionViolation extends Model return $this->belongsTo(Mission::class); } - public function machine(): HasOne + public function machine(): BelongsTo { - return $this->hasOne(CMMSMachine::class); + return $this->belongsTo(CMMSMachine::class, 'machine_id'); } } diff --git a/app/Services/CMMS/DailyMovingMachinesService.php b/app/Services/CMMS/DailyMovingMachinesService.php index 3f891221..0d0c86c1 100644 --- a/app/Services/CMMS/DailyMovingMachinesService.php +++ b/app/Services/CMMS/DailyMovingMachinesService.php @@ -46,6 +46,7 @@ class DailyMovingMachinesService $inputData = $this->makeInputParameters(); return Http::withBody($inputData) + ->timeout(120) ->throw() ->withoutVerifying() ->post($this->url) diff --git a/app/Services/Cartables/Mission/DailyMoveMachineService.php b/app/Services/Cartables/Mission/DailyMoveMachineService.php index 9e83ef0d..72a3e1a5 100644 --- a/app/Services/Cartables/Mission/DailyMoveMachineService.php +++ b/app/Services/Cartables/Mission/DailyMoveMachineService.php @@ -30,7 +30,6 @@ class DailyMoveMachineService $request, allowedFilters: ['*'], allowedSortings: ['*'], - allowedSelects: ['id', 'mission_id', 'machine_code', 'request_date', 'type', 'exit_time', 'enter_time', 'status'] ); } }