@fleetbase/fleetops-engine 0.6.8 → 0.6.10

package/addon/templates/operations/orders/index/new.hbs

@@ -405,7 +405,7 @@
                                 </div>
                                 <div>
                                     <div class="flex flex-row items-center space-x-4 text-sm mt-2">
-                                        <div class={{if (eq waypoint.type "dropoff") 'is-checked'}}>
+                                        <div class={{if (eq waypoint.type "dropoff") "is-checked"}}>
                                             <div class="flex flex-row items-center">
                                                 <RadioButton
                                                     @radioClass="focus:ring-blue-500 h-4 w-4 text-blue-500"
@@ -418,7 +418,7 @@
                                                 <label for={{concat "waypoint_" index "_dropoff"}} class="ml-2">Dropoff</label>
                                             </div>
                                         </div>
-                                        <div class={{if (eq waypoint.type "pickup") 'is-checked'}}>
+                                        <div class={{if (eq waypoint.type "pickup") "is-checked"}}>
                                             <div class="flex flex-row items-center">
                                                 <RadioButton
                                                     @radioClass="focus:ring-blue-500 h-4 w-4 text-blue-500"

package/addon/templates/operations/orders/index/view.hbs

@@ -579,7 +579,11 @@
         >
             {{#if @model.payload.isMultiDrop}}
                 <div>
-                    <RouteList @order={{@model}} @eta={{@model.eta}} />
+                    <RouteList
+                        @order={{@model}}
+                        @eta={{@model.eta}}
+                        @waypointActions={{hash viewWaypointLabel=(hash label=(t "fleet-ops.operations.orders.index.view.get-label") fn=this.viewWaypointLabel)}}
+                    />
                 </div>
             {{else}}
                 <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 lg:gap-2">

package/addon/templates/operations/orders/index.hbs

@@ -72,7 +72,12 @@
                     <h4>Bulk Search</h4>
                 </div>
                 <div class="filters-dropdown-body">
-                    <Textarea @value={{this.bulkSearchValue}} class="form-input w-full" rows="8" placeholder="Input comma delimited order ID's or tracking numbers to perform a bulk search" />
+                    <Textarea
+                        @value={{this.bulkSearchValue}}
+                        class="form-input w-full"
+                        rows="8"
+                        placeholder="Input comma delimited order ID's or tracking numbers to perform a bulk search"
+                    />
                 </div>
                 <div class="filters-dropdown-footer space-x-2">
                     <Button @text="Clear" @icon="trash" @size="xs" @onClick={{dropdown-fn dd this.removeBulkQuery}} />

package/addon/templates/settings/notifications.hbs

@@ -1,5 +1,13 @@
 <Layout::Section::Header @title={{t "fleet-ops.settings.notifications.fleet-ops-notification-settings"}}>
-     <Button @type="primary" @size="sm" @icon="save" @text={{t "common.save-button-text"}} @onClick={{perform this.saveSettings}} @disabled={{this.saveSettings.isRunning}} @isLoading={{or this.saveSettings.isRunning this.getSettings.isRunning}} />
+    <Button
+        @type="primary"
+        @size="sm"
+        @icon="save"
+        @text={{t "common.save-button-text"}}
+        @onClick={{perform this.saveSettings}}
+        @disabled={{this.saveSettings.isRunning}}
+        @isLoading={{or this.saveSettings.isRunning this.getSettings.isRunning}}
+    />
 </Layout::Section::Header>
 
 <Layout::Section::Body class="overflow-y-scroll h-full">

package/composer.json

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

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.8",
+    "version": "0.6.10",
     "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.8",
+    "version": "0.6.10",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -87,8 +87,7 @@
         "ember-cli-sri": "^2.1.1",
         "ember-cli-terser": "^4.0.2",
         "ember-composable-helpers": "^5.0.0",
-        "ember-concurrency": "^3.1.1",
-        "ember-concurrency-decorators": "^2.0.3",
+        "ember-concurrency": "^4.0.4",
         "ember-data": "^4.12.5",
         "ember-engines": "^0.9.0",
         "ember-load-initializers": "^2.1.2",

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

@@ -69,7 +69,7 @@ class TrackOrderDistanceAndTime extends Command
      * - Not in 'completed' or 'canceled' status.
      * - Not marked as deleted (`deleted_at` is null).
      * - Associated with a company (`company_uuid` is not null).
-     * - The order process has started (`started` is not null).
+     * - The order process has started (`started_at` is not null).
      * - Contains a payload (`payload` relationship exists).
      * - Created within the past month.
      *
@@ -85,7 +85,7 @@ class TrackOrderDistanceAndTime extends Command
         return Order::whereNotIn('status', ['completed', 'canceled'])
                     ->whereNull('deleted_at')
                     ->whereNotNull('company_uuid')
-                    ->whereNotNull('started')
+                    ->whereNotNull('started_at')
                     ->where('created_at', '>=', $oneMonthAgo)
                     ->whereHas('payload')
                     ->with(['payload', 'payload.waypoints', 'payload.pickup', 'payload.dropoff'])

package/server/src/Events/OrderCanceled.php

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\Events\ResourceLifecycleEvent;
 use Fleetbase\FleetOps\Flow\Activity;
+use Fleetbase\FleetOps\Models\Waypoint;
 
 class OrderCanceled extends ResourceLifecycleEvent
 {
@@ -18,4 +19,9 @@ class OrderCanceled extends ResourceLifecycleEvent
      * Assosciated activity which triggered the event.
      */
     public ?Activity $activity;
+
+    /**
+     * Assosciated order waypoint which event is for.
+     */
+    public ?Waypoint $waypoint;
 }

package/server/src/Events/OrderCompleted.php

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\Events\ResourceLifecycleEvent;
 use Fleetbase\FleetOps\Flow\Activity;
+use Fleetbase\FleetOps\Models\Waypoint;
 
 class OrderCompleted extends ResourceLifecycleEvent
 {
@@ -18,4 +19,9 @@ class OrderCompleted extends ResourceLifecycleEvent
      * Assosciated activity which triggered the event.
      */
     public ?Activity $activity;
+
+    /**
+     * Assosciated order waypoint which event is for.
+     */
+    public ?Waypoint $waypoint;
 }

package/server/src/Events/OrderDispatched.php

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\Events\ResourceLifecycleEvent;
 use Fleetbase\FleetOps\Flow\Activity;
+use Fleetbase\FleetOps\Models\Waypoint;
 
 class OrderDispatched extends ResourceLifecycleEvent
 {
@@ -18,4 +19,9 @@ class OrderDispatched extends ResourceLifecycleEvent
      * Assosciated activity which triggered the event.
      */
     public ?Activity $activity;
+
+    /**
+     * Assosciated order waypoint which event is for.
+     */
+    public ?Waypoint $waypoint;
 }

package/server/src/Events/OrderFailed.php

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\Events\ResourceLifecycleEvent;
 use Fleetbase\FleetOps\Flow\Activity;
+use Fleetbase\FleetOps\Models\Waypoint;
 
 class OrderFailed extends ResourceLifecycleEvent
 {
@@ -18,4 +19,9 @@ class OrderFailed extends ResourceLifecycleEvent
      * Assosciated activity which triggered the event.
      */
     public ?Activity $activity;
+
+    /**
+     * Assosciated order waypoint which event is for.
+     */
+    public ?Waypoint $waypoint;
 }

package/server/src/Events/WaypointActivityChanged.php

@@ -0,0 +1,119 @@
+<?php
+
+namespace Fleetbase\FleetOps\Events;
+
+use Fleetbase\FleetOps\Flow\Activity;
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\Waypoint;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Carbon;
+
+class WaypointActivityChanged implements ShouldBroadcast
+{
+    use Dispatchable;
+    use InteractsWithSockets;
+    use SerializesModels;
+
+    /**
+     * The waypoint which is completed.
+     */
+    public Waypoint $waypoint;
+
+    /**
+     * The activity which triggered the waypoint completed.
+     */
+    public Activity $activity;
+
+    /**
+     * The event id.
+     *
+     * @var string
+     */
+    public $eventId;
+
+    /**
+     * The datetime instance the broadcast ws triggered.
+     *
+     * @var string
+     */
+    public $sentAt;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(Waypoint $waypoint, Activity $activity)
+    {
+        $this->waypoint         = $waypoint;
+        $this->activity         = $activity;
+        $this->eventId          = uniqid('event_');
+        $this->sentAt           = Carbon::now()->toDateTimeString();
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return Channel|array
+     */
+    public function broadcastOn()
+    {
+        $channels = [
+            new Channel('api.' . session('api_credential')),
+            new Channel('waypoint.' . $this->waypoint->public_id),
+            new Channel('waypoint.' . $this->waypoint->uuid),
+        ];
+
+        $order = $this->getModelRecord();
+        if ($order) {
+            $channels[] = new Channel('company.' . session('company', data_get($order, 'company.uuid')));
+            $channels[] = new Channel('company.' . data_get($order, 'company.public_id'));
+            $channels[] = new Channel('order.' . $order->uuid);
+            $channels[] = new Channel('order.' . $order->public_id);
+        }
+
+        return $channels;
+    }
+
+    /**
+     * The event's broadcast name.
+     *
+     * @return string
+     */
+    public function broadcastAs()
+    {
+        return 'waypoint.activity';
+    }
+
+    /**
+     * Get the data to broadcast.
+     *
+     * @return array
+     */
+    public function broadcastWith()
+    {
+        return [
+            'id'          => $this->eventId,
+            'api_version' => config('api.version'),
+            'event'       => $this->broadcastAs(),
+            'created_at'  => $this->sentAt,
+            'data'        => [
+                'waypoint' => $this->waypoint->public_id,
+                'place'    => data_get($this->waypoint, 'place.public_id'),
+                'activity' => $this->activity->toArray(),
+            ],
+        ];
+    }
+
+    /**
+     * Get the assosciated order model record for this waypoint.
+     */
+    public function getModelRecord(): ?Order
+    {
+        return Order::where('payload_uuid', $this->waypoint->payload_uuid)->first();
+    }
+}

package/server/src/Events/WaypointCompleted.php

@@ -0,0 +1,119 @@
+<?php
+
+namespace Fleetbase\FleetOps\Events;
+
+use Fleetbase\FleetOps\Flow\Activity;
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\Waypoint;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Carbon;
+
+class WaypointCompleted implements ShouldBroadcast
+{
+    use Dispatchable;
+    use InteractsWithSockets;
+    use SerializesModels;
+
+    /**
+     * The waypoint which is completed.
+     */
+    public Waypoint $waypoint;
+
+    /**
+     * The activity which triggered the waypoint completed.
+     */
+    public Activity $activity;
+
+    /**
+     * The event id.
+     *
+     * @var string
+     */
+    public $eventId;
+
+    /**
+     * The datetime instance the broadcast ws triggered.
+     *
+     * @var string
+     */
+    public $sentAt;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(Waypoint $waypoint, Activity $activity)
+    {
+        $this->waypoint         = $waypoint;
+        $this->activity         = $activity;
+        $this->eventId          = uniqid('event_');
+        $this->sentAt           = Carbon::now()->toDateTimeString();
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return Channel|array
+     */
+    public function broadcastOn()
+    {
+        $channels = [
+            new Channel('api.' . session('api_credential')),
+            new Channel('waypoint.' . $this->waypoint->public_id),
+            new Channel('waypoint.' . $this->waypoint->uuid),
+        ];
+
+        $order = $this->getModelRecord();
+        if ($order) {
+            $channels[] = new Channel('company.' . session('company', data_get($order, 'company.uuid')));
+            $channels[] = new Channel('company.' . data_get($order, 'company.public_id'));
+            $channels[] = new Channel('order.' . $order->uuid);
+            $channels[] = new Channel('order.' . $order->public_id);
+        }
+
+        return $channels;
+    }
+
+    /**
+     * The event's broadcast name.
+     *
+     * @return string
+     */
+    public function broadcastAs()
+    {
+        return 'waypoint.completed';
+    }
+
+    /**
+     * Get the data to broadcast.
+     *
+     * @return array
+     */
+    public function broadcastWith()
+    {
+        return [
+            'id'          => $this->eventId,
+            'api_version' => config('api.version'),
+            'event'       => $this->broadcastAs(),
+            'created_at'  => $this->sentAt,
+            'data'        => [
+                'waypoint' => $this->waypoint->public_id,
+                'place'    => data_get($this->waypoint, 'place.public_id'),
+                'activity' => $this->activity->toArray(),
+            ],
+        ];
+    }
+
+    /**
+     * Get the assosciated order model record for this waypoint.
+     */
+    public function getModelRecord(): ?Order
+    {
+        return Order::where('payload_uuid', $this->waypoint->payload_uuid)->first();
+    }
+}

package/server/src/Flow/Activity.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Flow;
 
 use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\Waypoint;
 use Fleetbase\FleetOps\Support\Utils;
 
 class Activity extends FlowResource
@@ -100,10 +101,10 @@ class Activity extends FlowResource
      *
      * @param Order $order the order object to be passed to each event
      */
-    public function fireEvents(Order $order)
+    public function fireEvents(Order $order, ?Waypoint $waypoint = null)
     {
         foreach ($this->events as $event) {
-            $event->fire($order, $this);
+            $event->fire($order, $this, $waypoint);
         }
     }
 
@@ -112,12 +113,22 @@ class Activity extends FlowResource
      *
      * @return \Illuminate\Support\Collection a collection of child activities
      */
-    public function getChildActivities()
+    public function getChildActivities(Order|Waypoint|null $context = null)
     {
-        $children = collect();
-        if (is_array($this->activities)) {
-            foreach ($this->activities as $childActivityCode) {
+        $children   = collect();
+        $activities = $this->activities;
+
+        // if waypoint provided
+        $waypointContext = $context instanceof Waypoint;
+
+        if (is_array($activities)) {
+            foreach ($activities as $childActivityCode) {
                 $childActivity = $this->flow->getActivity($childActivityCode);
+                // if waypoint context skip `created` - `started` - `dispatched`
+                if ($waypointContext && in_array($childActivity->code, ['created', 'started', 'dispatched'])) {
+                    return $childActivity->getChildActivities($context);
+                }
+
                 if ($childActivity) {
                     $children->push($childActivity);
                 }
@@ -158,15 +169,19 @@ class Activity extends FlowResource
     /**
      * Determines the next set of activities based on the provided Order.
      *
-     * @param Order $order the order to determine the next activities for
-     *
      * @return \Illuminate\Support\Collection a collection of the next activities
      */
-    public function getNext(Order $order)
+    public function getNext(Order|Waypoint $context)
     {
-        $children       = $this->getChildActivities();
+        $children       = $this->getChildActivities($context);
         $nextActivities = collect();
 
+        // if context is a waypoint get the waypoint order
+        $order = $context;
+        if ($context instanceof Waypoint) {
+            $order = Order::where('payload_uuid', $context->payload_uuid)->first();
+        }
+
         foreach ($children as $childActivity) {
             if ($childActivity->passes($order)) {
                 $nextActivities->push($childActivity);
@@ -237,6 +252,9 @@ class Activity extends FlowResource
         return $this->complete();
     }
 
+    /**
+     *  Checks if this activiy has been completed within the order already.
+     */
     public function isCompleted(Order $order): bool
     {
         return $order->hasCompletedActivity($this);

package/server/src/Flow/Event.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Flow;
 
 use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\Waypoint;
 use Fleetbase\FleetOps\Support\Utils;
 use Illuminate\Support\Str;
 
@@ -18,6 +19,11 @@ class Event
      */
     public ?Order $order = null;
 
+    /**
+     * The waypoint associated with the event, if any.
+     */
+    public ?Waypoint $waypoint = null;
+
     /**
      * The activity for the order event.
      */
@@ -29,11 +35,12 @@ class Event
      * @param string $name  the name of the event
      * @param ?Order $order the associated order, if any
      */
-    public function __construct(string $name, ?Order $order = null, ?Activity $activity = null)
+    public function __construct(string $name, ?Order $order = null, ?Activity $activity = null, ?Waypoint $waypoint = null)
     {
         $this->name     = $name;
         $this->order    = $order;
         $this->activity = $activity;
+        $this->waypoint = $waypoint;
     }
 
     /**
@@ -60,6 +67,18 @@ class Event
         return $this;
     }
 
+    /**
+     * Sets the waypoint for the order event.
+     *
+     * @param Waypoint $waypoint the waypoint assosciated to this event
+     */
+    public function setWaypoint(Waypoint $waypoint)
+    {
+        $this->waypoint = $waypoint;
+
+        return $this;
+    }
+
     /**
      * Triggers the event, optionally setting the order if not already set.
      *
@@ -69,7 +88,7 @@ class Event
      * @param ?Order    $order    optional order to associate with the event
      * @param ?Activity $activity optional activity which triggered the event
      */
-    public function fire(?Order $order = null, ?Activity $activity = null)
+    public function fire(?Order $order = null, ?Activity $activity = null, ?Waypoint $waypoint = null)
     {
         if (!$this->order && $order instanceof Order) {
             $this->setOrder($order);
@@ -79,10 +98,15 @@ class Event
             $this->setActivity($activity);
         }
 
+        if ($waypoint) {
+            $this->setWaypoint($waypoint);
+        }
+
         $eventClass = $this->resolve();
         if ($eventClass) {
             $event           = new $eventClass($this->order);
             $event->activity = $activity;
+            $event->waypoint = $waypoint;
             event($event);
         }
     }

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

@@ -535,15 +535,32 @@ class DriverController extends Controller
                     return 'Your ' . data_get($company, 'name', config('app.name')) . ' verification code is ' . $verification->code;
                 },
             ]);
+
+            return response()->json(['status' => 'OK', 'method' => 'sms']);
         } catch (\Throwable $e) {
             if (app()->bound('sentry')) {
                 app('sentry')->captureException($e);
             }
 
-            return response()->apiError('Unable to send SMS Verification code.');
+            // SEND VERIFICATION CODE BY EMAIL IF DRIVER HAS EMAIL ADDRESS
+            if ($user->email) {
+                try {
+                    VerificationCode::generateEmailVerificationFor($user, 'driver_login', [
+                        'messageCallback' => function ($verification) use ($company) {
+                            return 'Your ' . data_get($company, 'name', config('app.name')) . ' verification code is ' . $verification->code;
+                        },
+                    ]);
+
+                    return response()->json(['status' => 'OK', 'method' => 'email']);
+                } catch (\Throwable $e) {
+                    if (app()->bound('sentry')) {
+                        app('sentry')->captureException($e);
+                    }
+                }
+            }
         }
 
-        return response()->json(['status' => 'OK']);
+        return response()->apiError('Unable to send SMS Verification code.');
     }
 
     /**