@fleetbase/fleetops-engine 0.6.49 → 0.6.50

package/addon/components/place/address.js

@@ -7,6 +7,6 @@ export default class PlaceAddressComponent extends Component {
     }
 
     get addressHtml() {
-        return placeAddressHtml(this.place);
+        return placeAddressHtml(this.place, { showTitle: this.args.showTitle });
     }
 }

package/addon/components/route-list.hbs

@@ -9,10 +9,10 @@
             </div>
             <div class="order-route-location {{@routeLocationClass}} dark:text-gray-100">
                 <div class="mb-2 flex flex-wrap items-center gap-1.5">
-                    {{#if this.firstStop.place.status_code}}
-                        <Badge @status={{this.firstStop.place.status_code}} />
+                    {{#if this.firstStop.statusCode}}
+                        <Badge @status={{this.firstStop.statusCode}} />
                     {{/if}}
-                    {{#if this.firstStop.completed}}
+                    {{#if this.firstStop.showCompletedFlagBadge}}
                         <Badge @status="success" @hideStatusDot={{true}}>Completed</Badge>
                     {{else if this.firstStop.active}}
                         <Badge @status="indigo" @hideStatusDot={{true}}>Current Stop</Badge>
@@ -24,7 +24,7 @@
                         <Badge @status="pending" @hideStatusDot={{true}}>{{format-date-fns this.firstStop.etaAt "d MMM HH:mm"}}</Badge>
                     {{/if}}
                 </div>
-                <DisplayPlace @place={{this.firstStop.place}} @waypointActions={{@waypointActions}} @hideBadges={{true}} />
+                <DisplayPlace @place={{this.firstStop.place}} @waypointActions={{@waypointActions}} @waypointActionContext={{this.firstStop}} @hideBadges={{true}} />
             </div>
         </div>
     {{/if}}
@@ -47,10 +47,10 @@
                     </div>
                     <div class="order-route-location {{@routeLocationClass}} dark:text-gray-100">
                         <div class="mb-2 flex flex-wrap items-center gap-1.5">
-                            {{#if stop.place.status_code}}
-                                <Badge @status={{stop.place.status_code}} />
+                            {{#if stop.statusCode}}
+                                <Badge @status={{stop.statusCode}} />
                             {{/if}}
-                            {{#if stop.completed}}
+                            {{#if stop.showCompletedFlagBadge}}
                                 <Badge @status="success" @hideStatusDot={{true}}>Completed</Badge>
                             {{else if stop.active}}
                                 <Badge @status="indigo" @hideStatusDot={{true}}>Current Stop</Badge>
@@ -62,7 +62,7 @@
                                 <Badge @status="pending" @hideStatusDot={{true}}>{{format-date-fns stop.etaAt "d MMM HH:mm"}}</Badge>
                             {{/if}}
                         </div>
-                        <DisplayPlace @place={{stop.place}} @waypointActions={{@waypointActions}} @hideBadges={{true}} />
+                        <DisplayPlace @place={{stop.place}} @waypointActions={{@waypointActions}} @waypointActionContext={{stop}} @hideBadges={{true}} />
                     </div>
                 </div>
             {{/each}}
@@ -75,10 +75,10 @@
                 </div>
                 <div class="order-route-location {{@routeLocationClass}} dark:text-gray-100">
                     <div class="mb-2 flex flex-wrap items-center gap-1.5">
-                        {{#if stop.place.status_code}}
-                            <Badge @status={{stop.place.status_code}} />
+                        {{#if stop.statusCode}}
+                            <Badge @status={{stop.statusCode}} />
                         {{/if}}
-                        {{#if stop.completed}}
+                        {{#if stop.showCompletedFlagBadge}}
                             <Badge @status="success" @hideStatusDot={{true}}>Completed</Badge>
                         {{else if stop.active}}
                             <Badge @status="indigo" @hideStatusDot={{true}}>Current Stop</Badge>
@@ -90,7 +90,7 @@
                             <Badge @status="pending" @hideStatusDot={{true}}>{{format-date-fns stop.etaAt "d MMM HH:mm"}}</Badge>
                         {{/if}}
                     </div>
-                    <DisplayPlace @place={{stop.place}} @waypointActions={{@waypointActions}} @hideBadges={{true}} />
+                    <DisplayPlace @place={{stop.place}} @waypointActions={{@waypointActions}} @waypointActionContext={{stop}} @hideBadges={{true}} />
                 </div>
             </div>
         {{/each}}
@@ -106,10 +106,10 @@
             </div>
             <div class="order-route-location {{@routeLocationClass}} dark:text-gray-100">
                 <div class="mb-2 flex flex-wrap items-center gap-1.5">
-                    {{#if this.lastStop.place.status_code}}
-                        <Badge @status={{this.lastStop.place.status_code}} />
+                    {{#if this.lastStop.statusCode}}
+                        <Badge @status={{this.lastStop.statusCode}} />
                     {{/if}}
-                    {{#if this.lastStop.completed}}
+                    {{#if this.lastStop.showCompletedFlagBadge}}
                         <Badge @status="success" @hideStatusDot={{true}}>Completed</Badge>
                     {{else if this.lastStop.active}}
                         <Badge @status="indigo" @hideStatusDot={{true}}>Current Stop</Badge>
@@ -121,8 +121,8 @@
                         <Badge @status="pending" @hideStatusDot={{true}}>{{format-date-fns this.lastStop.etaAt "d MMM HH:mm"}}</Badge>
                     {{/if}}
                 </div>
-                <DisplayPlace @place={{this.lastStop.place}} @waypointActions={{@waypointActions}} @hideBadges={{true}} />
+                <DisplayPlace @place={{this.lastStop.place}} @waypointActions={{@waypointActions}} @waypointActionContext={{this.lastStop}} @hideBadges={{true}} />
             </div>
         </div>
     {{/if}}
-</div>
+</div>

package/addon/components/route-list.js

@@ -17,20 +17,29 @@ export default class RouteListComponent extends Component {
         const routePoints = buildRoutePointsFromPayload(this.args.order?.payload);
 
         return routePoints
-            .map((routePoint) => ({
-                routePoint,
-                place: routePoint.place,
-                badgeStyle: this.badgeStyleForStop(routePoint),
-                trackingStop: this.trackingStopFor(routePoint.place),
-                routeLeg: this.routeLegFor(routePoint.place),
-                ...describeRoutePoint(routePoint, this.routeColor),
-            }))
+            .map((routePoint) => {
+                const trackingStop = this.trackingStopFor(routePoint.place);
+
+                return {
+                    routePoint,
+                    place: routePoint.place,
+                    badgeStyle: this.badgeStyleForStop(routePoint),
+                    trackingStop,
+                    routeLeg: this.routeLegFor(routePoint.place),
+                    trackingNumberUuid: routePoint.trackingNumberUuid ?? trackingStop?.tracking_number_uuid,
+                    ...describeRoutePoint(routePoint, this.routeColor),
+                };
+            })
             .map((stop) => ({
                 ...stop,
-                etaSeconds: stop.routeLeg?.eta_seconds ?? stop.routeLeg?.duration_in_traffic_s ?? stop.routeLeg?.duration_s ?? this.legacyEtaFor(stop.place),
-                etaAt: stop.routeLeg?.eta_at,
+                etaSeconds: this.shouldShowEtaForStop(stop)
+                    ? (stop.routeLeg?.eta_seconds ?? stop.routeLeg?.duration_in_traffic_s ?? stop.routeLeg?.duration_s ?? this.legacyEtaFor(stop.place))
+                    : null,
+                etaAt: this.shouldShowEtaForStop(stop) ? stop.routeLeg?.eta_at : null,
                 completed: Boolean(stop.trackingStop?.completed),
                 active: this.matchesStop(stop.trackingStop, this.args.order?.tracker_data?.active_stop),
+                statusCode: stop.place?.status_code ?? stop.trackingStop?.status,
+                showCompletedFlagBadge: this.shouldShowCompletedFlagBadge(stop),
             }));
     }
 
@@ -54,6 +63,10 @@ export default class RouteListComponent extends Component {
         return this.args.isCollapsible !== false && this.hasExtraStops;
     }
 
+    get showEta() {
+        return this.args.showEta !== false;
+    }
+
     badgeStyleForStop(routePoint) {
         const { markerColor } = describeRoutePoint(routePoint, this.routeColor);
         const isYellow = markerColor?.toLowerCase?.() === '#facc15' || markerColor?.toLowerCase?.() === '#ca8a04';
@@ -94,6 +107,25 @@ export default class RouteListComponent extends Component {
         return stop.uuid === activeStop.uuid || stop.public_id === activeStop.public_id;
     }
 
+    shouldShowCompletedFlagBadge(stop) {
+        if (!stop.trackingStop?.completed) {
+            return false;
+        }
+
+        const visibleStatus = stop.statusCode ?? stop.place?.status_code ?? stop.trackingStop?.status_code ?? stop.trackingStop?.status ?? stop.place?.status;
+        if (typeof visibleStatus !== 'string') {
+            return true;
+        }
+
+        return visibleStatus.trim().toLowerCase() !== 'completed';
+    }
+
+    shouldShowEtaForStop(stop) {
+        const status = this.args.order?.status;
+
+        return this.showEta && !['completed', 'canceled'].includes(status) && !stop.trackingStop?.completed;
+    }
+
     @action toggleWaypointsCollapse() {
         this.isWaypointsCollapsed = !this.isWaypointsCollapsed;
     }

package/addon/components/service-rate/details.hbs

@@ -121,6 +121,47 @@
                 </table>
             </div>
         </ContentPanel>
+    {{else if @resource.isMultiZoneDistance}}
+        <ContentPanel @title="Multi-zone Distance" @open={{true}} @wrapperClass="bordered-top" @panelBodyWrapperClass="p-0i">
+            <div class="next-table-wrapper h-auto table-fluid rounded-none overflow-x-auto">
+                <table class="table table-fixed w-full">
+                    <thead>
+                        <tr>
+                            <th>Label</th>
+                            <th>Geography Type</th>
+                            <th>Geography</th>
+                            <th>Priority</th>
+                            <th>Rate</th>
+                            <th>Unit</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {{#each @resource.rateFees as |rateFee|}}
+                            <tr>
+                                <td>{{n-a rateFee.label}}</td>
+                                <td>{{smart-humanize rateFee.geography_type}}</td>
+                                <td>
+                                    {{#if (eq rateFee.geography_type "zone")}}
+                                        {{n-a rateFee.zone.name}}
+                                    {{else if (eq rateFee.geography_type "fallback")}}
+                                        Unmatched route distance
+                                    {{else}}
+                                        {{n-a rateFee.service_area.name}}
+                                    {{/if}}
+                                </td>
+                                <td>{{n-a rateFee.priority}}</td>
+                                <td>{{format-currency (f-to-int rateFee.fee) @resource.currency}}</td>
+                                <td>{{n-a rateFee.distance_unit}}</td>
+                            </tr>
+                        {{else}}
+                            <tr>
+                                <td colspan="6" class="text-center text-gray-500 italic">No geographic pricing rules defined</td>
+                            </tr>
+                        {{/each}}
+                    </tbody>
+                </table>
+            </div>
+        </ContentPanel>
     {{else if @resource.isPerMeter}}
         <ContentPanel @title={{t "service-rate.fields.per-meter"}} @open={{true}} @wrapperClass="bordered-top">
             <div class="grid grid-cols-1 lg:grid-cols-2 gap-2">

package/addon/components/service-rate/form.hbs

@@ -209,6 +209,124 @@
                 </div>
             </div>
         </ContentPanel>
+    {{else if @resource.isMultiZoneDistance}}
+        <ContentPanel @title="Multi-zone Distance" @open={{true}} @wrapperClass="bordered-top" @panelBodyWrapperClass="px-0i">
+            <div class="px-2 mb-3">
+                <InfoBlock
+                    class="mb-3"
+                    @text="Price route distance across multiple service areas or zones. Priority controls overlap: if a route segment matches more than one rule, the highest-priority rule is used. Unmatched distance can use a fallback rule."
+                    @exampleText="Main City: 2.50 per km, Remote Area: 3.75 per km, Fallback: 3.75 per km."
+                />
+
+                <div class="flex flex-row items-center space-x-2">
+                    <Button @text="Add Rule" @icon="plus" @iconPrefix="fas" @onClick={{@resource.addMultiZoneDistanceRule}} />
+                    <Button @text="Add Fallback" @icon="route" @iconPrefix="fas" @onClick={{@resource.addMultiZoneDistanceFallbackRule}} />
+                </div>
+            </div>
+
+            <div class="overflow-x-auto">
+                <div class="next-table-wrapper h-auto table-fluid rounded-none">
+                    <table class="table table-fixed">
+                        <thead>
+                            <tr>
+                                <th class="w-1/6">Label</th>
+                                <th class="w-1/6">Geography Type</th>
+                                <th class="w-1/5">Geography</th>
+                                <th class="w-1/12">Priority</th>
+                                <th class="w-1/6">Rate</th>
+                                <th class="w-1/6">Unit</th>
+                                <th class="w-12"></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {{#each @resource.rateFees as |rateFee|}}
+                                <tr>
+                                    <td>
+                                        <Input @value={{rateFee.label}} placeholder="Rule label" disabled={{cannot-write @resource}} class="form-input w-full" />
+                                    </td>
+                                    <td>
+                                        <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
+                                            <PowerSelect
+                                                @options={{this.geographyTypes}}
+                                                @selected={{find-by "value" rateFee.geography_type this.geographyTypes}}
+                                                @onChange={{fn this.selectRuleGeographyType rateFee}}
+                                                @placeholder="Geography type"
+                                                @triggerClass="form-select form-input"
+                                                @disabled={{cannot-write @resource}}
+                                                as |type|
+                                            >
+                                                {{type.label}}
+                                            </PowerSelect>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        {{#if (eq rateFee.geography_type "zone")}}
+                                            <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
+                                                <PowerSelect
+                                                    @options={{this.zones}}
+                                                    @selected={{rateFee.zone}}
+                                                    @onChange={{fn this.selectRuleZone rateFee}}
+                                                    @placeholder="Select zone"
+                                                    @triggerClass="form-select form-input"
+                                                    @disabled={{cannot-write @resource}}
+                                                    as |zone|
+                                                >
+                                                    {{zone.name}}
+                                                </PowerSelect>
+                                            </div>
+                                        {{else if (eq rateFee.geography_type "fallback")}}
+                                            <div class="text-sm text-gray-500 dark:text-gray-400">Unmatched route distance</div>
+                                        {{else}}
+                                            <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
+                                                <PowerSelect
+                                                    @options={{this.serviceAreas}}
+                                                    @selected={{rateFee.service_area}}
+                                                    @onChange={{fn this.selectRuleServiceArea rateFee}}
+                                                    @placeholder="Select service area"
+                                                    @triggerClass="form-select form-input"
+                                                    @disabled={{cannot-write @resource}}
+                                                    as |serviceArea|
+                                                >
+                                                    {{serviceArea.name}}
+                                                </PowerSelect>
+                                            </div>
+                                        {{/if}}
+                                    </td>
+                                    <td>
+                                        <Input @type="number" @value={{rateFee.priority}} placeholder="0" disabled={{cannot-write @resource}} class="form-input w-full" />
+                                    </td>
+                                    <td>
+                                        <MoneyInput class="w-full" @currency={{@resource.currency}} @value={{rateFee.fee}} disabled={{cannot-write @resource}} />
+                                    </td>
+                                    <td>
+                                        <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
+                                            <PowerSelect
+                                                @options={{get-fleet-ops-options "distanceUnits"}}
+                                                @selected={{find-by "value" rateFee.distance_unit (get-fleet-ops-options "distanceUnits")}}
+                                                @onChange={{set-model-attr rateFee "distance_unit"}}
+                                                @placeholder="Distance unit"
+                                                @triggerClass="form-select form-input"
+                                                @disabled={{cannot-write @resource}}
+                                                as |unit|
+                                            >
+                                                {{unit.label}}
+                                            </PowerSelect>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <Button @type="danger" @icon="trash" @onClick={{fn @resource.removeMultiZoneDistanceRule rateFee}} />
+                                    </td>
+                                </tr>
+                            {{else}}
+                                <tr>
+                                    <td colspan="7" class="text-center text-gray-500 italic">No geographic pricing rules defined</td>
+                                </tr>
+                            {{/each}}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </ContentPanel>
     {{else if @resource.isPerMeter}}
         <ContentPanel @title={{t "service-rate.fields.per-meter"}} @open={{true}} @wrapperClass="bordered-top">
             <InfoBlock class="mb-5" @text={{t "service-rate.fields.per-meter-text"}} @exampleText={{t "service-rate.fields.per-meter-example-text"}} />

package/addon/components/service-rate/form.js

@@ -4,11 +4,29 @@ import { action } from '@ember/object';
 
 export default class ServiceRateFormComponent extends Component {
     @service orderConfigActions;
+    @service serviceAreaActions;
     @service serviceRateActions;
 
     constructor() {
         super(...arguments);
         this.orderConfigActions.loadAll.perform();
+        this.serviceAreaActions.loadAll.perform();
+    }
+
+    get serviceAreas() {
+        return this.serviceAreaActions.serviceAreas ?? [];
+    }
+
+    get zones() {
+        return Array.from(this.serviceAreas).flatMap((serviceArea) => serviceArea.zones?.toArray?.() ?? serviceArea.zones ?? []);
+    }
+
+    get geographyTypes() {
+        return [
+            { label: 'Service Area', value: 'service_area' },
+            { label: 'Zone', value: 'zone' },
+            { label: 'Fallback', value: 'fallback' },
+        ];
     }
 
     @action selectOrderConfig(orderConfig) {
@@ -24,10 +42,47 @@ export default class ServiceRateFormComponent extends Component {
             this.args.resource.resetPerDropFees();
         } else if (rateCalculationMethod === 'fixed_meter' || rateCalculationMethod === 'fixed_rate') {
             this.serviceRateActions.generateFixedRateFees(this.args.resource);
+        } else if (rateCalculationMethod === 'multi_zone_distance' && !this.args.resource.rateFees.length) {
+            this.args.resource.addMultiZoneDistanceRule();
+            this.args.resource.addMultiZoneDistanceFallbackRule();
         }
     }
 
     @action onMaxDistanceChange() {
         this.serviceRateActions.generateFixedRateFees(this.args.resource);
     }
+
+    @action selectRuleGeographyType(rule, { value }) {
+        rule.set('zone', null);
+        rule.set('zone_uuid', null);
+        rule.set('service_area', null);
+        rule.set('service_area_uuid', null);
+        rule.set('is_fallback', value === 'fallback');
+    }
+
+    @action selectRuleServiceArea(rule, serviceArea) {
+        rule.set('service_area', serviceArea);
+        rule.set('service_area_uuid', serviceArea?.id);
+        rule.set('zone', null);
+        rule.set('zone_uuid', null);
+        rule.set('is_fallback', false);
+    }
+
+    @action selectRuleZone(rule, zone) {
+        rule.set('zone', zone);
+        rule.set('zone_uuid', zone?.id);
+        rule.set('service_area', null);
+        rule.set('service_area_uuid', null);
+        rule.set('is_fallback', false);
+    }
+
+    @action setRuleFallback(rule, isFallback) {
+        rule.set('is_fallback', Boolean(isFallback));
+        if (isFallback) {
+            rule.set('zone', null);
+            rule.set('zone_uuid', null);
+            rule.set('service_area', null);
+            rule.set('service_area_uuid', null);
+        }
+    }
 }

package/addon/components/vehicle/form.js

@@ -10,7 +10,7 @@ export default class VehicleFormComponent extends Component {
     @service currentUser;
     @service notifications;
     @service modalsManager;
-    @tracked statusOptions = ['active', 'pending'];
+    @tracked statusOptions = ['available', 'pending'];
 
     @action updateAvatarUrl(option) {
         this.args.resource.avatar_url = option.key === 'custom_avatar' ? option.value : [option.value];

package/addon/components/vehicle/pill.hbs

@@ -20,7 +20,7 @@
     <:tooltip>
         <div>
             <div class="text-xs font-semibold">{{this.resource.name this.resource.yearMakeModel}}</div>
-            <div class="text-xs">{{t "this.resource.driver"}}: {{n-a this.resource.driver_name}}</div>
+            <div class="text-xs">{{t "resource.driver"}}: {{n-a this.resource.driver_name}}</div>
             <div class="text-xs">
                 <span>{{t "common.status"}}:</span>
                 <span class="{{if this.resource.online 'text-green-500' 'text-red-400'}}">

package/addon/controllers/management/vehicles/index/new.js

@@ -4,7 +4,7 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
 
-const DEFAULT_PROPERTIES = { status: 'active' };
+const DEFAULT_PROPERTIES = { status: 'available' };
 
 export default class ManagementVehiclesIndexNewController extends Controller {
     @service store;

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

@@ -103,10 +103,10 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
                             }),
                     },
                     {
-                        text: 'Unassign driver',
-                        icon: 'user-xmark',
-                        disabled: this.model.status === 'canceled' || !this.model.driver_assigned,
-                        fn: () => this.orderActions.unassignDriver(this.model),
+                        text: this.model.has_driver_assigned ? 'Unassign driver' : 'Assign driver',
+                        icon: this.model.has_driver_assigned ? 'user-xmark' : 'edit',
+                        disabled: this.model.has_driver_assigned ? !this.model.hasActiveStatus || !this.model.driver_assigned : !this.model.hasActiveStatus,
+                        fn: () => (this.model.has_driver_assigned ? this.orderActions.unassignDriver(this.model) : this.orderActions.assignDriver(this.model)),
                     },
                     {
                         text: 'View order label',

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

@@ -385,6 +385,20 @@ export default class OperationsOrdersIndexController extends Controller {
                         permission: 'fleet-ops dispatch order',
                         isVisible: (order) => order.canBeDispatched,
                     },
+                    {
+                        label: this.intl.t('common.assign-driver'),
+                        icon: 'edit',
+                        fn: this.orderActions.assignDriver,
+                        permission: 'fleet-ops update order',
+                        isVisible: (order) => !order.has_driver_assigned,
+                    },
+                    {
+                        label: this.intl.t('common.unassign-driver'),
+                        icon: 'edit',
+                        fn: this.orderActions.unassignDriver,
+                        permission: 'fleet-ops update order',
+                        isVisible: (order) => order.has_driver_assigned,
+                    },
                     {
                         label: this.intl.t('common.cancel-resource', { resource: this.intl.t('resource.order') }),
                         icon: 'ban',

package/addon/helpers/place-address-html.js

@@ -1,6 +1,6 @@
 import { helper } from '@ember/component/helper';
 import placeAddressHtml from '../utils/place-address-html';
 
-export default helper(function placeAddressHtmlHelper([place]) {
-    return placeAddressHtml(place);
+export default helper(function placeAddressHtmlHelper([place], hash = {}) {
+    return placeAddressHtml(place, hash);
 });

package/addon/routes/operations/service-rates/index.js

@@ -27,7 +27,7 @@ export default class OperationsServiceRatesIndexRoute extends Route {
     model(params) {
         return this.store.query('service-rate', {
             ...params,
-            with: ['parcelFees', 'rateFees', 'zone', 'serviceArea'],
+            with: ['parcelFees', 'rateFees.zone', 'rateFees.serviceArea', 'zone', 'serviceArea'],
         });
     }
 }