@fleetbase/fleetops-engine 0.4.0 → 0.4.2

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

@@ -14,6 +14,7 @@ import isNotEmpty from '@fleetbase/ember-core/utils/is-not-empty';
 import getRoutingHost from '@fleetbase/ember-core/utils/get-routing-host';
 import groupBy from '@fleetbase/ember-core/utils/macros/group-by';
 import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
+import isModel from '@fleetbase/ember-core/utils/is-model';
 
 L.Bounds.prototype.intersects = function (bounds) {
     var min = this.min,
@@ -71,6 +72,13 @@ export default class OperationsOrdersIndexNewController extends BaseController {
      */
     @service fileQueue;
 
+    /**
+     * Inject the `intl` service
+     *
+     * @var {Service}
+     */
+    @service intl;
+
     /**
      * Inject the `fetch` service
      *
@@ -116,6 +124,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
     @tracked meta = [];
     @tracked entities = [];
     @tracked waypoints = [];
+    @tracked payloadCoordinates = [];
     @tracked types = [];
     @tracked serviceRates = [];
     @tracked selectedServiceRate;
@@ -184,8 +193,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         return isOrderTypeSet && isPickupSet && isDropoffSet;
     }
 
-    @computed('payload.{dropoff,pickup,waypoints}', 'waypoints.[]')
-    get payloadCoordinates() {
+    updatePayloadCoordinates() {
         let waypoints = [];
         let coordinates = [];
 
@@ -200,9 +208,30 @@ export default class OperationsOrdersIndexNewController extends BaseController {
             }
         });
 
-        return coordinates;
+        this.payloadCoordinates = coordinates;
     }
 
+    // @computed('payload.{dropoff,pickup,waypoints}', 'waypoints.[]')
+    // get payloadCoordinates() {
+    //     let waypoints = [];
+    //     let coordinates = [];
+
+    //     console.log('[this.waypoints]', this.waypoints);
+
+    //     waypoints.pushObjects([this.payload.pickup, ...this.waypoints.map((waypoint) => waypoint.place), this.payload.dropoff]);
+    //     waypoints.forEach((place) => {
+    //         if (place && place.get('longitude') && place.get('latitude')) {
+    //             if (place.hasInvalidCoordinates) {
+    //                 return;
+    //             }
+
+    //             coordinates.pushObject([place.get('longitude'), place.get('latitude')]);
+    //         }
+    //     });
+
+    //     return coordinates;
+    // }
+
     @computed('payloadCoordinates.length', 'waypoints.[]') get isServicable() {
         return this.payloadCoordinates.length >= 2;
     }
@@ -297,7 +326,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
 
                     // transition to order view
                     return this.hostRouter.transitionTo(`${engineMountPoint}operations.orders.index.view`, order).then(() => {
-                        this.notifications.success(`New Order ${order.public_id} Created`);
+                        this.notifications.success(this.intl.t('fleet-ops.operations.orders.index.new.success-message', { orderId: order.public_id }));
                         this.loader.removeLoader();
                         this.resetForm();
                         later(
@@ -382,7 +411,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
                 };
 
                 if (!uploadQueue.length) {
-                    return this.notifications.warning('No files in queue to upload!');
+                    return this.notifications.warning(this.intl.t('fleet-ops.operations.orders.index.new.warning-message'));
                 }
 
                 modal.startLoading();
@@ -423,7 +452,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
                     });
                 }
 
-                this.notifications.success('Import completed.');
+                this.notifications.success(this.intl.t('fleet-ops.operations.orders.index.new.import-success'));
                 this.isCsvImportedOrder = true;
                 this.previewDraftOrderRoute(this.payload, this.waypoints, this.isMultipleDropoffOrder);
                 modal.done();
@@ -499,8 +528,8 @@ export default class OperationsOrdersIndexNewController extends BaseController {
 
         let payload = this.payload.serialize();
         let route = this.getRoute();
-        let distance = get(route, 'payload.summary.totalDistance');
-        let time = get(route, 'payload.summary.totalTime');
+        let distance = get(route, 'details.summary.totalDistance');
+        let time = get(route, 'details.summary.totalTime');
         let service_type = this.order.type;
         let scheduled_at = this.order.scheduled_at;
         let facilitator = this.order.facilitator?.get('public_id');
@@ -532,7 +561,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
 
         this.fetch
             .post('service-quotes/preliminary', {
-                payload,
+                payload: this._getSerializedPayload(payload),
                 distance,
                 time,
                 service,
@@ -542,6 +571,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
                 is_route_optimized,
             })
             .then((serviceQuotes) => {
+                console.log('[serviceQuotes]', serviceQuotes);
                 set(this, 'serviceQuotes', isArray(serviceQuotes) ? serviceQuotes : []);
 
                 if (this.serviceQuotes.length && this.isUsingIntegratedVendor) {
@@ -549,13 +579,38 @@ export default class OperationsOrdersIndexNewController extends BaseController {
                 }
             })
             .catch(() => {
-                this.notifications.warning('Failed to fetch service quotes for this order.');
+                this.notifications.warning(this.intl.t('fleet-ops.operations.orders.index.new.service-warning'));
             })
             .finally(() => {
                 this.isFetchingQuotes = false;
             });
     }
 
+    _getSerializedPayload(payload) {
+        const serialized = {
+            pickup: payload.pickup,
+            dropoff: payload.dropoff,
+        };
+
+        if (isModel(payload.pickup)) {
+            serialized.pickup = payload.pickup.toJSON();
+        }
+
+        if (isModel(payload.dropoff)) {
+            serialized.dropoff = payload.dropoff.toJSON();
+        }
+
+        if (isArray(payload.entities)) {
+            serialized.entities = payload.entities.toArray();
+        }
+
+        if (isArray(payload.waypoints)) {
+            serialized.waypoints = payload.waypoints.toArray();
+        }
+
+        return serialized;
+    }
+
     @action scheduleOrder(dateInstance) {
         this.order.scheduled_at = dateInstance;
     }
@@ -818,7 +873,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
                 });
             }
         } else {
-            this.notifications.warning('No route to preview.');
+            this.notifications.warning(this.intl.t('fleet-ops.operations.orders.index.new.no-route-warning'));
         }
     }
 
@@ -846,7 +901,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         const routingHost = getRoutingHost(this.payload, this.waypoints);
 
         const response = await this.fetch.routing(coordinates, { source: 'any', destination: 'any', annotations: true }, { host: routingHost }).catch(() => {
-            this.notifications.error('Route optimization failed, check route entry and try again.');
+            this.notifications.error(this.intl.t('fleet-ops.operations.orders.index.new.route-error'));
             this.isOptimizingRoute = false;
         });
 
@@ -902,7 +957,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
                 maxZoom: 13,
             });
         } else {
-            this.notifications.error('Route optimization failed, check route entry and try again.');
+            this.notifications.error(this.intl.t('fleet-ops.operations.orders.index.new.route-error'));
             this.isOptimizingRoute = false;
         }
     }
@@ -936,9 +991,33 @@ export default class OperationsOrdersIndexNewController extends BaseController {
     @action toggleMultiDropOrder(isMultipleDropoffOrder) {
         this.isMultipleDropoffOrder = isMultipleDropoffOrder;
 
+        const { pickup, dropoff } = this.payload;
+
         if (isMultipleDropoffOrder) {
-            this.addWaypoint();
+            if (pickup) {
+                this.addWaypoint({ place: pickup });
+
+                if (dropoff) {
+                    this.addWaypoint({ place: dropoff });
+                }
+
+                // clear pickup and dropoff
+                this.payload.setProperties({ pickup: null, dropoff: null });
+            } else {
+                this.addWaypoint();
+            }
         } else {
+            const pickup = get(this.waypoints, '0.place');
+            const dropoff = get(this.waypoints, '1.place');
+
+            if (pickup) {
+                this.setPayloadPlace('pickup', pickup);
+            }
+
+            if (dropoff) {
+                this.setPayloadPlace('dropoff', dropoff);
+            }
+
             this.clearWaypoints();
         }
     }
@@ -1028,7 +1107,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         let label, value;
 
         this.modalsManager.show('modals/meta-field-form', {
-            title: 'Add custom field to order',
+            title: this.intl.t('fleet-ops.operations.orders.index.new.custom-field-title'),
             acceptButtonIcon: 'check',
             acceptButtonIconPrefix: 'fas',
             acceptButtonText: 'Done',
@@ -1041,11 +1120,11 @@ export default class OperationsOrdersIndexNewController extends BaseController {
                 const value = modal.getOption('value');
 
                 if (!label) {
-                    return this.notifications.warning('Custom field must have a label');
+                    return this.notifications.warning(this.intl.t('fleet-ops.operations.orders.index.new.label-warning'));
                 }
 
                 if (!value) {
-                    return this.notifications.warning('Custom field must have a value');
+                    return this.notifications.warning(this.intl.t('fleet-ops.operations.orders.index.new.value-warning'));
                 }
 
                 modal.startLoading();
@@ -1066,7 +1145,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         const { label, value } = metaField;
 
         this.modalsManager.show('modals/meta-field-form', {
-            title: 'Edit custom field',
+            title: this.intl.t('fleet-ops.operations.orders.index.new.edit-field-title'),
             acceptButtonIcon: 'save',
             acceptButtonText: 'Save Changes',
             label,
@@ -1076,11 +1155,11 @@ export default class OperationsOrdersIndexNewController extends BaseController {
                 const value = modal.getOption('value');
 
                 if (!label) {
-                    return this.notifications.warning('Custom field must have a label');
+                    return this.notifications.warning(this.intl.t('fleet-ops.operations.orders.index.new.label-warning'));
                 }
 
                 if (!value) {
-                    return this.notifications.warning('Custom field must have a value');
+                    return this.notifications.warning(this.intl.t('fleet-ops.operations.orders.index.new.value-warning'));
                 }
 
                 modal.startLoading();
@@ -1106,7 +1185,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         }
 
         this.modalsManager.show('modals/edit-meta-form', {
-            title: 'Edit Metadata',
+            title: this.intl.t('fleet-ops.operations.orders.index.new.edit-metadata'),
             hideDeclineButton: true,
             acceptButtonIcon: 'check',
             acceptButtonIconPrefix: 'fas',
@@ -1146,6 +1225,8 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         if (this.isUsingIntegratedVendor) {
             this.getQuotes();
         }
+
+        this.updatePayloadCoordinates();
     }
 
     @action sortWaypoints({ sourceList, sourceIndex, targetList, targetIndex }) {
@@ -1163,10 +1244,10 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         }
     }
 
-    @action addWaypoint() {
-        const waypoint = this.store.createRecord('waypoint');
-
+    @action addWaypoint(properties = {}) {
+        const waypoint = this.store.createRecord('waypoint', properties);
         this.waypoints.pushObject(waypoint);
+        this.updatePayloadCoordinates();
     }
 
     @action setWaypointPlace(index, place) {
@@ -1183,6 +1264,8 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         if (this.isUsingIntegratedVendor) {
             this.getQuotes();
         }
+
+        this.updatePayloadCoordinates();
     }
 
     @action removeWaypoint(waypoint) {
@@ -1197,6 +1280,8 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         } else {
             this.previewDraftOrderRoute(this.payload, this.waypoints, this.isMultipleDropoffOrder);
         }
+
+        this.updatePayloadCoordinates();
     }
 
     @action clearWaypoints() {
@@ -1235,28 +1320,34 @@ export default class OperationsOrdersIndexNewController extends BaseController {
 
     @action editEntity(entity) {
         this.modalsManager.show('modals/entity-form', {
-            title: 'Edit Item',
+            title: this.intl.t('fleet-ops.operations.orders.index.new.edit-item'),
             acceptButtonText: 'Save Changes',
             entity,
             uploadNewPhoto: (file) => {
+                const fileUrl = URL.createObjectURL(file.file);
+
                 if (entity.get('isNew')) {
                     const { queue } = file;
-                    const fileUrl = URL.createObjectURL(file.blob);
 
                     this.modalsManager.setOption('pendingFileUpload', file);
                     entity.set('photo_url', fileUrl);
-                    // entity.set('photo_upload', fileUrl);
                     queue.remove(file);
                     return;
+                } else {
+                    entity.set('photo_url', fileUrl);
                 }
 
+                // Indicate loading
+                this.modalsManager.startLoading();
+
+                // Perform upload
                 return this.fetch.uploadFile.perform(
                     file,
                     {
                         path: `uploads/${this.currentUser.companyId}/entities/${entity.id}`,
                         subject_uuid: entity.id,
-                        subject_type: `entity`,
-                        type: `entity_photo`,
+                        subject_type: 'fleet-ops:entity',
+                        type: 'entity_photo',
                     },
                     (uploadedFile) => {
                         entity.setProperties({
@@ -1264,6 +1355,13 @@ export default class OperationsOrdersIndexNewController extends BaseController {
                             photo_url: uploadedFile.url,
                             photo: uploadedFile,
                         });
+
+                        // Stop loading
+                        this.modalsManager.stopLoading();
+                    },
+                    () => {
+                        // Stop loading
+                        this.modalsManager.stopLoading();
                     }
                 );
             },
@@ -1271,7 +1369,6 @@ export default class OperationsOrdersIndexNewController extends BaseController {
                 modal.startLoading();
 
                 const pendingFileUpload = modal.getOption('pendingFileUpload');
-
                 return entity.save().then(() => {
                     if (pendingFileUpload) {
                         return modal.invoke('uploadNewPhoto', pendingFileUpload);

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

@@ -6,6 +6,7 @@ import { action, computed } from '@ember/object';
 import { isArray } from '@ember/array';
 import { later } from '@ember/runloop';
 import { not, notEmpty, alias } from '@ember/object/computed';
+import { task } from 'ember-concurrency-decorators';
 import { OSRMv1, Control as RoutingControl } from '@fleetbase/leaflet-routing-machine';
 import groupBy from '@fleetbase/ember-core/utils/macros/group-by';
 import findClosestWaypoint from '@fleetbase/ember-core/utils/find-closest-waypoint';
@@ -41,7 +42,14 @@ export default class OperationsOrdersIndexViewController extends BaseController
     @controller('management.drivers.index') driversController;
 
     /**
-     * Inject the `modals-manager` service
+     * Inject the `store` service
+     *
+     * @var {Service}
+     */
+    @service store;
+
+    /**
+     * Inject the `modalsManager` service
      *
      * @var {Service}
      */
@@ -54,6 +62,13 @@ export default class OperationsOrdersIndexViewController extends BaseController
      */
     @service notifications;
 
+    /**
+     * Inject the `intl` service
+     *
+     * @var {Service}
+     */
+    @service intl;
+
     /**
      * Inject the `currentUser` service
      *
@@ -142,7 +157,7 @@ export default class OperationsOrdersIndexViewController extends BaseController
 
         // create groups
         this.model.payload.waypoints.forEach((waypoint) => {
-            const destinationId = waypoint.id || null;
+            const destinationId = waypoint.id;
 
             if (destinationId) {
                 const entities = this.model.payload.entities.filter((entity) => entity.destination_uuid === destinationId);
@@ -164,6 +179,15 @@ export default class OperationsOrdersIndexViewController extends BaseController
         return groups;
     }
 
+    @task *loadOrderRelations(order) {
+        yield order.loadPayload();
+        yield order.loadDriver();
+        yield order.loadTrackingNumber();
+        yield order.loadCustomer();
+        yield order.loadTrackingActivity();
+        yield order.loadOrderConfig();
+    }
+
     @action resetView() {
         this.removeRoutingControlPreview();
         this.resetInterface();
@@ -356,7 +380,7 @@ export default class OperationsOrdersIndexViewController extends BaseController
         options = options === null ? {} : options;
 
         this.modalsManager.show('modals/order-form', {
-            title: 'Edit Order Details',
+            title: this.intl.t('fleet-ops.operations.orders.index.view.edit-order-title'),
             acceptButtonText: 'Save Changes',
             acceptButtonIcon: 'save',
             setOrderFacilitator: (model) => {
@@ -389,7 +413,7 @@ export default class OperationsOrdersIndexViewController extends BaseController
             confirm: (modal) => {
                 modal.startLoading();
                 return order.save().then(() => {
-                    this.notifications.success(options.successNotification || `'${order.public_id}' details has been updated.`);
+                    this.notifications.success(options.successNotification || this.intl.t('fleet-ops.operations.orders.index.view.update-success', { orderId: order.public_id }));
                 });
             },
             decline: () => {
@@ -408,7 +432,7 @@ export default class OperationsOrdersIndexViewController extends BaseController
      */
     @action viewOrderMeta(order) {
         this.modalsManager.show('modals/order-meta', {
-            title: 'Order Metadata',
+            title: this.intl.t('fleet-ops.operations.orders.index.view.order-metadata'),
             acceptButtonText: 'Done',
             acceptButtonIcon: 'check',
             acceptButtonIconPrefix: 'fas',
@@ -419,8 +443,8 @@ export default class OperationsOrdersIndexViewController extends BaseController
 
     @action unassignDriver(order, options = {}) {
         this.modalsManager.confirm({
-            title: `Are you sure you wish to unassing the driver (${order.driver_assigned.name}) from this order?`,
-            body: `Once the driver is unassigned, the driver will no longer have access to this orders details.`,
+            title: this.intl.t('fleet-ops.operations.orders.index.view.edit-order-title', { driverName: order.driver_assigned.name }),
+            body: this.intl.t('fleet-ops.operations.orders.index.view.unassign-body'),
             order,
             confirm: (modal) => {
                 modal.startLoading();
@@ -433,7 +457,7 @@ export default class OperationsOrdersIndexViewController extends BaseController
                 return order
                     .save()
                     .then(() => {
-                        this.notifications.success(`Driver has been unassigned from this order.`);
+                        this.notifications.success(this.intl.t('fleet-ops.operations.orders.index.view.unassign-success'));
                     })
                     .catch((error) => {
                         this.notifications.serverError(error);
@@ -456,7 +480,7 @@ export default class OperationsOrdersIndexViewController extends BaseController
         await this.modalsManager.done();
 
         this.modalsManager.show('modals/order-route-form', {
-            title: 'Edit Order Route',
+            title: this.intl.t('fleet-ops.operations.orders.index.view.edit-route-title'),
             acceptButtonText: 'Save Changes',
             acceptButtonIcon: 'save',
             order,
@@ -521,7 +545,7 @@ export default class OperationsOrdersIndexViewController extends BaseController
                 const routingHost = getRoutingHost(order.payload, order.payload.waypoints);
 
                 const response = await this.fetch.routing(coordinates, { source: 'any', destination: 'any', annotations: true }, { host: routingHost }).catch(() => {
-                    this.notifications.error('Route optimization failed, check route entry and try again.');
+                    this.notifications.error(this.intl.t('fleet-ops.operations.orders.index.view.route-error'));
                     this.modalsManager.setOption('isOptimizingRoute', false);
                 });
 
@@ -542,7 +566,7 @@ export default class OperationsOrdersIndexViewController extends BaseController
                         order.payload.waypoints = sortedWaypoints;
                     }
                 } else {
-                    this.notifications.error('Route optimization failed, check route entry and try again.');
+                    this.notifications.error(this.intl.t('fleet-ops.operations.orders.index.view.route-error'));
                 }
 
                 this.modalsManager.setOption('isOptimizingRoute', false);
@@ -551,7 +575,7 @@ export default class OperationsOrdersIndexViewController extends BaseController
                 modal.startLoading();
 
                 return order.payload.save().then(() => {
-                    this.notifications.success(options.successNotification ?? `'${order.public_id}' route details updated.`);
+                    this.notifications.success(options.successNotification ?? this.intl.t('fleet-ops.operations.orders.index.view.route-update-success', { orderId: order.public_id }));
                 });
             },
             decline: () => {
@@ -627,7 +651,7 @@ export default class OperationsOrdersIndexViewController extends BaseController
         await this.modalsManager.done();
 
         this.modalsManager.show(`modals/order-new-activity`, {
-            title: 'Add new activity to order',
+            title: this.intl.t('fleet-ops.operations.orders.index.view.add-activity-title'),
             acceptButton: false,
             selected: null,
             custom: {
@@ -647,7 +671,7 @@ export default class OperationsOrdersIndexViewController extends BaseController
                     if (!custom.status || !custom.details || !custom.code) {
                         modal.stopLoading();
 
-                        return this.notifications.warning('Invalid custom status entry.');
+                        return this.notifications.warning(this.intl.t('fleet-ops.operations.orders.index.view.invalid-warning'));
                     }
 
                     activity = custom;
@@ -690,13 +714,13 @@ export default class OperationsOrdersIndexViewController extends BaseController
         }
 
         this.modalsManager.show(`modals/order-assign-driver`, {
-            title: order.driver_uuid ? 'Change order driver' : 'Assign driver to order',
+            title: order.driver_uuid ? this.intl.t('fleet-ops.operations.orders.index.view.change-order') : this.intl.t('fleet-ops.operations.orders.index.view.assign-order'),
             acceptButtonText: 'Save Changes',
             order,
             confirm: (modal) => {
                 modal.startLoading();
                 return order.save().then(() => {
-                    this.notifications.success(`${order.public_id} assigned driver updated.`);
+                    this.notifications.success(this.intl.t('fleet-ops.operations.orders.index.view.assign-success', { orderId: order.public_id }));
                 });
             },
         });
@@ -834,23 +858,30 @@ export default class OperationsOrdersIndexViewController extends BaseController
             acceptButtonText: 'Save Changes',
             entity,
             uploadNewPhoto: (file) => {
+                const fileUrl = URL.createObjectURL(file.blob);
+
                 if (entity.get('isNew')) {
                     const { queue } = file;
-                    const fileUrl = URL.createObjectURL(file.blob);
 
                     this.modalsManager.setOption('pendingFileUpload', file);
                     entity.set('photo_url', fileUrl);
                     queue.remove(file);
                     return;
+                } else {
+                    entity.set('photo_url', fileUrl);
                 }
 
+                // Indicate loading
+                this.modalsManager.startLoading();
+
+                // Perform upload
                 return this.fetch.uploadFile.perform(
                     file,
                     {
                         path: `uploads/${this.currentUser.companyId}/entities/${entity.id}`,
                         subject_uuid: entity.id,
-                        subject_type: `entity`,
-                        type: `entity_photo`,
+                        subject_type: 'fleet-ops:entity',
+                        type: 'entity_photo',
                     },
                     (uploadedFile) => {
                         entity.setProperties({
@@ -858,6 +889,13 @@ export default class OperationsOrdersIndexViewController extends BaseController
                             photo_url: uploadedFile.url,
                             photo: uploadedFile,
                         });
+
+                        // Stop loading
+                        this.modalsManager.stopLoading();
+                    },
+                    () => {
+                        // Stop loading
+                        this.modalsManager.stopLoading();
                     }
                 );
             },
@@ -865,7 +903,6 @@ export default class OperationsOrdersIndexViewController extends BaseController
                 modal.startLoading();
 
                 const pendingFileUpload = modal.getOption('pendingFileUpload');
-
                 return entity.save().then(() => {
                     if (pendingFileUpload) {
                         return modal.invoke('uploadNewPhoto', pendingFileUpload);