@fleetbase/fleetops-engine 0.4.7 → 0.4.9

package/addon/services/location.js

@@ -93,14 +93,16 @@ export default class LocationService extends Service {
 
             if (isArray(coordinates)) {
                 const validCoordinates = coordinates.filter((point) => point.coordinates[0] !== 0);
-                const [longitude, latitude] = getWithDefault(validCoordinates, '0.coordinates', [0, 0]);
-                const coordinates = {
-                    latitude,
-                    longitude,
-                };
-
-                this.updateLocation(coordinates);
-                return coordinates;
+                if (validCoordinates) {
+                    const [longitude, latitude] = getWithDefault(validCoordinates, '0.coordinates', [0, 0]);
+                    const userCoordinates = {
+                        latitude,
+                        longitude,
+                    };
+
+                    this.updateLocation(userCoordinates);
+                    return userCoordinates;
+                }
             }
 
             return this.getUserLocationFromWhois();

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.4.7",
+    "version": "0.4.9",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.0",
+        "fleetbase/core-api": "^1.4.3",
         "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.7",
+    "version": "0.4.9",
     "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.7",
+    "version": "0.4.9",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"

package/server/src/Casts/Point.php

@@ -106,8 +106,6 @@ class Point implements CastsAttributes
 
     /**
      * Check if the given data is a raw Point object.
-     *
-     * @return bool
      */
     public static function isRawPoint($data): bool
     {

package/server/src/Exceptions/IntegratedVendorException.php

@@ -32,7 +32,7 @@ class IntegratedVendorException extends \Exception implements Responsable
      * @param int                   $code             the exception code
      * @param \Throwable|null       $previous         the previous throwable used for the exception chaining
      */
-    public function __construct(string $message = '', IntegratedVendor $integratedVendor = null, string $triggerMethod = null, int $code = 400, \Throwable $previous = null)
+    public function __construct(string $message = '', ?IntegratedVendor $integratedVendor = null, ?string $triggerMethod = null, int $code = 400, ?\Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
         $this->integratedVendor = $integratedVendor;
@@ -44,7 +44,7 @@ class IntegratedVendorException extends \Exception implements Responsable
      *
      * @param \Illuminate\Http\Request $request
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function toResponse($request)
     {

package/server/src/Flow/Activity.php

@@ -1,12 +1,13 @@
-<?php 
+<?php
 
 namespace Fleetbase\FleetOps\Flow;
 
 use Fleetbase\Models\Model;
 
-class Activity {
+class Activity
+{
     protected string $status;
     protected string $code;
     protected string $details;
     protected Model $owner;
-}
+}

package/server/src/Flow/Config.php

@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 namespace Fleetbase\FleetOps\Flow;
 
-class Config {
-    
-}
+class Config
+{
+}

package/server/src/Flow/Logic.php

@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 namespace Fleetbase\FleetOps\Flow;
 
-class Logic {
-    
-}
+class Logic
+{
+}

package/server/src/Http/Controllers/Api/v1/DriverController.php

@@ -354,7 +354,7 @@ class DriverController extends Controller
     /**
      * Authenticates customer using login credentials and returns with auth token.
      *
-     * @return \Fleetbase\FleetOps\Http\Resources\v1\Driver
+     * @return DriverResource
      */
     public function login(Request $request)
     {
@@ -418,9 +418,11 @@ class DriverController extends Controller
 
         // generate verification token
         try {
-            VerificationCode::generateSmsVerificationFor($user, 'driver_login', function ($verification) use ($company) {
-                return 'Your ' . data_get($company, 'name', config('app.name')) . ' verification code is ' . $verification->code;
-            });
+            VerificationCode::generateSmsVerificationFor($user, 'driver_login', [
+                'messageCallback' => function ($verification) use ($company) {
+                    return 'Your ' . data_get($company, 'name', config('app.name')) . ' verification code is ' . $verification->code;
+                },
+            ]);
         } catch (\Throwable $e) {
             if (app()->bound('sentry')) {
                 app('sentry')->captureException($e);
@@ -435,7 +437,7 @@ class DriverController extends Controller
     /**
      * Verifys SMS code and sends auth token with customer resource.
      *
-     * @return \Fleetbase\FleetOps\Http\Resources\v1\Driver
+     * @return DriverResource
      */
     public function verifyCode(Request $request)
     {
@@ -489,11 +491,9 @@ class DriverController extends Controller
     }
 
     /**
-     * Gets the current organization/company for the driver
+     * Gets the current organization/company for the driver.
      *
-     * @param string $id
-     * @param \Illuminate\Http\Request $request
-     * @return \Fleetbase\Http\Resources\Organization
+     * @return Organization
      */
     public function currentOrganization(string $id, Request $request)
     {
@@ -521,7 +521,7 @@ class DriverController extends Controller
     /**
      * List organizations that driver is apart of.
      *
-     * @return \Fleetbase\Http\Resources\Organization
+     * @return Organization
      */
     public function listOrganizations(string $id, Request $request)
     {
@@ -546,7 +546,7 @@ class DriverController extends Controller
     /**
      * Allow driver to switch organization.
      *
-     * @return \Fleetbase\Http\Resources\Organization
+     * @return Organization
      */
     public function switchOrganization(string $id, SwitchOrganizationRequest $request)
     {
@@ -604,7 +604,7 @@ class DriverController extends Controller
         $order = $request->input('order');
 
         try {
-            /** @var \Fleetbase\FleetOps\Models\Driver $driver */
+            /** @var Driver $driver */
             $driver = Driver::findRecordOrFail($id, ['user']);
         } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
             return response()->json(
@@ -617,7 +617,7 @@ class DriverController extends Controller
 
         if ($order) {
             try {
-                /** @var \Fleetbase\FleetOps\Models\Order $order */
+                /** @var Order $order */
                 $order = Order::findRecordOrFail($order, ['payload']);
             } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
                 return response()->json(
@@ -720,9 +720,6 @@ class DriverController extends Controller
 
     /**
      * Get the drivers current company using their user account.
-     *
-     * @param \Fleetbase\Models\User $user
-     * @return \Fleetbase\Models\Company|null
      */
     private static function getDriverCompanyFromUser(User $user): ?Company
     {
@@ -747,7 +744,7 @@ class DriverController extends Controller
     /**
      * Patches phone number with international code.
      */
-    private static function phone(string $phone = null): string
+    private static function phone(?string $phone = null): string
     {
         if ($phone === null) {
             $phone = request()->input('phone');

package/server/src/Http/Controllers/Api/v1/OrderController.php

@@ -423,7 +423,7 @@ class OrderController extends Controller
     {
         $results = Order::queryWithRequest($request, function (&$query, $request) {
             $query->where('company_uuid', session('company'));
-            
+
             if ($request->has('payload')) {
                 $query->whereHas('payload', function ($q) use ($request) {
                     $q->where('public_id', $request->input('payload'));
@@ -691,7 +691,7 @@ class OrderController extends Controller
     /**
      * Schedules an order using date and time.
      *
-     * @param \Fleetbase\FleetOps\Http\Requests\ScheduleOrderRequest
+     * @param ScheduleOrderRequest
      *
      * @return \Fleetbase\Http\Resources\v1\Order
      */
@@ -835,7 +835,7 @@ class OrderController extends Controller
 
         // if instance of order is passed directly to this method
         if ($id instanceof Order) {
-            /** @var \Fleetbase\FleetOps\Models\Order $order */
+            /** @var Order $order */
             $order = $id;
         }
 
@@ -1112,7 +1112,7 @@ class OrderController extends Controller
      *
      * @return void
      */
-    public function captureQrScan(string $id, string $subjectId = null, Request $request)
+    public function captureQrScan(string $id, ?string $subjectId = null, Request $request)
     {
         $code    = $request->input('code');
         $data    = $request->input('data', []);
@@ -1183,7 +1183,7 @@ class OrderController extends Controller
      *
      * @return void
      */
-    public function captureSignature(string $id, string $subjectId = null, Request $request)
+    public function captureSignature(string $id, ?string $subjectId = null, Request $request)
     {
         $disk         = $request->input('disk', config('filesystems.default'));
         $bucket       = $request->input('bucket', config('filesystems.disks.' . $disk . '.bucket', config('filesystems.disks.s3.bucket')));

package/server/src/Http/Controllers/Api/v1/TrackingNumberController.php

@@ -115,7 +115,7 @@ class TrackingNumberController extends Controller
     /**
      * Take the uuid value of an entity QR code and return the object.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
      * @return \Illuminate\Http\Response
      */

package/server/src/Http/Controllers/Internal/v1/DriverController.php

@@ -116,7 +116,7 @@ class DriverController extends FleetOpsController
                         CompanyUser::create([
                             'user_uuid'    => $existingUser->uuid,
                             'company_uuid' => $company->uuid,
-                            'status'       => $isOrganizationMember ? 'active' : 'pending'
+                            'status'       => $isOrganizationMember ? 'active' : 'pending',
                         ]);
                     }
 
@@ -397,9 +397,11 @@ class DriverController extends FleetOpsController
         }
 
         // Generate verification token
-        VerificationCode::generateSmsVerificationFor($user, 'driver_login', function ($verification) {
-            return 'Your ' . config('app.name') . ' verification code is ' . $verification->code;
-        });
+        VerificationCode::generateSmsVerificationFor($user, 'driver_login', [
+            'messageCallback' => function ($verification) {
+                return 'Your ' . config('app.name') . ' verification code is ' . $verification->code;
+            },
+        ]);
 
         return response()->json(['status' => 'OK']);
     }
@@ -453,7 +455,7 @@ class DriverController extends FleetOpsController
     /**
      * Patches phone number with international code.
      */
-    public static function phone(string $phone = null): string
+    public static function phone(?string $phone = null): string
     {
         if ($phone === null) {
             $phone = request()->input('phone');

package/server/src/Http/Controllers/Internal/v1/FleetOpsLookupController.php

@@ -16,7 +16,7 @@ class FleetOpsLookupController extends Controller
     /**
      * Returns a collection of polymorphic resources as JSON.
      *
-     * @param \Illuminate\Http\Request $request the HTTP request object
+     * @param Request $request the HTTP request object
      *
      * @return \Illuminate\Http\Response the JSON response with the polymorphic resources
      */

package/server/src/Http/Controllers/Internal/v1/GeocoderController.php

@@ -13,7 +13,7 @@ class GeocoderController extends Controller
     /**
      * Reverse geocodes the given coordinates and returns the results as JSON.
      *
-     * @param \Illuminate\Http\Request $request the HTTP request object
+     * @param Request $request the HTTP request object
      *
      * @return \Illuminate\Http\Response the JSON response with the geocoded results
      */
@@ -57,7 +57,7 @@ class GeocoderController extends Controller
     /**
      * Geocodes the given query and returns the results as JSON.
      *
-     * @param \Illuminate\Http\Request $request the HTTP request object
+     * @param Request $request the HTTP request object
      *
      * @return \Illuminate\Http\Response the JSON response with the geocoded results
      */

package/server/src/Http/Controllers/Internal/v1/MetricsController.php

@@ -11,7 +11,6 @@ class MetricsController extends Controller
     /**
      * Gets all key metrics for the current session.
      *
-     * @param \Illuminate\Http\Request $request
      * @return \Illuminate\Http\Response
      */
     public function all(Request $request)

package/server/src/Http/Controllers/Internal/v1/OrderController.php

@@ -94,7 +94,7 @@ class OrderController extends FleetOpsController
 
                     // If order creation includes files assosciate each to this order
                     if ($uploads) {
-                        $ids = collect($uploads)->pluck('uuid');
+                        $ids   = collect($uploads)->pluck('uuid');
                         $files = File::whereIn('uuid', $ids)->get();
 
                         foreach ($files as $file) {
@@ -339,7 +339,7 @@ class OrderController extends FleetOpsController
     public function start(Request $request)
     {
         /**
-         * @var \Fleetbase\FleetOps\Models\Order
+         * @var Order
          */
         $order = Order::where('uuid', $request->input('order'))->withoutGlobalScopes()->first();
 
@@ -352,12 +352,12 @@ class OrderController extends FleetOpsController
         }
 
         /**
-         * @var \Fleetbase\FleetOps\Models\Driver
+         * @var Driver
          */
         $driver = Driver::where('uuid', $order->driver_assigned_uuid)->withoutGlobalScopes()->first();
 
         /**
-         * @var \Fleetbase\FleetOps\Models\Payload
+         * @var Payload
          */
         $payload = Payload::where('uuid', $order->payload_uuid)->withoutGlobalScopes()->with(['waypoints', 'waypointMarkers', 'entities'])->first();
 

package/server/src/Http/Resources/v1/Order.php

@@ -3,8 +3,8 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\FleetOps\Support\Utils;
-use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Http\Resources\Comment;
+use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
 use Fleetbase\Support\Resolve;
 

package/server/src/Http/Resources/v1/ServiceQuoteItem.php

@@ -17,13 +17,13 @@ class ServiceQuoteItem extends FleetbaseResource
     public function toArray($request)
     {
         return [
-            'id'                => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid'              => $this->when(Http::isInternalRequest(), $this->uuid),
+            'id'                 => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'               => $this->when(Http::isInternalRequest(), $this->uuid),
             'service_quote_uuid' => $this->when(Http::isInternalRequest(), $this->service_quote_uuid),
-            'amount'       => $this->amount,
-            'currency'     => $this->currency,
-            'details'      => $this->details,
-            'code'         => $this->code,
+            'amount'             => $this->amount,
+            'currency'           => $this->currency,
+            'details'            => $this->details,
+            'code'               => $this->code,
         ];
     }
 }

package/server/src/Imports/OrdersImport.php

@@ -9,7 +9,7 @@ use Maatwebsite\Excel\Concerns\WithHeadingRow;
 class OrdersImport implements ToCollection, WithHeadingRow
 {
     /**
-     * @return \Illuminate\Support\Collection
+     * @return Collection
      */
     public function collection(Collection $rows)
     {

package/server/src/Integrations/Lalamove/Lalamove.php

@@ -76,7 +76,7 @@ class Lalamove
      */
     private ?IntegratedVendor $integratedVendor = null;
 
-    public function __construct(string $apiKey = null, string $apiSecret = null, bool $sandbox = false, $market = null)
+    public function __construct(?string $apiKey = null, ?string $apiSecret = null, bool $sandbox = false, $market = null)
     {
         if ($apiKey === null) {
             $apiKey = config('services.lalamove.key');
@@ -109,7 +109,7 @@ class Lalamove
         );
     }
 
-    public static function instance(string $apiKey = null, string $apiSecret = null, bool $sandbox = false, $market = null): Lalamove
+    public static function instance(?string $apiKey = null, ?string $apiSecret = null, bool $sandbox = false, $market = null): Lalamove
     {
         return new static($apiKey, $apiSecret, $market, $sandbox);
     }
@@ -169,7 +169,7 @@ class Lalamove
         return $this;
     }
 
-    public static function createServiceQuoteFromQuotation($quotation, $requestId = null, $integratedVendor = null, Payload $payload = null): ServiceQuote
+    public static function createServiceQuoteFromQuotation($quotation, $requestId = null, $integratedVendor = null, ?Payload $payload = null): ServiceQuote
     {
         $serviceQuote = static::serviceQuoteFromQuotation($quotation, $requestId, $integratedVendor, $payload);
         $serviceQuote->save();
@@ -182,7 +182,7 @@ class Lalamove
         return $serviceQuote->load(['items']);
     }
 
-    public static function serviceQuoteFromQuotation($quotation = null, $requestId = null, $integratedVendor = null, Payload $payload = null): ServiceQuote
+    public static function serviceQuoteFromQuotation($quotation = null, $requestId = null, $integratedVendor = null, ?Payload $payload = null): ServiceQuote
     {
         if (!$quotation) {
             return null;
@@ -651,7 +651,7 @@ class Lalamove
         return $this->createOrder($quotationId, $sender, $recipients, false, $isPODEnabled, $metadata);
     }
 
-    public function setWebhook(string $webhookUrl = null)
+    public function setWebhook(?string $webhookUrl = null)
     {
         if (!is_string($webhookUrl)) {
             return;

package/server/src/Jobs/SimulateDrivingRoute.php

@@ -48,8 +48,8 @@ class SimulateDrivingRoute implements ShouldQueue
     /**
      * Create a new job instance.
      *
-     * @param \Fleetbase\FleetOps\Models\Driver $driver    the driver for whom the route is being simulated
-     * @param array                             $waypoints the waypoints that make up the route
+     * @param Driver $driver    the driver for whom the route is being simulated
+     * @param array  $waypoints the waypoints that make up the route
      */
     public function __construct(Driver $driver, array $waypoints = [])
     {

package/server/src/Jobs/SimulateWaypointReached.php

@@ -23,12 +23,12 @@ class SimulateWaypointReached implements ShouldQueue
     use SerializesModels;
 
     /**
-     * @var \Fleetbase\FleetOps\Models\Driver the driver for whom the waypoint is being simulated
+     * @var Driver the driver for whom the waypoint is being simulated
      */
     public Driver $driver;
 
     /**
-     * @var \Fleetbase\LaravelMysqlSpatial\Types\Point the waypoint that the driver is simulated to have reached
+     * @var Point the waypoint that the driver is simulated to have reached
      */
     public Point $waypoint;
 

package/server/src/Listeners/HandleOrderDispatchFailed.php

@@ -24,7 +24,7 @@ class HandleOrderDispatchFailed implements ShouldQueue
         /** @var \Fleetbase\FleetOps\Models\Order $order */
         $order = $event->getModelRecord();
 
-        /** @var \Fleetbase\Models\User */
+        /** @var User */
         $createdBy = User::where('uuid', $order->created_by_uuid)->first();
 
         // notify driver assigned order was canceled

package/server/src/Listeners/HandleOrderDriverAssigned.php

@@ -22,7 +22,7 @@ class HandleOrderDriverAssigned implements ShouldQueue
      */
     public function handle(OrderDriverAssigned $event)
     {
-        /** @var \Fleetbase\FleetOps\Models\Order $order */
+        /** @var Order $order */
         $order = $event->getModelRecord();
 
         // halt if unable to resolve order record from event
@@ -30,7 +30,7 @@ class HandleOrderDriverAssigned implements ShouldQueue
             return;
         }
 
-        /** @var \Fleetbase\FleetOps\Models\Driver */
+        /** @var Driver */
         $driver = Driver::where('uuid', $order->driver_assigned_uuid)->withoutGlobalScopes()->first();
         $order->setRelation('driverAssigned', $driver);
 

package/server/src/Models/Driver.php

@@ -498,9 +498,9 @@ class Driver extends Model
      *
      * @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 updatePosition(Order $order = null): ?Position
+    public function updatePosition(?Order $order = null): ?Position
     {
         $position     = null;
         $lastPosition = $this->positions()->whereCompanyUuid(session('company'))->latest()->first();

package/server/src/Models/Entity.php

@@ -273,7 +273,7 @@ class Entity extends Model
     /**
      * The length the entity belongs to.
      *
-     * @var \PhpUnitsOfMeasure\PhysicalQuantity\Length
+     * @var Length
      */
     public function getLengthUnitAttribute()
     {
@@ -283,7 +283,7 @@ class Entity extends Model
     /**
      * The width the entity belongs to.
      *
-     * @var \PhpUnitsOfMeasure\PhysicalQuantity\Length
+     * @var Length
      */
     public function getWidthUnitAttribute()
     {
@@ -416,7 +416,7 @@ class Entity extends Model
         return $this;
     }
 
-    public static function insertGetUuid($values = [], Payload $payload = null)
+    public static function insertGetUuid($values = [], ?Payload $payload = null)
     {
         if (is_array($values) && isset($values['uuid'])) {
             Entity::where('uuid', $values['uuid'])->update([

package/server/src/Models/Order.php

@@ -244,7 +244,7 @@ class Order extends Model
      */
     public function transaction()
     {
-        return $this->belongsTo(\Fleetbase\Models\Transaction::class);
+        return $this->belongsTo(Transaction::class);
     }
 
     /**
@@ -586,7 +586,7 @@ class Order extends Model
     /**
      * Set the order type attribute, which defaults to `default`.
      */
-    public function setTypeAttribute(string $type = null): void
+    public function setTypeAttribute(?string $type = null): void
     {
         $this->attributes['type'] = is_string($type) ? Str::slug($type) : 'default';
     }
@@ -594,7 +594,7 @@ class Order extends Model
     /**
      * Set the order status attribute, which defaults to `created`.
      */
-    public function setStatusAttribute(string $status = null): void
+    public function setStatusAttribute(?string $status = null): void
     {
         $this->attributes['status'] = is_string($status) ? Str::snake($status) : 'created';
     }
@@ -979,7 +979,7 @@ class Order extends Model
         }
     }
 
-    public function updateActivity(array $activity = null, $proof = null): Order
+    public function updateActivity(?array $activity = null, $proof = null): Order
     {
         $status   = data_get($activity, 'status');
         $details  = data_get($activity, 'details', '');

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

@@ -84,7 +84,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)
     {

package/server/src/Notifications/OrderCanceled.php

@@ -84,7 +84,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)
     {

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

@@ -129,7 +129,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)
     {

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;

package/server/src/Support/Metrics.php

@@ -25,7 +25,7 @@ class Metrics
     protected Company $company;
     protected array $metrics = [];
 
-    public static function new(Company $company, \DateTime $start = null, \DateTime $end = null): Metrics
+    public static function new(Company $company, ?\DateTime $start = null, ?\DateTime $end = null): Metrics
     {
         $start = $start === null ? Carbon::create(1900)->toDateTime() : $start;
         $end   = $end === null ? Carbon::tomorrow()->toDateTime() : $end;
@@ -33,7 +33,7 @@ class Metrics
         return (new static())->setCompany($company)->between($start, $end);
     }
 
-    public static function forCompany(Company $company, \DateTime $start = null, \DateTime $end = null): Metrics
+    public static function forCompany(Company $company, ?\DateTime $start = null, ?\DateTime $end = null): Metrics
     {
         return static::new($company, $start, $end);
     }
@@ -106,7 +106,7 @@ class Metrics
         return $this;
     }
 
-    public function earnings(callable $callback = null): Metrics
+    public function earnings(?callable $callback = null): Metrics
     {
         $query = Transaction::where('company_uuid', $this->company->uuid)->whereBetween('created_at', [$this->start, $this->end]);
 
@@ -119,7 +119,7 @@ class Metrics
         return $this->set('earnings', (int) $data);
     }
 
-    public function fuelCosts(callable $callback = null): Metrics
+    public function fuelCosts(?callable $callback = null): Metrics
     {
         $query = FuelReport::where('company_uuid', $this->company->uuid)->whereBetween('created_at', [$this->start, $this->end]);
 
@@ -132,7 +132,7 @@ class Metrics
         return $this->set('fuel_costs', (int) $data);
     }
 
-    public function totalDistanceTraveled(callable $callback = null): Metrics
+    public function totalDistanceTraveled(?callable $callback = null): Metrics
     {
         $query = Order::where(
             [
@@ -151,7 +151,7 @@ class Metrics
         return $this->set('total_distance_traveled', (int) $data);
     }
 
-    public function totalTimeTraveled(callable $callback = null): Metrics
+    public function totalTimeTraveled(?callable $callback = null): Metrics
     {
         $query = Order::where(
             [
@@ -170,7 +170,7 @@ class Metrics
         return $this->set('total_distance_traveled', (int) $data);
     }
 
-    public function ordersCanceled(callable $callback = null): Metrics
+    public function ordersCanceled(?callable $callback = null): Metrics
     {
         $query = Order::where('company_uuid', $this->company->uuid)
             ->whereBetween('created_at', [$this->start, $this->end])
@@ -185,7 +185,7 @@ class Metrics
         return $this->set('orders_canceled', $data);
     }
 
-    public function ordersCompleted(callable $callback = null): Metrics
+    public function ordersCompleted(?callable $callback = null): Metrics
     {
         $query = Order::where('company_uuid', $this->company->uuid)
             ->whereBetween('created_at', [$this->start, $this->end])
@@ -200,7 +200,7 @@ class Metrics
         return $this->set('orders_completed', $data);
     }
 
-    public function ordersInProgress(callable $callback = null): Metrics
+    public function ordersInProgress(?callable $callback = null): Metrics
     {
         $query = Order::where('company_uuid', $this->company->uuid)
             ->whereBetween('created_at', [$this->start, $this->end])
@@ -215,7 +215,7 @@ class Metrics
         return $this->set('orders_in_progress', $data);
     }
 
-    public function ordersScheduled(callable $callback = null): Metrics
+    public function ordersScheduled(?callable $callback = null): Metrics
     {
         $query = Order::where('company_uuid', $this->company->uuid)
             ->whereBetween('created_at', [$this->start, $this->end])
@@ -231,7 +231,7 @@ class Metrics
         return $this->set('orders_scheduled', $data);
     }
 
-    public function driversOnline(callable $callback = null): Metrics
+    public function driversOnline(?callable $callback = null): Metrics
     {
         $query = Driver::where('company_uuid', $this->company->uuid)
             ->where('online', true)
@@ -246,7 +246,7 @@ class Metrics
         return $this->set('drivers_online', $data);
     }
 
-    public function totalDrivers(callable $callback = null): Metrics
+    public function totalDrivers(?callable $callback = null): Metrics
     {
         $query = Driver::where('company_uuid', $this->company->uuid);
 
@@ -259,7 +259,7 @@ class Metrics
         return $this->set('total_drivers', $data);
     }
 
-    public function totalCustomers(callable $callback = null): Metrics
+    public function totalCustomers(?callable $callback = null): Metrics
     {
         $query = Contact::where('company_uuid', $this->company->uuid)
             ->where('type', 'customer');
@@ -273,7 +273,7 @@ class Metrics
         return $this->set('total_customers', $data);
     }
 
-    public function openIssues(callable $callback = null): Metrics
+    public function openIssues(?callable $callback = null): Metrics
     {
         $query = Issue::where('company_uuid', session('company'))
             ->whereBetween('created_at', [$this->start, $this->end])
@@ -288,7 +288,7 @@ class Metrics
         return $this->set('open_issues', $data);
     }
 
-    public function resolvedIssues(callable $callback = null): Metrics
+    public function resolvedIssues(?callable $callback = null): Metrics
     {
         $query = Issue::where('company_uuid', session('company'))
             ->whereBetween('created_at', [$this->start, $this->end])

package/server/src/routes.php

@@ -23,7 +23,7 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
         | End-user API routes, these are routes that the SDK and applications will interface with, and require API credentials.
         */
         Route::prefix('v1')
-            ->middleware(['fleetbase.api', \Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class])
+            ->middleware(['fleetbase.api', Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class])
             ->namespace('Api\v1')
             ->group(function ($router) {
                 // drivers routes
@@ -194,7 +194,7 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                 });
 
                 // auth:sanctum
-                $router->group(['middleware' => ['fleetbase.protected', \Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class]], function () use ($router) {
+                $router->group(['middleware' => ['fleetbase.protected', Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class]], function () use ($router) {
                     $router->group(['prefix' => 'orders'], function () use ($router) {
                         $router->post('/', 'Api\v1\OrderController@create');
                         $router->get('/', 'Api\v1\OrderController@query');
@@ -249,7 +249,7 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                 );
 
                 $router->group(
-                    ['prefix' => 'v1', 'namespace' => 'v1', 'middleware' => ['fleetbase.protected', \Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class]],
+                    ['prefix' => 'v1', 'namespace' => 'v1', 'middleware' => ['fleetbase.protected', Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class]],
                     function ($router) {
                         $router->fleetbaseRoutes(
                             'contacts',