@fleetbase/fleetops-engine 0.6.47 → 0.6.48

package/addon/routes/application.js

@@ -29,6 +29,7 @@ export default class ApplicationRoute extends Route {
 
         await this.location.getUserLocation();
         await this.#loadRoutingSettings();
+        await this.#loadTrackingSettings();
         await this.#loadMapSettings();
     }
 
@@ -37,6 +38,11 @@ export default class ApplicationRoute extends Route {
         this.currentUser.setOption('routing', routingSetting);
     }
 
+    async #loadTrackingSettings() {
+        const trackingSettings = await this.fetch.get('fleet-ops/settings/tracking-settings');
+        this.currentUser.setOption('tracking', trackingSettings);
+    }
+
     async #loadMapSettings() {
         await this.mapSettings.load();
     }

package/addon/services/order-list-overlay.js

@@ -185,12 +185,12 @@ export default class OrderListOverlayService extends Service {
 
     #peekActiveOrders() {
         // Consider an order "active" if it has an assigned driver and is not terminal
-        const TERMINAL = ['created', 'completed', 'canceled', 'expired'];
+        const TERMINAL = ['created', 'completed', 'canceled', 'expired', 'order_canceled', 'pending'];
         return this.#peekOrders((order) => !!order.driver_assigned && !TERMINAL.includes(order.status));
     }
 
     #peekDriverActiveOrders(driver) {
-        const TERMINAL = ['created', 'completed', 'canceled', 'expired'];
+        const TERMINAL = ['created', 'completed', 'canceled', 'expired', 'order_canceled', 'pending'];
         return this.#peekOrders((order) => !!order.driver_assigned && order.driver_assigned?.id === driver.id && !TERMINAL.includes(order.status));
     }