@fleetbase/fleetops-engine 0.4.3 → 0.4.5

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

@@ -17,6 +17,7 @@ use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Http\Requests\SwitchOrganizationRequest;
 use Fleetbase\Http\Resources\Organization;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Models\Company;
 use Fleetbase\Models\CompanyUser;
 use Fleetbase\Models\User;
@@ -24,7 +25,6 @@ use Fleetbase\Models\UserDevice;
 use Fleetbase\Models\VerificationCode;
 use Fleetbase\Support\Auth;
 use Geocoder\Laravel\Facades\Geocoder;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
@@ -376,7 +376,7 @@ class DriverController extends Controller
         }
 
         // Get the user's company for this driver profile
-        $company = $this->_getDriverCompanyFromUser($user);
+        $company = static::getDriverCompanyFromUser($user);
 
         // Get driver record
         $driver = Driver::where(
@@ -414,7 +414,7 @@ class DriverController extends Controller
         }
 
         // Get the user's company for this driver profile
-        $company = $this->_getDriverCompanyFromUser($user);
+        $company = static::getDriverCompanyFromUser($user);
 
         // generate verification token
         try {
@@ -425,6 +425,7 @@ class DriverController extends Controller
             if (app()->bound('sentry')) {
                 app('sentry')->captureException($e);
             }
+
             return response()->apiError('Unable to send SMS Verification code.');
         }
 
@@ -464,7 +465,7 @@ class DriverController extends Controller
         }
 
         // Get the user's company for this driver profile
-        $company = $this->_getDriverCompanyFromUser($user);
+        $company = static::getDriverCompanyFromUser($user);
 
         // get driver record
         $driver = Driver::where(
@@ -488,19 +489,33 @@ class DriverController extends Controller
     }
 
     /**
-     * Patches phone number with international code.
+     * Gets the current organization/company for the driver
+     *
+     * @param string $id
+     * @param \Illuminate\Http\Request $request
+     * @return \Fleetbase\Http\Resources\Organization
      */
-    public static function phone(string $phone = null): string
+    public function currentOrganization(string $id, Request $request)
     {
-        if ($phone === null) {
-            $phone = request()->input('phone');
+        try {
+            $driver = Driver::findRecordOrFail($id);
+        } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
+            return response()->apiError('Driver resource not found.', 404);
         }
 
-        if (!Str::startsWith($phone, '+')) {
-            $phone = '+' . $phone;
+        // Get the driver user account
+        $user = $driver->getUser();
+        if (!$user) {
+            return response()->apiError('Driver has not user account.');
         }
 
-        return $phone;
+        // Get the user account company
+        $company = Flow::getCompanySessionForUser($user);
+        if (!$company) {
+            return response()->apiError('No company found for this driver.');
+        }
+
+        return new Organization($company);
     }
 
     /**
@@ -548,23 +563,26 @@ class DriverController extends Controller
             );
         }
 
-        // get the next organization
+        // Get the next organization
         $company = Company::where('public_id', $nextOrganization)->first();
 
         if ($company->uuid === $driver->user->company_uuid) {
-            return response()->json([
-                'error' => 'Driver is already on this organizations session',
-            ]);
+            return response()->apiError('Driver is already on this organizations session.');
         }
 
         if (!CompanyUser::where(['user_uuid' => $driver->user_uuid, 'company_uuid' => $company->uuid])->exists()) {
-            return response()->json([
-                'errors' => ['You do not belong to this organization'],
-            ]);
+            return response()->apiError('You do not belong to this organization');
         }
 
-        $driver->user->assignCompany($company);
-        Auth::setSession($driver->user);
+        // Get the driver user account
+        $user = $driver->getUser();
+        if (!$user) {
+            return response()->apiError('Driver has not user account.');
+        }
+
+        // Assign user to company and update their session
+        $user->assignCompany($company);
+        Auth::setSession($user);
 
         return new Organization($company);
     }
@@ -700,7 +718,13 @@ class DriverController extends Controller
         return response()->json($route);
     }
 
-    private function _getDriverCompanyFromUser(User $user): ?Company
+    /**
+     * 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
     {
         // company defaults to null
         $company = null;
@@ -719,4 +743,20 @@ class DriverController extends Controller
 
         return $company;
     }
+
+    /**
+     * Patches phone number with international code.
+     */
+    private static function phone(string $phone = null): string
+    {
+        if ($phone === null) {
+            $phone = request()->input('phone');
+        }
+
+        if (!Str::startsWith($phone, '+')) {
+            $phone = '+' . $phone;
+        }
+
+        return $phone;
+    }
 }

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

@@ -422,6 +422,8 @@ class OrderController extends Controller
     public function query(Request $request)
     {
         $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'));
@@ -806,7 +808,7 @@ class OrderController extends Controller
         $driver->current_job_uuid = $order->uuid;
         $driver->save();
 
-        /** @var \Grimzy\LaravelMysqlSpatial\Types\Point */
+        /** @var \Fleetbase\LaravelMysqlSpatial\Types\Point */
         $location = $order->getLastLocation();
 
         // set first destination for payload
@@ -888,7 +890,7 @@ class OrderController extends Controller
             return new OrderResource($order);
         }
 
-        /** @var \Grimzy\LaravelMysqlSpatial\Types\Point */
+        /** @var \Fleetbase\LaravelMysqlSpatial\Types\Point */
         $location = $order->getLastLocation();
 
         // if is multi drop order and no current destination set it
@@ -1021,7 +1023,7 @@ class OrderController extends Controller
 
         $order->notifyCompleted();
 
-        /** @var \Grimzy\LaravelMysqlSpatial\Types\Point */
+        /** @var \Fleetbase\LaravelMysqlSpatial\Types\Point */
         $location = $order->getLastLocation();
 
         $order->setStatus($activity['code']);

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

@@ -9,10 +9,10 @@ use Fleetbase\FleetOps\Http\Resources\v1\Place as PlaceResource;
 use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Geocoder\Laravel\Facades\Geocoder;
 use Geocoder\Provider\GoogleMapsPlaces\GoogleMapsPlaces;
 use Geocoder\Query\GeocodeQuery;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Http\Adapter\Guzzle7\Client;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;

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

@@ -9,7 +9,7 @@ use Fleetbase\FleetOps\Http\Resources\v1\ServiceArea as ServiceAreaResource;
 use Fleetbase\FleetOps\Models\ServiceArea;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 
 class ServiceAreaController extends Controller

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

@@ -10,7 +10,7 @@ use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\TrackingStatus;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 
 class TrackingStatusController extends Controller

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

@@ -9,7 +9,7 @@ use Fleetbase\FleetOps\Http\Resources\v1\Zone as ZoneResource;
 use Fleetbase\FleetOps\Models\Zone;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 
 class ZoneController extends Controller

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

@@ -13,13 +13,13 @@ use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Requests\ExportRequest;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Models\CompanyUser;
 use Fleetbase\Models\Invite;
 use Fleetbase\Models\User;
 use Fleetbase\Models\VerificationCode;
 use Fleetbase\Notifications\UserInvited;
 use Fleetbase\Support\Auth;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
@@ -94,8 +94,9 @@ class DriverController extends FleetOpsController
                         ->filter()
                         ->toArray();
 
-                    // set the user
-                    $input['company_uuid'] = session('company');
+                    // Get current session company
+                    $company               = Auth::getCompany();
+                    $input['company_uuid'] = session('company', $company->uuid);
                     $input['user_uuid']    = $existingUser->uuid;
                     $input['slug']         = $existingUser->slug;
 
@@ -107,6 +108,18 @@ class DriverController extends FleetOpsController
                     // create the profile
                     $driverProfile = Driver::create($input);
 
+                    // Assign user to company
+                    if ($company) {
+                        $existingUser->assignCompany($company);
+
+                        // create company user
+                        CompanyUser::create([
+                            'user_uuid'    => $existingUser->uuid,
+                            'company_uuid' => $company->uuid,
+                            'status'       => $isOrganizationMember ? 'active' : 'pending'
+                        ]);
+                    }
+
                     if (!$isOrganizationMember) {
                         // send invitation to user
                         $invitation = Invite::create([
@@ -159,7 +172,7 @@ class DriverController extends FleetOpsController
 
                     // Get current session company
                     $company                   = Auth::getCompany();
-                    $userInput['company_uuid'] = $company ? $company->uuid : session('company');
+                    $userInput['company_uuid'] = session('company', $company->uuid);
 
                     // Create user account
                     $user = User::create($userInput);

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

@@ -22,11 +22,11 @@ class GeocoderController extends Controller
         $query  = $request->or(['coordinates', 'query']);
         $single = $request->boolean('single');
 
-        /** @var \Grimzy\LaravelMysqlSpatial\Types\Point $coordinates */
+        /** @var \Fleetbase\LaravelMysqlSpatial\Types\Point $coordinates */
         $coordinates = Utils::getPointFromCoordinates($query);
 
         // if not a valid point error
-        if (!$coordinates instanceof \Grimzy\LaravelMysqlSpatial\Types\Point) {
+        if (!$coordinates instanceof \Fleetbase\LaravelMysqlSpatial\Types\Point) {
             return response()->error('Invalid coordinates provided.');
         }
 

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

@@ -8,6 +8,12 @@ use Illuminate\Http\Request;
 
 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)
     {
         $start    = $request->date('start');
@@ -22,54 +28,4 @@ class MetricsController extends Controller
 
         return response()->json($data);
     }
-
-    public function dashboard(Request $request)
-    {
-        $start    = $request->date('start');
-        $end      = $request->date('end');
-        $discover = $request->array('discover', []);
-        $metrics  = [];
-
-        try {
-            $metrics = Metrics::forCompany($request->user()->company, $start, $end)->with($discover)->get();
-        } catch (\Exception $e) {
-            return response()->error($e->getMessage());
-        }
-
-        // metrics format map
-        $metricsFormats = [
-            'earnings'                => 'money',
-            'fuel_costs'              => 'money',
-            'total_distance_traveled' => 'meters',
-        ];
-
-        // dashboard config
-        $dashboardConfig = [
-            [
-                'size'        => 12,
-                'title'       => 'Fleet-Ops Metrics',
-                'classList'   => [],
-                'component'   => null,
-                'queryParams' => [
-                    'start' => ['component' => 'date-picker'],
-                    'end'   => ['component' => 'date-picker'],
-                ],
-                'widgets' => collect($metrics)
-                    ->map(function ($value, $key) use ($metricsFormats) {
-                        return [
-                            'component' => 'count',
-                            'options'   => [
-                                'format' => $metricsFormats[$key] ?? null,
-                                'title'  => str_replace('_', ' ', \Illuminate\Support\Str::title($key)),
-                                'value'  => $value,
-                            ],
-                        ];
-                    })
-                    ->values()
-                    ->toArray(),
-            ],
-        ];
-
-        return response()->json(array_values($dashboardConfig));
-    }
 }

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

@@ -82,6 +82,7 @@ class OrderController extends FleetOpsController
                     $payload   = Utils::get($input, 'payload');
                     $waypoints = Utils::get($input, 'payload.waypoints');
                     $entities  = Utils::get($input, 'payload.entities');
+                    $uploads   = Utils::get($input, 'files', []);
 
                     // save order route & payload with request input
                     $order
@@ -91,6 +92,16 @@ class OrderController extends FleetOpsController
                         ->insertWaypoints($waypoints)
                         ->insertEntities($entities);
 
+                    // If order creation includes files assosciate each to this order
+                    if ($uploads) {
+                        $ids = collect($uploads)->pluck('uuid');
+                        $files = File::whereIn('uuid', $ids)->get();
+
+                        foreach ($files as $file) {
+                            $file->setKey($order);
+                        }
+                    }
+
                     // if it's integrated vendor order apply to meta
                     if ($isIntegratedVendorOrder) {
                         $order->updateMeta(
@@ -370,7 +381,7 @@ class OrderController extends FleetOpsController
         $flow = $activity = Flow::getNextActivity($order);
 
         /**
-         * @var \Grimzy\LaravelMysqlSpatial\Types\Point
+         * @var \Fleetbase\LaravelMysqlSpatial\Types\Point
          */
         $location = $order->getLastLocation();
 
@@ -442,7 +453,7 @@ class OrderController extends FleetOpsController
         }
 
         /**
-         * @var \Grimzy\LaravelMysqlSpatial\Types\Point
+         * @var \Fleetbase\LaravelMysqlSpatial\Types\Point
          */
         $location = $order->getLastLocation();
 

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

@@ -8,7 +8,7 @@ use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\FleetOps\Support\Geocoding;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\Internal\BulkDeleteRequest;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;

package/server/src/Http/Filter/PlaceFilter.php

@@ -6,7 +6,7 @@ use Fleetbase\FleetOps\Models\ServiceArea;
 use Fleetbase\FleetOps\Models\Zone;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Filter\Filter;
-use Grimzy\LaravelMysqlSpatial\Types\Geometry;
+use Fleetbase\LaravelMysqlSpatial\Types\Geometry;
 
 class PlaceFilter extends Filter
 {

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

@@ -4,8 +4,8 @@ namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class Driver extends FleetbaseResource
 {

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

@@ -3,8 +3,8 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class FuelReport extends FleetbaseResource
 {

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

@@ -3,8 +3,8 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class Issue extends FleetbaseResource
 {

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

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Http\Resources\Comment;
 use Fleetbase\Support\Http;
 use Fleetbase\Support\Resolve;
 
@@ -43,6 +44,8 @@ class Order extends FleetbaseResource
             'driver_assigned'      => new Driver($this->driverAssigned()->without(['jobs', 'currentJob'])->first()),
             'tracking_number'      => new TrackingNumber($this->trackingNumber),
             'tracking_statuses'    => $this->whenLoaded('trackingStatuses', TrackingStatus::collection($this->trackingStatuses)),
+            'comments'             => $this->when(Http::isInternalRequest(), Comment::collection($this->comments)),
+            'files'                => $this->when(Http::isInternalRequest(), $this->files),
             'purchase_rate'        => new PurchaseRate($this->purchaseRate),
             'notes'                => $this->notes,
             'type'                 => $this->type,

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

@@ -43,6 +43,7 @@ class Payload extends FleetbaseResource
     {
         return $this->waypoints->map(function ($waypoint) {
             $waypoint->payload_uuid = $this->uuid;
+
             return $waypoint;
         });
     }

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

@@ -3,9 +3,9 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
 use Fleetbase\Support\Resolve;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class Place extends FleetbaseResource
 {

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

@@ -21,13 +21,14 @@ class PurchaseRate extends FleetbaseResource
             'id'            => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'uuid'          => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id'     => $this->when(Http::isInternalRequest(), $this->public_id),
-            'service_quote' => $this->service_quote_id,
+            'service_quote' => $this->when(Http::isInternalRequest(), $this->serviceQuote(), $this->service_quote_id),
             'order'         => $this->order_id,
             'customer'      => $this->customer_id,
             'transaction'   => $this->transaction_id,
             'amount'        => $this->amount,
             'currency'      => $this->currency,
             'status'        => $this->status,
+            // 'type'          => $this->when(Http::isInternalRequest(), 'service-rate'),
             'updated_at'    => $this->updated_at,
             'created_at'    => $this->created_at,
         ];

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

@@ -25,6 +25,7 @@ class ServiceQuote extends FleetbaseResource
             'service_rate_name' => $this->when(Http::isInternalRequest(), data_get($this, 'serviceRate.name')),
             'service_rate'      => $this->when(Http::isPublicRequest(), data_get($this, 'serviceRate.public_id')),
             'facilitator'       => $this->when(Http::isPublicRequest(), data_get($this, 'integratedVendor.public_id')),
+            'items'             => ServiceQuoteItem::collection($this->items),
             'request_id'        => $this->request_id,
             'amount'            => $this->amount,
             'currency'          => $this->currency,

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

@@ -0,0 +1,29 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+class ServiceQuoteItem extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            '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,
+        ];
+    }
+}

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

@@ -4,8 +4,8 @@ namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class TrackingStatus extends FleetbaseResource
 {

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

@@ -3,8 +3,8 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class Vehicle extends FleetbaseResource
 {

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

@@ -3,8 +3,8 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class VehicleWithoutDriver extends FleetbaseResource
 {

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

@@ -4,9 +4,9 @@ namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\FleetOps\Models\Waypoint as WaypointModel;
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
 use Fleetbase\Support\Resolve;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class Waypoint extends FleetbaseResource
 {
@@ -56,9 +56,7 @@ class Waypoint extends FleetbaseResource
     }
 
     /**
-     * Finds the waypoint got a payload and place
-     *
-     * @return WaypointModel|null
+     * Finds the waypoint got a payload and place.
      */
     private function getWaypoint(): ?WaypointModel
     {

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

@@ -3,8 +3,8 @@
 namespace Fleetbase\FleetOps\Integrations\Lalamove;
 
 use Fleetbase\FleetOps\Models\Place;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialExpression;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialExpression;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Support\Str;
 
 class LalamoveDeliveryStop

package/server/src/Jobs/SimulateWaypointReached.php

@@ -4,7 +4,7 @@ namespace Fleetbase\FleetOps\Jobs;
 
 use Fleetbase\FleetOps\Events\DriverSimulatedLocationChanged;
 use Fleetbase\FleetOps\Models\Driver;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -28,7 +28,7 @@ class SimulateWaypointReached implements ShouldQueue
     public Driver $driver;
 
     /**
-     * @var \Grimzy\LaravelMysqlSpatial\Types\Point the waypoint that the driver is simulated to have reached
+     * @var \Fleetbase\LaravelMysqlSpatial\Types\Point the waypoint that the driver is simulated to have reached
      */
     public Point $waypoint;