@fleetbase/fleetops-engine 0.4.11 → 0.4.13

package/server/src/Models/Vehicle.php

@@ -6,6 +6,7 @@ use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+use Fleetbase\Models\File;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasMetaAttributes;
@@ -165,7 +166,7 @@ class Vehicle extends Model
      */
     public function photo()
     {
-        return $this->belongsTo(\Fleetbase\Models\File::class);
+        return $this->belongsTo(File::class);
     }
 
     /**
@@ -237,20 +238,6 @@ class Vehicle extends Model
         return $displayName;
     }
 
-    /**
-     * Get avatar url.
-     *
-     * @return string|null
-     */
-    public function getAvatarUrlAttribute($value)
-    {
-        if (!$value) {
-            return static::getAvatar();
-        }
-
-        return $value;
-    }
-
     /**
      * Get the driver's name assigned to vehicle.
      *
@@ -317,15 +304,40 @@ class Vehicle extends Model
         return $modelAttributes;
     }
 
+    /**
+     * Get avatar url.
+     *
+     * @return string|null
+     */
+    public function getAvatarUrlAttribute($value)
+    {
+        if (!$value) {
+            return static::getAvatar();
+        }
+
+        if (Str::isUuid($value)) {
+            return static::getAvatar($value);
+        }
+
+        return $value;
+    }
+
     /**
      * Get an avatar url by key.
      *
      * @param string $key
-     *
-     * @return string
      */
-    public static function getAvatar($key = 'mini_bus')
+    public static function getAvatar($key = 'mini_bus'): ?string
     {
+        if (Str::isUuid($key)) {
+            $file = File::where('uuid', $key)->first();
+            if ($file) {
+                return $file->url;
+            }
+
+            return null;
+        }
+
         return static::getAvatarOptions()->get($key);
     }
 
@@ -367,13 +379,25 @@ class Vehicle extends Model
             'taxi.svg',
         ];
 
-        return collect($options)->mapWithKeys(
+        // Get custom avatars
+        $customAvatars = collect(File::where('type', 'vehicle-avatar')->get()->mapWithKeys(
+            function ($file) {
+                $key = str_replace(['.svg', '.png'], '', 'Custom: ' . $file->original_filename);
+
+                return [$key => $file->uuid];
+            }
+        )->toArray());
+
+        // Create default avatars included from fleetbase
+        $avatars = collect($options)->mapWithKeys(
             function ($option) {
-                $key = str_replace('.svg', '', $option);
+                $key = str_replace(['.svg', '.png'], '', $option);
 
                 return [$key => Utils::assetFromS3('static/vehicle-icons/' . $option)];
             }
         );
+
+        return $customAvatars->merge($avatars);
     }
 
     /**

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;
@@ -74,6 +75,28 @@ class OrderAssigned 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' => '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(),
+            ],
         ];
     }
 

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/routes.php

@@ -264,6 +264,7 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                             'drivers',
                             function ($router, $controller) {
                                 $router->get('statuses', $controller('statuses'));
+                                $router->get('avatars', $controller('avatars'));
                                 $router->get('export', $controller('export'));
                                 $router->delete('bulk-delete', $controller('bulkDelete'));
                             }
@@ -310,6 +311,7 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                                 $router->get('label/{id}', $controller('label'));
                                 $router->get('next-activity/{id}', $controller('nextActivity'));
                                 $router->post('process-imports', $controller('importFromFiles'));
+                                $router->patch('route/{id}', $controller('editOrderRoute'));
                                 $router->patch('update-activity/{id}', $controller('updateActivity'));
                                 $router->patch('bulk-cancel', $controller('bulkCancel'));
                                 $router->patch('cancel', $controller('cancel'));
@@ -324,6 +326,7 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                             function ($router, $controller) {
                                 $router->get('search', $controller('search'))->middleware('cache.headers:private;max_age=3600');
                                 $router->get('lookup', $controller('geocode'))->middleware('cache.headers:private;max_age=3600');
+                                $router->get('avatars', $controller('avatars'));
                                 $router->get('export', $controller('export'));
                                 $router->delete('bulk-delete', $controller('bulkDelete'));
                             }

package/translations/en-us.yaml

@@ -95,6 +95,11 @@ fleet-ops:
     back: Back
 
   component:
+    avatar-picker:
+      avatar: Avatar
+      select-map-avatar: Select map avatar
+      select-avatar-rendering: Select an avatar to be used for rendering on maps when using geolocation tracking features.
+      select-avatar: Select avatar
     admin:
       navigator-app:
         title: Navigator App
@@ -104,6 +109,12 @@ fleet-ops:
         title: Visibility Controls
         message: Visibility controls allow you to disable sections of Fleet-Ops. Toggle the checkbox to enable or disable sections to hide in Fleet-ops.
         checkbox-text: Enable or disable visibility for this section in Fleet-Ops.
+      avatar-management:
+        upload-avatar: Upload Avatar
+        view-avatar: View Avatar
+        vehicles : Vehicles
+        drivers : Drivers
+        places : Places
     cell:
       driver-name:
         not-assigned: No driver assigned
@@ -524,6 +535,7 @@ fleet-ops:
         show-less: Show less details
         show-more: Show more details
       schedule-card:
+        destination: Destination
         unassign-driver: Unassign Driver?
         unassign-text: You are about to unassign the driver for Order {orderId}. Click continue to confirm removal of driver.
         unassign-button: Continue and unassign driver
@@ -531,11 +543,11 @@ fleet-ops:
         assign-text: You are about to assign a new driver ({driverName}) to Order {orderId}. Click continue to confirm driver.
         assign-button: Continue and assign driver
         date: Date scheduled
-        driver-assigned: Driver Assigned
-        no-driver: No Driver Assigned
+        driver-assigned: Driver
+        no-driver: No Driver
         select-driver: Select Driver
-        vehicle-assigned: Vehicle Assigned
-        no-vehicle: No Vehicle Assigned
+        vehicle-assigned: Vehicle
+        no-vehicle: No Vehicle
     widget:
       fleet-ops-quickstart:
         message: Let's see what you can do to jumpstart operations...