@fleetbase/fleetops-engine 0.6.44 → 0.6.46

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.6.44",
+    "version": "0.6.46",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.44",
+    "version": "0.6.46",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.6.44",
+    "version": "0.6.46",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -43,8 +43,8 @@
     "dependencies": {
         "@babel/core": "^7.23.2",
         "@fleetbase/ember-core": "^0.3.18",
-        "@fleetbase/ember-ui": "^0.3.26",
-        "@fleetbase/fleetops-data": "^0.1.29",
+        "@fleetbase/ember-ui": "^0.3.29",
+        "@fleetbase/fleetops-data": "^0.1.31",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "@fortawesome/fontawesome-svg-core": "6.4.0",

package/server/src/Auth/Schemas/FleetOps.php

@@ -157,6 +157,11 @@ class FleetOps
             'action'         => [],
             'remove_actions' => ['export', 'create'],
         ],
+        [
+            'name'           => 'map-settings',
+            'action'         => [],
+            'remove_actions' => ['export', 'create'],
+        ],
     ];
 
     /**

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, [
@@ -321,7 +326,7 @@ class OrderController extends Controller
         }
 
         // load required relations
-        $order->load(['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate', 'customer', 'facilitator']);
+        $order->load(['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate.serviceQuote.items', 'customer', 'facilitator']);
 
         // Determine if order should be dispatched on creation
         $shouldDispatch = $request->boolean('dispatch') && $integratedVendorOrder === null;
@@ -364,7 +369,7 @@ class OrderController extends Controller
 
         // find for the order
         try {
-            $order = Order::findRecordOrFail($id, ['trackingNumber', 'driverAssigned', 'purchaseRate', 'customer', 'facilitator']);
+            $order = Order::findRecordOrFail($id, ['trackingNumber', 'driverAssigned', 'purchaseRate.serviceQuote.items', 'customer', 'facilitator']);
         } catch (ModelNotFoundException $exception) {
             return response()->json(
                 [
@@ -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;
         }
 
@@ -549,7 +573,7 @@ class OrderController extends Controller
         $order->flushAttributesCache();
 
         // load required relations
-        $order->load(['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate', 'customer', 'facilitator']);
+        $order->load(['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate.serviceQuote.items', 'customer', 'facilitator']);
 
         // response the order resource
         return new OrderResource($order);
@@ -759,7 +783,7 @@ class OrderController extends Controller
     {
         // find for the order
         try {
-            $order = Order::findRecordOrFail($id, ['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate', 'customer', 'facilitator']);
+            $order = Order::findRecordOrFail($id, ['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate.serviceQuote.items', 'customer', 'facilitator']);
         } catch (ModelNotFoundException $exception) {
             return response()->json(
                 [
@@ -839,7 +863,7 @@ class OrderController extends Controller
     public function dispatchOrder(string $id)
     {
         try {
-            $order = Order::findRecordOrFail($id, ['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate', 'customer', 'facilitator']);
+            $order = Order::findRecordOrFail($id, ['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate.serviceQuote.items', 'customer', 'facilitator']);
         } catch (ModelNotFoundException $exception) {
             return response()->json(
                 [
@@ -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/PurchaseRateController.php

@@ -41,10 +41,19 @@ class PurchaseRateController extends Controller
 
         // order assignment
         if ($request->has('order')) {
-            $input['order_uuid'] = Utils::getUuid('orders', [
+            $orderUuid = Utils::getUuid('orders', [
                 'public_id'    => $request->input('order'),
                 'company_uuid' => session('company'),
             ]);
+
+            $order = Order::where('uuid', $orderUuid)->first();
+
+            if ($order instanceof Order) {
+                $input['payload_uuid']   = $order->payload_uuid;
+                $input['customer_uuid']  = $order->customer_uuid;
+                $input['customer_type']  = $order->customer_type;
+                $input['company_uuid']   = $order->company_uuid ?? $input['company_uuid'];
+            }
         } elseif ($createOrder) {
             // create order from service quote
             $serviceQuote = ServiceQuote::where('uuid', $input['service_quote_uuid'])->orWhere('public_id', $request->input('service_quote'))->first();
@@ -70,9 +79,8 @@ class PurchaseRateController extends Controller
         // create the purchaseRate
         $purchaseRate = PurchaseRate::create($input);
 
-        // set purchase rate to order
         if ($order instanceof Order) {
-            $order->update(['purchase_rate_uuid' => $purchaseRate->uuid]);
+            $order->attachPurchaseRate($purchaseRate);
         }
 
         // response the driver resource

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

@@ -98,6 +98,7 @@ class ServiceQuoteController extends Controller
                     'amount'            => $subTotal,
                     'currency'          => $serviceRate->currency,
                 ]);
+                $quote->setRelation('serviceRate', $serviceRate);
 
                 $items = $lines->map(function ($line) use ($quote) {
                     return ServiceQuoteItem::create([
@@ -143,6 +144,7 @@ class ServiceQuoteController extends Controller
                 'amount'            => $subTotal,
                 'currency'          => $serviceRate->currency,
             ]);
+            $quote->setRelation('serviceRate', $serviceRate);
 
             $items = $lines->map(function ($line) use ($quote) {
                 return ServiceQuoteItem::create([
@@ -230,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)) {
@@ -279,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,
@@ -288,6 +291,7 @@ class ServiceQuoteController extends Controller
                     'amount'            => $subTotal,
                     'currency'          => $serviceRate->currency,
                 ]);
+                $quote->setRelation('serviceRate', $serviceRate);
 
                 // set preliminary data to meta
                 $quote->updateMeta('preliminary_data', $preliminaryData);
@@ -326,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,
@@ -335,6 +339,7 @@ class ServiceQuoteController extends Controller
                 'amount'            => $subTotal,
                 'currency'          => $serviceRate->currency,
             ]);
+            $quote->setRelation('serviceRate', $serviceRate);
 
             // set preliminary data to meta
             $quote->updateMeta('preliminary_data', $preliminaryData);

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

@@ -30,6 +30,8 @@ class ServiceRateController extends Controller
             'rate_calculation_method',
             'currency',
             'base_fee',
+            'max_distance_unit',
+            'max_distance',
             'per_meter_unit',
             'per_meter_flat_rate_fee',
             'meter_fees',
@@ -119,7 +121,10 @@ class ServiceRateController extends Controller
             'rate_calculation_method',
             'currency',
             'base_fee',
-            'per_km_flat_rate_fee',
+            'max_distance_unit',
+            'max_distance',
+            'per_meter_unit',
+            'per_meter_flat_rate_fee',
             'meter_fees',
             'meter_fees.*.distance',
             'meter_fees.*.fee',

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

@@ -109,9 +109,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 +129,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'])) {
@@ -225,10 +227,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 +242,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 +558,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 +734,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,