@fleetbase/fleetops-engine 0.4.8 → 0.4.10

package/server/src/Models/Payload.php

@@ -562,7 +562,7 @@ class Payload extends Model
     /**
      * Get the pickup location for the payload.
      *
-     * @return \Fleetbase\LaravelMysqlSpatial\Types\Point
+     * @return Point
      */
     public function getPickupLocation()
     {
@@ -653,8 +653,8 @@ class Payload extends Model
     /**
      * Set the first waypoint and update activity.
      *
-     * @param array                                      $activity
-     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point $location
+     * @param array $activity
+     * @param Point $location
      *
      * @return void
      */
@@ -682,9 +682,9 @@ class Payload extends Model
     /**
      * Update the current waypoint activity and it's entities.
      *
-     * @param array                                      $activity
-     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point $location
-     * @param \Fleetbase\Models\Proof|string|null        $proof    resolvable proof of delivery/activity
+     * @param array                               $activity
+     * @param Point                               $location
+     * @param \Fleetbase\Models\Proof|string|null $proof    resolvable proof of delivery/activity
      *
      * @return $this
      */
@@ -743,14 +743,14 @@ class Payload extends Model
         $order = $this->order;
 
         // set google matrix based distance and time
-        if ($order instanceof \Fleetbase\FleetOps\Models\Order) {
+        if ($order instanceof Order) {
             return $order->setDistanceAndTime();
         }
 
         return null;
     }
 
-    public function findDestinationFromKey(string $destinationKey = null): ?Place
+    public function findDestinationFromKey(?string $destinationKey = null): ?Place
     {
         if ($destinationKey === null) {
             return null;

package/server/src/Models/Place.php

@@ -179,7 +179,7 @@ class Place extends Model
     /**
      * Fills empty address attributes with Google address attributes.
      *
-     * @return \Fleetbase\FleetOps\Models\Place $this
+     * @return Place $this
      */
     public function fillWithGoogleAddress(\Geocoder\Provider\GoogleMaps\Model\GoogleAddress $address): Place
     {

package/server/src/Models/ServiceArea.php

@@ -18,8 +18,8 @@ use Fleetbase\Traits\TracksApiCredential;
 use Illuminate\Support\Arr;
 
 /**
- * @var \Fleetbase\LaravelMysqlSpatial\Types\Point        $location
- * @var \Fleetbase\LaravelMysqlSpatial\Types\MultiPolygon $border
+ * @var Point        $location
+ * @var MultiPolygon $border
  */
 class ServiceArea extends Model
 {
@@ -130,10 +130,10 @@ class ServiceArea extends Model
     /**
      * Creates a polygon from a given point and radius.
      *
-     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point $point  the central point from which to create the polygon
-     * @param int                                        $meters The radius in meters for the polygon. Default is 500 meters.
+     * @param Point $point  the central point from which to create the polygon
+     * @param int   $meters The radius in meters for the polygon. Default is 500 meters.
      *
-     * @return \Fleetbase\LaravelMysqlSpatial\Types\Polygon returns a Polygon object
+     * @return Polygon returns a Polygon object
      */
     public static function createPolygonFromPoint(Point $point, int $meters = 500): Polygon
     {
@@ -150,10 +150,10 @@ class ServiceArea extends Model
     /**
      * Creates a multi-polygon from a given point and radius.
      *
-     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point $point  the central point from which to create the multi-polygon
-     * @param int                                        $meters The radius in meters for the multi-polygon. Default is 500 meters.
+     * @param Point $point  the central point from which to create the multi-polygon
+     * @param int   $meters The radius in meters for the multi-polygon. Default is 500 meters.
      *
-     * @return \Fleetbase\LaravelMysqlSpatial\Types\MultiPolygon returns a MultiPolygon object
+     * @return MultiPolygon returns a MultiPolygon object
      */
     public static function createMultiPolygonFromPoint(Point $point, int $meters = 500): MultiPolygon
     {
@@ -180,7 +180,7 @@ class ServiceArea extends Model
     /**
      * Retrieves the location attribute as a point.
      *
-     * @return \Fleetbase\LaravelMysqlSpatial\Types\Point returns the centroid of the border as a Point object
+     * @return Point returns the centroid of the border as a Point object
      */
     public function getLocationAttribute(): Point
     {

package/server/src/Models/ServiceRate.php

@@ -378,7 +378,7 @@ class ServiceRate extends Model
      *
      * @return array an array of applicable service rates
      */
-    public static function getServicableForWaypoints($waypoints = [], \Closure $queryCallback = null): array
+    public static function getServicableForWaypoints($waypoints = [], ?\Closure $queryCallback = null): array
     {
         $reader                 = new GeoJSONReader();
         $applicableServiceRates = [];
@@ -440,7 +440,7 @@ class ServiceRate extends Model
      *
      * @return array an array of applicable service rates
      */
-    public static function getServicableForPlaces($places = [], $service = null, $currency = null, \Closure $queryCallback = null): array
+    public static function getServicableForPlaces($places = [], $service = null, $currency = null, ?\Closure $queryCallback = null): array
     {
         $reader                 = new GeoJSONReader();
         $applicableServiceRates = [];

package/server/src/Models/TrackingNumber.php

@@ -223,7 +223,7 @@ class TrackingNumber extends Model
         throw (new \Illuminate\Database\Eloquent\ModelNotFoundException())->setModel(static::class, $id);
     }
 
-    public function updateOwnerStatus(TrackingStatus $trackingStatus = null)
+    public function updateOwnerStatus(?TrackingStatus $trackingStatus = null)
     {
         $trackingStatus = $trackingStatus ?? $this->load(['status'])->getRelationValue('status');
         // update status on owner
@@ -239,7 +239,7 @@ class TrackingNumber extends Model
         return $this;
     }
 
-    public static function insertGetUuid($values = [], Model $owner = null)
+    public static function insertGetUuid($values = [], ?Model $owner = null)
     {
         $instance   = new static();
         $fillable   = $instance->getFillable();

package/server/src/Models/TrackingStatus.php

@@ -144,7 +144,7 @@ class TrackingStatus extends Model
         return $string;
     }
 
-    public static function insertGetUuid($values = [], TrackingNumber $trackingNumber = null)
+    public static function insertGetUuid($values = [], ?TrackingNumber $trackingNumber = null)
     {
         $instance   = new static();
         $fillable   = $instance->getFillable();

package/server/src/Models/Vehicle.php

@@ -392,11 +392,11 @@ class Vehicle extends Model
      * Updates the position of the vehicle, creating a new Position record if
      * the driver has moved more than 100 meters or if it's their first recorded position.
      *
-     * @param \Fleetbase\FleetOps\Models\Order|null $order The order to consider when updating the position (default: null)
+     * @param Order|null $order The order to consider when updating the position (default: null)
      *
-     * @return \Fleetbase\FleetOps\Models\Position|null The created Position object, or null if no new position was created
+     * @return Position|null The created Position object, or null if no new position was created
      */
-    public function updatePositionWithOrderContext(Order $order = null): ?Position
+    public function updatePositionWithOrderContext(?Order $order = null): ?Position
     {
         $position     = null;
         $lastPosition = $this->positions()->whereCompanyUuid(session('company'))->latest()->first();

package/server/src/Models/Waypoint.php

@@ -182,7 +182,7 @@ class Waypoint extends Model
         return data_get($this, 'trackingNumber.last_status_code');
     }
 
-    public static function insertGetUuid($values = [], Payload $payload = null)
+    public static function insertGetUuid($values = [], ?Payload $payload = null)
     {
         $instance   = new static();
         $fillable   = $instance->getFillable();

package/server/src/Models/Zone.php

@@ -104,7 +104,7 @@ class Zone extends Model
     /**
      * Retrieves the location attribute as a point.
      *
-     * @return \Fleetbase\LaravelMysqlSpatial\Types\Point returns the centroid of the border as a Point object
+     * @return Point returns the centroid of the border as a Point object
      */
     public function getLocationAttribute(): Point
     {
@@ -195,10 +195,10 @@ class Zone extends Model
     /**
      * Creates a polygon from a given point and radius.
      *
-     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point $point  the central point from which to create the polygon
-     * @param int                                        $meters The radius in meters for the polygon. Default is 500 meters.
+     * @param Point $point  the central point from which to create the polygon
+     * @param int   $meters The radius in meters for the polygon. Default is 500 meters.
      *
-     * @return \Fleetbase\LaravelMysqlSpatial\Types\Polygon returns a Polygon object
+     * @return Polygon returns a Polygon object
      */
     public static function createPolygonFromPoint(Point $point, int $meters = 500): Polygon
     {

package/server/src/Notifications/OrderAssigned.php

@@ -13,11 +13,7 @@ use NotificationChannels\Apn\ApnChannel;
 use NotificationChannels\Apn\ApnMessage;
 use NotificationChannels\Fcm\FcmChannel;
 use NotificationChannels\Fcm\FcmMessage;
-use NotificationChannels\Fcm\Resources\AndroidConfig;
-use NotificationChannels\Fcm\Resources\AndroidFcmOptions;
-use NotificationChannels\Fcm\Resources\AndroidNotification;
-use NotificationChannels\Fcm\Resources\ApnsConfig;
-use NotificationChannels\Fcm\Resources\ApnsFcmOptions;
+use NotificationChannels\Fcm\Resources\Notification as FcmNotification;
 
 class OrderAssigned extends Notification implements ShouldQueue
 {
@@ -84,7 +80,7 @@ class OrderAssigned extends Notification implements ShouldQueue
     /**
      * Get the mail representation of the notification.
      *
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
@@ -108,27 +104,26 @@ class OrderAssigned extends Notification implements ShouldQueue
      */
     public function toFcm($notifiable)
     {
-        $notification = \NotificationChannels\Fcm\Resources\Notification::create()
-            ->setTitle('New order ' . $this->order->public_id . ' assigned!')
-            ->setBody('You have a new order assigned, tap for details.');
-
-        if ($this->order->isScheduled) {
-            $notification->setBody('You have a new order scheduled for ' . $this->order->scheduled_at);
-        }
-
-        $message = FcmMessage::create()
-            ->setData(['id' => $this->order->public_id, 'type' => 'order_assigned'])
-            ->setNotification($notification)
-            ->setAndroid(
-                AndroidConfig::create()
-                    ->setFcmOptions(AndroidFcmOptions::create()->setAnalyticsLabel('analytics'))
-                    ->setNotification(AndroidNotification::create()->setColor('#4391EA'))
-            )->setApns(
-                ApnsConfig::create()
-                    ->setFcmOptions(ApnsFcmOptions::create()->setAnalyticsLabel('analytics_ios'))
-            );
-
-        return $message;
+        return (new FcmMessage(notification: new FcmNotification(
+            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'])
+        ->custom([
+            'android' => [
+                'notification' => [
+                    'color' => '#4391EA',
+                ],
+                'fcm_options' => [
+                    'analytics_label' => 'analytics',
+                ],
+            ],
+            'apns' => [
+                'fcm_options' => [
+                    'analytics_label' => 'analytics',
+                ],
+            ],
+        ]);
     }
 
     /**

package/server/src/Notifications/OrderCanceled.php

@@ -13,11 +13,7 @@ use NotificationChannels\Apn\ApnChannel;
 use NotificationChannels\Apn\ApnMessage;
 use NotificationChannels\Fcm\FcmChannel;
 use NotificationChannels\Fcm\FcmMessage;
-use NotificationChannels\Fcm\Resources\AndroidConfig;
-use NotificationChannels\Fcm\Resources\AndroidFcmOptions;
-use NotificationChannels\Fcm\Resources\AndroidNotification;
-use NotificationChannels\Fcm\Resources\ApnsConfig;
-use NotificationChannels\Fcm\Resources\ApnsFcmOptions;
+use NotificationChannels\Fcm\Resources\Notification as FcmNotification;
 
 class OrderCanceled extends Notification implements ShouldQueue
 {
@@ -84,7 +80,7 @@ class OrderCanceled extends Notification implements ShouldQueue
     /**
      * Get the mail representation of the notification.
      *
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
@@ -105,23 +101,26 @@ class OrderCanceled extends Notification implements ShouldQueue
      */
     public function toFcm($notifiable)
     {
-        $notification = \NotificationChannels\Fcm\Resources\Notification::create()
-            ->setTitle('Order ' . $this->order->public_id . ' was canceled')
-            ->setBody('No further action is necessary.');
-
-        $message = FcmMessage::create()
-            ->setData(['id' => $this->order->public_id, 'type' => 'order_canceled'])
-            ->setNotification($notification)
-            ->setAndroid(
-                AndroidConfig::create()
-                    ->setFcmOptions(AndroidFcmOptions::create()->setAnalyticsLabel('analytics'))
-                    ->setNotification(AndroidNotification::create()->setColor('#4391EA'))
-            )->setApns(
-                ApnsConfig::create()
-                    ->setFcmOptions(ApnsFcmOptions::create()->setAnalyticsLabel('analytics_ios'))
-            );
-
-        return $message;
+        return (new FcmMessage(notification: new FcmNotification(
+            title: 'Order ' . $this->order->public_id . ' was canceled',
+            body: 'No further action is necessary.',
+        )))
+        ->data(['id' => $this->order->public_id, 'type' => 'order_canceled'])
+        ->custom([
+            'android' => [
+                'notification' => [
+                    'color' => '#4391EA',
+                ],
+                'fcm_options' => [
+                    'analytics_label' => 'analytics',
+                ],
+            ],
+            'apns' => [
+                'fcm_options' => [
+                    'analytics_label' => 'analytics',
+                ],
+            ],
+        ]);
     }
 
     /**

package/server/src/Notifications/OrderDispatchFailed.php

@@ -84,7 +84,7 @@ class OrderDispatchFailed extends Notification implements ShouldQueue
     /**
      * Get the mail representation of the notification.
      *
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {

package/server/src/Notifications/OrderDispatched.php

@@ -16,11 +16,7 @@ use NotificationChannels\Apn\ApnChannel;
 use NotificationChannels\Apn\ApnMessage;
 use NotificationChannels\Fcm\FcmChannel;
 use NotificationChannels\Fcm\FcmMessage;
-use NotificationChannels\Fcm\Resources\AndroidConfig;
-use NotificationChannels\Fcm\Resources\AndroidFcmOptions;
-use NotificationChannels\Fcm\Resources\AndroidNotification;
-use NotificationChannels\Fcm\Resources\ApnsConfig;
-use NotificationChannels\Fcm\Resources\ApnsFcmOptions;
+use NotificationChannels\Fcm\Resources\Notification as FcmNotification;
 
 class OrderDispatched extends Notification implements ShouldQueue
 {
@@ -129,7 +125,7 @@ class OrderDispatched extends Notification implements ShouldQueue
     /**
      * Get the mail representation of the notification.
      *
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
@@ -149,23 +145,26 @@ class OrderDispatched extends Notification implements ShouldQueue
      */
     public function toFcm($notifiable)
     {
-        $notification = \NotificationChannels\Fcm\Resources\Notification::create()
-            ->setTitle('Order ' . $this->order->public_id . ' has been dispatched!')
-            ->setBody('An order has just been dispatched to you and is ready to be started.');
-
-        $message = FcmMessage::create()
-            ->setData(['id' => $this->order->public_id, 'type' => 'order_dispatched'])
-            ->setNotification($notification)
-            ->setAndroid(
-                AndroidConfig::create()
-                    ->setFcmOptions(AndroidFcmOptions::create()->setAnalyticsLabel('analytics'))
-                    ->setNotification(AndroidNotification::create()->setColor('#4391EA'))
-            )->setApns(
-                ApnsConfig::create()
-                    ->setFcmOptions(ApnsFcmOptions::create()->setAnalyticsLabel('analytics_ios'))
-            );
-
-        return $message;
+        return (new FcmMessage(notification: new FcmNotification(
+            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'])
+        ->custom([
+            'android' => [
+                'notification' => [
+                    'color' => '#4391EA',
+                ],
+                'fcm_options' => [
+                    'analytics_label' => 'analytics',
+                ],
+            ],
+            'apns' => [
+                'fcm_options' => [
+                    'analytics_label' => 'analytics',
+                ],
+            ],
+        ]);
     }
 
     /**

package/server/src/Notifications/OrderPing.php

@@ -15,11 +15,7 @@ use NotificationChannels\Apn\ApnChannel;
 use NotificationChannels\Apn\ApnMessage;
 use NotificationChannels\Fcm\FcmChannel;
 use NotificationChannels\Fcm\FcmMessage;
-use NotificationChannels\Fcm\Resources\AndroidConfig;
-use NotificationChannels\Fcm\Resources\AndroidFcmOptions;
-use NotificationChannels\Fcm\Resources\AndroidNotification;
-use NotificationChannels\Fcm\Resources\ApnsConfig;
-use NotificationChannels\Fcm\Resources\ApnsFcmOptions;
+use NotificationChannels\Fcm\Resources\Notification as FcmNotification;
 
 class OrderPing extends Notification implements ShouldQueue
 {
@@ -138,23 +134,26 @@ class OrderPing extends Notification implements ShouldQueue
      */
     public function toFcm($notifiable)
     {
-        $notification = \NotificationChannels\Fcm\Resources\Notification::create()
-            ->setTitle('New incoming order!')
-            ->setBody($this->distance ? 'New order available for pickup about ' . Utils::formatMeters($this->distance, false) . ' away' : 'New order is available for pickup.');
-
-        $message = FcmMessage::create()
-            ->setData(['id' => $this->order->public_id, 'type' => 'order_ping'])
-            ->setNotification($notification)
-            ->setAndroid(
-                AndroidConfig::create()
-                    ->setFcmOptions(AndroidFcmOptions::create()->setAnalyticsLabel('analytics'))
-                    ->setNotification(AndroidNotification::create()->setColor('#4391EA'))
-            )->setApns(
-                ApnsConfig::create()
-                    ->setFcmOptions(ApnsFcmOptions::create()->setAnalyticsLabel('analytics_ios'))
-            );
-
-        return $message;
+        return (new FcmMessage(notification: new FcmNotification(
+            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'])
+        ->custom([
+            'android' => [
+                'notification' => [
+                    'color' => '#4391EA',
+                ],
+                'fcm_options' => [
+                    'analytics_label' => 'analytics',
+                ],
+            ],
+            'apns' => [
+                'fcm_options' => [
+                    'analytics_label' => 'analytics',
+                ],
+            ],
+        ]);
     }
 
     /**

package/server/src/Notifications/OrderSplit.php

@@ -55,7 +55,7 @@ class OrderSplit extends Notification
     /**
      * Get the mail representation of the notification.
      *
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {

package/server/src/Support/Flow.php

@@ -47,7 +47,7 @@ class Flow
         $authored = $authoredQuery->get();
 
         // create array of configs
-        /** @var \Illuminate\Support\Collection $configs */
+        /** @var Collection $configs */
         $configs = collect([...$installedExtensions, ...$authored]);
 
         // if no installed configs always place default config
@@ -79,7 +79,7 @@ class Flow
         $authored = Extension::where(['author_uuid' => session('company'), 'meta_type' => 'order_config', 'status' => 'private'])->get();
 
         // create array of configs
-        /** @var \Illuminate\Support\Collection $configs */
+        /** @var Collection $configs */
         $configs = collect([...$installedExtensions, ...$authored]);
 
         // if no installed configs always place default config
@@ -111,7 +111,7 @@ class Flow
         $authored = Extension::where(['author_uuid' => $order->company_uuid, 'meta_type' => 'order_config', 'status' => 'private'])->get();
 
         // create array of configs
-        /** @var \Illuminate\Support\Collection $configs */
+        /** @var Collection $configs */
         $configs = collect([...$installedExtensions, ...$authored]);
 
         // if no installed configs always place default config
@@ -259,7 +259,7 @@ class Flow
     /**
      * Returns a order flow status for the waypoint only.
      */
-    public static function getOrderWaypointFlow(Order $order, Waypoint $waypoint = null): ?array
+    public static function getOrderWaypointFlow(Order $order, ?Waypoint $waypoint = null): ?array
     {
         if ($waypoint === null) {
             /** @var \Fleetbase\Models\Waypoint $waypoint */
@@ -293,7 +293,7 @@ class Flow
     /**
      * Returns a order flow status for the waypoint only.
      */
-    public static function getOrderFlowVars(Order $order, Waypoint $currentWaypoint = null): ?array
+    public static function getOrderFlowVars(Order $order, ?Waypoint $currentWaypoint = null): ?array
     {
         $vars         = [];
         $allWaypoints = data_get($order, 'payload.waypoints', collect());
@@ -603,7 +603,7 @@ class Flow
 
     public static function getAllDefaultOrderConfigs(): Collection
     {
-        /** @var \Illuminate\Support\Collection $extensions */
+        /** @var Collection $extensions */
         $extensions             = collect();
         $company                = static::getCompanySession();
         $orderConfigs           = config('api.types.order', []);

package/server/src/Support/Geocoding.php

@@ -125,7 +125,7 @@ class Geocoding
      *
      * @throws \Exception
      */
-    public static function reverseFromCoordinates($latitude, $longitude, string $searchQuery = null): Collection
+    public static function reverseFromCoordinates($latitude, $longitude, ?string $searchQuery = null): Collection
     {
         $httpClient = new Client();
         $provider   = new GoogleMaps($httpClient, null, config('services.google_maps.api_key', env('GOOGLE_MAPS_API_KEY')));

package/server/src/Support/IntegratedVendors.php

@@ -169,7 +169,7 @@ class ResolvedIntegratedVendor
         return json_encode($this->toArray());
     }
 
-    public function callback(string $callback = null, ...$callbackParams)
+    public function callback(?string $callback = null, ...$callbackParams)
     {
         if (!is_string($callback)) {
             return;