@fleetbase/fleetops-engine 0.4.10 → 0.4.12

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.4.10",
+    "version": "0.4.12",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.4",
+        "fleetbase/core-api": "^1.4.5",
         "barryvdh/laravel-dompdf": "^2.0",
         "brick/geo": "0.7.2",
         "cknow/laravel-money": "^7.1",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.4.10",
+    "version": "0.4.12",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "MIT",

package/package.json

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

package/server/src/Notifications/OrderAssigned.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Notifications;
 
+use Fleetbase\FleetOps\Http\Resources\v1\Order as OrderResource;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Support\Utils;
 use Illuminate\Broadcasting\Channel;
@@ -77,6 +78,26 @@ class OrderAssigned extends Notification implements ShouldQueue
         ];
     }
 
+    /**
+     * Get notification as array.
+     *
+     * @return void
+     */
+    public function toArray()
+    {
+        $order = new OrderResource($this->order);
+
+        return [
+            'title' => 'New order ' . $this->order->public_id . ' assigned!',
+            'body'  => $this->order->isScheduled ? 'You have a new order scheduled for ' . $this->order->scheduled_at : 'You have a new order assigned, tap for details.',
+            'data'  => [
+                'id'    => $this->order->public_id,
+                'type'  => 'order_assigned',
+                'order' => $order->toWebhookPayload(),
+            ],
+        ];
+    }
+
     /**
      * Get the mail representation of the notification.
      *

package/server/src/Notifications/OrderCanceled.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Notifications;
 
+use Fleetbase\FleetOps\Http\Resources\v1\Order as OrderResource;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Support\Utils;
 use Illuminate\Broadcasting\Channel;
@@ -77,6 +78,26 @@ class OrderCanceled extends Notification implements ShouldQueue
         ];
     }
 
+    /**
+     * Get notification as array.
+     *
+     * @return void
+     */
+    public function toArray()
+    {
+        $order = new OrderResource($this->order);
+
+        return [
+            'title' => 'Order ' . $this->order->public_id . ' was canceled',
+            'body'  => 'Order ' . $this->order->public_id . ' has been canceled.',
+            'data'  => [
+                'id'    => $this->order->public_id,
+                'type'  => 'order_canceled',
+                'order' => $order->toWebhookPayload(),
+            ],
+        ];
+    }
+
     /**
      * Get the mail representation of the notification.
      *

package/server/src/Notifications/OrderDispatchFailed.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Notifications;
 
 use Fleetbase\FleetOps\Events\OrderDispatchFailed as OrderDispatchFailedEvent;
+use Fleetbase\FleetOps\Http\Resources\v1\Order as OrderResource;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Support\Utils;
 use Illuminate\Broadcasting\Channel;
@@ -81,6 +82,26 @@ class OrderDispatchFailed extends Notification implements ShouldQueue
         return ['mail'];
     }
 
+    /**
+     * Get notification as array.
+     *
+     * @return void
+     */
+    public function toArray()
+    {
+        $order = new OrderResource($this->order);
+
+        return [
+            'title' => 'Order ' . $this->order->public_id . ' has dispatch has failed!',
+            'body'  => $this->reason,
+            'data'  => [
+                'id'    => $this->order->public_id,
+                'type'  => 'order_dispatch_failed',
+                'order' => $order->toWebhookPayload(),
+            ],
+        ];
+    }
+
     /**
      * Get the mail representation of the notification.
      *

package/server/src/Notifications/OrderDispatched.php

@@ -87,6 +87,28 @@ class OrderDispatched extends Notification implements ShouldQueue
             new Channel('api.' . session('api_credential')),
             new Channel('order.' . $this->order->uuid),
             new Channel('order.' . $this->order->public_id),
+            new Channel('driver.' . data_get($this->order, 'driverAssigned.uuid')),
+            new Channel('driver.' . data_get($this->order, 'driverAssigned.public_id')),
+        ];
+    }
+
+    /**
+     * Get notification as array.
+     *
+     * @return void
+     */
+    public function toArray()
+    {
+        $order = new OrderResource($this->order);
+
+        return [
+            'title' => 'Order ' . $this->order->public_id . ' has been dispatched!',
+            'body'  => 'An order has just been dispatched to you and is ready to be started.',
+            'data'  => [
+                'id'    => $this->order->public_id,
+                'type'  => 'order_dispatched',
+                'order' => $order->toWebhookPayload(),
+            ],
         ];
     }
 
@@ -131,7 +153,7 @@ class OrderDispatched extends Notification implements ShouldQueue
     {
         $message = (new MailMessage())
             ->subject('Order ' . $this->order->public_id . ' has been dispatched!')
-            ->line('Order ' . $this->order->public_id . ' has been dispatched to you.');
+            ->line('An order has just been dispatched to you and is ready to be started.');
 
         $message->action('View Details', Utils::consoleUrl('', ['shift' => 'fleet-ops/orders/view/' . $this->order->public_id]));
 

package/server/src/Notifications/OrderPing.php

@@ -95,6 +95,26 @@ class OrderPing extends Notification implements ShouldQueue
         ];
     }
 
+    /**
+     * Get notification as array.
+     *
+     * @return void
+     */
+    public function toArray()
+    {
+        $order = new OrderResource($this->order);
+
+        return [
+            'title' => 'New incoming order!',
+            'body'  => $this->distance ? 'New order available for pickup about ' . Utils::formatMeters($this->distance, false) . ' away' : 'New order is available for pickup.',
+            'data'  => [
+                'id'    => $this->order->public_id,
+                'type'  => 'order_ping',
+                'order' => $order->toWebhookPayload(),
+            ],
+        ];
+    }
+
     /**
      * Get the broadcastable representation of the notification.
      *

package/server/src/Support/DistanceMatrix.php

@@ -17,9 +17,9 @@ namespace Fleetbase\FleetOps\Support;
 class DistanceMatrix
 {
     public ?float $distance;
-    public ?int $time;
+    public ?float $time;
 
-    public function __construct(?float $distance, ?int $time)
+    public function __construct(?float $distance, ?float $time)
     {
         $this->distance = $distance;
         $this->time     = $time;

package/server/src/Support/Utils.php

@@ -783,8 +783,8 @@ class Utils extends FleetbaseUtils
             ]
         )->json();
 
-        $distance = data_get($response, 'rows.0.elements.0.distance.value');
-        $time     = data_get($response, 'rows.0.elements.0.duration.value');
+        $distance = (float) data_get($response, 'rows.0.elements.0.distance.value', 0);
+        $time     = (float) data_get($response, 'rows.0.elements.0.duration.value', 0);
 
         $result = static::createObject(
             [
@@ -812,7 +812,7 @@ class Utils extends FleetbaseUtils
         $destination = static::getPointFromMixed($destination);
 
         $distance = Utils::vincentyGreatCircleDistance($origin, $destination);
-        $time     = round($distance / 100) * self::DRIVING_TIME_MULTIPLIER;
+        $time     = (float) round($distance / 100) * self::DRIVING_TIME_MULTIPLIER;
 
         return new DistanceMatrix($distance, $time);
     }