@fleetbase/fleetops-engine 0.6.11 → 0.6.12

package/addon/components/leaflet-tracking-marker.js

@@ -1,6 +1,16 @@
 import MarkerLayer from 'ember-leaflet/components/marker-layer';
 import { isArray } from '@ember/array';
 
+const __draggingHotfix = (layer) => {
+    if (!layer.dragging) {
+        layer.dragging = {
+            enabled: () => false,
+            enable: () => (layer.options.draggable = true),
+            disable: () => (layer.options.draggable = false),
+        };
+    }
+};
+
 const arrayFromLatLng = (latlng) => {
     if (isArray(latlng)) {
         return latlng;
@@ -52,6 +62,7 @@ L.TrackingMarker = L.Marker.extend({
         this._slideKeepAtCenter = false;
         this._slideDraggingWasAllowed = false;
         this._slideFrame = 0;
+        __draggingHotfix(this);
     },
 
     slideTo: function (latlng, options = {}) {
@@ -69,6 +80,7 @@ L.TrackingMarker = L.Marker.extend({
         this._nextPosition = arrayFromLatLng(latlng);
         this._slideKeepAtCenter = !!options.keepAtCenter;
         this._slideDraggingWasAllowed = this._slideDraggingWasAllowed !== undefined ? this._slideDraggingWasAllowed : this._map.dragging.enabled();
+        __draggingHotfix(this);
 
         if (this._slideKeepAtCenter) {
             this._map.dragging.disable();
@@ -245,6 +257,13 @@ export default class LeafletTrackingMarkerComponent extends MarkerLayer {
      */
     rotationAngle = 0;
 
+    /**
+     * Default value for the draggable prop.
+     *
+     * @memberof LeafletTrackingMarkerComponent
+     */
+    draggable = false;
+
     getOption(key, defaultValue = null) {
         const value = this.options[key] ?? this[key];
         if (value === undefined) {

package/addon/components/live-map.hbs

@@ -38,6 +38,7 @@
                         @icon={{icon iconUrl=driver.vehicle_avatar iconSize=(array 24 24)}}
                         @onAdd={{fn this.triggerAction "onDriverAdded" driver}}
                         @onClick={{fn this.triggerAction "onDriverClicked" driver}}
+                        @draggable={{false}}
                         as |marker|
                     >
                         <marker.popup @maxWidth="500" @minWidth="225">
@@ -77,6 +78,7 @@
                             @icon={{icon iconUrl=driver.vehicle_avatar iconSize=(array 24 24)}}
                             @onAdd={{fn this.triggerAction "onDriverAdded" driver}}
                             @onClick={{fn this.triggerAction "onDriverClicked" driver}}
+                            @draggable={{false}}
                             as |marker|
                         >
                             <marker.popup @maxWidth="500" @minWidth="225">
@@ -114,6 +116,7 @@
                             @icon={{icon iconUrl=vehicle.avatar_url iconSize=(array 24 24)}}
                             @onAdd={{fn this.triggerAction "onVehicleAdded" vehicle}}
                             @onClick={{fn this.triggerAction "onVehicleClicked" vehicle}}
+                            @draggable={{false}}
                             as |marker|
                         >
                             <marker.popup @permanent={{false}} @sticky={{true}}>
@@ -150,6 +153,7 @@
                             @icon={{icon iconUrl=vehicle.avatar_url iconSize=(array 24 24)}}
                             @onAdd={{fn this.triggerAction "onVehicleAdded" vehicle}}
                             @onClick={{fn this.triggerAction "onVehicleClicked" vehicle}}
+                            @draggable={{false}}
                             as |marker|
                         >
                             <marker.popup @permanent={{false}} @sticky={{true}}>
@@ -189,6 +193,7 @@
                             @alt={{place.address}}
                             @onAdd={{fn this.triggerAction "onPlaceAdded" place}}
                             @onClick={{fn this.triggerAction "onPlaceClicked" place}}
+                            @draggable={{false}}
                             as |marker|
                         >
                             <marker.popup>

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

@@ -677,7 +677,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
 
     @action resetInterface() {
         if (this.leafletMap && this.leafletMap.liveMap) {
-            this.leafletMap.liveMap.show(['drivers', 'vehicles', 'routes']);
+            this.leafletMap.liveMap.showAll();
         }
     }
 
@@ -709,31 +709,35 @@ export default class OperationsOrdersIndexNewController extends BaseController {
     }
 
     @action removeRoutingControlPreview() {
-        const leafletMap = this.leafletMap;
-        const previewRouteControl = this.previewRouteControl;
+        return new Promise((resolve) => {
+            const leafletMap = this.leafletMap;
+            const previewRouteControl = this.previewRouteControl;
 
-        let removed = false;
+            let removed = false;
 
-        if (leafletMap && previewRouteControl instanceof RoutingControl) {
-            try {
-                previewRouteControl.remove();
-                removed = true;
-            } catch (e) {
-                // silent
-            }
-
-            if (!removed) {
+            if (leafletMap && previewRouteControl instanceof RoutingControl) {
                 try {
-                    leafletMap.removeControl(previewRouteControl);
+                    previewRouteControl.remove();
+                    removed = true;
                 } catch (e) {
                     // silent
                 }
+
+                if (!removed) {
+                    try {
+                        leafletMap.removeControl(previewRouteControl);
+                    } catch (e) {
+                        // silent
+                    }
+                }
             }
-        }
 
-        if (!removed) {
-            this.forceRemoveRoutePreview();
-        }
+            if (!removed) {
+                this.forceRemoveRoutePreview();
+            }
+
+            resolve(true);
+        });
     }
 
     @action forceRemoveRoutePreview() {
@@ -1060,7 +1064,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         }
     }
 
-    @action resetForm() {
+    @action async resetForm() {
         const order = this.store.createRecord('order', { meta: [] });
         const payload = this.store.createRecord('payload');
         const driversQuery = {};
@@ -1080,8 +1084,6 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         const customFields = [];
         const customFieldValues = {};
 
-        this.removeRoutingControlPreview();
-        this.removeOptimizedRoute();
         this.setProperties({
             order,
             payload,
@@ -1102,6 +1104,9 @@ export default class OperationsOrdersIndexNewController extends BaseController {
             customFields,
             customFieldValues,
         });
+
+        await this.removeRoutingControlPreview();
+        this.removeOptimizedRoute();
         this.resetInterface();
     }
 

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

@@ -243,39 +243,41 @@ export default class OperationsOrdersIndexViewController extends BaseController
         this.customFieldGroups = customFieldGroups;
     }
 
-    @action resetView() {
-        this.removeRoutingControlPreview();
+    @action async resetView() {
+        await this.removeRoutingControlPreview();
         this.resetInterface();
     }
 
     @action resetInterface() {
-        const liveMap = this.leafletMap ? this.leafletMap.liveMap : null;
-        if (liveMap) {
-            liveMap.reload();
-            liveMap.showAll();
+        if (this.leafletMap && this.leafletMap.liveMap) {
+            this.leafletMap.liveMap.showAll();
+            this.leafletMap.liveMap.reload();
         }
     }
 
     @action removeRoutingControlPreview() {
-        const { leafletMap, routeControl } = this;
+        return new Promise((resolve) => {
+            const { leafletMap, routeControl } = this;
 
-        if (routeControl instanceof RoutingControl) {
-            try {
-                routeControl.remove();
-            } catch (e) {
-                // silent
+            if (routeControl instanceof RoutingControl) {
+                try {
+                    routeControl.remove();
+                } catch (e) {
+                    // silent
+                }
             }
-        }
 
-        if (leafletMap instanceof L.Map) {
-            try {
-                leafletMap.removeControl(routeControl);
-            } catch (e) {
-                // silent
+            if (leafletMap instanceof L.Map) {
+                try {
+                    leafletMap.removeControl(routeControl);
+                } catch (e) {
+                    // silent
+                }
             }
-        }
 
-        this.forceRemoveRoutePreview();
+            this.forceRemoveRoutePreview();
+            resolve(true);
+        });
     }
 
     @action forceRemoveRoutePreview() {

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.6.11",
+    "version": "0.6.12",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.11",
+    "version": "0.6.12",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.6.11",
+    "version": "0.6.12",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"

package/server/src/Console/Commands/DebugOrderTracker.php

@@ -29,11 +29,11 @@ class DebugOrderTracker extends Command
      */
     public function handle()
     {
-        $order = Order::where('public_id', 'order_n227274')->first();
-        if ($order) {
-            $tracker = new OrderTracker($order);
-            dd($tracker->getOrderProgressPercentage());
-        }
+        // $order = Order::where('public_id', 'order_n227274')->first();
+        // if ($order) {
+        //     $tracker = new OrderTracker($order);
+        //     dd($tracker->getOrderProgressPercentage());
+        // }
 
         return Command::SUCCESS;
     }

package/server/src/Http/Controllers/Api/v1/ServiceAreaController.php

@@ -66,7 +66,9 @@ class ServiceAreaController extends Controller
         try {
             $serviceArea = ServiceArea::create($input);
         } catch (\Throwable $e) {
-            dd($e->getMessage());
+            logger()->error('Unable to create service area.', ['error' => $e->getMessage()]);
+
+            return response()->apiError('Failed to create service area.');
         }
 
         // response the driver resource

package/server/src/Http/Controllers/Internal/v1/OrderController.php

@@ -167,25 +167,28 @@ class OrderController extends FleetOpsController
                         );
                     }
 
-                    // notify driver if assigned
-                    $order->notifyDriverAssigned();
+                    // Run background processes on queue
+                    dispatch(function () use ($order, $serviceQuote): void {
+                        // notify driver if assigned
+                        $order->notifyDriverAssigned();
 
-                    // set driving distance and time
-                    $order->setPreliminaryDistanceAndTime();
+                        // set driving distance and time
+                        $order->setPreliminaryDistanceAndTime();
 
-                    // if service quote attached purchase
-                    $order->purchaseServiceQuote($serviceQuote);
+                        // if service quote attached purchase
+                        $order->purchaseServiceQuote($serviceQuote);
 
-                    // dispatch if flagged true
-                    $order->firstDispatchWithActivity();
+                        // dispatch if flagged true
+                        $order->firstDispatchWithActivity();
 
-                    // load tracking number
-                    $order->load(['trackingNumber']);
+                        // Trigger order created event
+                        event(new OrderReady($order));
+                    })->afterCommit();
                 }
             );
 
-            // Trigger order created event
-            event(new OrderReady($record));
+            // Reload payload and tracking number
+            $record->load(['payload', 'trackingNumber']);
 
             return ['order' => new $this->resource($record)];
         } catch (\Exception $e) {

package/server/src/Http/Controllers/Internal/v1/SettingController.php

@@ -150,7 +150,7 @@ class SettingController extends Controller
         if (!is_array($notificationSettings)) {
             throw new \Exception('Invalid notification settings data.');
         }
-        $currentNotificationSettings = Setting::lookupCompany('notification_settings');
+        $currentNotificationSettings = Setting::lookupCompany('notification_settings', []);
         Setting::configureCompany('notification_settings', array_merge($currentNotificationSettings, $notificationSettings));
 
         return response()->json([

package/server/src/Http/Resources/v1/Waypoint.php

@@ -58,7 +58,7 @@ class Waypoint extends FleetbaseResource
             'owner'                  => $this->when(!Http::isInternalRequest(), Resolve::resourceForMorph($this->owner_type, $this->owner_uuid)),
             'tracking_number'        => $this->whenLoaded('trackingNumber', $waypoint->trackingNumber),
             'customer'               => $this->setCustomerType(Resolve::resourceForMorph($waypoint->customer_type, $waypoint->customer_uuid)),
-            'type'                   => $this->type,
+            'type'                   => $waypoint->type ?? $this->type,
             'meta'                   => data_get($this, 'meta', Utils::createObject()),
             'eta'                    => $this->eta,
             'updated_at'             => $this->updated_at,

package/server/src/Models/Order.php

@@ -1395,8 +1395,6 @@ class Order extends Model
             $activity = $flow->firstWhere('code', $code);
         }
 
-        // dd($activity);
-
         if (!Utils::isActivity($activity)) {
             return false;
         }
@@ -1760,23 +1758,55 @@ class Order extends Model
      */
     public function resolveDynamicProperty(string $property)
     {
-        $snakedProperty = Str::snake($property);
+        // Special payload shortcuts
+        $root       = Str::before($property, '.');   // e.g. "pickup" in "pickup.address"
+        $payloadMap = [
+            'pickup'                => 'payload.pickup',
+            'dropoff'               => 'payload.dropoff',
+            'waypoint'              => 'payload.currentWaypointMarker',
+            'currentWaypoint'       => 'payload.currentWaypointMarker',
+            'currentWaypointMarker' => 'payload.currentWaypointMarker',
+        ];
+
+        if (isset($payloadMap[$root])) {
+            $this->loadMissing($payloadMap[$root]);
+            $target = data_get($this, $payloadMap[$root]);
+
+            // “pickup”, “dropoff”, or “currentWaypoint” on their own
+            if ($property === $root) {
+                return $target;
+            }
+
+            // e.g. "address.city" part of "pickup.address.city"
+            $subKey = Str::after($property, $root . '.');
+
+            // if waypoint we can do "waypoint.place.address" or "waypoint.address" for resolution
+            $isWaypointMarker = Str::startsWith($root, 'currentWaypoint') || $root === 'waypoint';
+            if ($isWaypointMarker && $target instanceof Waypoint) {
+                $target->loadMissing('place');
+
+                return data_get($target, $subKey) ?? data_get($target->place, $subKey);
+            }
+
+            return data_get($target, $subKey);
+        }
 
-        // check if existing property
-        if ($this->{$snakedProperty}) {
-            return $this->{$snakedProperty};
+        // Direct attribute on the model
+        $snake = Str::snake($property);
+        if (array_key_exists($snake, $this->getAttributes())) {
+            return $this->getAttribute($snake);
         }
 
-        // Check if custom field property
+        // Custom-field / meta look-ups
         if ($this->isCustomField($property)) {
             return $this->getCustomFieldValueByKey($property);
         }
 
-        // Check if meta attribute
         if ($this->hasMeta($property)) {
             return $this->getMeta($property);
         }
 
+        // Fallback deep-path access
         return data_get($this, $property);
     }
 

package/server/src/Models/Payload.php

@@ -185,6 +185,14 @@ class Payload extends Model
         return $this->belongsTo(Place::class, 'current_waypoint_uuid')->withoutGlobalScopes();
     }
 
+    /**
+     * The current waypoint of the payload in progress.
+     */
+    public function currentWaypointMarker()
+    {
+        return $this->belongsTo(Waypoint::class, 'current_waypoint_uuid', 'place_uuid')->withoutGlobalScopes();
+    }
+
     /**
      * Waypoints between start and end.
      *
@@ -305,7 +313,7 @@ class Payload extends Model
         }
 
         foreach ($waypoints as $index => $attributes) {
-            $waypoint = ['payload_uuid' => $this->payload_uuid];
+            $waypoint = ['payload_uuid' => $this->payload_uuid, 'type' => data_get($attributes, 'type', 'dropoff')];
 
             if (Utils::isset($attributes, 'place') && is_array(Utils::get($attributes, 'place'))) {
                 $attributes = Utils::get($attributes, 'place');
@@ -355,7 +363,7 @@ class Payload extends Model
         }
 
         foreach ($waypoints as $index => $attributes) {
-            $waypoint = ['payload_uuid' => $this->uuid, 'order' => $index];
+            $waypoint = ['payload_uuid' => $this->uuid, 'order' => $index, 'type' => data_get($attributes, 'type', 'dropoff')];
 
             if (Utils::isset($attributes, 'place') && is_array(Utils::get($attributes, 'place'))) {
                 $placeAttributes = Utils::get($attributes, 'place');

package/server/src/Support/Geocoding.php

@@ -209,8 +209,6 @@ class Geocoding
             throw $e;
         }
 
-        // dd($reverseQueryResults, $geodingQueryResults);
-
         return $reverseQueryResults->merge($geodingQueryResults)->unique('street1');
     }