Merge pull request #233 from fleetbase/feature/fleetops-repricing-service-rate-fixes

Implement repricing flow and service rate fixes

Author: roncodes

addon/components/entity/form.hbs

@@ -23,6 +23,30 @@
             <div class="grid grid-cols-1 lg:grid-cols-2 gap-2">
                 <InputGroup @name={{t "common.name"}} @value={{@resource.name}} @helpText={{t "modals.entity-form.name-text"}} />
                 <InputGroup @name={{t "common.internal-id"}} @value={{@resource.internal_id}} @helpText={{t "modals.entity-form.id-text"}} />
+                <div class="space-y-2">
+                    <InputGroup @name={{t "common.type"}} @helpText="Choose a common entity type or switch to a custom value.">
+                        {{#if this.useCustomType}}
+                            <Input @value={{@resource.type}} @type="text" class="w-full form-input" placeholder="Enter custom entity type" />
+                        {{else}}
+                            <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
+                                <PowerSelect
+                                    @options={{this.entityTypes}}
+                                    @selected={{this.selectedEntityType}}
+                                    @onChange={{this.selectEntityType}}
+                                    @placeholder="Select entity type"
+                                    @triggerClass="form-select"
+                                    as |type|
+                                >
+                                    <div class="text-sm">
+                                        <div class="font-semibold normalize-in-trigger">{{type.label}}</div>
+                                        <div class="hide-from-trigger">{{type.description}}</div>
+                                    </div>
+                                </PowerSelect>
+                            </div>
+                        {{/if}}
+                    </InputGroup>
+                    <Checkbox @value={{this.useCustomType}} @label="Use custom type" @onToggle={{this.toggleCustomType}} @alignItems="center" @labelClass="mb-0i" />
+                </div>
                 <InputGroup @name={{t "modals.entity-form.sku"}} @value={{@resource.sku}} @helpText={{t "modals.entity-form.sku-text"}} />
                 <div></div>
                 <InputGroup @name={{t "modals.entity-form.description"}} @helpText={{t "modals.entity-form.description-text"}} @wrapperClass="col-span-2">

addon/components/entity/form.js

@@ -1,11 +1,41 @@
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
 import { task } from 'ember-concurrency';
+import fleetOpsOptions from '../../utils/fleet-ops-options';
 
 export default class EntityFormComponent extends Component {
     @service fetch;
     @service currentUser;
     @service notifications;
+    @tracked useCustomType = false;
+
+    constructor() {
+        super(...arguments);
+        this.useCustomType = this.selectedEntityType === undefined && Boolean(this.args.resource?.type);
+    }
+
+    get entityTypes() {
+        return fleetOpsOptions('entityTypes');
+    }
+
+    get selectedEntityType() {
+        return this.entityTypes.find((option) => option.value === this.args.resource?.type);
+    }
+
+    @action selectEntityType(option) {
+        this.useCustomType = false;
+        this.args.resource.type = option?.value ?? null;
+    }
+
+    @action toggleCustomType(value) {
+        this.useCustomType = value;
+
+        if (!value && !this.selectedEntityType) {
+            this.args.resource.type = null;
+        }
+    }
 
     @task *handlePhotoUpload(file) {
         try {

addon/components/leaflet-draw-control.js

@@ -27,7 +27,7 @@ export default class LeafletDrawControl extends BaseLayer {
     leafletOptions = ['draw', 'edit', 'remove', 'poly', 'position'];
 
     @computed('leafletEvents.[]', 'args') get usedLeafletEvents() {
-        const leafletEvents = [...this.leafletEvents, ...Object.values(L.Draw.Event)];
+        const leafletEvents = [...this.leafletEvents, ...Object.values(L.Draw?.Event ?? {})];
         return leafletEvents.filter((eventName) => {
             eventName = camelize(eventName.replace(':', ' '));
             let methodName = `_${eventName}`;

addon/components/map/drawer/geofence-event-listing.js

@@ -2,6 +2,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import { next } from '@ember/runloop';
 
 export default class MapDrawerGeofenceEventListingComponent extends Component {
     @service fetch;
@@ -12,8 +13,10 @@ export default class MapDrawerGeofenceEventListingComponent extends Component {
 
     constructor() {
         super(...arguments);
-        this.geofenceEventBus.subscribe(this.currentUser.companyId);
-        this.loadRecentEvents();
+        next(() => {
+            this.geofenceEventBus.subscribe(this.currentUser.companyId);
+            this.loadRecentEvents();
+        });
     }
 
     get events() {

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

@@ -58,7 +58,7 @@
                                         @name="serviceQuote"
                                         @changed={{fn (mut @resource.service_quote_uuid)}}
                                     />
-                                    <label for={{serviceQuote.uuid}} class="ml-3 flex-1">{{serviceQuote.public_id}}</label>
+                                    <label for={{serviceQuote.uuid}} class="ml-3 flex-1 text-sm">{{serviceQuote.public_id}} ({{serviceQuote.service_rate_name}})</label>
                                     <Badge @hideStatusDot={{true}} @status="info">
                                         {{serviceQuote.request_id}}
                                     </Badge>

addon/components/service-rate/details.hbs

@@ -106,11 +106,11 @@
                         </tr>
                     </thead>
                     <tbody>
-                        {{#each @resource.rate_fees as |rateFee|}}
+                        {{#each @resource.rateFees as |rateFee|}}
                             <tr>
                                 <td>{{n-a rateFee.min}}</td>
                                 <td>{{n-a rateFee.max}}</td>
-                                <td>{{format-currency rateFee.fee @resource.currency}}</td>
+                                <td>{{format-currency (f-to-int rateFee.fee) @resource.currency}}</td>
                             </tr>
                         {{else}}
                             <tr>
@@ -158,7 +158,7 @@
             <div class="field-info-container">
                 <div class="field-name">Algorithm Code</div>
                 <div class="field-value">
-                    <pre class="bg-gray-100 dark:bg-gray-800 p-3 rounded text-xs overflow-x-auto"><code>{{n-a @resource.algorithm}}</code></pre>
+                    <pre class="bg-gray-100 dark:bg-gray-900 font-mono p-3 rounded text-xs overflow-x-auto"><code class="font-mono text-xs">{{n-a @resource.algorithm}}</code></pre>
                 </div>
             </div>
         </ContentPanel>
@@ -167,7 +167,7 @@
     {{#if @resource.isParcelService}}
         <ContentPanel @title={{t "service-rate.fields.percel-fee-title"}} @open={{true}} @wrapperClass="bordered-top">
             <div class="space-y-2">
-                {{#each @resource.parcel_fees as |parcelFee|}}
+                {{#each @resource.parcelFees as |parcelFee|}}
                     <div class="dark:text-gray-100">
                         <div class="grid grid-cols-7">
                             <div class="flex flex-col items-start justify-start pt-3">
@@ -242,7 +242,7 @@
                                             {{t "service-rate.fields.additional-fee"}}
                                         </div>
                                         <div class="field-value">
-                                            {{n-a (format-currency parcelFee.fee @resource.currency)}}
+                                            {{n-a (format-currency (f-to-int parcelFee.fee) @resource.currency)}}
                                         </div>
                                     </div>
                                 </div>
@@ -323,4 +323,4 @@
     </ContentPanel>
 
     <CustomField::Yield @subject={{@resource}} @viewMode={{true}} @wrapperClass="bordered-top" />
-</div>
+</div>

addon/components/service-rate/form.hbs

@@ -176,7 +176,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            {{#each @resource.rate_fees as |rateFee|}}
+                            {{#each @resource.rateFees as |rateFee|}}
                                 <tr>
                                     <td>
                                         <Input
@@ -252,25 +252,38 @@
     {{else if @resource.isAlgorithm}}
         <ContentPanel @title={{t "service-rate.fields.custom-algorithm-title"}} @open={{true}} @wrapperClass="bordered-top">
             <InfoBlock class="mb-5">
-                {{t "service-rate.fields.custom-algorithm-info-message"}}
-                {{t "service-rate.fields.custom-algorithm-info-second-message"}}
+                Define a custom formula for this service rate using variables wrapped in a single pair of curly braces.
 
                 <div class="block my-4 break-text">
                     <ul class="list-disc space-y-2 pl-16">
-                        <li class="leading-5"><i>{{t "service-rate.fields.distance-message"}}</i>
-                            {{t "service-rate.fields.distance-continue-message"}}</li>
-                        <li class="leading-5"><i>{{t "service-rate.fields.time-message"}}</i>
-                            {{t "service-rate.fields.time-continue-message"}}</li>
+                        <li class="leading-5"><code>&#123;distance&#125;</code>, <code>&#123;distance_m&#125;</code>, <code>&#123;distance_km&#125;</code>, <code>&#123;distance_mi&#125;</code>: route distance in meters, kilometers, or miles.</li>
+                        <li class="leading-5"><code>&#123;time&#125;</code>, <code>&#123;time_s&#125;</code>, <code>&#123;time_min&#125;</code>: route time in seconds or minutes.</li>
+                        <li class="leading-5"><code>&#123;stops&#125;</code>: total service stops including pickup, dropoff, and intermediate waypoints.</li>
+                        <li class="leading-5"><code>&#123;waypoints&#125;</code>: intermediate waypoint count only.</li>
+                        <li class="leading-5"><code>&#123;parcels&#125;</code>, <code>&#123;entities&#125;</code>: parcel count and total payload entity count.</li>
+                        <li class="leading-5"><code>&#123;base_fee&#125;</code>: the configured base fee for this service rate.</li>
+                        <li class="leading-5">Supported functions: <code>max(a,b)</code>, <code>min(a,b)</code>, <code>ceil(x)</code>, <code>floor(x)</code>, <code>round(x)</code>.</li>
                     </ul>
                 </div>
 
-                <div>
-                    <h4 class="mb-1 text-sm font-semibold">{{t "service-rate.fields.example"}}</h4>
-                    <div class="mb-3 text-inherit">
-                        {{t "service-rate.fields.example-message"}}
-                        {{t "service-rate.fields.example-second-message"}}
+                <div class="space-y-3">
+                    <div>
+                        <h4 class="mb-1 text-sm font-semibold">{{t "service-rate.fields.example"}} 1</h4>
+                        <div class="mb-2 text-inherit">Charge by distance in miles after the first 15 miles, plus the base fee.</div>
+                        <code class="text-xs font-mono">max(&#123;distance_mi&#125; - 15, 0) * 5 + &#123;base_fee&#125;</code>
+                    </div>
+
+                    <div>
+                        <h4 class="mb-1 text-sm font-semibold">{{t "service-rate.fields.example"}} 2</h4>
+                        <div class="mb-2 text-inherit">Charge extra for stops after the first 2 service stops.</div>
+                        <code class="text-xs font-mono">max(&#123;stops&#125; - 2, 0) * 10 + &#123;base_fee&#125;</code>
+                    </div>
+
+                    <div>
+                        <h4 class="mb-1 text-sm font-semibold">{{t "service-rate.fields.example"}} 3</h4>
+                        <div class="mb-2 text-inherit">Combine waypoint, parcel, and distance surcharges in one formula.</div>
+                        <code class="text-xs font-mono">max(&#123;waypoints&#125;, 0) * 15 + max(&#123;parcels&#125; - 3, 0) * 2 + max(&#123;distance_km&#125; - 25, 0) * 0.5 + &#123;base_fee&#125;</code>
                     </div>
-                    <code class="text-xs font-mono">(( {distance} / 50 ) * .05 ) + (( {time} / 60 ) * .01)</code>
                 </div>
             </InfoBlock>
 
@@ -287,7 +300,7 @@
     {{else if @resource.isParcelService}}
         <ContentPanel @title={{t "service-rate.fields.percel-fee-title"}} @open={{true}} @wrapperClass="bordered-top">
             <div class="space-y-2">
-                {{#each @resource.parcel_fees as |parcelFee|}}
+                {{#each @resource.parcelFees as |parcelFee|}}
                     <div class="dark:text-gray-100">
                         <div class="grid grid-cols-7">
                             <div class="flex flex-col items-start justify-start pt-3">
@@ -541,4 +554,4 @@
             </InputGroup>
         {{/if}}
     </ContentPanel>
-</div>
+</div>

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

@@ -16,6 +16,7 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
     @service universe;
     @service sidebar;
     @tracked routingControl;
+    @tracked routingCompleted = false;
 
     get tabs() {
         const registeredTabs = this.menuService.getMenuItems('fleet-ops:component:order:details');
@@ -109,7 +110,19 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
     @action async setup() {
         // Change to map layout and display order route
         this.index.changeLayout('map');
-        this.routingControl = await this.leafletMapManager.addRoutingControl(this.model.routeWaypoints);
+        this.routingCompleted = false;
+        this.routingControl = await this.leafletMapManager.addRoutingControl(this.model.routeWaypoints, {
+            onRouteFound: () => {
+                this.routingCompleted = true;
+            },
+            onRoutingError: () => {
+                this.routingCompleted = true;
+            },
+        });
+
+        if (!this.routingControl) {
+            this.routingCompleted = true;
+        }
 
         // Hide sidebar
         this.sidebar.hideNow();
@@ -125,7 +138,19 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
             async (_msg, { reloadable }) => {
                 if (reloadable) {
                     await this.hostRouter.refresh();
-                    this.leafletMapManager.replaceRoutingControl(this.model.routeWaypoints, this.routingControl);
+                    this.routingCompleted = false;
+                    this.routingControl = await this.leafletMapManager.replaceRoutingControl(this.model.routeWaypoints, this.routingControl, {
+                        onRouteFound: () => {
+                            this.routingCompleted = true;
+                        },
+                        onRoutingError: () => {
+                            this.routingCompleted = true;
+                        },
+                    });
+
+                    if (!this.routingControl) {
+                        this.routingCompleted = true;
+                    }
                 }
             },
             { debounceMs: 250 }

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

@@ -0,0 +1,5 @@
+import Controller, { inject as controller } from '@ember/controller';
+
+export default class OperationsOrdersIndexDetailsVirtualController extends Controller {
+    @controller('operations.orders.index.details') parent;
+}

addon/controllers/operations/service-rates/index/edit.js

@@ -22,6 +22,7 @@ export default class OperationsServiceRatesIndexEditController extends Controlle
     @task *save(serviceRate) {
         try {
             yield serviceRate.save();
+            yield serviceRate.reload();
             this.events.trackResourceUpdated(serviceRate);
             this.overlay?.close();