@fleetbase/fleetops-engine 0.6.13 → 0.6.15

package/addon/components/customer/orders.js

@@ -25,7 +25,7 @@ export default class CustomerOrdersComponent extends Component {
     @service modalsManager;
     @service customerSession;
     @service hostRouter;
-    @service leafletRouterControl;
+    @service leafletRoutingControl;
     @engineService('@fleetbase/fleetops-engine') movementTracker;
     @engineService('@fleetbase/fleetops-engine') location;
     @tracked orders = [];
@@ -240,7 +240,7 @@ export default class CustomerOrdersComponent extends Component {
         }
 
         const routingService = this.currentUser.getOption('routing', { router: 'osrm' }).router;
-        const { router, formatter } = this.leafletRouterControl.get(routingService);
+        const { router, formatter } = this.leafletRoutingControl.get(routingService);
 
         this.routeControl = new RoutingControl({
             router,

package/addon/components/live-map.hbs

@@ -243,7 +243,7 @@
     {{/if}}
 </div>
 
-{{#if this.isDataLoaded}}
+{{#if (and this.isDataLoaded (not-eq @drawerTab false))}}
     <LiveMapDrawer
         @tab={{@drawerTab}}
         @onTabChanged={{@onDrawerTabChanged}}

package/addon/components/live-map.js

@@ -36,7 +36,7 @@ export default class LiveMapComponent extends Component {
     @service contextPanel;
     @service leafletMapManager;
     @service leafletContextmenuManager;
-    @service leafletRouterControl;
+    @service leafletRoutingControl;
     @service theme;
 
     /**
@@ -1140,7 +1140,7 @@ export default class LiveMapComponent extends Component {
         }
 
         const routingService = this.currentUser.getOption('routing', { router: 'osrm' }).router;
-        const { router, formatter } = this.leafletRouterControl.get(routingService);
+        const { router, formatter } = this.leafletRoutingControl.get(routingService);
 
         this.routeControl = new RoutingControl({
             router,

package/addon/components/route-optimization-engine-select-button.hbs

@@ -15,7 +15,8 @@
         <div class="px-1">
             {{#each this.routeOptimization.availableServices as |service|}}
                 <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.handleClick service)}}>
-                    <div >
+                    <div class="flex flex-row items-center">
+                        <div class="mr-2"><FaIcon @icon="arrow-right" /></div>
                         <div class="text-sm">{{service.name}}</div>
                     </div>
                 </a>

package/addon/components/route-optimization-wizard-panel.hbs

@@ -0,0 +1,24 @@
+<Overlay
+    @isOpen={{true}}
+    @onLoad={{this.setOverlayContext}}
+    @position="right"
+    @noBackdrop={{true}}
+    @fullHeight={{true}}
+    @isResizeble={{true}}
+    @width="450px"
+    @overlayClass="route-optimization-wizard-panel"
+>
+    <Overlay::Header @title="New Route Optimization">
+        <div class="flex flex-1 justify-end">
+            <Button @icon="play" @type="primary" @text="Run" @wrapperClass="mr-2" />
+            <Button @type="default" @icon="times" />
+        </div>
+    </Overlay::Header>
+
+    <Overlay::Body @wrapperClass="px-4 space-y-4 pt-4">
+        {{#each @waypoints as |waypoint|}}
+            <div class="border rounded p-4 flex items-center mb-3">{{waypoint.address}}</div>
+        {{/each}}
+        <Spacer @height="300px" />
+    </Overlay::Body>
+</Overlay>

package/addon/components/route-optimization-wizard-panel.js

@@ -0,0 +1,46 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
+
+export default class RouteOptimizationWizardPanelComponent extends Component {
+    @service universe;
+    @tracked context;
+
+    /**
+     * Constructs the component and applies initial state.
+     */
+    constructor(owner, { controller }) {
+        super(...arguments);
+        this.controller = controller;
+        applyContextComponentArguments(this);
+    }
+
+    /**
+     * Sets the overlay context.
+     *
+     * @action
+     * @param {OverlayContextObject} overlayContext
+     */
+    @action setOverlayContext(overlayContext) {
+        this.context = overlayContext;
+        // hide sidebar
+        if (this.universe.sidebarContext) {
+            this.universe.sidebarContext.hide();
+        }
+        contextComponentCallback(this, 'onLoad', ...arguments);
+    }
+
+    /**
+     * Handles the cancel action.
+     *
+     * @method
+     * @action
+     * @returns {Boolean} Indicates whether the cancel action was overridden.
+     */
+    @action onPressCancel() {
+        return contextComponentCallback(this, 'onPressCancel');
+    }
+}

package/addon/controllers/operations/orders/index/new.js

@@ -41,7 +41,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
     @service contextPanel;
     @service universe;
     @service routeOptimization;
-    @service leafletRouterControl;
+    @service leafletRoutingControl;
     @service osrm;
 
     @tracked order = this.store.createRecord('order', { meta: [] });
@@ -613,7 +613,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         return route;
     }
 
-    @action setOptimizedRoute(route, trip, waypoints) {
+    @action setOptimizedRoute(route, trip, waypoints, engine = 'osrm') {
         let summary = { totalDistance: trip.distance, totalTime: trip.duration };
         let payload = {
             optimized: true,
@@ -621,6 +621,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
             waypoints,
             trip,
             summary,
+            engine,
         };
 
         this.leafletOptimizedRoute = payload;
@@ -792,7 +793,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
 
         if (canPreviewRoute) {
             const routingService = this.currentUser.getOption('routing', { router: 'osrm' }).router;
-            const { router, formatter } = this.leafletRouterControl.get(routingService);
+            const { router, formatter } = this.leafletRoutingControl.get(routingService);
 
             this.previewRouteControl = new RoutingControl({
                 router,
@@ -886,7 +887,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         }
     }
 
-    handleRouteOptimization({ sortedWaypoints, route, trip, result }) {
+    handleRouteOptimization({ sortedWaypoints, route, trip, result, engine = 'osrm' }) {
         // Update map layers & UI
         this.removeRoutingControlPreview();
         this.removeOptimizedRoute(this.leafletMap);
@@ -895,7 +896,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         // Update controller state
         this.waypoints = sortedWaypoints;
         if (route) {
-            this.setOptimizedRoute(route, trip, result.waypoints);
+            this.setOptimizedRoute(route, trip, result.waypoints, engine);
         }
         this.previewDraftOrderRoute(this.payload, this.waypoints, this.isMultipleDropoffOrder);
         this.updatePayloadCoordinates();

package/addon/controllers/operations/orders/index/view.js

@@ -23,7 +23,7 @@ export default class OperationsOrdersIndexViewController extends BaseController
     @service socket;
     @service universe;
     @service contextPanel;
-    @service leafletRouterControl;
+    @service leafletRoutingControl;
 
     @tracked isLoadingAdditionalData = false;
     @tracked isWaypointsCollapsed;
@@ -383,7 +383,7 @@ export default class OperationsOrdersIndexViewController extends BaseController
         leafletMap.flyTo(waypoints.firstObject);
 
         const routingService = this.currentUser.getOption('routing', { router: 'osrm' }).router;
-        const { router, formatter } = this.leafletRouterControl.get(routingService);
+        const { router, formatter } = this.leafletRoutingControl.get(routingService);
 
         this.routeControl = new RoutingControl({
             router,

package/addon/controllers/operations/orders/index.js

@@ -22,6 +22,7 @@ export default class OperationsOrdersIndexController extends BaseController {
     @service socket;
     @service abilities;
     @service theme;
+    @service routeOptimization;
 
     /**
      * Queryable parameters for this controller's model
@@ -1130,7 +1131,6 @@ export default class OperationsOrdersIndexController extends BaseController {
      */
     @action bulkAssignDriver(selected = []) {
         selected = selected.length > 0 ? selected : this.table.selectedRows;
-
         if (!isArray(selected) || selected.length === 0) {
             return;
         }
@@ -1199,12 +1199,37 @@ export default class OperationsOrdersIndexController extends BaseController {
         });
     }
 
+    /**
+     * Commits the bulk query to the server for results.
+     * @action
+     * @memberof OperationsOrdersIndexController
+     */
     @action commitBulkQuery() {
         this.bulk_query = this.bulkSearchValue;
     }
 
+    /**
+     * Resets/clear the bulk query search.
+     * @action
+     * @memberof OperationsOrdersIndexController
+     */
     @action removeBulkQuery() {
         this.bulkSearchValue = '';
         this.bulk_query = null;
     }
+
+    /**
+     * Run route optimization wizard.
+     * @action
+     * @memberof OperationsOrdersIndexController
+     */
+    @action optimizeOrderRoutes(selected = []) {
+        selected = selected.length > 0 ? selected : this.table.selectedRows;
+
+        return this.hostRouter.transitionTo('console.fleet-ops.operations.routes.index.new', {
+            queryParams: {
+                selectedOrders: selected.map((_) => _.public_id).join(','),
+            },
+        });
+    }
 }

package/addon/controllers/operations/routes/index/new.js

@@ -0,0 +1,36 @@
+import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { task } from 'ember-concurrency';
+
+export default class OperationsRoutesIndexNewController extends Controller {
+    @service store;
+    @tracked panel;
+    @tracked selectedOrders = '';
+    @tracked waypoints = [];
+
+    @action setOverlayPanelContext(overlayPanelContext) {
+        this.panel = overlayPanelContext;
+        this.loadSelectedOrders.perform(this.selectedOrders.split(','));
+    }
+
+    @task *loadSelectedOrders(selectedOrders) {
+        const orders = yield this.store.query('order', { only: selectedOrders });
+        console.log('[orders]', orders);
+        this.extractWaypoints(orders);
+    }
+
+    extractWaypoints(orders = []) {
+        const extracted = [];
+
+        orders.forEach((order) => {
+            const pickup = order.get('payload.pickup');
+            const dropoff = order.get('payload.dropoff');
+            const waypoints = order.get('payload.waypoints')?.toArray() ?? [];
+            extracted.push(pickup, dropoff, ...waypoints);
+        });
+
+        this.waypoints = extracted.filter(Boolean);
+    }
+}

package/addon/controllers/operations/routes/index/view.js

@@ -0,0 +1,3 @@
+import Controller from '@ember/controller';
+
+export default class OperationsRoutesIndexViewController extends Controller {}

package/addon/controllers/operations/routes/index.js

@@ -0,0 +1,13 @@
+import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+
+export default class OperationsRoutesIndexController extends Controller {
+    @tracked leafletMap;
+    @tracked liveMap;
+
+    @action setMapReference({ target }) {
+        this.leafletMap = target;
+        this.liveMap = target.liveMap;
+    }
+}

package/addon/controllers/settings/routing.js

@@ -7,8 +7,14 @@ export default class SettingsRoutingController extends Controller {
     @service fetch;
     @service notifications;
     @service currentUser;
-    @service leafletRouterControl;
+    @service leafletRoutingControl;
     @tracked routerService = 'osrm';
+    @tracked routingUnit = 'km';
+    @tracked routingUnitOptions = [
+        { label: 'Kilometers', value: 'km' },
+        { label: 'Miles', value: 'mi' },
+    ];
+    @tracked saveTasks = [];
 
     constructor() {
         super(...arguments);
@@ -23,8 +29,9 @@ export default class SettingsRoutingController extends Controller {
     @task *saveSettings() {
         try {
             yield this.fetch.post('fleet-ops/settings/routing-settings', { router: this.routerService });
+            yield this.performAdditionalSaveTasks();
             // Save in local memory too
-            this.currentUser.setOption('routing', { router: this.routerService });
+            this.currentUser.setOption('routing', { router: this.routerService, unit: this.routingUnit });
             this.notifications.success('Routing setting saved.');
         } catch (error) {
             this.notifications.serverError(error);
@@ -38,10 +45,25 @@ export default class SettingsRoutingController extends Controller {
      */
     @task *getSettings() {
         try {
-            const { router } = yield this.fetch.get('fleet-ops/settings/routing-settings');
+            const { router, unit } = yield this.fetch.get('fleet-ops/settings/routing-settings');
             this.routerService = router;
+            this.routingUnit = unit;
         } catch (error) {
             this.notifications.serverError(error);
         }
     }
+
+    registerSaveTask(task) {
+        this.saveTasks.push(task);
+    }
+
+    async performAdditionalSaveTasks() {
+        for (let i = 0; i < this.saveTasks.length; i++) {
+            const task = this.saveTasks[i];
+            if (typeof task.perform === 'function') {
+                await task.perform();
+            }
+        }
+        return true;
+    }
 }

package/addon/engine.js

@@ -9,7 +9,7 @@ import AdminAvatarManagementComponent from './components/admin/avatar-management
 import CustomerOrdersComponent from './components/customer/orders';
 import CustomerAdminSettingsComponent from './components/customer/admin-settings';
 import OrderTrackingLookupComponent from './components/order-tracking-lookup';
-import { RouterControl } from './services/leaflet-router-control';
+import { RoutingControl } from './services/leaflet-routing-control';
 import { OSRMv1 } from '@fleetbase/leaflet-routing-machine';
 import getRoutingHost from '@fleetbase/ember-core/utils/get-routing-host';
 
@@ -68,12 +68,12 @@ export default class FleetOpsEngine extends Engine {
         }
 
         // Register OSRM as Routing Controler
-        const leafletRouterControl = app.lookup('service:leaflet-router-control');
-        if (leafletRouterControl) {
+        const leafletRoutingControl = app.lookup('service:leaflet-routing-control');
+        if (leafletRoutingControl) {
             const routingHost = getRoutingHost();
-            leafletRouterControl.register(
+            leafletRoutingControl.register(
                 'osrm',
-                new RouterControl({
+                new RoutingControl({
                     name: 'OSRM',
                     router: new OSRMv1({
                         serviceUrl: `${routingHost}/route/v1`,
@@ -133,6 +133,7 @@ export default class FleetOpsEngine extends Engine {
             'fleet-ops:template:operations:orders:new',
             'fleet-ops:template:operations:orders:new:entities-input',
             'fleet-ops:template:operations:orders:new:entities-input:entity',
+            'fleet-ops:template:settings:routing',
         ]);
 
         universe.afterBoot(function (universe) {

package/addon/routes/operations/routes/index/new.js

@@ -0,0 +1,9 @@
+import Route from '@ember/routing/route';
+
+export default class OperationsRoutesIndexNewRoute extends Route {
+    queryParams = {
+        selectedOrders: {
+            refreshModel: false,
+        },
+    };
+}

package/addon/routes/operations/routes/index/view.js

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class OperationsRoutesIndexViewRoute extends Route {}

package/addon/routes/operations/routes/index.js

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class OperationsRoutesIndexRoute extends Route {}

package/addon/routes/operations/routes.js

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class OperationsRoutesRoute extends Route {}

package/addon/routes.js

@@ -31,6 +31,12 @@ export default buildRoutes(function () {
                 });
             });
         });
+        this.route('routes', function () {
+            this.route('index', { path: '/' }, function () {
+                this.route('new');
+                this.route('view', { path: '/:public_id' });
+            });
+        });
     });
     this.route('management', { path: '/manage' }, function () {
         this.route('fleets', function () {

package/addon/services/leaflet-routing-control.js

@@ -0,0 +1,64 @@
+import Service, { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { underscore } from '@ember/string';
+
+export class RoutingControlRegistry {
+    @tracked routers = {};
+}
+
+export class RoutingControl {
+    @tracked name;
+    @tracked router;
+    @tracked formatter;
+
+    constructor(init) {
+        const { name, router, formatter } = typeof init === 'function' ? init() : init;
+        this.name = name;
+        this.router = router;
+        this.formatter = formatter;
+    }
+}
+
+export default class LeafletRoutingControlService extends Service {
+    @service universe;
+    registry = this.#initializeRegistry();
+
+    get availableEngines() {
+        return Object.keys(this.registry.routers).map(underscore);
+    }
+
+    get availableServices() {
+        return Object.entries(this.registry.routers).map(([key, control]) => ({
+            key,
+            name: control.name ?? key,
+        }));
+    }
+
+    register(name, getter) {
+        this.registry.routers = {
+            ...this.registry.routers,
+            [underscore(name)]: getter,
+        };
+    }
+
+    /* eslint-disable no-unused-vars */
+    unregister(name) {
+        let key = underscore(name);
+        let { [key]: _, ...rest } = this.registry.routers;
+        this.registry.routers = rest;
+    }
+
+    get(name) {
+        return this.registry.routers[underscore(name)];
+    }
+
+    #initializeRegistry() {
+        const registry = 'registry:routing-controls';
+        const application = this.universe.getApplicationInstance();
+        if (!application.hasRegistration(registry)) {
+            application.register(registry, new RoutingControlRegistry(), { instantiate: false });
+        }
+
+        return application.resolveRegistration(registry);
+    }
+}

package/addon/services/osrm.js

@@ -37,7 +37,7 @@ export default class OsrmService extends RouteOptimizationInterfaceService {
             const trip = result.trips?.[0];
             const route = polyline.decode(trip.geometry);
 
-            return { sortedWaypoints, trip, route, result };
+            return { sortedWaypoints, trip, route, result, engine: 'osrm' };
         } catch (err) {
             debug(`[OSRM] Error routing trip : ${err.message}`);
             throw err;

package/addon/templates/operations/routes/index/new.hbs

@@ -0,0 +1,2 @@
+<RouteOptimizationWizardPanel @waypoints={{this.waypoints}} @controller={{this}} @onLoad={{this.setOverlayPanelContext}} />
+{{outlet}}

package/addon/templates/operations/routes/index/view.hbs

@@ -0,0 +1 @@
+{{outlet}}

package/addon/templates/operations/routes/index.hbs

@@ -0,0 +1,13 @@
+<LiveMap
+    id="leafletMap"
+    class="next-leaflet-container-map"
+    @lat={{1.3521}}
+    @lng={{103.8198}}
+    @zoom={{12}}
+    @zoomControl={{false}}
+    @drawerTab={{false}}
+    @onLoad={{this.setMapReference}}
+    @darkMode={{eq this.theme.activeTheme "dark"}}
+    {{set-container-dimensions}}
+/>
+{{outlet}}

package/addon/templates/operations/routes.hbs

@@ -0,0 +1 @@
+{{outlet}}

package/addon/templates/settings/routing.hbs

@@ -17,7 +17,7 @@
                 <InputGroup @name="Routing Service" @helpText="Select the service which is responsible for calculating and plotting routes on the map.">
                     <Select
                         @value={{this.routerService}}
-                        @options={{this.leafletRouterControl.availableServices}}
+                        @options={{this.leafletRoutingControl.availableServices}}
                         @optionLabel="name"
                         @optionValue="key"
                         @onSelect={{fn (mut this.routerService)}}
@@ -25,7 +25,21 @@
                         class="w-full"
                     />
                 </InputGroup>
+                <InputGroup @name="Routing Distance Unit" @helpText="The unit used for calculating distance and routes.">
+                    <Select
+                        @value={{this.routingUnit}}
+                        @options={{this.routingUnitOptions}}
+                        @optionLabel="label"
+                        @optionValue="value"
+                        @onSelect={{fn (mut this.routingUnit)}}
+                        @placeholder="Select routing unit..."
+                        class="w-full"
+                    />
+                </InputGroup>
             </ContentPanel>
+            <RegistryYield @registry="fleet-ops:template:settings:routing" as |RegistryComponent|>
+                <RegistryComponent @controller={{this}} />
+            </RegistryYield>
         </div>
     </div>
     <Spacer @height="600px" />

package/app/components/route-optimization-wizard-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/route-optimization-wizard-panel';

package/app/controllers/operations/routes/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/operations/routes/index/new';

package/app/controllers/operations/routes/index/view.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/operations/routes/index/view';

package/app/routes/operations/routes/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/operations/routes/index/new';

package/app/routes/operations/routes/index/view.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/operations/routes/index/view';

package/app/routes/operations/routes/index.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/operations/routes/index';

package/app/routes/operations/routes.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/operations/routes';

package/app/services/leaflet-routing-control.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/services/leaflet-routing-control';

package/app/templates/operations/routes/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/operations/routes/index/new';

package/app/templates/operations/routes/index/view.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/operations/routes/index/view';

package/app/templates/operations/routes/index.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/operations/routes/index';

package/app/templates/operations/routes.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/operations/routes';

package/composer.json

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

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.13",
+    "version": "0.6.15",
     "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.13",
+    "version": "0.6.15",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"

package/server/src/Events/EntityActivityChanged.php

@@ -21,12 +21,12 @@ class EntityActivityChanged implements ShouldBroadcast
     /**
      * The entity which has new activity.
      */
-    public Entity $entity;
+    public ?Entity $entity = null;
 
     /**
      * The activity which triggered the waypoint completed.
      */
-    public Activity $activity;
+    public ?Activity $activity = null;
 
     /**
      * The event id.

package/server/src/Events/EntityCompleted.php

@@ -21,12 +21,12 @@ class EntityCompleted implements ShouldBroadcast
     /**
      * The entity which is completed.
      */
-    public Entity $entity;
+    public ?Entity $entity = null;
 
     /**
      * The activity which triggered the waypoint completed.
      */
-    public Activity $activity;
+    public ?Activity $activity = null;
 
     /**
      * The event id.

package/server/src/Events/OrderCanceled.php

@@ -18,10 +18,10 @@ class OrderCanceled extends ResourceLifecycleEvent
     /**
      * Assosciated activity which triggered the event.
      */
-    public ?Activity $activity;
+    public ?Activity $activity = null;
 
     /**
      * Assosciated order waypoint which event is for.
      */
-    public ?Waypoint $waypoint;
+    public ?Waypoint $waypoint = null;
 }

package/server/src/Events/OrderCompleted.php

@@ -18,10 +18,10 @@ class OrderCompleted extends ResourceLifecycleEvent
     /**
      * Assosciated activity which triggered the event.
      */
-    public ?Activity $activity;
+    public ?Activity $activity = null;
 
     /**
      * Assosciated order waypoint which event is for.
      */
-    public ?Waypoint $waypoint;
+    public ?Waypoint $waypoint = null;
 }

package/server/src/Events/OrderDispatched.php

@@ -18,10 +18,10 @@ class OrderDispatched extends ResourceLifecycleEvent
     /**
      * Assosciated activity which triggered the event.
      */
-    public ?Activity $activity;
+    public ?Activity $activity = null;
 
     /**
      * Assosciated order waypoint which event is for.
      */
-    public ?Waypoint $waypoint;
+    public ?Waypoint $waypoint = null;
 }

package/server/src/Events/OrderDriverAssigned.php

@@ -17,5 +17,5 @@ class OrderDriverAssigned extends ResourceLifecycleEvent
     /**
      * Assosciated activity which triggered the event.
      */
-    public ?Activity $activity;
+    public ?Activity $activity = null;
 }

package/server/src/Events/OrderFailed.php

@@ -18,10 +18,10 @@ class OrderFailed extends ResourceLifecycleEvent
     /**
      * Assosciated activity which triggered the event.
      */
-    public ?Activity $activity;
+    public ?Activity $activity = null;
 
     /**
      * Assosciated order waypoint which event is for.
      */
-    public ?Waypoint $waypoint;
+    public ?Waypoint $waypoint = null;
 }

package/server/src/Events/OrderReady.php

@@ -17,5 +17,5 @@ class OrderReady extends ResourceLifecycleEvent
     /**
      * Assosciated activity which triggered the event.
      */
-    public ?Activity $activity;
+    public ?Activity $activity = null;
 }

package/server/src/Events/OrderStarted.php

@@ -17,5 +17,5 @@ class OrderStarted extends ResourceLifecycleEvent
     /**
      * Assosciated activity which triggered the event.
      */
-    public ?Activity $activity;
+    public ?Activity $activity = null;
 }

package/server/src/Events/WaypointActivityChanged.php

@@ -21,12 +21,12 @@ class WaypointActivityChanged implements ShouldBroadcast
     /**
      * The waypoint which is completed.
      */
-    public Waypoint $waypoint;
+    public ?Waypoint $waypoint = null;
 
     /**
      * The activity which triggered the waypoint completed.
      */
-    public Activity $activity;
+    public ?Activity $activity = null;
 
     /**
      * The event id.

package/server/src/Events/WaypointCompleted.php

@@ -21,12 +21,12 @@ class WaypointCompleted implements ShouldBroadcast
     /**
      * The waypoint which is completed.
      */
-    public Waypoint $waypoint;
+    public ?Waypoint $waypoint = null;
 
     /**
      * The activity which triggered the waypoint completed.
      */
-    public Activity $activity;
+    public ?Activity $activity = null;
 
     /**
      * The event id.

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

@@ -185,7 +185,8 @@ class SettingController extends Controller
     public function saveRoutingSettings(Request $request)
     {
         $router = $request->input('router');
-        Setting::configureCompany('routing', ['router' => $router]);
+        $unit   = $request->input('unit', 'km');
+        Setting::configureCompany('routing', ['router' => $router, 'unit' => $unit]);
 
         return response()->json([
             'status'  => 'ok',
@@ -200,7 +201,12 @@ class SettingController extends Controller
      */
     public function getRoutingSettings()
     {
-        $routingSettings = Setting::lookupCompany('routing', ['router' => 'osrm']);
+        $routingSettings = Setting::lookupCompany('routing', ['router' => 'osrm', 'unit' => 'km']);
+
+        // always default to km if no unit is set
+        if (!isset($routingSettings['unit'])) {
+            $routingSettings['unit'] = 'km';
+        }
 
         return response()->json($routingSettings);
     }

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

@@ -173,6 +173,11 @@ class OrderFilter extends Filter
         }
     }
 
+    public function only($ids)
+    {
+        $this->builder->whereIn('public_id', $ids);
+    }
+
     public function pickup(string $pickup)
     {
         $this->builder->whereHas(

package/server/src/Http/Requests/CreateDriverRequest.php

@@ -34,7 +34,7 @@ class CreateDriverRequest extends FleetbaseRequest
             'password'  => 'nullable|string',
             'country'   => 'nullable|size:2',
             'city'      => 'nullable|string',
-            'vehicle'   => 'nullable|string|starts_with:vehicle_|exists:drivers,public_id',
+            'vehicle'   => 'nullable|string|starts_with:vehicle_|exists:vehicles,public_id',
             'status'    => 'nullable|string|in:active,inactive',
             'vendor'    => 'nullable|exists:vendors,public_id',
             'job'       => 'nullable|exists:orders,public_id',

package/server/src/Listeners/NotifyOrderEvent.php

@@ -34,6 +34,7 @@ class NotifyOrderEvent implements ShouldQueue
                 $reason = $event->activity ? $event->activity->get('details') : '';
                 NotificationRegistry::notify(OrderCanceled::class, $order, $reason, $event->waypoint);
             }
+
             if ($event instanceof \Fleetbase\FleetOps\Events\OrderCompleted) {
                 NotificationRegistry::notify(OrderCompleted::class, $order, $event->waypoint);
             }

package/server/src/Models/Order.php

@@ -1187,7 +1187,7 @@ class Order extends Model
             }
         }
 
-        return event(new OrderCanceled($this));
+        return dispatch(fn () => event(new OrderCanceled($this)))->afterCommit();
     }
 
     /**

package/translations/en-us.yaml

@@ -1332,6 +1332,7 @@ fleet-ops:
         delete-orders: Delete Orders
         dispatch-orders: Dispatch Orders
         assign-driver: Assign Driver
+        route-optimization: Route Optimization
         bulk-assign-driver-helptext: Select a driver to assign to multiple orders.
         new:
           create-new-customer: Create new customer