@fleetbase/fleetops-engine 0.6.12 → 0.6.14

package/server/src/Events/OrderDispatched.php

@@ -18,10 +18,10 @@ class OrderDispatched extends ResourceLifecycleEvent
     /**
      * Assosciated activity which triggered the event.
      */
-    public ?Activity $activity;
+    public ?Activity $activity = null;
 
     /**
      * Assosciated order waypoint which event is for.
      */
-    public ?Waypoint $waypoint;
+    public ?Waypoint $waypoint = null;
 }

package/server/src/Events/OrderDriverAssigned.php

@@ -17,5 +17,5 @@ class OrderDriverAssigned extends ResourceLifecycleEvent
     /**
      * Assosciated activity which triggered the event.
      */
-    public ?Activity $activity;
+    public ?Activity $activity = null;
 }

package/server/src/Events/OrderFailed.php

@@ -18,10 +18,10 @@ class OrderFailed extends ResourceLifecycleEvent
     /**
      * Assosciated activity which triggered the event.
      */
-    public ?Activity $activity;
+    public ?Activity $activity = null;
 
     /**
      * Assosciated order waypoint which event is for.
      */
-    public ?Waypoint $waypoint;
+    public ?Waypoint $waypoint = null;
 }

package/server/src/Events/OrderReady.php

@@ -17,5 +17,5 @@ class OrderReady extends ResourceLifecycleEvent
     /**
      * Assosciated activity which triggered the event.
      */
-    public ?Activity $activity;
+    public ?Activity $activity = null;
 }

package/server/src/Events/OrderStarted.php

@@ -17,5 +17,5 @@ class OrderStarted extends ResourceLifecycleEvent
     /**
      * Assosciated activity which triggered the event.
      */
-    public ?Activity $activity;
+    public ?Activity $activity = null;
 }

package/server/src/Events/WaypointActivityChanged.php

@@ -21,12 +21,12 @@ class WaypointActivityChanged implements ShouldBroadcast
     /**
      * The waypoint which is completed.
      */
-    public Waypoint $waypoint;
+    public ?Waypoint $waypoint = null;
 
     /**
      * The activity which triggered the waypoint completed.
      */
-    public Activity $activity;
+    public ?Activity $activity = null;
 
     /**
      * The event id.

package/server/src/Events/WaypointCompleted.php

@@ -21,12 +21,12 @@ class WaypointCompleted implements ShouldBroadcast
     /**
      * The waypoint which is completed.
      */
-    public Waypoint $waypoint;
+    public ?Waypoint $waypoint = null;
 
     /**
      * The activity which triggered the waypoint completed.
      */
-    public Activity $activity;
+    public ?Activity $activity = null;
 
     /**
      * The event id.

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

@@ -354,7 +354,7 @@ class OrderController extends FleetOpsController
      */
     public function bulkCancel(BulkActionRequest $request)
     {
-        /** @var Order */
+        /** @var \Illuminate\Database\Eloquent\Collection $orders */
         $orders = Order::whereIn('uuid', $request->input('ids'))->get();
 
         $count      = $orders->count();

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

@@ -174,4 +174,34 @@ class SettingController extends Controller
             'notificationSettings' => $notificationSettings,
         ]);
     }
+
+    /**
+     * Save routing settings.
+     *
+     * @param Request $request the HTTP request object containing the routing settings data
+     *
+     * @return \Illuminate\Http\JsonResponse a JSON response
+     */
+    public function saveRoutingSettings(Request $request)
+    {
+        $router = $request->input('router');
+        Setting::configureCompany('routing', ['router' => $router]);
+
+        return response()->json([
+            'status'  => 'ok',
+            'message' => 'Routing settings succesfully saved.',
+        ]);
+    }
+
+    /**
+     * Retrieve and return the routing settings.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function getRoutingSettings()
+    {
+        $routingSettings = Setting::lookupCompany('routing', ['router' => 'osrm']);
+
+        return response()->json($routingSettings);
+    }
 }

package/server/src/Listeners/NotifyOrderEvent.php

@@ -34,6 +34,7 @@ class NotifyOrderEvent implements ShouldQueue
                 $reason = $event->activity ? $event->activity->get('details') : '';
                 NotificationRegistry::notify(OrderCanceled::class, $order, $reason, $event->waypoint);
             }
+            
             if ($event instanceof \Fleetbase\FleetOps\Events\OrderCompleted) {
                 NotificationRegistry::notify(OrderCompleted::class, $order, $event->waypoint);
             }

package/server/src/Models/Order.php

@@ -1173,6 +1173,12 @@ class Order extends Model
     {
         $this->status = 'canceled';
 
+        // if saving update the status and add the cancel activity
+        $this->loadMissing('orderConfig');
+        $canceledActivity = $this->orderConfig->getCanceledActivity();
+        $this->updateActivity($canceledActivity);
+
+        // trigger integrated vendor cancelation
         if ($this->isIntegratedVendorOrder()) {
             $api = $this->facilitator->api();
 
@@ -1181,7 +1187,7 @@ class Order extends Model
             }
         }
 
-        return event(new OrderCanceled($this));
+        return dispatch(fn () => event(new OrderCanceled($this)))->afterCommit();
     }
 
     /**

package/server/src/Models/Payload.php

@@ -3,6 +3,8 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\FleetOps\Events\EntityActivityChanged;
+use Fleetbase\FleetOps\Events\EntityCompleted;
 use Fleetbase\FleetOps\Events\WaypointActivityChanged;
 use Fleetbase\FleetOps\Events\WaypointCompleted;
 use Fleetbase\FleetOps\Flow\Activity;
@@ -337,11 +339,13 @@ class Payload extends Model
             }
 
             // Handle customer assosciation for waypoint
-            if (is_array($attributes) && Utils::notEmpty($attributes['customer_uuid']) && Utils::notEmpty($attributes['customer_type'])) {
-                $customerTypeNamespace = Utils::getMutationType($attributes['customer_type']);
-                $customerExists        = app($customerTypeNamespace)->where('uuid', $attributes['customer_uuid'])->exists();
+            $customerId   = data_get($attributes, 'customer_uuid');
+            $customerType = data_get($attributes, 'customer_type', 'fleetops:contact');
+            if ($customerId && $customerType) {
+                $customerTypeNamespace = Utils::getMutationType($customerType);
+                $customerExists        = app($customerTypeNamespace)->where('uuid', $customerId)->exists();
                 if ($customerExists) {
-                    $waypoint['customer_uuid'] = $attributes['customer_uuid'];
+                    $waypoint['customer_uuid'] = $customerId;
                     $waypoint['customer_type'] = $customerTypeNamespace;
                 }
             }
@@ -392,11 +396,13 @@ class Payload extends Model
             }
 
             // Handle customer assosciation for waypoint
-            if (is_array($attributes) && Utils::notEmpty($attributes['customer_uuid']) && Utils::notEmpty($attributes['customer_type'])) {
-                $customerTypeNamespace = Utils::getMutationType($attributes['customer_type']);
-                $customerExists        = app($customerTypeNamespace)->where('uuid', $attributes['customer_uuid'])->exists();
+            $customerId   = data_get($attributes, 'customer_uuid');
+            $customerType = data_get($attributes, 'customer_type', 'fleetops:contact');
+            if ($customerId && $customerType) {
+                $customerTypeNamespace = Utils::getMutationType($customerType);
+                $customerExists        = app($customerTypeNamespace)->where('uuid', $customerId)->exists();
                 if ($customerExists) {
-                    $waypoint['customer_uuid'] = $attributes['customer_uuid'];
+                    $waypoint['customer_uuid'] = $customerId;
                     $waypoint['customer_type'] = $customerTypeNamespace;
                 }
             }
@@ -792,6 +798,11 @@ class Payload extends Model
             $entities = $this->entities->where('destination_uuid', $this->current_waypoint_uuid);
             foreach ($entities as $entity) {
                 $entity->insertActivity($activity, $location, $proof);
+                if ($activity && $activity->complete()) {
+                    event(new EntityCompleted($entity, $activity));
+                } else {
+                    event(new EntityActivityChanged($entity, $activity));
+                }
             }
 
             // if this activity completes the waypoint notify waypoint customer

package/server/src/Models/Place.php

@@ -366,6 +366,22 @@ class Place extends Model
         return static::createFromGoogleAddress($results->first(), $saveInstance);
     }
 
+    /**
+     * Create a new Place instance from a geocoding lookup.
+     *
+     * @return \Fleetbase\Models\Place|null
+     */
+    public static function getValuesFromGeocodingLookup(string $address): array
+    {
+        $results = \Geocoder\Laravel\Facades\Geocoder::geocode($address)->get();
+
+        if ($results->isEmpty() || !$results->first()) {
+            return ['street1' => $address];
+        }
+
+        return static::getGoogleAddressArray($results->first());
+    }
+
     /**
      * Create a new Place instance from a geocoding lookup.
      *
@@ -482,12 +498,12 @@ class Place extends Model
         if (is_string($place)) {
             // Check if $place is a valid public_id, return matching Place object if found
             if (Utils::isPublicId($place)) {
-                return Place::where('public_id', $place)->first();
+                return static::where('public_id', $place)->first();
             }
 
             // Check if $place is a valid uuid, return matching Place object if found
             if (Str::isUuid($place)) {
-                return Place::where('uuid', $place)->first();
+                return static::where('uuid', $place)->first();
             }
 
             // Attempt to find by address or name
@@ -521,12 +537,27 @@ class Place extends Model
             $uuid = data_get($place, 'uuid');
 
             // If $place has a valid uuid and a matching Place object exists, return the uuid
-            if (Str::isUuid($uuid) && $existingPlace = Place::where('uuid', $uuid)->first()) {
+            if (Str::isUuid($uuid) && $existingPlace = static::where('uuid', $uuid)->first()) {
                 return $existingPlace;
             }
 
-            // Otherwise, create a new Place object with the given attributes
-            return Place::create($place);
+            // If has $attributes['address']
+            if (!empty($place['address'])) {
+                return static::createFromGeocodingLookup($place['address'], $saveInstance);
+            }
+
+            // Perform google lookup to fill address
+            $street1 = $place['street1'];
+            if ($street1) {
+                return static::create(array_merge($place, static::getValuesFromGeocodingLookup($street1)));
+            }
+
+            // Otherwise, create a new Place owith the given attributes
+            if (empty($place['location'])) {
+                $place['location'] = new SpatialPoint(0, 0);
+            }
+
+            return static::create($place);
         }
         // If $place is a GoogleAddress object
         elseif ($place instanceof \Geocoder\Provider\GoogleMaps\Model\GoogleAddress) {
@@ -547,10 +578,10 @@ class Place extends Model
     {
         if (Utils::isCoordinatesStrict($place)) {
             // create a place from coordinates using reverse loopup
-            return Place::insertFromCoordinates($place);
+            return static::insertFromCoordinates($place);
         } elseif (is_string($place)) {
             if (Utils::isPublicId($place)) {
-                $resolvedPlace = Place::where('public_id', $place)->first();
+                $resolvedPlace = static::where('public_id', $place)->first();
 
                 if ($resolvedPlace) {
                     return $resolvedPlace->uuid;
@@ -558,14 +589,19 @@ class Place extends Model
             }
 
             if (Str::isUuid($place)) {
-                $resolvedPlace = Place::where('uuid', $place)->first();
+                $resolvedPlace = static::where('uuid', $place)->first();
 
                 if ($resolvedPlace) {
                     return $resolvedPlace->uuid;
                 }
             }
 
-            return Place::insertFromGeocodingLookup($place);
+            // handle address if set
+            if (!empty($place['address'])) {
+                return static::insertFromGeocodingLookup($place['address']);
+            }
+
+            return static::insertFromGeocodingLookup($place);
         } elseif (is_array($place) || is_object($place)) {
             // if place already exists just return uuid
             if (static::isValidPlaceUuid(data_get($place, 'uuid'))) {
@@ -592,12 +628,12 @@ class Place extends Model
 
     public static function isValidPlaceUuid($uuid): bool
     {
-        return is_string($uuid) && Str::isUuid($uuid) && Place::where('uuid', $uuid)->exists();
+        return is_string($uuid) && Str::isUuid($uuid) && static::where('uuid', $uuid)->exists();
     }
 
     public static function isValidPlacePublicId($publicId): bool
     {
-        return is_string($publicId) && Utils::isPublicId($publicId) && Place::where('public_id', $publicId)->exists();
+        return is_string($publicId) && Utils::isPublicId($publicId) && static::where('public_id', $publicId)->exists();
     }
 
     /**
@@ -717,7 +753,7 @@ class Place extends Model
             return null;
         }
 
-        $place = Place::createFromGeocodingLookup($address, false);
+        $place = static::createFromGeocodingLookup($address, false);
         foreach ($addressFields as $field => $options) {
             if ($place->isFillable($field) && empty($place->{$field})) {
                 $value = Utils::or($row, array_merge([$field], $options['alias']));
@@ -783,7 +819,7 @@ class Place extends Model
      * $data = ['address' => '123 Main St, Anytown, USA'];
      * $place = Place::createFromImport($data, true);
      */
-    public static function createFromImport(array $row, bool $saveInstance = false): Place
+    public static function createFromImport(array $row, bool $saveInstance = false): ?Place
     {
         // Filter array for null key values
         $row = array_filter($row);

package/server/src/routes.php

@@ -469,6 +469,8 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                                         $router->get('notification-registry', 'SettingController@getNotificationRegistry');
                                         $router->get('notification-settings', 'SettingController@getNotificationSettings');
                                         $router->post('notification-settings', 'SettingController@saveNotificationSettings');
+                                        $router->get('routing-settings', 'SettingController@getRoutingSettings');
+                                        $router->post('routing-settings', 'SettingController@saveRoutingSettings');
                                     }
                                 );
                                 $router->group(

package/translations/en-us.yaml

@@ -298,6 +298,7 @@ fleet-ops:
         loading-vehicle: Loading fleet vehicles...
     layout:
       fleet-ops-sidebar:
+        routing: Routing
         notifications: Notifications
         payments: Payments
         navigator-app: Navigator App
@@ -1635,6 +1636,10 @@ fleet-ops:
       fleet-ops-notification-settings: Fleet-Ops Notification Settings
       fleet-ops-notifications: Fleet-Ops Notifications
       configure-notifications: Configure Notifications
+    routing:
+      fleet-ops-routing-settings: Fleet-Ops Routing Settings
+      fleet-ops-routing: Fleet-Ops Routing
+      configure-routing: Configure Routing
     navigator-app:
       navigator-app-settings: Navigator App Settings
     payments: