diff --git a/server/src/Http/Controllers/Api/v1/OrderController.php b/server/src/Http/Controllers/Api/v1/OrderController.php index 74ce7916..5bfbcf6b 100644 --- a/server/src/Http/Controllers/Api/v1/OrderController.php +++ b/server/src/Http/Controllers/Api/v1/OrderController.php @@ -532,6 +532,7 @@ public function query(Request $request) set_time_limit(180); $results = Order::queryWithRequest($request, function (&$query, $request) { + $query->with('driverAssigned'); $query->where('company_uuid', session('company')); $query->whereNotNull('payload_uuid'); @@ -726,6 +727,7 @@ public function find($id, Request $request) // find for the order try { $order = Order::findRecordOrFail($id); + $order->load('driverAssigned'); } catch (ModelNotFoundException $exception) { return response()->json( [ @@ -1226,7 +1228,7 @@ public function setDestination(string $id, string $placeId) } // Load required relations - $order->loadMissing(['payload.waypoints', 'payload.pickup', 'payload.dropoff']); + $order->loadMissing(['payload.waypoints', 'payload.pickup', 'payload.dropoff', 'driverAssigned']); // Get the order payload $payload = $order->payload;