@fleetbase/fleetops-engine 0.6.13 → 0.6.14

package/composer.json

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

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.13",
+    "version": "0.6.14",
     "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.13",
+    "version": "0.6.14",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"

package/server/src/Events/EntityActivityChanged.php

@@ -21,12 +21,12 @@ class EntityActivityChanged implements ShouldBroadcast
     /**
      * The entity which has new activity.
      */
-    public Entity $entity;
+    public ?Entity $entity = null;
 
     /**
      * The activity which triggered the waypoint completed.
      */
-    public Activity $activity;
+    public ?Activity $activity = null;
 
     /**
      * The event id.

package/server/src/Events/EntityCompleted.php

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

package/server/src/Events/OrderCanceled.php

@@ -18,10 +18,10 @@ class OrderCanceled 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/OrderCompleted.php

@@ -18,10 +18,10 @@ class OrderCompleted 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/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/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

@@ -1187,7 +1187,7 @@ class Order extends Model
             }
         }
 
-        return event(new OrderCanceled($this));
+        return dispatch(fn () => event(new OrderCanceled($this)))->afterCommit();
     }
 
     /**