@fleetbase/fleetops-engine 0.6.39 → 0.6.40

package/addon/components/layout/fleet-ops-sidebar.hbs

@@ -104,8 +104,9 @@
                 }}
             {{else}}
                 <Layout::Sidebar::Item
-                    @onClick={{menuItem.onClick}}
-                    @route={{concat this.routePrefix menuItem.route}}
+                    @onClick={{if menuItem._virtual (fn this.universe.transitionMenuItem (concat this.routePrefix "virtual") menuItem) menuItem.onClick}}
+                    @menuItem={{menuItem}}
+                    @route={{if menuItem._virtual null (concat this.routePrefix menuItem.route)}}
                     @icon={{menuItem.icon}}
                     @iconComponent={{menuItem.iconComponent}}
                     @iconComponentOptions={{menuItem.iconComponentOptions}}
@@ -135,7 +136,7 @@
                 >{{if menuItem.intl (t menuItem.intl) menuItem.title}}</Layout::Sidebar::Item>
             {{/if}}
         {{/each}}
-        {{#let (array "operations" "management" "connectivity" "maintenance" "analytics" "settings") as |sectionsToRender|}}
+        {{!-- {{#let (array "operations" "management" "connectivity" "maintenance" "analytics" "settings") as |sectionsToRender|}}
             {{#each sectionsToRender as |section|}}
                 {{#if (eq menuPanel.routePrefix section)}}
                     {{#each (get this (concat "universe" (capitalize section) "MenuItems")) as |menuItem|}}
@@ -176,7 +177,7 @@
                     {{/each}}
                 {{/if}}
             {{/each}}
-        {{/let}}
+        {{/let}} --}}
     </Layout::Sidebar::Panel>
 {{/each}}
 {{#each this.universeMenuPanels as |menuPanel|}}

package/addon/components/layout/fleet-ops-sidebar.js

@@ -31,7 +31,6 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
 
     createMenuItemsFromUniverseRegistry() {
         const registeredMenuItems = this.menuService.getMenuItems('engine:fleet-ops');
-        console.log('Registered menu items for engine:fleet-ops:', registeredMenuItems);
         this.universeMenuPanels = this.menuService.getMenuPanels('engine:fleet-ops');
         this.universeMenuItems = registeredMenuItems.filter((menuItem) => menuItem.section === undefined);
         this.universeOperationsMenuItems = registeredMenuItems.filter((menuItem) => menuItem.section === 'operations');
@@ -46,6 +45,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
     createMenuPanels() {
         const operationsItems = [
             {
+                priority: 0,
                 intl: 'menu.dashboard',
                 title: this.intl.t('menu.dashboard'),
                 icon: 'home',
@@ -54,6 +54,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see order'),
             },
             {
+                priority: 1,
                 intl: 'menu.orchestrator',
                 title: this.intl.t('menu.orchestrator'),
                 icon: 'circle-nodes',
@@ -62,6 +63,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see order'),
             },
             {
+                priority: 2,
                 intl: 'menu.scheduler',
                 title: this.intl.t('menu.scheduler'),
                 icon: 'calendar-day',
@@ -70,6 +72,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see order'),
             },
             {
+                priority: 3,
                 intl: 'menu.order-config',
                 title: this.intl.t('menu.order-config'),
                 icon: 'diagram-project',
@@ -78,6 +81,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see order-config'),
             },
             {
+                priority: 4,
                 intl: 'menu.service-rates',
                 title: this.intl.t('menu.service-rates'),
                 icon: 'file-invoice-dollar',
@@ -85,10 +89,12 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 permission: 'fleet-ops list service-rate',
                 visible: this.abilities.can('fleet-ops see service-rate'),
             },
-        ];
+            ...(this.universeOperationsMenuItems ?? []).map((item) => ({ ...item, _virtual: true })),
+        ].sort((a, b) => (a.priority ?? 0) - (b.priority ?? 0));
 
         const resourcesItems = [
             {
+                priority: 0,
                 intl: 'menu.drivers',
                 title: this.intl.t('menu.drivers'),
                 icon: 'id-card',
@@ -99,6 +105,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see driver'),
             },
             {
+                priority: 1,
                 intl: 'menu.vehicles',
                 title: this.intl.t('menu.vehicles'),
                 icon: 'truck',
@@ -107,6 +114,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see vehicle'),
             },
             {
+                priority: 2,
                 intl: 'menu.fleets',
                 title: this.intl.t('menu.fleets'),
                 icon: 'user-group',
@@ -117,6 +125,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see fleet'),
             },
             {
+                priority: 3,
                 intl: 'menu.vendors',
                 title: this.intl.t('menu.vendors'),
                 icon: 'warehouse',
@@ -125,6 +134,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see vendor'),
             },
             {
+                priority: 4,
                 intl: 'menu.contacts',
                 title: this.intl.t('menu.contacts'),
                 icon: 'address-book',
@@ -133,6 +143,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see contact'),
             },
             {
+                priority: 5,
                 intl: 'menu.places',
                 title: this.intl.t('menu.places'),
                 icon: 'location-dot',
@@ -141,6 +152,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see place'),
             },
             {
+                priority: 6,
                 intl: 'menu.fuel-reports',
                 title: this.intl.t('menu.fuel-reports'),
                 icon: 'gas-pump',
@@ -149,6 +161,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see fuel-report'),
             },
             {
+                priority: 7,
                 intl: 'menu.issues',
                 title: this.intl.t('menu.issues'),
                 icon: 'triangle-exclamation',
@@ -156,10 +169,12 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 permission: 'fleet-ops list issue',
                 visible: this.abilities.can('fleet-ops see issue'),
             },
-        ];
+            ...(this.universeManagementMenuItems ?? []).map((item) => ({ ...item, _virtual: true })),
+        ].sort((a, b) => (a.priority ?? 0) - (b.priority ?? 0));
 
         const connectivityItems = [
             {
+                priority: 0,
                 intl: 'menu.telematics',
                 title: this.intl.t('menu.telematics'),
                 icon: 'satellite-dish',
@@ -168,6 +183,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see telematic'),
             },
             {
+                priority: 1,
                 intl: 'menu.devices',
                 title: this.intl.t('menu.devices'),
                 icon: 'hard-drive',
@@ -176,6 +192,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see device'),
             },
             {
+                priority: 2,
                 intl: 'menu.sensors',
                 title: this.intl.t('menu.sensors'),
                 icon: 'temperature-full',
@@ -184,6 +201,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see sensor'),
             },
             {
+                priority: 3,
                 intl: 'menu.events',
                 title: this.intl.t('menu.events'),
                 icon: 'stream',
@@ -191,18 +209,12 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 permission: 'fleet-ops list device-event',
                 visible: this.abilities.can('fleet-ops see device-event'),
             },
-            // {
-            //     intl: 'menu.tracking',
-            //     title: this.intl.t('menu.tracking'),
-            //     icon: 'map-marked-alt',
-            //     route: 'connectivity.tracking',
-            //     permission: 'fleet-ops list device',
-            //     visible: this.abilities.can('fleet-ops see device'),
-            // },
-        ];
+            ...(this.universeConnectivityMenuItems ?? []).map((item) => ({ ...item, _virtual: true })),
+        ].sort((a, b) => (a.priority ?? 0) - (b.priority ?? 0));
 
         const maintenanceItems = [
             {
+                priority: 0,
                 intl: 'menu.schedules',
                 title: this.intl.t('menu.schedules'),
                 icon: 'calendar-alt',
@@ -211,6 +223,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see maintenance-schedule'),
             },
             {
+                priority: 1,
                 intl: 'menu.work-orders',
                 title: this.intl.t('menu.work-orders'),
                 icon: 'clipboard-list',
@@ -219,6 +232,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see work-order'),
             },
             {
+                priority: 2,
                 intl: 'menu.maintenances',
                 title: this.intl.t('menu.maintenances'),
                 icon: 'history',
@@ -227,6 +241,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see maintenance'),
             },
             {
+                priority: 3,
                 intl: 'menu.equipment',
                 title: this.intl.t('menu.equipment'),
                 icon: 'trailer',
@@ -235,6 +250,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see equipment'),
             },
             {
+                priority: 4,
                 intl: 'menu.parts',
                 title: this.intl.t('menu.parts'),
                 icon: 'cog',
@@ -242,10 +258,12 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 permission: 'fleet-ops list part',
                 visible: this.abilities.can('fleet-ops see part'),
             },
-        ];
+            ...(this.universeMaintenanceMenuItems ?? []).map((item) => ({ ...item, _virtual: true })),
+        ].sort((a, b) => (a.priority ?? 0) - (b.priority ?? 0));
 
         const analyticsItems = [
             {
+                priority: 0,
                 intl: 'menu.reports',
                 title: this.intl.t('menu.reports'),
                 icon: 'file-import',
@@ -253,10 +271,12 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 permission: 'iam list report',
                 visible: this.abilities.can('fleet-ops see report'),
             },
-        ];
+            ...(this.universeAnalyticsMenuItems ?? []).map((item) => ({ ...item, _virtual: true })),
+        ].sort((a, b) => (a.priority ?? 0) - (b.priority ?? 0));
 
         const settingsItems = [
             {
+                priority: 0,
                 intl: 'menu.navigator-app',
                 title: this.intl.t('menu.navigator-app'),
                 icon: 'location-arrow',
@@ -265,6 +285,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see navigator-settings'),
             },
             {
+                priority: 1,
                 intl: 'menu.payments',
                 title: this.intl.t('menu.payments'),
                 icon: 'cash-register',
@@ -273,6 +294,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see payments'),
             },
             {
+                priority: 2,
                 intl: 'menu.notifications',
                 title: this.intl.t('menu.notifications'),
                 icon: 'bell',
@@ -281,6 +303,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see notification-settings'),
             },
             {
+                priority: 3,
                 intl: 'menu.routing',
                 title: this.intl.t('menu.routing'),
                 icon: 'route',
@@ -289,6 +312,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see routing-settings'),
             },
             {
+                priority: 4,
                 intl: 'menu.orchestrator',
                 title: this.intl.t('menu.orchestrator'),
                 icon: 'circle-nodes',
@@ -297,6 +321,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see routing-settings'),
             },
             {
+                priority: 5,
                 intl: 'menu.scheduling',
                 title: this.intl.t('menu.scheduling'),
                 icon: 'calendar-days',
@@ -305,6 +330,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see scheduling-settings'),
             },
             {
+                priority: 6,
                 intl: 'menu.custom-fields',
                 title: this.intl.t('menu.custom-fields'),
                 icon: 'rectangle-list',
@@ -313,6 +339,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see custom-field'),
             },
             {
+                priority: 7,
                 intl: 'menu.avatars',
                 title: this.intl.t('menu.avatars'),
                 icon: 'icons',
@@ -320,7 +347,8 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 permission: 'fleet-ops view avatar',
                 visible: this.abilities.can('fleet-ops see avatar'),
             },
-        ];
+            ...(this.universeSettingsMenuItems ?? []).map((item) => ({ ...item, _virtual: true })),
+        ].sort((a, b) => (a.priority ?? 0) - (b.priority ?? 0));
 
         const createPanel = (intl, routePrefix, items = [], options = {}) => ({
             intl,

package/addon/components/orchestrator-workbench.js

@@ -3,6 +3,7 @@ import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { later } from '@ember/runloop';
+import { debug } from '@ember/debug';
 import { task } from 'ember-concurrency';
 import { colorForId, waypointIconHtml } from '../utils/route-colors';
 import polyline from '@fleetbase/ember-core/utils/polyline';
@@ -122,7 +123,7 @@ export default class OrchestratorWorkbenchComponent extends Component {
         const lat = this.location.getLatitude();
         const lng = this.location.getLongitude();
         // eslint-disable-next-line no-console
-        console.log('[Orchestrator] constructor: location service initial coords =>', { lat, lng });
+        debug(`[Orchestrator] constructor: location service initial coords => ${lat}, ${lng}`);
         if (lat != null && lng != null) {
             this.mapCenter = { lat, lng };
         }
@@ -132,17 +133,17 @@ export default class OrchestratorWorkbenchComponent extends Component {
             .getUserLocation()
             .then(({ latitude, longitude }) => {
                 // eslint-disable-next-line no-console
-                console.log('[Orchestrator] getUserLocation resolved =>', { latitude, longitude }, '| _mapCenteredOnOrders =', this._mapCenteredOnOrders);
+                debug(`[Orchestrator] getUserLocation resolved => ${latitude}, ${longitude} | _mapCenteredOnOrders = ${this._mapCenteredOnOrders}`);
                 if (!this._mapCenteredOnOrders) {
                     // eslint-disable-next-line no-console
-                    console.log('[Orchestrator] applying geolocation as map center (no orders centered yet)');
+                    debug('[Orchestrator] applying geolocation as map center (no orders centered yet)');
                     this.mapCenter = { lat: latitude, lng: longitude };
                     if (this.leafletMap?.setView) {
                         this.leafletMap.setView([latitude, longitude], this.mapZoom);
                     }
                 } else {
                     // eslint-disable-next-line no-console
-                    console.log('[Orchestrator] geolocation ignored — map already centered on orders');
+                    debug('[Orchestrator] geolocation ignored — map already centered on orders');
                 }
             })
             .catch(() => {});

package/addon/components/vehicle/details.hbs

@@ -407,6 +407,28 @@
                 </div>
             </div>
 
+            <div class="field-info-container">
+                <div class="field-name">Payload Volume</div>
+                <div class="field-value">
+                    {{#if @resource.payload_capacity_volume}}
+                        {{@resource.payload_capacity_volume}}
+                        m³
+                    {{else}}
+                        {{n-a @resource.payload_capacity_volume}}
+                    {{/if}}
+                </div>
+            </div>
+
+            <div class="field-info-container">
+                <div class="field-name">Pallet Capacity</div>
+                <div class="field-value">{{n-a @resource.payload_capacity_pallets}}</div>
+            </div>
+
+            <div class="field-info-container">
+                <div class="field-name">Parcel Capacity</div>
+                <div class="field-value">{{n-a @resource.payload_capacity_parcels}}</div>
+            </div>
+
             <div class="field-info-container">
                 <div class="field-name">Passenger Volume</div>
                 <div class="field-value">

package/addon/components/vehicle/form.hbs

@@ -403,6 +403,18 @@
                     <UnitInput class="w-full" @value={{@resource.cargo_volume}} @unit="L" @placeholder="Cargo Volume" />
                 </InputGroup>
 
+                <InputGroup @name="Payload Volume (m³)" @helpText="The maximum cargo volume this vehicle can carry, in cubic metres.">
+                    <Input @value={{@resource.payload_capacity_volume}} @type="number" class="form-input w-full" placeholder="e.g. 40" disabled={{cannot-write @resource}} />
+                </InputGroup>
+
+                <InputGroup @name="Pallet Capacity" @helpText="The maximum number of standard pallets this vehicle can carry.">
+                    <Input @value={{@resource.payload_capacity_pallets}} @type="number" class="form-input w-full" placeholder="e.g. 20" disabled={{cannot-write @resource}} />
+                </InputGroup>
+
+                <InputGroup @name="Parcel Capacity" @helpText="The maximum number of parcels or packages this vehicle can carry.">
+                    <Input @value={{@resource.payload_capacity_parcels}} @type="number" class="form-input w-full" placeholder="e.g. 200" disabled={{cannot-write @resource}} />
+                </InputGroup>
+
                 <InputGroup @name="Passenger Volume">
                     <UnitInput class="w-full" @value={{@resource.passenger_volume}} @unit="L" @placeholder="Passenger Volume" />
                 </InputGroup>

package/addon/services/work-order-actions.js

@@ -96,7 +96,6 @@ export default class WorkOrderActionsService extends ResourceActionService {
 
     @action sendEmail(workOrder, options = {}) {
         const assignee = workOrder.assignee;
-        console.log('Assignee:', assignee);
         const vendorName = assignee?.name ?? workOrder.assignee_name ?? null;
         const vendorEmail = assignee?.email ?? null;
         const vendorPhone = assignee?.phone ?? null;

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.6.39",
+    "version": "0.6.40",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -96,4 +96,4 @@
             "@test:unit"
         ]
     }
-}
+}

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.39",
+    "version": "0.6.40",
     "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.39",
+    "version": "0.6.40",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -44,7 +44,7 @@
         "@babel/core": "^7.23.2",
         "@fleetbase/ember-core": "^0.3.18",
         "@fleetbase/ember-ui": "^0.3.26",
-        "@fleetbase/fleetops-data": "^0.1.27",
+        "@fleetbase/fleetops-data": "^0.1.28",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "@fortawesome/fontawesome-svg-core": "6.4.0",

package/server/migrations/2026_04_08_000001_add_orchestrator_columns_to_vehicles_table.php

@@ -1,9 +1,7 @@
 <?php
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-
 /**
  * Add Orchestrator constraint columns to the vehicles table.
  *
@@ -24,13 +22,11 @@ return new class extends Migration {
         Schema::table('vehicles', function (Blueprint $table) {
             // Skills / capabilities
             $table->json('skills')->nullable()->after('status');
-
             // Multi-dimensional capacity
             $table->unsignedDecimal('capacity_weight_kg', 10, 2)->nullable()->after('skills');
             $table->unsignedDecimal('capacity_volume_m3', 10, 3)->nullable()->after('capacity_weight_kg');
             $table->unsignedInteger('capacity_pallets')->nullable()->after('capacity_volume_m3');
             $table->unsignedInteger('capacity_parcels')->nullable()->after('capacity_pallets');
-
             // Route constraints
             $table->unsignedInteger('max_tasks')->nullable()->after('capacity_parcels');
             $table->time('time_window_start')->nullable()->after('max_tasks');
@@ -38,7 +34,6 @@ return new class extends Migration {
             $table->boolean('return_to_depot')->default(true)->after('time_window_end');
         });
     }
-
     public function down(): void
     {
         Schema::table('vehicles', function (Blueprint $table) {

package/server/migrations/2026_04_08_000004_add_orchestrator_columns_to_payloads_table.php

@@ -1,9 +1,7 @@
 <?php
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-
 /**
  * Add Orchestrator capacity columns to the payloads table.
  *
@@ -26,7 +24,6 @@ return new class extends Migration {
             $table->unsignedInteger('capacity_parcels')->nullable()->after('capacity_pallets');
         });
     }
-
     public function down(): void
     {
         Schema::table('payloads', function (Blueprint $table) {

package/server/migrations/2026_04_14_000001_drop_redundant_capacity_columns_from_payloads_table.php

@@ -0,0 +1,42 @@
+<?php
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+/**
+ * Drop redundant denormalised capacity columns from the payloads table.
+ *
+ * The columns capacity_weight_kg, capacity_volume_m3, capacity_pallets, and
+ * capacity_parcels were added in migration 2026_04_08_000004 as a cache of
+ * aggregated entity dimensions. Storing them creates a synchronisation problem:
+ * any entity add, update, or removal requires explicit cache invalidation.
+ *
+ * The OrchestrationPayloadBuilder now computes these values dynamically from
+ * the payload->entities relationship at orchestration time, so the columns are
+ * no longer needed.
+ *
+ * Rollback restores the columns as nullable so existing data is not lost if
+ * this migration is reversed.
+ */
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::table('payloads', function (Blueprint $table) {
+            $table->dropColumn([
+                'capacity_weight_kg',
+                'capacity_volume_m3',
+                'capacity_pallets',
+                'capacity_parcels',
+            ]);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('payloads', function (Blueprint $table) {
+            $table->unsignedDecimal('capacity_weight_kg', 10, 2)->nullable()->after('cod_currency');
+            $table->unsignedDecimal('capacity_volume_m3', 10, 3)->nullable()->after('capacity_weight_kg');
+            $table->unsignedInteger('capacity_pallets')->nullable()->after('capacity_volume_m3');
+            $table->unsignedInteger('capacity_parcels')->nullable()->after('capacity_pallets');
+        });
+    }
+};

package/server/migrations/2026_04_14_000002_rename_capacity_columns_on_vehicles_table.php

@@ -0,0 +1,48 @@
+<?php
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+/**
+ * Correct orchestrator capacity column names on the vehicles table.
+ *
+ * The columns added in migration 2026_04_08_000001 did not follow the Fleetbase
+ * naming convention for capacity fields. This migration:
+ *
+ *   1. Drops capacity_weight_kg — this is a duplicate of the pre-existing
+ *      payload_capacity column which already represents maximum payload weight.
+ *
+ *   2. Renames the remaining capacity columns to follow the payload_capacity_*
+ *      convention used by the existing payload_capacity column:
+ *        capacity_volume_m3  → payload_capacity_volume
+ *        capacity_pallets    → payload_capacity_pallets
+ *        capacity_parcels    → payload_capacity_parcels
+ *
+ * Rollback reverses the renames and restores capacity_weight_kg as nullable.
+ */
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::table('vehicles', function (Blueprint $table) {
+            // Drop the redundant weight capacity column (payload_capacity already exists)
+            $table->dropColumn('capacity_weight_kg');
+
+            // Rename remaining columns to follow payload_capacity_* convention
+            $table->renameColumn('capacity_volume_m3', 'payload_capacity_volume');
+            $table->renameColumn('capacity_pallets', 'payload_capacity_pallets');
+            $table->renameColumn('capacity_parcels', 'payload_capacity_parcels');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('vehicles', function (Blueprint $table) {
+            // Restore the dropped column
+            $table->unsignedDecimal('capacity_weight_kg', 10, 2)->nullable()->after('skills');
+
+            // Reverse the renames
+            $table->renameColumn('payload_capacity_volume', 'capacity_volume_m3');
+            $table->renameColumn('payload_capacity_pallets', 'capacity_pallets');
+            $table->renameColumn('payload_capacity_parcels', 'capacity_parcels');
+        });
+    }
+};

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

@@ -55,7 +55,14 @@ class OrderController extends Controller
         set_time_limit(180);
 
         // get request input
-        $input = $request->only(['internal_id', 'payload', 'service_quote', 'purchase_rate', 'adhoc', 'adhoc_distance', 'pod_method', 'pod_required', 'scheduled_at', 'status', 'meta', 'notes']);
+        $input = $request->only([
+            'internal_id', 'payload', 'service_quote', 'purchase_rate',
+            'adhoc', 'adhoc_distance', 'pod_method', 'pod_required',
+            'scheduled_at', 'status', 'meta', 'notes',
+            // Orchestrator constraints
+            'time_window_start', 'time_window_end',
+            'required_skills', 'orchestrator_priority',
+        ]);
 
         // Get order config
         $orderConfig = OrderConfig::resolveFromIdentifier($request->only(['type', 'order_config']));
@@ -363,7 +370,13 @@ class OrderController extends Controller
         }
 
         // get request input
-        $input = $request->only(['internal_id', 'payload', 'adhoc', 'adhoc_distance', 'pod_method', 'pod_required', 'scheduled_at', 'meta', 'type', 'status', 'notes']);
+        $input = $request->only([
+            'internal_id', 'payload', 'adhoc', 'adhoc_distance',
+            'pod_method', 'pod_required', 'scheduled_at', 'meta', 'type', 'status', 'notes',
+            // Orchestrator constraints
+            'time_window_start', 'time_window_end',
+            'required_skills', 'orchestrator_priority',
+        ]);
 
         // update payload if new input or change payload by id
         if ($request->isArray('payload')) {

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

@@ -26,7 +26,15 @@ class VehicleController extends Controller
     public function create(CreateVehicleRequest $request)
     {
         // get request input
-        $input = $request->only(['status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin', 'meta', 'online', 'location', 'altitude', 'heading', 'speed']);
+        $input = $request->only([
+            'status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin',
+            'meta', 'online', 'location', 'altitude', 'heading', 'speed',
+            // Capacity
+            'payload_capacity', 'payload_capacity_volume',
+            'payload_capacity_pallets', 'payload_capacity_parcels',
+            // Orchestrator constraints
+            'skills', 'max_tasks', 'time_window_start', 'time_window_end', 'return_to_depot',
+        ]);
 
         // make sure company is set
         $input['company_uuid'] = session('company');
@@ -97,7 +105,15 @@ class VehicleController extends Controller
         }
 
         // get request input
-        $input = $request->only(['status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin', 'meta', 'location', 'online', 'altitude', 'heading', 'speed']);
+        $input = $request->only([
+            'status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin',
+            'meta', 'location', 'online', 'altitude', 'heading', 'speed',
+            // Capacity
+            'payload_capacity', 'payload_capacity_volume',
+            'payload_capacity_pallets', 'payload_capacity_parcels',
+            // Orchestrator constraints
+            'skills', 'max_tasks', 'time_window_start', 'time_window_end', 'return_to_depot',
+        ]);
 
         // vendor assignment
         if ($request->has('vendor')) {

package/server/src/Models/Payload.php

@@ -61,7 +61,7 @@ class Payload extends Model
      *
      * @var array
      */
-    protected $fillable = ['_key', 'company_uuid', 'pickup_uuid', 'dropoff_uuid', 'return_uuid', 'current_waypoint_uuid', 'meta', 'payment_method', 'cod_amount', 'cod_currency', 'cod_payment_method', 'type', 'capacity_weight_kg', 'capacity_volume_m3', 'capacity_pallets', 'capacity_parcels'];
+    protected $fillable = ['_key', 'company_uuid', 'pickup_uuid', 'dropoff_uuid', 'return_uuid', 'current_waypoint_uuid', 'meta', 'payment_method', 'cod_amount', 'cod_currency', 'cod_payment_method', 'type'];
 
     /**
      * The attributes that should be cast to native types.
@@ -69,12 +69,7 @@ class Payload extends Model
      * @var array
      */
     protected $casts = [
-        'meta'               => Json::class,
-        // Orchestrator
-        'capacity_weight_kg' => 'decimal:2',
-        'capacity_volume_m3' => 'decimal:3',
-        'capacity_pallets'   => 'integer',
-        'capacity_parcels'   => 'integer',
+        'meta' => Json::class,
     ];
 
     /**

package/server/src/Models/Vehicle.php

@@ -207,10 +207,9 @@ class Vehicle extends Model
         'lease_expires_at',
         // Orchestrator
         'skills',
-        'capacity_weight_kg',
-        'capacity_volume_m3',
-        'capacity_pallets',
-        'capacity_parcels',
+        'payload_capacity_volume',
+        'payload_capacity_pallets',
+        'payload_capacity_parcels',
         'max_tasks',
         'time_window_start',
         'time_window_end',
@@ -307,13 +306,12 @@ class Vehicle extends Model
         'gvwr'                => 'decimal:2',
         'gcwr'                => 'decimal:2',
         // Orchestrator
-        'skills'              => Json::class,
-        'capacity_weight_kg'  => 'decimal:2',
-        'capacity_volume_m3'  => 'decimal:3',
-        'capacity_pallets'    => 'integer',
-        'capacity_parcels'    => 'integer',
-        'max_tasks'           => 'integer',
-        'return_to_depot'     => 'boolean',
+        'skills'                    => Json::class,
+        'payload_capacity_volume'   => 'decimal:3',
+        'payload_capacity_pallets'  => 'integer',
+        'payload_capacity_parcels'  => 'integer',
+        'max_tasks'                 => 'integer',
+        'return_to_depot'           => 'boolean',
     ];
 
     public function photo(): BelongsTo

package/server/src/Orchestration/Support/OrchestrationPayloadBuilder.php

@@ -16,9 +16,12 @@ use Illuminate\Support\Collection;
  * adapter (e.g. VroomOrchestrationEngine) calls the builder and then maps the
  * normalized output to its own wire format.
  *
- * The builder now reads first-class orchestrator columns (skills, capacity_*,
- * time_window_*, service_time, orchestrator_priority) added by the 2026-04-08
- * migrations, falling back to custom fields and meta for backwards compatibility.
+ * Vehicle capacity is read from the existing first-class columns on the
+ * vehicles table (payload_capacity, payload_capacity_volume, etc.).
+ *
+ * Order/payload capacity demand is computed dynamically by aggregating the
+ * weight and dimensions of the payload's entities — no denormalised cache
+ * columns are needed or used on the payloads table.
  */
 class OrchestrationPayloadBuilder
 {
@@ -41,6 +44,102 @@ class OrchestrationPayloadBuilder
         }
     }
 
+    /**
+     * Compute the multi-dimensional capacity demand for a payload by aggregating
+     * its entities' weight and volume values.
+     *
+     * Returns a 4-element integer array matching the vehicle capacity array:
+     *   [weight_kg, volume_litres, pallets, parcels]
+     *
+     * Weight is normalised to kg from entity.weight_unit.
+     * Volume is derived from entity length × width × height (dimensions_unit normalised to metres)
+     * and expressed in litres (×1000) so it can be stored as an integer for VROOM.
+     *
+     * Falls back to order meta keys (weight_kg, volume_m3, pallets, parcels) for
+     * backwards compatibility with orders that were created before entity-level
+     * dimension data was captured.
+     */
+    protected static function computePayloadDemand(Order $order): array
+    {
+        $payload = $order->payload;
+
+        if ($payload && $payload->entities && $payload->entities->isNotEmpty()) {
+            $totalWeightKg  = 0.0;
+            $totalVolumeLit = 0.0;
+            $totalParcels   = 0;
+
+            foreach ($payload->entities as $entity) {
+                // --- Weight ---
+                $rawWeight = (float) ($entity->weight ?? 0);
+                $weightUnit = strtolower($entity->weight_unit ?? 'kg');
+                $weightKg = match ($weightUnit) {
+                    'g', 'gram', 'grams'              => $rawWeight / 1000,
+                    'lb', 'lbs', 'pound', 'pounds'    => $rawWeight * 0.453592,
+                    'oz', 'ounce', 'ounces'            => $rawWeight * 0.0283495,
+                    't', 'ton', 'tonne', 'tonnes'      => $rawWeight * 1000,
+                    default                            => $rawWeight, // kg assumed
+                };
+                $totalWeightKg += $weightKg;
+
+                // --- Volume (L × W × H → m³ → litres) ---
+                $l    = (float) ($entity->length ?? 0);
+                $w    = (float) ($entity->width ?? 0);
+                $h    = (float) ($entity->height ?? 0);
+                $unit = strtolower($entity->dimensions_unit ?? 'm');
+
+                if ($l > 0 && $w > 0 && $h > 0) {
+                    // Normalise to metres
+                    $factor = match ($unit) {
+                        'cm', 'centimeter', 'centimetre'   => 0.01,
+                        'mm', 'millimeter', 'millimetre'   => 0.001,
+                        'in', 'inch', 'inches'             => 0.0254,
+                        'ft', 'foot', 'feet'               => 0.3048,
+                        default                            => 1.0, // metres assumed
+                    };
+                    $volumeM3    = ($l * $factor) * ($w * $factor) * ($h * $factor);
+                    $totalVolumeLit += $volumeM3 * 1000; // m³ → litres
+                }
+
+                $totalParcels++;
+            }
+
+            return [
+                (int) round($totalWeightKg),
+                (int) round($totalVolumeLit),
+                0, // pallet count not tracked at entity level
+                $totalParcels,
+            ];
+        }
+
+        // Fallback: order meta keys for backwards compatibility
+        return [
+            (int) round((float) ($order->getMeta('weight_kg') ?? 0)),
+            (int) round((float) ($order->getMeta('volume_m3') ?? 0) * 1000),
+            (int) ($order->getMeta('pallets') ?? 0),
+            (int) ($order->getMeta('parcels') ?? 1),
+        ];
+    }
+
+    /**
+     * Build the vehicle capacity array from the vehicle's first-class columns.
+     *
+     * Returns a 4-element integer array:
+     *   [weight_kg, volume_litres, pallets, parcels]
+     *
+     * payload_capacity        — existing column, weight in kg
+     * payload_capacity_volume — new column, volume in m³ (stored as litres for VROOM)
+     * payload_capacity_pallets / payload_capacity_parcels — new columns
+     */
+    protected static function buildVehicleCapacity(Vehicle $vehicle): array
+    {
+        return [
+            (int) round((float) ($vehicle->payload_capacity ?? static::safeMeta($vehicle, 'max_weight_kg', 0))),
+            (int) round((float) ($vehicle->payload_capacity_volume ?? static::safeMeta($vehicle, 'max_volume_m3', 0)) * 1000),
+            (int) ($vehicle->payload_capacity_pallets ?? static::safeMeta($vehicle, 'max_pallets', 0)),
+            (int) ($vehicle->payload_capacity_parcels ?? static::safeMeta($vehicle, 'max_parcels', 100)),
+        ];
+    }
+
     /**
      * Build the normalized job list from a collection of Orders.
      *
@@ -51,7 +150,7 @@ class OrchestrationPayloadBuilder
      *   - service:       service time in seconds (waypoint.service_time → order meta → default 300)
      *   - time_windows:  [[earliest_unix, latest_unix]] from order.time_window_start/end or scheduled_at
      *   - skills:        integer skill codes from order.required_skills or custom fields
-     *   - amount:        multi-dimensional capacity demand [weight_kg, volume_m3, pallets, parcels]
+     *   - amount:        multi-dimensional capacity demand [weight_kg, volume_litres, pallets, parcels]
      *   - priority:      orchestrator_priority (0–100, higher = more important)
      *   - description:   human-readable label for debugging
      */
@@ -87,14 +186,9 @@ class OrchestrationPayloadBuilder
                 ?? 300
             );
 
-            // --- Capacity demand (multi-dimensional) ---
-            // [weight_kg, volume_m3, pallets, parcels] — must match vehicle capacity array
-            $job['amount'] = [
-                (int) round((float) ($payload?->capacity_weight_kg ?? $order->getMeta('weight_kg') ?? 0)),
-                (int) round((float) ($payload?->capacity_volume_m3 ?? $order->getMeta('volume_m3') ?? 0) * 1000), // store as litres for integer
-                (int) ($payload?->capacity_pallets ?? $order->getMeta('pallets') ?? 0),
-                (int) ($payload?->capacity_parcels ?? $order->getMeta('parcels') ?? 1),
-            ];
+            // --- Capacity demand ---
+            // Aggregated dynamically from payload entities; falls back to order meta.
+            $job['amount'] = static::computePayloadDemand($order);
 
             // --- Time windows ---
             // Prefer explicit orchestrator time_window columns, fall back to scheduled_at
@@ -148,12 +242,7 @@ class OrchestrationPayloadBuilder
             if ($vehicle->return_to_depot && $vehicle->location) {
                 $entry['end'] = [$vehicle->location->getLng(), $vehicle->location->getLat()];
             }
-            $entry['capacity'] = [
-                (int) round((float) ($vehicle->capacity_weight_kg ?? static::safeMeta($vehicle, 'max_weight_kg', 0))),
-                (int) round((float) ($vehicle->capacity_volume_m3 ?? static::safeMeta($vehicle, 'max_volume_m3', 0)) * 1000),
-                (int) ($vehicle->capacity_pallets ?? static::safeMeta($vehicle, 'max_pallets', 0)),
-                (int) ($vehicle->capacity_parcels ?? static::safeMeta($vehicle, 'max_parcels', 100)),
-            ];
+            $entry['capacity'] = static::buildVehicleCapacity($vehicle);
             if ($vehicle->max_tasks !== null && $vehicle->max_tasks > 0) {
                 $entry['max_tasks'] = (int) $vehicle->max_tasks;
             }
@@ -172,6 +261,13 @@ class OrchestrationPayloadBuilder
         })->filter()->values()->toArray();
     }
 
+    /**
+     * Build vehicles for driver+vehicle allocation mode.
+     *
+     * Uses driver.location as the start position, falling back to vehicle.location.
+     * Capacity is read from the vehicle. Time windows prefer the driver's explicit
+     * window, then the driver's active shift, then the vehicle's window.
+     */
     public static function buildVehicles(Collection $vehicles): array
     {
         return $vehicles->map(function (Vehicle $vehicle) {
@@ -193,13 +289,7 @@ class OrchestrationPayloadBuilder
             }
 
             // --- Multi-dimensional capacity ---
-            // [weight_kg, volume_l (×1000 from m3), pallets, parcels]
-            $entry['capacity'] = [
-                (int) round((float) ($vehicle->capacity_weight_kg ?? static::safeMeta($vehicle, 'max_weight_kg', 0))),
-                (int) round((float) ($vehicle->capacity_volume_m3 ?? static::safeMeta($vehicle, 'max_volume_m3', 0)) * 1000),
-                (int) ($vehicle->capacity_pallets ?? static::safeMeta($vehicle, 'max_pallets', 0)),
-                (int) ($vehicle->capacity_parcels ?? static::safeMeta($vehicle, 'max_parcels', 100)),
-            ];
+            $entry['capacity'] = static::buildVehicleCapacity($vehicle);
 
             // --- Max tasks ---
             if ($vehicle->max_tasks !== null && $vehicle->max_tasks > 0) {