@fleetbase/fleetops-engine 0.6.52 → 0.6.54

package/addon/components/maintenance-schedule/form.js

@@ -37,6 +37,7 @@ const MODEL_TO_TYPE = {
 const ASSIGNEE_MODEL_TO_TYPE = {
     'facilitator-vendor': 'fleet-ops:vendor',
     'facilitator-contact': 'fleet-ops:contact',
+    'facilitator-driver': 'fleet-ops:driver',
     'facilitator-integrated-vendor': 'fleet-ops:vendor',
     vendor: 'fleet-ops:vendor',
     contact: 'fleet-ops:contact',

package/addon/components/order/form/details.hbs

@@ -28,7 +28,7 @@
                 @value={{@resource.scheduled_at}}
                 @minDate={{format-date-fns (now) "yyyy-MM-dd"}}
                 @minTime={{format-date-fns (now) "HH:mm"}}
-                @onUpdate={{fn (mut @resource.scheduled_at)}}
+                @onUpdate={{this.setScheduledAt}}
                 @disabled={{or @resource.dispatched (cannot-write @resource)}}
             />
         </InputGroup>
@@ -237,46 +237,4 @@
     </div>
 </ContentPanel>
 
-{{! ORCHESTRATOR CONSTRAINTS }}
-<ContentPanel @title="Orchestrator Constraints" @open={{true}} @wrapperClass="bordered-top">
-    <div class="grid grid-cols-1 gap-2 lg:grid-cols-2 lg:gap-2 no-input-group-padding text-xs">
-        <div class="col-span-1 lg:col-span-2 text-[11px] uppercase tracking-wide text-gray-500 font-semibold mt-1">
-            Delivery Window
-        </div>
-        <InputGroup
-            @name="Time Window Start"
-            @helpText="Earliest acceptable arrival time at the delivery location. The date defaults to the order's scheduled date (or creation date if not yet scheduled)."
-        >
-            <DateTimeInput class="form-input" @value={{@resource.time_window_start}} @onUpdate={{fn this.setTimeWindow "time_window_start"}} @disabled={{cannot-write @resource}} />
-        </InputGroup>
-        <InputGroup
-            @name="Time Window End"
-            @helpText="Latest acceptable arrival time at the delivery location. The date defaults to the order's scheduled date (or creation date if not yet scheduled)."
-        >
-            <DateTimeInput class="form-input" @value={{@resource.time_window_end}} @onUpdate={{fn this.setTimeWindow "time_window_end"}} @disabled={{cannot-write @resource}} />
-        </InputGroup>
-        <div class="col-span-1 lg:col-span-2 text-[11px] uppercase tracking-wide text-gray-500 font-semibold mt-3">
-            Requirements & Priority
-        </div>
-        <div class="col-span-1 lg:col-span-2">
-            <InputGroup @name="Required Skills" @helpText="Skills the assigned driver and vehicle must have to fulfil this order.">
-                <MultiSelect
-                    @options={{get-fleet-ops-options "driverSkills"}}
-                    @selected={{@resource.required_skills}}
-                    @onChange={{fn (mut @resource.required_skills)}}
-                    @placeholder="Select required skills…"
-                    @triggerClass="form-select form-input"
-                    @disabled={{cannot-write @resource}}
-                    as |option|
-                >
-                    {{option.label}}
-                </MultiSelect>
-            </InputGroup>
-        </div>
-        <InputGroup @name="Orchestrator Priority" @helpText="Priority score 0–100. Higher values are scheduled first when capacity is constrained. Default is 0.">
-            <Input @value={{@resource.orchestrator_priority}} @type="number" class="form-input w-full" placeholder="0–100" disabled={{cannot-write @resource}} />
-        </InputGroup>
-    </div>
-</ContentPanel>
-
 <Order::Form::CustomFields @resource={{@resource}} @customFields={{this.customFields}} />

package/addon/components/order/form/details.js

@@ -20,9 +20,14 @@ export default class OrderFormDetailsComponent extends Component {
         this.orderConfigActions.loadAll.perform();
     }
 
+    get integratedVendorServiceType() {
+        return this.args.resource?.type;
+    }
+
     @action selectFacilitator(model) {
         this.args.resource.set('facilitator', model);
         this.args.resource.set('driver', null);
+        this.requestServiceQuoteRefresh('details.facilitator.changed');
     }
 
     @action selectCustomer(model) {
@@ -39,6 +44,7 @@ export default class OrderFormDetailsComponent extends Component {
             type: orderConfig.key,
         });
         this.args.resource.payload.set('type', orderConfig.key);
+        this.requestServiceQuoteRefresh('details.order_config.changed');
 
         try {
             const customFieldsManager = yield this.customFieldsRegistry.loadSubjectCustomFields.perform(orderConfig);
@@ -70,61 +76,16 @@ export default class OrderFormDetailsComponent extends Component {
         this.leafletLayerVisibilityManager.showModelLayer(this.args.resource.driver_assigned);
     }
 
-    /**
-     * Resolves the reference date to use when pre-populating the date portion
-     * of a time window field. Prefers scheduled_at, falls back to created_at,
-     * and finally falls back to now so there is always a valid date.
-     *
-     * @returns {Date}
-     */
-    get _timeWindowReferenceDate() {
-        const raw = this.args.resource.scheduled_at ?? this.args.resource.created_at ?? new Date();
-        return raw instanceof Date ? raw : new Date(raw);
+    @action setScheduledAt(value) {
+        this.args.resource.scheduled_at = value;
+        this.requestServiceQuoteRefresh('details.scheduled_at.changed');
     }
 
-    /**
-     * Called by DateTimeInput @onUpdate for time_window_start and time_window_end.
-     *
-     * When the user picks a time, we preserve their chosen time but replace the
-     * date portion with the order's scheduled_at date (or created_at if
-     * scheduled_at is not set). This means the user only ever needs to set the
-     * time — the date is always contextually correct.
-     *
-     * If the incoming value already carries a different date (e.g. the user
-     * explicitly changed it via the date part of the picker) we respect that
-     * and do not override it.
-     *
-     * @param {'time_window_start'|'time_window_end'} field
-     * @param {Date|string|null} value  Value emitted by DateTimeInput
-     */
-    @action setTimeWindow(field, value) {
-        if (!value) {
-            this.args.resource[field] = null;
-            return;
-        }
-
-        const picked = value instanceof Date ? value : new Date(value);
-        if (isNaN(picked.getTime())) {
-            this.args.resource[field] = value;
-            return;
-        }
-
-        const ref = this._timeWindowReferenceDate;
-
-        // Only inject the reference date when the picked value has no meaningful
-        // date of its own — i.e. when the date portion is the Unix epoch
-        // (1970-01-01), which is what DateTimeInput emits when the user has only
-        // touched the time picker and not the date picker.
-        const isEpochDate = picked.getUTCFullYear() === 1970 && picked.getUTCMonth() === 0 && picked.getUTCDate() === 1;
-
-        if (isEpochDate) {
-            const merged = new Date(ref);
-            merged.setHours(picked.getHours(), picked.getMinutes(), picked.getSeconds(), 0);
-            this.args.resource[field] = merged;
-        } else {
-            // User explicitly set a date — honour it as-is.
-            this.args.resource[field] = picked;
-        }
+    @action selectIntegratedServiceType(serviceType) {
+        const type = serviceType?.key ?? serviceType?.value ?? serviceType;
+        this.args.resource.type = type;
+        this.args.resource.payload.set('type', type);
+        this.requestServiceQuoteRefresh('details.integrated_service_type.changed');
     }
 
     @action toggleAdhoc(toggled) {
@@ -136,4 +97,8 @@ export default class OrderFormDetailsComponent extends Component {
         this.args.resource.pod_required = toggled;
         this.args.resource.pod_method = toggled ? 'scan' : null;
     }
+
+    requestServiceQuoteRefresh(reason) {
+        this.orderCreation.requestServiceQuoteRefresh(reason, this.args.resource);
+    }
 }

package/addon/components/order/form/orchestrator-constraints.hbs

@@ -0,0 +1,40 @@
+<ContentPanel @title="Orchestrator Constraints" @open={{true}} @wrapperClass="bordered-top">
+    <div class="grid grid-cols-1 gap-2 lg:grid-cols-2 lg:gap-2 no-input-group-padding text-xs">
+        <div class="col-span-1 lg:col-span-2 text-[11px] uppercase tracking-wide text-gray-500 font-semibold mt-1">
+            Delivery Window
+        </div>
+        <InputGroup
+            @name="Time Window Start"
+            @helpText="Earliest acceptable arrival time at the delivery location. The date defaults to the order's scheduled date (or creation date if not yet scheduled)."
+        >
+            <DateTimeInput class="form-input" @value={{@resource.time_window_start}} @onUpdate={{fn this.setTimeWindow "time_window_start"}} @disabled={{cannot-write @resource}} />
+        </InputGroup>
+        <InputGroup
+            @name="Time Window End"
+            @helpText="Latest acceptable arrival time at the delivery location. The date defaults to the order's scheduled date (or creation date if not yet scheduled)."
+        >
+            <DateTimeInput class="form-input" @value={{@resource.time_window_end}} @onUpdate={{fn this.setTimeWindow "time_window_end"}} @disabled={{cannot-write @resource}} />
+        </InputGroup>
+        <div class="col-span-1 lg:col-span-2 text-[11px] uppercase tracking-wide text-gray-500 font-semibold mt-3">
+            Requirements & Priority
+        </div>
+        <div class="col-span-1 lg:col-span-2">
+            <InputGroup @name="Required Skills" @helpText="Skills the assigned driver and vehicle must have to fulfil this order.">
+                <MultiSelect
+                    @options={{get-fleet-ops-options "driverSkills"}}
+                    @selected={{@resource.required_skills}}
+                    @onChange={{fn (mut @resource.required_skills)}}
+                    @placeholder="Select required skills..."
+                    @triggerClass="form-select form-input"
+                    @disabled={{cannot-write @resource}}
+                    as |option|
+                >
+                    {{option.label}}
+                </MultiSelect>
+            </InputGroup>
+        </div>
+        <InputGroup @name="Orchestrator Priority" @helpText="Priority score 0-100. Higher values are scheduled first when capacity is constrained. Default is 0.">
+            <Input @value={{@resource.orchestrator_priority}} @type="number" class="form-input w-full" placeholder="0-100" disabled={{cannot-write @resource}} />
+        </InputGroup>
+    </div>
+</ContentPanel>

package/addon/components/order/form/orchestrator-constraints.js

@@ -0,0 +1,61 @@
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+
+export default class OrderFormOrchestratorConstraintsComponent extends Component {
+    /**
+     * Resolves the reference date to use when pre-populating the date portion
+     * of a time window field. Prefers scheduled_at, falls back to created_at,
+     * and finally falls back to now so there is always a valid date.
+     *
+     * @returns {Date}
+     */
+    get _timeWindowReferenceDate() {
+        const raw = this.args.resource.scheduled_at ?? this.args.resource.created_at ?? new Date();
+        return raw instanceof Date ? raw : new Date(raw);
+    }
+
+    /**
+     * Called by DateTimeInput @onUpdate for time_window_start and time_window_end.
+     *
+     * When the user picks a time, we preserve their chosen time but replace the
+     * date portion with the order's scheduled_at date (or created_at if
+     * scheduled_at is not set). This means the user only ever needs to set the
+     * time, the date is always contextually correct.
+     *
+     * If the incoming value already carries a different date (e.g. the user
+     * explicitly changed it via the date part of the picker) we respect that
+     * and do not override it.
+     *
+     * @param {'time_window_start'|'time_window_end'} field
+     * @param {Date|string|null} value  Value emitted by DateTimeInput
+     */
+    @action setTimeWindow(field, value) {
+        if (!value) {
+            this.args.resource[field] = null;
+            return;
+        }
+
+        const picked = value instanceof Date ? value : new Date(value);
+        if (isNaN(picked.getTime())) {
+            this.args.resource[field] = value;
+            return;
+        }
+
+        const ref = this._timeWindowReferenceDate;
+
+        // Only inject the reference date when the picked value has no meaningful
+        // date of its own, i.e. when the date portion is the Unix epoch
+        // (1970-01-01), which is what DateTimeInput emits when the user has only
+        // touched the time picker and not the date picker.
+        const isEpochDate = picked.getUTCFullYear() === 1970 && picked.getUTCMonth() === 0 && picked.getUTCDate() === 1;
+
+        if (isEpochDate) {
+            const merged = new Date(ref);
+            merged.setHours(picked.getHours(), picked.getMinutes(), picked.getSeconds(), 0);
+            this.args.resource[field] = merged;
+        } else {
+            // User explicitly set a date, honour it as-is.
+            this.args.resource[field] = picked;
+        }
+    }
+}

package/addon/components/order/form/payload.js

@@ -7,6 +7,7 @@ export default class OrderFormPayloadComponent extends Component {
     @service store;
     @service fetch;
     @service entityActions;
+    @service orderCreation;
 
     get entitiesByImportId() {
         const groups = [];
@@ -32,6 +33,7 @@ export default class OrderFormPayloadComponent extends Component {
         const { value } = target;
 
         this.args.resource.payload.entities[index].destination_uuid = value;
+        this.requestServiceQuoteRefresh('entity.destination.changed');
     }
 
     @action addFromCustomEntity(customEntity) {
@@ -41,11 +43,15 @@ export default class OrderFormPayloadComponent extends Component {
         });
 
         this.args.resource.payload.entities.pushObject(entity);
+        this.requestServiceQuoteRefresh('entity.added');
     }
 
     @action addEntities(entities = []) {
         if (isArray(entities)) {
             this.args.resource.payload.entities.pushObjects(entities);
+            if (entities.length) {
+                this.requestServiceQuoteRefresh('entity.batch_added');
+            }
         }
     }
 
@@ -56,19 +62,61 @@ export default class OrderFormPayloadComponent extends Component {
         });
 
         this.args.resource.payload.entities.pushObject(entity);
+        this.requestServiceQuoteRefresh('entity.added');
     }
 
     @action removeEntity(entity) {
         if (this.args.resource.payload.entities.length === 1) return;
 
         if (!entity.isNew) {
-            return entity.destroyRecord();
+            return entity.destroyRecord().then(() => {
+                this.requestServiceQuoteRefresh('entity.removed');
+            });
         }
 
         this.args.resource.payload.entities.removeObject(entity);
+        this.requestServiceQuoteRefresh('entity.removed');
     }
 
     @action editEntity(entity) {
-        this.entityActions.modal.edit(entity);
+        this.entityActions.modal.edit(entity, {
+            confirm: (modal) => {
+                modal.done();
+                this.requestServiceQuoteRefresh('entity.edited');
+            },
+        });
+    }
+
+    @action setEntityQuoteField(entity, field, value) {
+        this.setEntityValue(entity, field, value);
+        this.requestServiceQuoteRefresh(`entity.${field}.changed`);
+    }
+
+    @action setEntityCurrency(entity, value) {
+        this.setEntityValue(entity, 'currency', value);
+        this.requestServiceQuoteRefresh('entity.currency.changed');
+    }
+
+    @action setEntityDimensionsUnit(entity, value) {
+        this.setEntityValue(entity, 'dimensions_unit', value);
+        this.requestServiceQuoteRefresh('entity.dimensions_unit.changed');
+    }
+
+    @action setEntityWeightUnit(entity, value) {
+        this.setEntityValue(entity, 'weight_unit', value);
+        this.requestServiceQuoteRefresh('entity.weight_unit.changed');
+    }
+
+    setEntityValue(entity, field, value) {
+        if (typeof entity?.set === 'function') {
+            entity.set(field, value);
+            return;
+        }
+
+        entity[field] = value;
+    }
+
+    requestServiceQuoteRefresh(reason) {
+        this.orderCreation.requestServiceQuoteRefresh(reason, this.args.resource);
     }
 }

package/addon/components/order/form/route.js

@@ -20,6 +20,7 @@ export default class OrderFormRouteComponent extends Component {
     @service currentUser;
     @service notifications;
     @service placeActions;
+    @service orderCreation;
     @tracked multipleWaypoints = false;
     @tracked routingControl;
     @tracked route;
@@ -119,6 +120,8 @@ export default class OrderFormRouteComponent extends Component {
 
             this.clearWaypoints();
         }
+
+        this.requestServiceQuoteRefresh('route.waypoints.toggled');
     }
 
     @action sortWaypoints({ sourceList, sourceIndex, targetList, targetIndex }) {
@@ -132,6 +135,7 @@ export default class OrderFormRouteComponent extends Component {
         targetList.insertAt(targetIndex, item);
 
         this.previewRoute();
+        this.requestServiceQuoteRefresh('route.waypoints.reordered');
     }
 
     @action addWaypoint(properties = {}) {
@@ -143,6 +147,7 @@ export default class OrderFormRouteComponent extends Component {
         this.args.resource.payload.waypoints.pushObject(waypoint);
 
         this.previewRoute();
+        this.requestServiceQuoteRefresh('route.waypoint.added');
     }
 
     @action setWaypointPlace(index, place) {
@@ -159,6 +164,7 @@ export default class OrderFormRouteComponent extends Component {
             location: place.location,
         });
         this.previewRoute();
+        this.requestServiceQuoteRefresh('route.waypoint.place.changed');
     }
 
     @action setWaypointCustomer(waypoint, model) {
@@ -170,16 +176,19 @@ export default class OrderFormRouteComponent extends Component {
         if (this.multipleWaypoints && this.args.resource.payload.waypoints.length === 1) return;
         this.args.resource.payload.waypoints.removeObject(waypoint);
         this.previewRoute();
+        this.requestServiceQuoteRefresh('route.waypoint.removed');
     }
 
     @action clearWaypoints() {
         this.args.resource.payload.waypoints.clear();
         this.previewRoute();
+        this.requestServiceQuoteRefresh('route.waypoints.cleared');
     }
 
     @action setPayloadPlace(prop, place) {
         this.args.resource.payload[prop] = place;
         this.previewRoute();
+        this.requestServiceQuoteRefresh(`route.${prop}.changed`);
     }
 
     @action editPlace(place) {
@@ -291,6 +300,7 @@ export default class OrderFormRouteComponent extends Component {
         }
         this.previewRoute();
         this.args.resource.set('optimized', true);
+        this.requestServiceQuoteRefresh('route.optimized');
     }
 
     @action setOptimizedRoute(route, trip, waypoints, engine = 'osrm') {
@@ -314,5 +324,10 @@ export default class OrderFormRouteComponent extends Component {
         const routeModel = this.store.createRecord('route', payload);
         this.args.resource.route = routeModel;
         this.route = payload;
+        this.requestServiceQuoteRefresh('route.changed');
+    }
+
+    requestServiceQuoteRefresh(reason) {
+        this.orderCreation.requestServiceQuoteRefresh(reason, this.args.resource);
     }
 }

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

@@ -1,14 +1,55 @@
 <ContentPanel @title={{t "order.fields.service"}} @open={{true}} @wrapperClass="bordered-top">
     <div>
-        <Toggle
-            @label={{t "order.fields.apply-service-rate"}}
-            @wrapperClass="justify-start-i mb-4"
-            @isToggled={{@resource.servicable}}
-            @onToggle={{perform this.queryServiceRates}}
-            @disabled={{or (cannot-write @resource) (not this.isServicable)}}
-            @helpText={{t "order.fields.service-help-text"}}
-        />
-        {{#if @resource.servicable}}
+        {{#if this.hasServiceQuoteOverride}}
+            <div class="rounded-md border border-blue-200 bg-blue-50 px-3 py-3 text-blue-800 dark:border-blue-800 dark:bg-blue-900 dark:text-blue-100">
+                <div class="flex items-start justify-between gap-3">
+                    <div>
+                        <div class="text-sm font-semibold">{{this.serviceQuoteOverride.title}}</div>
+                        {{#if this.serviceQuoteOverride.description}}
+                            <div class="mt-1 text-xs opacity-80">{{this.serviceQuoteOverride.description}}</div>
+                        {{/if}}
+                    </div>
+                    <Badge @hideStatusDot={{true}} @status="info">Locked</Badge>
+                </div>
+
+                {{#if this.serviceQuoteOverride.isLoading}}
+                    <div class="flex items-center justify-center py-5">
+                        <Spinner class="text-sm flex flex-row items-center" @iconClass="mr-2" @loadingMessage="Generating contract quote..." />
+                    </div>
+                {{else if this.overrideQuote}}
+                    <div class="mt-3 rounded-md border border-blue-300 bg-blue-600/20 text-blue-50 dark:border-blue-600 dark:bg-blue-950/30">
+                        <div class="border-b border-blue-300 px-3 py-2 text-xs font-semibold uppercase tracking-wide text-blue-100/80 dark:border-blue-700 dark:text-blue-200/80">
+                            {{t "order.fields.breakdown"}}
+                        </div>
+                        <div class="divide-y divide-blue-300/70 dark:divide-blue-700">
+                            {{#each this.overrideQuoteItems as |item|}}
+                                <div class="flex flex-col gap-1 px-3 py-2 sm:flex-row sm:items-start sm:justify-between sm:gap-3">
+                                    <span class="min-w-0 whitespace-normal break-words text-sm font-semibold text-blue-50 dark:text-blue-100 w-3/4">{{item.details}}</span>
+                                    <span class="shrink-0 text-right text-sm font-medium text-blue-50 dark:text-blue-100">
+                                        {{format-currency item.amount this.overrideCurrency}}
+                                    </span>
+                                </div>
+                            {{/each}}
+                            <div class="flex flex-col gap-1 px-3 py-2 sm:flex-row sm:items-center sm:justify-between sm:gap-3">
+                                <span class="font-semibold text-blue-50 dark:text-blue-100">{{t "common.total"}}</span>
+                                <span class="shrink-0 text-right font-semibold text-blue-50 dark:text-blue-100">
+                                    {{format-currency this.overrideQuote.amount this.overrideCurrency}}
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                {{/if}}
+            </div>
+        {{else}}
+            <Toggle
+                @label={{t "order.fields.apply-service-rate"}}
+                @wrapperClass="justify-start-i mb-4"
+                @isToggled={{@resource.servicable}}
+                @onToggle={{perform this.queryServiceRates}}
+                @disabled={{or (cannot-write @resource) (not this.isServicable)}}
+                @helpText={{t "order.fields.service-help-text"}}
+            />
+            {{#if @resource.servicable}}
             <div>
                 <div class="space-y-2">
                     {{#unless @resource.facilitator.isIntegratedVendor}}
@@ -36,18 +77,27 @@
                         <Button
                             @icon="refresh"
                             @text={{t "order.fields.refresh-button"}}
-                            @isLoading={{this.getServiceQuotes.isRunning}}
+                            @isLoading={{this.isLoadingServiceQuotes}}
                             @disabled={{not this.selectedRate}}
                             @onClick={{perform this.getServiceQuotes this.selectedRate}}
                         />
                     </div>
                 </div>
-                {{#if this.getServiceQuotes.isRunning}}
+                {{#if this.shouldShowServiceQuotesLoader}}
                     <div class="flex items-center justify-center py-5">
                         <Spinner class="text-sm dark:text-gray-100 flex flex-row items-center" @iconClass="mr-2" @loadingMessage={{t "order.fields.loading-message"}} />
                     </div>
                 {{else}}
                     <InfoBlock class="my-3" @text={{t "order.fields.service-quote-info"}} />
+                    {{#if (and this.isAutoRefreshingServiceQuotes this.hasServiceQuotes)}}
+                        <div class="my-3 rounded-md border border-blue-200 bg-blue-50 px-3 py-2 text-blue-700 dark:border-blue-800 dark:bg-blue-900 dark:text-blue-100">
+                            <Spinner
+                                class="text-sm flex flex-row items-center"
+                                @iconClass="mr-2"
+                                @loadingMessage={{t "order.fields.updating-service-quotes-message"}}
+                            />
+                        </div>
+                    {{/if}}
                     <div class="radio-group-condensed -space-y-px">
                         {{#each this.serviceQuotes as |serviceQuote|}}
                             <div class="radio-group-item shadow-sm flex-col pl-0i pr-0i {{if (eq @resource.service_quote_uuid serviceQuote.uuid) 'is-checked'}}">
@@ -106,6 +156,7 @@
                     </div>
                 {{/if}}
             </div>
+            {{/if}}
         {{/if}}
     </div>
 </ContentPanel>