@fleetbase/fleetops-engine 0.6.49 → 0.6.50

package/addon/components/modals/order-change-destination.js

@@ -0,0 +1,106 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { task } from 'ember-concurrency';
+import { buildServiceStopsFromPayload, describeRoutePoint } from '../../utils/route-visualization';
+import { colorForId } from '../../utils/route-colors';
+
+export default class ModalsOrderChangeDestinationComponent extends Component {
+    @service fetch;
+    @service notifications;
+    @tracked selectedOption;
+
+    get order() {
+        return this.args.options?.order;
+    }
+
+    get waypoints() {
+        const waypoints = this.order?.payload?.waypoints;
+        if (typeof waypoints?.toArray === 'function') {
+            return waypoints.toArray();
+        }
+
+        return Array.isArray(waypoints) ? waypoints : Array.from(waypoints ?? []);
+    }
+
+    get routeColor() {
+        return colorForId(this.order?.public_id ?? this.order?.id ?? 'order-route');
+    }
+
+    get serviceStops() {
+        return buildServiceStopsFromPayload(this.order?.payload);
+    }
+
+    get currentWaypointId() {
+        const activeStop = this.order?.tracker_data?.active_stop;
+        const payload = this.order?.payload;
+
+        return activeStop?.uuid ?? activeStop?.public_id ?? payload?.current_waypoint_uuid ?? payload?.current_waypoint;
+    }
+
+    get waypointOptions() {
+        return this.serviceStops.map((stop, index) => ({
+            waypoint: stop.place,
+            stop,
+            index,
+            id: this.waypointId(stop.place),
+            isCurrent: this.isCurrentWaypoint(stop.place),
+            isSelected: this.isSelectedStop(stop),
+            label: describeRoutePoint(stop, this.routeColor).label,
+            title: describeRoutePoint(stop, this.routeColor).title,
+            tracking: this.trackingForStop(stop),
+        }));
+    }
+
+    waypointId(waypoint) {
+        return waypoint?.id ?? waypoint?.public_id ?? waypoint?.uuid;
+    }
+
+    isCurrentWaypoint(waypoint) {
+        return [waypoint?.id, waypoint?.uuid, waypoint?.public_id, waypoint?.waypoint_public_id].includes(this.currentWaypointId);
+    }
+
+    isSelectedStop(stop) {
+        const selectedPlace = this.selectedOption?.waypoint;
+
+        return [selectedPlace?.id, selectedPlace?.uuid, selectedPlace?.public_id, selectedPlace?.waypoint_public_id].includes(this.waypointId(stop?.place));
+    }
+
+    trackingForStop(stop) {
+        return stop?.place?.tracking ?? stop?.place?.tracking_number ?? stop?.trackingNumberUuid ?? this.order?.tracking ?? this.order?.tracking_number;
+    }
+
+    @action selectOption(option) {
+        if (!option?.isCurrent) {
+            this.selectedOption = option;
+        }
+    }
+
+    @task *confirmSelection(modal) {
+        const option = this.selectedOption;
+        const waypoint = option?.waypoint;
+        const waypointId = this.waypointId(waypoint);
+        if (!waypointId) {
+            modal.stopLoading();
+            return this.notifications.warning('Select a destination first.');
+        }
+
+        modal.startLoading();
+
+        try {
+            const order = yield this.fetch.patch(`orders/set-destination/${this.order.id}/${waypointId}`);
+            this.notifications.success(`Current destination changed to ${waypoint.name ?? waypoint.address ?? waypointId}.`);
+
+            if (typeof this.args.options?.onChange === 'function') {
+                yield this.args.options.onChange(order, waypoint);
+            }
+
+            modal.done();
+        } catch (error) {
+            this.notifications.serverError(error);
+        } finally {
+            modal.stopLoading();
+        }
+    }
+}

package/addon/components/modals/stop-activity.hbs

@@ -0,0 +1,28 @@
+<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
+    <div class="modal-body-container">
+        <div class="mb-4 rounded-md border border-gray-200 bg-gray-50 px-4 py-3 dark:border-gray-700 dark:bg-gray-800">
+            <div class="text-xs font-semibold uppercase text-gray-500 dark:text-gray-400">Stop</div>
+            <div class="mt-1 text-sm font-semibold text-gray-900 dark:text-gray-100">{{this.stopName}}</div>
+            <div class="mt-1 text-xs text-gray-500 dark:text-gray-400">{{or this.place.address this.place.street1}}</div>
+        </div>
+
+        {{#if this.loadActivity.isRunning}}
+            <div class="flex items-center justify-center p-8 text-sm text-gray-500 dark:text-gray-400">
+                <FaIcon @icon="spinner" @spin={{true}} class="mr-2" />
+                Loading activity...
+            </div>
+        {{else if this.trackingNumberUuid}}
+            <Order::ActivityList @activity={{this.activity}} @resource={{hash status=this.stop.status}} />
+        {{else}}
+            <div class="min-h-24 pb-4">
+                <div class="flex items-center justify-center rounded-xl border border-dashed border-gray-300 bg-gray-50 p-6 dark:border-gray-600 dark:bg-gray-800">
+                    <div class="text-center">
+                        <FaIcon @icon="layer-group" @size="2x" class="mb-2 text-gray-400" />
+                        <div class="text-sm font-medium text-gray-600 dark:text-gray-400">No stop activity</div>
+                        <div class="mt-1 text-xs text-gray-500 dark:text-gray-500">This stop does not have a separate activity stream.</div>
+                    </div>
+                </div>
+            </div>
+        {{/if}}
+    </div>
+</Modal::Default>

package/addon/components/modals/stop-activity.js

@@ -0,0 +1,52 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { task } from 'ember-concurrency';
+
+export default class ModalsStopActivityComponent extends Component {
+    @service store;
+    @service notifications;
+    @tracked activity = [];
+
+    constructor() {
+        super(...arguments);
+        this.loadActivity.perform();
+    }
+
+    get stop() {
+        return this.args.options?.stop;
+    }
+
+    get place() {
+        return this.stop?.place ?? this.stop;
+    }
+
+    get order() {
+        return this.args.options?.order;
+    }
+
+    get stopName() {
+        return this.place?.name ?? this.place?.address ?? this.place?.id;
+    }
+
+    get trackingNumberUuid() {
+        return this.stop?.trackingNumberUuid ?? this.stop?.tracking_number_uuid ?? this.stop?.tracking_number?.uuid ?? this.place?.tracking_number_uuid ?? this.place?.tracking_number?.uuid;
+    }
+
+    @task *loadActivity() {
+        if (!this.trackingNumberUuid) {
+            this.activity = [];
+            return [];
+        }
+
+        try {
+            const activity = yield this.store.query('tracking-status', {
+                tracking_number_uuid: this.trackingNumberUuid,
+            });
+            this.activity = activity.toArray();
+            return activity;
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+}

package/addon/components/modals/update-order-activity.hbs

@@ -16,6 +16,23 @@
             </InfoBlock>
         {{/if}}
 
+        {{#if this.currentWaypoint}}
+            <div class="my-4 rounded-md border border-blue-200 bg-blue-50 px-4 py-3 text-blue-900 dark:border-blue-700 dark:bg-blue-900 dark:text-blue-50">
+                <div class="text-xs font-semibold uppercase">Updating activity for</div>
+                <div class="mt-1 flex items-start justify-between gap-3">
+                    <div class="min-w-0">
+                        <div class="truncate text-sm font-semibold">{{or this.currentWaypoint.name this.currentWaypoint.id}}</div>
+                        <div class="truncate text-xs">{{or (place-address-html this.currentWaypoint showTitle=false) this.currentWaypoint.address this.currentWaypoint.street1}}</div>
+                    </div>
+                    {{#if this.currentWaypoint.status_code}}
+                        <Badge @status={{dasherize this.currentWaypoint.status_code}} class="uppercase">{{this.currentWaypoint.status_code}}</Badge>
+                    {{else if this.currentWaypoint.status}}
+                        <Badge @status={{dasherize this.currentWaypoint.status}} class="uppercase">{{this.currentWaypoint.status}}</Badge>
+                    {{/if}}
+                </div>
+            </div>
+        {{/if}}
+
         <fieldset class="my-5">
             <legend class="sr-only">
                 {{t "modals.order-new-activity.activity-options"}}
@@ -36,14 +53,18 @@
                         </div>
                         <label for={{concat "activity_" index}} class="ml-3 flex flex-col cursor-pointer w-full">
                             <span class="block text-sm font-semibold">
-                                {{activity.status}}
+                                {{or activity._resolved_status activity.status}}
                             </span>
                             <span class="block text-sm">
-                                {{activity.details}}
+                                {{or activity._resolved_details activity.details}}
 
                                 {{#if (eq activity.code "dispatched")}}
                                     <InfoBlock @type="warning" @size="xs" @icon="exclamation-triangle" @text={{t "modals.order-new-activity.dispatch"}} class="mt-1" />
                                 {{/if}}
+
+                                {{#if activity.require_pod}}
+                                    <InfoBlock @type="warning" @size="xs" @icon="camera" @text="Requires photo proof of delivery" class="mt-1" />
+                                {{/if}}
                             </span>
                         </label>
                         <div>
@@ -88,5 +109,26 @@
                 </div>
             </div>
         </fieldset>
+
+        {{#if this.selectedActivityRequiresPod}}
+            <div class="mb-5 rounded-md border border-yellow-300 bg-yellow-50 p-4 dark:border-yellow-700 dark:bg-yellow-900">
+                <div class="mb-2 text-sm font-semibold text-yellow-900 dark:text-yellow-50">Photo proof of delivery required</div>
+                <p class="mb-3 text-xs text-yellow-800 dark:text-yellow-100">Upload a delivery photo before submitting this activity update.</p>
+                <FileUpload @name="photos[]" @accept={{join "," this.acceptedProofFileTypes}} @multiple={{false}} @onFileAdded={{this.setProofFile}}>
+                    <a tabindex={{0}} class="btn btn-magic cursor-pointer">
+                        <FaIcon @icon="camera" class="mr-1" />
+                        Select photo
+                    </a>
+                </FileUpload>
+                {{#if this.proofFiles}}
+                    {{#each this.proofFiles as |file|}}
+                        <div class="mt-3 flex items-center justify-between rounded-md border border-yellow-400 bg-white px-3 py-2 text-xs text-yellow-900 dark:bg-yellow-950 dark:text-yellow-50">
+                            <span class="truncate">{{file.name}}</span>
+                            <span class="font-semibold">{{round file.progress}}%</span>
+                        </div>
+                    {{/each}}
+                {{/if}}
+            </div>
+        {{/if}}
     </div>
-</Modal::Default>
+</Modal::Default>

package/addon/components/modals/update-order-activity.js

@@ -1,16 +1,21 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
+import { action, get } from '@ember/object';
 import { task } from 'ember-concurrency';
+import config from 'ember-get-config';
+import { buildServiceStopsFromPayload } from '../../utils/route-visualization';
 
 export default class ModalsUpdateOrderActivityComponent extends Component {
     @service fetch;
+    @service intl;
     @service notifications;
     @service modalsManager;
     @tracked activityOptions = [];
     @tracked order;
     @tracked selectedActivity;
-    @tracked customActivity;
+    @tracked customActivity = {};
+    @tracked proofFiles = [];
 
     constructor(owner, { options = {} }) {
         super(...arguments);
@@ -18,9 +23,95 @@ export default class ModalsUpdateOrderActivityComponent extends Component {
         this.loadActivity.perform();
     }
 
+    get waypoints() {
+        const waypoints = this.order?.payload?.waypoints;
+        if (typeof waypoints?.toArray === 'function') {
+            return waypoints.toArray();
+        }
+
+        return Array.isArray(waypoints) ? waypoints : Array.from(waypoints ?? []);
+    }
+
+    get serviceStops() {
+        return buildServiceStopsFromPayload(this.order?.payload);
+    }
+
+    get activeStopId() {
+        const activeStop = this.order?.tracker_data?.active_stop;
+
+        return activeStop?.uuid ?? activeStop?.public_id ?? this.order?.payload?.current_waypoint_uuid ?? this.order?.payload?.current_waypoint;
+    }
+
+    get isMultipleWaypointOrder() {
+        return this.waypoints.length > 0;
+    }
+
+    get orderHasStarted() {
+        const status = this.order?.status;
+
+        return Boolean(this.order?.started || this.order?.started_at || (status && !['created', 'dispatched'].includes(status)));
+    }
+
+    get shouldUseWaypointActivity() {
+        return this.isMultipleWaypointOrder && this.orderHasStarted;
+    }
+
+    get currentWaypoint() {
+        if (!this.shouldUseWaypointActivity) {
+            return null;
+        }
+
+        const currentWaypointId = this.activeStopId;
+
+        if (currentWaypointId) {
+            const stop = this.serviceStops.find(({ place }) => {
+                return [place?.id, place?.uuid, place?.public_id, place?.waypoint_public_id].includes(currentWaypointId);
+            });
+
+            if (stop?.place) {
+                return stop.place;
+            }
+        }
+
+        return this.serviceStops.find(({ place }) => !place?.complete)?.place ?? this.serviceStops[0]?.place;
+    }
+
+    get currentWaypointId() {
+        const waypoint = this.currentWaypoint;
+
+        return waypoint?.id ?? waypoint?.public_id ?? waypoint?.uuid;
+    }
+
+    get currentWaypointProofSubjectId() {
+        const waypoint = this.currentWaypoint;
+
+        return waypoint?.waypoint_public_id ?? waypoint?.id ?? waypoint?.public_id ?? waypoint?.uuid;
+    }
+
+    get selectedActivityRecord() {
+        if (this.selectedActivity === 'custom') {
+            return this.customActivity;
+        }
+
+        return this.activityOptions[this.selectedActivity];
+    }
+
+    get selectedActivityRequiresPod() {
+        return Boolean(this.selectedActivityRecord?.require_pod);
+    }
+
+    get acceptedProofFileTypes() {
+        return ['image/jpeg', 'image/png', 'image/gif', 'image/webp'];
+    }
+
     @task *loadActivity() {
+        if (!this.order?.id) {
+            return [];
+        }
+
         try {
-            const activityOptions = yield this.fetch.get(`orders/next-activity/${this.order.id}`);
+            const params = this.shouldUseWaypointActivity && this.currentWaypointId ? { waypoint: this.currentWaypointId } : {};
+            const activityOptions = yield this.fetch.get(`orders/next-activity/${this.order.id}`, params);
             this.activityOptions = activityOptions;
             return activityOptions;
         } catch (err) {
@@ -31,21 +122,68 @@ export default class ModalsUpdateOrderActivityComponent extends Component {
     @task *submitActivity(modal) {
         modal.startLoading();
 
-        const activity = this.selectedActivity === 'custom' ? this.customActivity : this.activityOptions[this.selectedActivity];
+        const activity = this.selectedActivityRecord;
         if (this.selectedActivity === 'custom' && !activity.status && !activity.details && !activity.code) {
             modal.stopLoading();
             return this.notifications.warning(this.intl.t('fleet-ops.operations.orders.index.view.invalid-warning'));
         }
 
+        if (this.selectedActivityRequiresPod && this.proofFiles.length === 0) {
+            modal.stopLoading();
+            return this.notifications.warning('Photo proof of delivery is required for this activity.');
+        }
+
         try {
-            yield this.fetch.patch(`orders/update-activity/${this.order.id}`, { activity });
+            const proof = this.selectedActivityRequiresPod ? yield this.capturePhotoProof.perform() : null;
+            yield this.fetch.patch(`orders/update-activity/${this.order.id}`, { activity, proof: proof?.id ?? proof?.public_id });
+
+            if (typeof this.order?.reload === 'function') {
+                yield this.order.reload();
+            }
+
+            if (typeof this.order?.loadTrackerData === 'function') {
+                if (typeof this.order.set === 'function') {
+                    this.order.set('tracker_data', null);
+                }
+
+                yield this.order.loadTrackerData();
+            }
+
             this.modalsManager.setOption('activityCreated', activity);
             this.notifications.success(`Order activity has been updated to ${activity.status}`);
+            modal.done();
         } catch (error) {
             this.notifications.serverError(error);
         } finally {
             modal.stopLoading();
-            modal.done();
         }
     }
+
+    @task *capturePhotoProof() {
+        const [proofFile] = this.proofFiles;
+        const headers = this.fetch.getHeaders();
+        delete headers['Content-Type'];
+
+        const subjectId = this.currentWaypointProofSubjectId;
+        const subjectPath = subjectId ? `/${subjectId}` : '';
+        const url = [get(config, 'API.host'), get(config, 'API.namespace'), `orders/${this.order.id}/capture-photo${subjectPath}`].filter(Boolean).join('/');
+
+        const response = yield proofFile.upload(url, {
+            data: {
+                remarks: 'Verified by Photo',
+            },
+            headers,
+            withCredentials: true,
+        });
+
+        return response.json();
+    }
+
+    @action setProofFile(file) {
+        if (!file) {
+            return;
+        }
+
+        this.proofFiles = [file];
+    }
 }

package/addon/components/orchestrator/resource-panel.hbs

@@ -69,16 +69,6 @@
                         }}"
                     {{on "click" (fn this.setVehicleFilter "all")}}
                 >{{t "orchestrator.filter-all"}}</button>
-                <button
-                    type="button"
-                    class="px-2 py-0.5 rounded text-xs transition-colors
-                        {{if
-                            (eq this.vehicleFilter 'active')
-                            'bg-indigo-500 text-white'
-                            'bg-gray-100 dark:bg-gray-700 text-gray-600 dark:text-gray-300 hover:bg-gray-200 dark:hover:bg-gray-600'
-                        }}"
-                    {{on "click" (fn this.setVehicleFilter "active")}}
-                >{{t "orchestrator.filter-active"}}</button>
                 <button
                     type="button"
                     class="px-2 py-0.5 rounded text-xs transition-colors

package/addon/components/orchestrator/resource-panel.js

@@ -59,12 +59,10 @@ export default class OrchestratorResourcePanelComponent extends Component {
             );
         }
 
-        if (this.vehicleFilter === 'active') {
-            vehicles = vehicles.filter((v) => v.status === 'active');
-        } else if (this.vehicleFilter === 'no-driver') {
+        if (this.vehicleFilter === 'no-driver') {
             vehicles = vehicles.filter((v) => !v.driver?.id);
         } else if (this.vehicleFilter === 'available') {
-            vehicles = vehicles.filter((v) => v.status === 'active' && !v.driver?.current_job);
+            vehicles = vehicles.filter((v) => v.status === 'available' && !v.driver?.current_job);
         }
 
         return vehicles;

package/addon/components/order/activity-list.hbs

@@ -1,5 +1,5 @@
 <div class="order-activity-list space-y-2">
-    {{#each @resource.tracking_statuses as |trackingStatus|}}
+    {{#each (or @activity @resource.tracking_statuses) as |trackingStatus|}}
         <div class="order-activity-list-item flex flex-row justify-between">
             <div class="flex flex-row">
                 <div class="w-8 pt-1">
@@ -31,4 +31,4 @@
             </div>
         </div>
     {{/each}}
-</div>
+</div>

package/addon/components/order/activity-timeline.hbs

@@ -1,33 +1,35 @@
-{{#if @resource.tracking_statuses}}
-    <Timeline @activity={{@resource.tracking_statuses}} @arrowClass="bg-gray-600 border border-gray-900 shadow-md" as |TimelineItem|>
-        <TimelineItem @activeStatus={{@resource.status}} as |trackingStatus|>
-            <div class="flex flex-col px-3 py-2 rounded text-sm leading-4 space-y-2 bg-gray-100 dark:bg-gray-900 dark:text-white">
-                <div class="flex flex-col space-y-1">
-                    <div class="text-xs font-semibold truncate">{{trackingStatus.status}}</div>
-                    <div class="text-xs truncate">{{n-a trackingStatus.details}}</div>
-                    <div class="text-xs">{{format-date-fns trackingStatus.created_at "d MMM HH:mm"}}</div>
+{{#let (or @activity @resource.tracking_statuses) as |activity|}}
+    {{#if activity.length}}
+        <Timeline @activity={{activity}} @arrowClass="bg-gray-600 border border-gray-900 shadow-md" as |TimelineItem|>
+            <TimelineItem @activeStatus={{@resource.status}} as |trackingStatus|>
+                <div class="flex flex-col px-3 py-2 rounded text-sm leading-4 space-y-2 bg-gray-100 dark:bg-gray-900 dark:text-white">
+                    <div class="flex flex-col space-y-1">
+                        <div class="text-xs font-semibold truncate">{{trackingStatus.status}}</div>
+                        <div class="text-xs truncate">{{n-a trackingStatus.details}}</div>
+                        <div class="text-xs">{{format-date-fns trackingStatus.created_at "d MMM HH:mm"}}</div>
+                    </div>
+                    <Attach::Tooltip @class="clean" @animation="scale" @placement="top">
+                        <InputInfo>
+                            <div class="text-xs">{{or trackingStatus.details trackingStatus.status}}</div>
+                            <div class="text-xs">{{format-date-fns trackingStatus.created_at "d MMM yyyy HH:mm"}}</div>
+                        </InputInfo>
+                    </Attach::Tooltip>
                 </div>
-                <Attach::Tooltip @class="clean" @animation="scale" @placement="top">
-                    <InputInfo>
-                        <div class="text-xs">{{or trackingStatus.details trackingStatus.status}}</div>
-                        <div class="text-xs">{{format-date-fns trackingStatus.created_at "d MMM yyyy HH:mm"}}</div>
-                    </InputInfo>
-                </Attach::Tooltip>
-            </div>
-        </TimelineItem>
-    </Timeline>
-{{else}}
-    <div class="min-h-24 p-4">
-        <div class="flex items-center justify-center border border-dashed border-gray-300 dark:border-gray-600 p-6 rounded-xl bg-gray-50 dark:bg-gray-800">
-            <div class="text-center">
-                <FaIcon @icon="layer-group" @size="2x" class="text-gray-400 mb-2" />
-                <div class="text-sm text-gray-600 dark:text-gray-400 font-medium">
-                    No order activity
-                </div>
-                <div class="text-xs text-gray-500 dark:text-gray-500 mt-1">
-                    Dispatch or update the order to create activity
+            </TimelineItem>
+        </Timeline>
+    {{else}}
+        <div class="min-h-24 p-4">
+            <div class="flex items-center justify-center border border-dashed border-gray-300 dark:border-gray-600 p-6 rounded-xl bg-gray-50 dark:bg-gray-800">
+                <div class="text-center">
+                    <FaIcon @icon="layer-group" @size="2x" class="text-gray-400 mb-2" />
+                    <div class="text-sm text-gray-600 dark:text-gray-400 font-medium">
+                        No order activity
+                    </div>
+                    <div class="text-xs text-gray-500 dark:text-gray-500 mt-1">
+                        Dispatch or update the order to create activity
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-{{/if}}
+    {{/if}}
+{{/let}}

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

@@ -6,8 +6,8 @@
     @wrapperClass="bordered-top"
 >
     {{#if (eq this.layout "timeline")}}
-        <Order::ActivityTimeline @resource={{@resource}} />
+        <Order::ActivityTimeline @resource={{@resource}} @activity={{this.parentOrderActivity}} />
     {{else}}
-        <Order::ActivityList @resource={{@resource}} />
+        <Order::ActivityList @resource={{@resource}} @activity={{this.parentOrderActivity}} />
     {{/if}}
-</ContentPanel>
+</ContentPanel>

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

@@ -9,6 +9,17 @@ export default class OrderDetailsActivityComponent extends Component {
     @service intl;
     @tracked layout = this.appCache.get('fleetops:order:activity:layout', 'timeline');
 
+    get parentOrderActivity() {
+        const orderTrackingNumberUuid = this.args.resource?.tracking_number_uuid;
+        const activity = this.args.resource?.tracking_statuses ?? [];
+
+        if (!orderTrackingNumberUuid) {
+            return activity;
+        }
+
+        return activity.filter((trackingStatus) => trackingStatus.tracking_number_uuid === orderTrackingNumberUuid);
+    }
+
     /* eslint-disable ember/no-side-effects */
     get actionButtons() {
         return [

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

@@ -39,6 +39,8 @@ export default class OrderDetailsDocumentsComponent extends Component {
                 file,
                 {
                     path: 'uploads/fleet-ops/order-files',
+                    subject_uuid: this.args.resource.id,
+                    subject_type: 'fleet-ops:order',
                     type: 'order_file',
                 },
                 (uploadedFile) => {

package/addon/components/order/details/purchase-rate.hbs

@@ -12,7 +12,7 @@
                     {{#each @resource.purchase_rate.service_quote.items as |item|}}
                         <tr class="border-b border-gray-100 dark:border-gray-800 last:border-0">
                             <td class="py-1 pr-2 text-gray-700 dark:text-gray-300">
-                                {{smart-humanize item.details}}
+                                {{item.details}}
                             </td>
                             <td class="py-1 pl-2 text-right font-medium text-gray-700 dark:text-gray-300 whitespace-nowrap">
                                 {{format-currency item.amount @resource.purchase_rate.service_quote.currency}}
@@ -33,4 +33,4 @@
             </table>
         </div>
     </ContentPanel>
-{{/if}}
+{{/if}}

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

@@ -26,17 +26,25 @@
 
     {{#if @resource.hasIntermediateWaypoints}}
         <div>
-            <RouteList @order={{@resource}} @eta={{@resource.eta}} @waypointActions={{hash viewWaypointLabel=(hash label=(t "order.fields.get-label") fn=this.viewWaypointLabel)}} />
+            <RouteList
+                @order={{@resource}}
+                @eta={{if this.showRouteEtaData @resource.eta}}
+                @showEta={{this.showRouteEtaData}}
+                @waypointActions={{hash
+                    viewStopActivity=(hash label="View activity" fn=this.viewStopActivity)
+                    viewWaypointLabel=(hash label=(t "order.fields.get-label") fn=this.viewWaypointLabel)
+                }}
+            />
         </div>
     {{else}}
         <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 lg:gap-2">
             <div class="field-info-container">
                 <label class="field-name">{{t "order.fields.pickup"}}</label>
-                <DisplayPlace @place={{@resource.payload.pickup}} @eta={{get @resource.eta @resource.payload.pickup.id}} />
+                <DisplayPlace @place={{@resource.payload.pickup}} @eta={{if this.showRouteEtaData (get @resource.eta @resource.payload.pickup.id)}} />
             </div>
             <div class="field-info-container">
                 <label class="field-name">{{t "order.fields.dropoff"}}</label>
-                <DisplayPlace @place={{@resource.payload.dropoff}} @eta={{get @resource.eta @resource.payload.dropoff.id}} />
+                <DisplayPlace @place={{@resource.payload.dropoff}} @eta={{if this.showRouteEtaData (get @resource.eta @resource.payload.dropoff.id)}} />
             </div>
             <div class="field-info-container">
                 <label class="field-name">{{t "order.fields.return"}}</label>