@fleetbase/fleetops-engine 0.6.45 → 0.6.47

package/server/src/Http/Controllers/Api/v1/OrderController.php

@@ -100,6 +100,11 @@ class OrderController extends Controller
             $pickup       = data_get($payloadInput, 'pickup');
             $dropoff      = data_get($payloadInput, 'dropoff');
             $return       = data_get($payloadInput, 'return');
+            $hasPickupField = array_key_exists('pickup', $payloadInput);
+            $hasDropoffField = array_key_exists('dropoff', $payloadInput);
+            $hasReturnField = array_key_exists('return', $payloadInput);
+            $hasWaypointsField = array_key_exists('waypoints', $payloadInput);
+            $hasRouteEndpointFields = $hasPickupField || $hasDropoffField || $hasReturnField;
 
             if ($pickup) {
                 $payload->setPickup($pickup, [
@@ -414,14 +419,21 @@ class OrderController extends Controller
             $payload->save();
 
             // set waypoints and entities after payload is saved
-            if ($waypoints) {
+            if ($hasWaypointsField && is_array($waypoints) && count($waypoints)) {
                 $payload->setWaypoints($waypoints);
+            } elseif ($hasWaypointsField || $hasRouteEndpointFields) {
+                $payload->removeWaypoints();
             }
 
             if ($entities) {
                 $payload->setEntities($entities);
             }
 
+            $firstWaypoint = $payload->getPickupOrFirstWaypoint();
+            if ($firstWaypoint instanceof Place) {
+                $payload->setCurrentWaypoint($firstWaypoint);
+            }
+
             $input['payload_uuid'] = $payload->uuid;
         } elseif ($request->has('payload')) {
             $input['payload_uuid'] = Utils::getUuid('payloads', [
@@ -440,6 +452,11 @@ class OrderController extends Controller
             $pickup       = data_get($payloadInput, 'pickup');
             $dropoff      = data_get($payloadInput, 'dropoff');
             $return       = data_get($payloadInput, 'return');
+            $hasPickupField = $request->exists('pickup');
+            $hasDropoffField = $request->exists('dropoff');
+            $hasReturnField = $request->exists('return');
+            $hasWaypointsField = $request->exists('waypoints');
+            $hasRouteEndpointFields = $hasPickupField || $hasDropoffField || $hasReturnField;
 
             // if no pickup and dropoff extract from waypoints
             if (empty($pickup) && empty($dropoff) && count($waypoints)) {
@@ -462,14 +479,21 @@ class OrderController extends Controller
             $payload->save();
 
             // set waypoints and entities after payload is saved
-            if ($waypoints) {
+            if ($hasWaypointsField && is_array($waypoints) && count($waypoints)) {
                 $payload->setWaypoints($waypoints);
+            } elseif ($hasWaypointsField || $hasRouteEndpointFields) {
+                $payload->removeWaypoints();
             }
 
             if ($entities) {
                 $payload->setEntities($entities);
             }
 
+            $firstWaypoint = $payload->getPickupOrFirstWaypoint();
+            if ($firstWaypoint instanceof Place) {
+                $payload->setCurrentWaypoint($firstWaypoint);
+            }
+
             $input['payload_uuid'] = $payload->uuid;
         }
 
@@ -1159,7 +1183,11 @@ class OrderController extends Controller
             })->first();
         }
 
-        $activities = $order->config()->nextActivity($waypoint);
+        $orderConfig = $order->ensureOrderConfig();
+        if (!$orderConfig) {
+            return response()->apiError('No order config found for order.');
+        }
+        $activities = $orderConfig->nextActivity($waypoint);
 
         // If activity is to complete order add proof of delivery properties if required
         // This is a temporary fix until activity is updated to handle POD on it's own

package/server/src/Http/Controllers/Api/v1/PayloadController.php

@@ -31,6 +31,11 @@ class PayloadController extends Controller
         $pickup    = data_get($input, 'pickup');
         $dropoff   = data_get($input, 'dropoff');
         $return    = data_get($input, 'return');
+        $hasPickupField = array_key_exists('pickup', $input);
+        $hasDropoffField = array_key_exists('dropoff', $input);
+        $hasReturnField = array_key_exists('return', $input);
+        $hasWaypointsField = array_key_exists('waypoints', $input);
+        $hasRouteEndpointFields = $hasPickupField || $hasDropoffField || $hasReturnField;
 
         // make sure company is set
         $input['company_uuid'] = session('company');
@@ -116,8 +121,10 @@ class PayloadController extends Controller
         }
 
         // set waypoints
-        if ($waypoints) {
+        if ($hasWaypointsField && is_array($waypoints) && count($waypoints)) {
             $payload->setWaypoints($waypoints);
+        } elseif ($hasWaypointsField || $hasRouteEndpointFields) {
+            $payload->removeWaypoints();
         }
 
         // set entities
@@ -131,6 +138,12 @@ class PayloadController extends Controller
         // save the payload
         $payload->save();
 
+        // set the first / current waypoint from the effective route shape
+        $firstWaypoint = $payload->getPickupOrFirstWaypoint();
+        if ($firstWaypoint instanceof Place) {
+            $payload->setCurrentWaypoint($firstWaypoint);
+        }
+
         // make sure entities and waypoints is loaded
         $payload->load(['entities', 'waypoints', 'pickup', 'dropoff', 'return']);
 

package/server/src/Http/Controllers/Api/v1/ServiceAreaController.php

@@ -65,6 +65,7 @@ class ServiceAreaController extends Controller
         // create the serviceArea
         try {
             $serviceArea = ServiceArea::create($input);
+            $serviceArea->refresh();
         } catch (\Throwable $e) {
             logger()->error('Unable to create service area.', ['error' => $e->getMessage()]);
 
@@ -135,6 +136,7 @@ class ServiceAreaController extends Controller
 
         // update the serviceArea
         $serviceArea->update($input);
+        $serviceArea->refresh();
 
         // response the serviceArea resource
         return new ServiceAreaResource($serviceArea);

package/server/src/Http/Controllers/Api/v1/ServiceQuoteController.php

@@ -232,6 +232,7 @@ class ServiceQuoteController extends Controller
 
         // should all be Place like
         $waypoints = collect([$pickup, ...$waypoints, $dropoff])->filter();
+        $endpointCount = (int) ($pickup instanceof Place) + (int) ($dropoff instanceof Place);
 
         // if facilitator is an integrated partner resolve service quotes from bridge
         if ($facilitator && Utils::isIntegratedVendorId($facilitator)) {
@@ -281,7 +282,7 @@ class ServiceQuoteController extends Controller
             $serviceQuotes = collect();
 
             if ($serviceRate) {
-                [$subTotal, $lines] = $serviceRate->quoteFromPreliminaryData($entities, $waypoints, $totalDistance, $totalTime, $isCashOnDelivery);
+                [$subTotal, $lines] = $serviceRate->quoteFromPreliminaryData($entities, $waypoints, $totalDistance, $totalTime, $isCashOnDelivery, $endpointCount);
 
                 $quote = ServiceQuote::create([
                     'request_id'        => $requestId,
@@ -329,7 +330,7 @@ class ServiceQuoteController extends Controller
 
         // calculate quotes
         foreach ($serviceRates as $serviceRate) {
-            [$subTotal, $lines] = $serviceRate->quoteFromPreliminaryData($entities, $waypoints, $totalDistance, $totalTime, $isCashOnDelivery);
+            [$subTotal, $lines] = $serviceRate->quoteFromPreliminaryData($entities, $waypoints, $totalDistance, $totalTime, $isCashOnDelivery, $endpointCount);
 
             $quote = ServiceQuote::create([
                 'request_id'        => $requestId,

package/server/src/Http/Controllers/Api/v1/ZoneController.php

@@ -69,6 +69,7 @@ class ZoneController extends Controller
 
         // create the zone
         $zone = Zone::create($input);
+        $zone->refresh();
 
         // response the zone resource
         return new ZoneResource($zone);
@@ -134,6 +135,7 @@ class ZoneController extends Controller
 
         // update the zone
         $zone->update($input);
+        $zone->refresh();
 
         // response the zone resource
         return new ZoneResource($zone);

package/server/src/Http/Controllers/Internal/v1/LiveController.php

@@ -128,10 +128,11 @@ class LiveController extends Controller
             ->applyDirectivesForPermissions('fleet-ops list order')
             ->with([
                 'payload.entities',
-                'payload.waypoints',
                 'payload.dropoff',
                 'payload.pickup',
                 'payload.return',
+                'payload.firstWaypointMarker.place',
+                'payload.lastWaypointMarker.place',
                 'trackingNumber',
                 'trackingStatuses',
                 'driverAssigned' => function ($query) {

package/server/src/Http/Controllers/Internal/v1/OrchestrationController.php

@@ -574,12 +574,15 @@ class OrchestrationController extends Controller
 
                 // ── Resolve OrderConfig ───────────────────────────────────────
                 $orderConfigUuid = null;
+                $resolvedOrderConfig = null;
                 if (!empty($firstRow['type'])) {
-                    $orderConfig = OrderConfig::resolveFromIdentifier($firstRow['type']);
-                    if ($orderConfig) {
-                        $orderConfigUuid = $orderConfig->uuid;
+                    $resolvedOrderConfig = OrderConfig::resolveFromIdentifier($firstRow['type']);
+                    if ($resolvedOrderConfig) {
+                        $orderConfigUuid = $resolvedOrderConfig->uuid;
                     }
                 }
+                $resolvedOrderConfig ??= OrderConfig::defaultOrCreate();
+                $orderConfigUuid = $resolvedOrderConfig?->uuid;
 
                 // ── Resolve Customer ─────────────────────────────────────────
                 $customerUuid = null;
@@ -660,7 +663,7 @@ class OrchestrationController extends Controller
                     'driver_assigned_uuid'  => $driverUuid,
                     'internal_id'           => $firstRow['internal_id'] ?? null,
                     'status'                => $firstRow['status'] ?? 'created',
-                    'type'                  => $firstRow['type'] ?? 'default',
+                    'type'                  => $resolvedOrderConfig?->key ?? 'transport',
                     'notes'                 => $firstRow['notes'] ?? null,
                     'scheduled_at'          => !empty($firstRow['scheduled_at'])
                         ? Carbon::parse($firstRow['scheduled_at'])

package/server/src/Http/Controllers/Internal/v1/OrderController.php

@@ -97,6 +97,8 @@ class OrderController extends FleetOpsController
                 function ($request, &$input) {
                     $serviceQuote = ServiceQuote::resolveFromRequest($request);
 
+                    $this->normalizeCustomerType($input);
+
                     // if service quote is applied, resolve it
                     if ($serviceQuote instanceof ServiceQuote && $serviceQuote->fromIntegratedVendor()) {
                         // create order with integrated vendor, then resume fleetbase order creation
@@ -109,9 +111,19 @@ class OrderController extends FleetOpsController
                         $input['integrated_vendor_order'] = $integratedVendorOrder;
                     }
 
-                    // if no type is set its default to default
-                    if (!isset($input['type'])) {
-                        $input['type'] = 'default';
+                    // Normalize order config + type onto the company transport
+                    // config when an explicit config was not provided.
+                    $resolvedOrderConfig = null;
+                    if (!empty($input['order_config_uuid']) || !empty($input['type'])) {
+                        $resolvedOrderConfig = OrderConfig::resolveFromIdentifier([$input['order_config_uuid'] ?? null, $input['type'] ?? null]);
+                    }
+                    $resolvedOrderConfig ??= OrderConfig::defaultOrCreate();
+
+                    if ($resolvedOrderConfig) {
+                        $input['order_config_uuid'] = $resolvedOrderConfig->uuid;
+                        $input['type'] = $resolvedOrderConfig->key;
+                    } elseif (!isset($input['type'])) {
+                        $input['type'] = 'transport';
                     }
 
                     // if no status is set its default to `created`
@@ -119,14 +131,6 @@ class OrderController extends FleetOpsController
                         $input['status'] = 'created';
                     }
 
-                    // Set order config
-                    if (!isset($input['order_config_uuid'])) {
-                        $defaultOrderConfig = OrderConfig::default();
-                        if ($defaultOrderConfig) {
-                            $input['order_config_uuid'] = $defaultOrderConfig->uuid;
-                        }
-                    }
-
                     // Ensure orchestrator_priority is never null — the column is NOT NULL
                     // and the DB default is bypassed when Eloquent receives an explicit null.
                     if (!isset($input['orchestrator_priority']) || !is_numeric($input['orchestrator_priority'])) {
@@ -216,6 +220,33 @@ class OrderController extends FleetOpsController
         }
     }
 
+    /**
+     * Resolve the concrete polymorphic customer type from the submitted UUID.
+     */
+    protected function normalizeCustomerType(array &$input): void
+    {
+        $customerUuid = data_get($input, 'customer_uuid') ?? data_get($input, 'customer.uuid');
+        if (!$customerUuid) {
+            return;
+        }
+
+        $customer = Utils::getUuid(
+            ['contacts', 'vendors'],
+            [
+                'uuid'         => $customerUuid,
+                'company_uuid' => session('company'),
+            ],
+            [
+                'with_table' => true,
+            ]
+        );
+
+        if (is_array($customer)) {
+            $input['customer_uuid'] = Utils::get($customer, 'uuid');
+            $input['customer_type'] = Utils::getModelClassName(Utils::get($customer, 'table'));
+        }
+    }
+
     /**
      *  Route which enables editing of an order route.
      *
@@ -225,10 +256,14 @@ class OrderController extends FleetOpsController
      */
     public function editOrderRoute(string $id, Request $request)
     {
-        $pickup    = $request->input('pickup');
-        $dropoff   = $request->input('dropoff');
-        $return    = $request->input('return');
-        $waypoints = $request->array('waypoints', []);
+        $pickup            = $request->input('pickup');
+        $dropoff           = $request->input('dropoff');
+        $return            = $request->input('return');
+        $waypoints         = $request->array('waypoints', []);
+        $hasPickupInput    = $request->exists('pickup');
+        $hasDropoffInput   = $request->exists('dropoff');
+        $hasReturnInput    = $request->exists('return');
+        $hasWaypointsInput = $request->exists('waypoints');
 
         // Get the order
         $order = Order::where('uuid', $id)->with(['payload'])->first();
@@ -236,30 +271,51 @@ class OrderController extends FleetOpsController
             return response()->error('Unable to find order to update route for.');
         }
 
-        // Handle update of multiple waypoints
-        if ($waypoints) {
-            $order->payload->updateWaypoints($waypoints);
-            $order->payload->removePlace(['pickup', 'dropoff', 'return'], ['save' => true]);
-        } else {
-            // Update pickup
+        if ($hasPickupInput) {
             if ($pickup) {
                 $order->payload->setPickup($pickup, ['save' => true]);
+            } else {
+                $order->payload->removePlace('pickup', ['save' => true]);
             }
+        }
 
-            // Update dropoff
+        if ($hasDropoffInput) {
             if ($dropoff) {
                 $order->payload->setDropoff($dropoff, ['save' => true]);
+            } else {
+                $order->payload->removePlace('dropoff', ['save' => true]);
             }
+        }
 
-            // Update return
+        if ($hasReturnInput) {
             if ($return) {
-                $order->payload->setDropoff($return, ['save' => true]);
+                $order->payload->setReturn($return, ['save' => true]);
+            } else {
+                $order->payload->removePlace('return', ['save' => true]);
             }
+        }
 
-            // Remove waypoints if any
+        if ($hasWaypointsInput) {
+            if (!empty($waypoints)) {
+                $order->payload->updateWaypoints($waypoints);
+            } else {
+                $order->payload->removeWaypoints();
+            }
+        } elseif ($hasPickupInput || $hasDropoffInput || $hasReturnInput) {
             $order->payload->removeWaypoints();
         }
 
+        $startingDestination = $order->payload->getPickupOrFirstWaypoint();
+        if (!$startingDestination) {
+            $startingDestination = $order->payload->getDropoffOrLastWaypoint();
+        }
+
+        if ($startingDestination instanceof Place || $startingDestination instanceof Waypoint) {
+            $order->payload->setCurrentWaypoint($startingDestination);
+        }
+
+        $order->load(['payload.pickup', 'payload.dropoff', 'payload.return', 'payload.waypoints']);
+
         return ['order' => new $this->resource($order)];
     }
 
@@ -531,14 +587,10 @@ class OrderController extends FleetOpsController
             return response()->error('No order found to dispatch.');
         }
 
-        // if order has no config set, set default config
-        $order->loadMissing('orderConfig');
-        if (!$order->orderConfig) {
-            $defaultOrderConfig = OrderConfig::default();
-            if ($defaultOrderConfig) {
-                $order->update(['order_config_uuid' => $defaultOrderConfig->uuid]);
-                $order->loadMissing('orderConfig');
-            }
+        // Ensure the order is normalized onto a real order config before
+        // dispatching activities.
+        if (!$order->ensureOrderConfig()) {
+            return response()->error('No order config found for dispatch.');
         }
 
         if (!$order->hasDriverAssigned && !$order->adhoc) {
@@ -711,7 +763,11 @@ class OrderController extends FleetOpsController
         }
 
         $waypoint   = $request->filled('waypoint') ? Waypoint::findByPlace($request->input('waypoint'), $order) : null;
-        $activities = $order->config()->nextActivity($waypoint);
+        $orderConfig = $order->ensureOrderConfig();
+        if (!$orderConfig) {
+            return response()->error('No order config found for order.');
+        }
+        $activities = $orderConfig->nextActivity($waypoint);
 
         // If activity is to complete order add proof of delivery properties if required
         // This is a temporary fix until activity is updated to handle POD on it's own

package/server/src/Http/Controllers/Internal/v1/ServiceQuoteController.php

@@ -227,6 +227,7 @@ class ServiceQuoteController extends FleetOpsController
 
         // should all be Place like
         $waypoints = collect([$pickup, ...$waypoints, $dropoff])->filter();
+        $endpointCount = (int) ($pickup instanceof Place) + (int) ($dropoff instanceof Place);
 
         // if facilitator is an integrated partner resolve service quotes from bridge
         if ($facilitator && Str::startsWith($facilitator, 'integrated_vendor')) {
@@ -274,7 +275,7 @@ class ServiceQuoteController extends FleetOpsController
             $serviceQuotes = collect();
 
             if ($serviceRate) {
-                [$subTotal, $lines] = $serviceRate->quoteFromPreliminaryData($entities, $waypoints, $totalDistance, $totalTime, $isCashOnDelivery);
+                [$subTotal, $lines] = $serviceRate->quoteFromPreliminaryData($entities, $waypoints, $totalDistance, $totalTime, $isCashOnDelivery, $endpointCount);
 
                 $quote = ServiceQuote::create([
                     'request_id'        => $requestId,
@@ -322,7 +323,7 @@ class ServiceQuoteController extends FleetOpsController
 
         // calculate quotes
         foreach ($serviceRates as $serviceRate) {
-            [$subTotal, $lines] = $serviceRate->quoteFromPreliminaryData($entities, $waypoints, $totalDistance, $totalTime, $isCashOnDelivery);
+            [$subTotal, $lines] = $serviceRate->quoteFromPreliminaryData($entities, $waypoints, $totalDistance, $totalTime, $isCashOnDelivery, $endpointCount);
 
             $quote = ServiceQuote::create([
                 'request_id'        => $requestId,

package/server/src/Http/Controllers/Internal/v1/SettingController.php

@@ -184,9 +184,17 @@ class SettingController extends Controller
      */
     public function saveRoutingSettings(Request $request)
     {
-        $router = $request->input('router');
-        $unit   = $request->input('unit', 'km');
-        Setting::configureCompany('routing', ['router' => $router, 'unit' => $unit]);
+        $displayEngine      = $request->input('display_engine', $request->input('router', 'osrm'));
+        $optimizationEngine = $request->input('optimization_engine', $displayEngine);
+        $unit               = $request->input('unit', 'km');
+        Setting::configureCompany('routing', [
+            'router'                      => $displayEngine,
+            'display_engine'              => $displayEngine,
+            'optimization_engine'         => $optimizationEngine,
+            'routing_display_engine'      => $displayEngine,
+            'routing_optimization_engine' => $optimizationEngine,
+            'unit'                        => $unit,
+        ]);
 
         return response()->json([
             'status'  => 'ok',
@@ -203,6 +211,14 @@ class SettingController extends Controller
     {
         $routingSettings = Setting::lookupCompany('routing', ['router' => 'osrm', 'unit' => 'km']);
 
+        $displayEngine = data_get($routingSettings, 'display_engine', data_get($routingSettings, 'routing_display_engine', data_get($routingSettings, 'router', 'osrm')));
+        $optimizationEngine = data_get($routingSettings, 'optimization_engine', data_get($routingSettings, 'routing_optimization_engine', $displayEngine));
+        $routingSettings['router'] = $displayEngine;
+        $routingSettings['display_engine'] = $displayEngine;
+        $routingSettings['optimization_engine'] = $optimizationEngine;
+        $routingSettings['routing_display_engine'] = $displayEngine;
+        $routingSettings['routing_optimization_engine'] = $optimizationEngine;
+
         // always default to km if no unit is set
         if (!isset($routingSettings['unit'])) {
             $routingSettings['unit'] = 'km';
@@ -211,6 +227,93 @@ class SettingController extends Controller
         return response()->json($routingSettings);
     }
 
+    /**
+     * Retrieve and return the map provider settings for the current company.
+     *
+     * The Google Maps API key is sourced exclusively from the system-level
+     * services configuration managed by the core-api admin settings panel
+     * (services.google_maps.api_key). FleetOps never stores or manages the
+     * key independently — it simply reads it from the shared system config
+     * and passes it to the frontend so the Google Maps adapter can initialise.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function getMapSettings()
+    {
+        $defaults = [
+            'mapProvider' => 'leaflet',
+        ];
+
+        $systemMapSettings = Setting::lookup('fleet-ops.map-settings', []);
+        $mapSettings = Setting::lookupFromCompany('fleet-ops.map-settings', $defaults);
+        $mapSettings['mapProvider'] = data_get($mapSettings, 'mapProvider') ?: data_get($systemMapSettings, 'mapProvider', 'leaflet');
+
+        // Source the Google Maps API key from the system-level services config
+        // that is managed by the core-api admin settings panel. This ensures a
+        // single source of truth and avoids duplicating key management.
+        $mapSettings['googleMapsApiKey'] = config('services.google_maps.api_key', env('GOOGLE_MAPS_API_KEY', ''));
+        $mapSettings['googleMapsMapId'] = data_get($systemMapSettings, 'googleMapsMapId', '');
+
+        return response()->json($mapSettings);
+    }
+
+    /**
+     * Persist the map provider settings for the current company.
+     *
+     * The Google Maps API key is managed entirely through the core-api admin
+     * settings panel (Settings → Services → Google Maps) and is therefore
+     * never accepted or stored by this endpoint. Only the provider selection
+     * and display preferences are persisted here.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function saveMapSettings(Request $request)
+    {
+        $settings = $request->input('settings', []);
+
+        // The API key is managed at the system level via core-api — strip it
+        // from the payload in case a client accidentally sends it.
+        unset($settings['googleMapsApiKey']);
+
+        // Validate provider value
+        $allowedProviders = ['leaflet', 'google'];
+        if (isset($settings['mapProvider']) && !in_array($settings['mapProvider'], $allowedProviders)) {
+            $settings['mapProvider'] = 'leaflet';
+        }
+
+        Setting::configureCompany('fleet-ops.map-settings', $settings);
+
+        return response()->json($this->getMapSettings()->getData(true));
+    }
+
+    public function getAdminMapSettings()
+    {
+        $defaults = [
+            'mapProvider' => 'leaflet',
+            'googleMapsMapId' => '',
+        ];
+
+        return response()->json(Setting::lookup('fleet-ops.map-settings', $defaults));
+    }
+
+    public function saveAdminMapSettings(Request $request)
+    {
+        $allowedProviders = ['leaflet', 'google'];
+        $mapProvider = $request->input('mapProvider', 'leaflet');
+        if (!in_array($mapProvider, $allowedProviders)) {
+            $mapProvider = 'leaflet';
+        }
+
+        $settings = [
+            'mapProvider' => $mapProvider,
+            'googleMapsMapId' => (string) $request->input('googleMapsMapId', ''),
+        ];
+
+        Setting::configure('fleet-ops.map-settings', $settings);
+
+        return response()->json($this->getAdminMapSettings()->getData(true));
+    }
+
     /**
      * Retrieve driver scheduling settings for the current company.
      *

package/server/src/Http/Filter/OrderFilter.php

@@ -44,10 +44,11 @@ class OrderFilter extends Filter
         // eager load main relationships to reduce N+1 overhead
         $this->builder->with([
             'payload.entities',
-            'payload.waypoints',
             'payload.pickup',
             'payload.dropoff',
             'payload.return',
+            'payload.firstWaypointMarker.place',
+            'payload.lastWaypointMarker.place',
             'trackingNumber',
             'trackingStatuses',
             'driverAssigned' => function ($query) {

package/server/src/Http/Resources/v1/Index/Payload.php

@@ -19,6 +19,8 @@ class Payload extends FleetbaseResource
     public function toArray($request): array
     {
         $isInternal = Http::isInternalRequest();
+        $pickup = $this->index_pickup_place;
+        $dropoff = $this->index_dropoff_place;
 
         return [
             'id'           => $this->when($isInternal, $this->id, $this->public_id),
@@ -30,24 +32,24 @@ class Payload extends FleetbaseResource
             'return_uuid'  => $this->when($isInternal, $this->return_uuid),
 
             // Minimal pickup - only what's displayed in the table
-            'pickup'     => $this->whenLoaded('pickup', function () {
-                return new Place($this->pickup);
+            'pickup'     => $this->when($pickup, function () use ($pickup) {
+                return new Place($pickup);
             }),
 
             // Minimal dropoff - only what's displayed in the table
-            'dropoff'    => $this->whenLoaded('dropoff', function () {
-                return new Place($this->dropoff);
+            'dropoff'    => $this->when($dropoff, function () use ($dropoff) {
+                return new Place($dropoff);
             }),
 
             // Entity count instead of full entities
             'entities_count' => $this->whenLoaded('entities', function () {
                 return $this->entities->count();
-            }),
+            }, $this->entities()->count()),
 
-            // Waypoint count instead of full waypoints
+            // Waypoint count for lightweight route-shape summaries.
             'waypoints_count' => $this->whenLoaded('waypoints', function () {
                 return $this->waypoints->count();
-            }),
+            }, $this->waypoints()->count()),
 
             'type'       => $this->type,
             'created_at' => $this->created_at,