@fleetbase/fleetops-engine 0.6.8 → 0.6.9

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.');
     }
 
     /**