@fleetbase/fleetops-engine 0.4.4 → 0.4.6

package/README.md

@@ -13,7 +13,7 @@ This monorepo contains both the frontend and backend components of the FleetOps
 
 ### Requirements
 
-* PHP 7.3.0 or above
+* PHP 8.0 or above
 * Ember.js v4.8 or above
 * Ember CLI v4.8 or above
 * Node.js v18 or above

package/addon/components/contact-form-panel.hbs

@@ -103,5 +103,6 @@
                 </div>
             </InputGroup>
         </div>
+        <Spacer @height="300px" />
     </Overlay::Body>
 </Overlay>

package/addon/components/driver-panel.hbs

@@ -79,5 +79,6 @@
         <div class="tab-content tab-{{this.tab.slug}}">
             {{component this.tab.component driver=this.driver tabOptions=this.tab options=this.tab.componentParams}}
         </div>
+        <Spacer @height="300px" />
     </Overlay::Body>
 </Overlay>

package/addon/components/edit-order-route-panel.hbs

@@ -178,5 +178,6 @@
                 </div>
             {{/if}}
         </div>
+        <Spacer @height="300px" />
     </Overlay::Body>
 </Overlay>

package/addon/components/fleet-form-panel.hbs

@@ -99,5 +99,6 @@
             </div>
         </div>
         {{yield}}
+        <Spacer @height="300px" />
     </Overlay::Body>
 </Overlay>

package/addon/components/fleet-panel.hbs

@@ -20,5 +20,6 @@
         <div class="tab-content tab-{{this.tab.slug}}">
             {{component this.tab.component fleet=this.fleet tabOptions=this.tab options=this.tab.componentParams}}
         </div>
+        <Spacer @height="300px" />
     </Overlay::Body>
 </Overlay>

package/addon/components/fuel-report-form-panel.hbs

@@ -116,5 +116,6 @@
                 <CoordinatesInput @value={{this.fuelReport.location}} @onChange={{fn (mut this.fuelReport.location)}} />
             </InputGroup>
         </div>
+        <Spacer @height="300px" />
     </Overlay::Body>
 </Overlay>

package/addon/components/fuel-report-panel.hbs

@@ -29,5 +29,6 @@
         <div class="tab-content tab-{{this.tab.slug}}">
             {{component this.tab.component fuelReport=this.fuelReport tabOptions=this.tab options=this.tab.componentParams}}
         </div>
+        <Spacer @height="300px" />
     </Overlay::Body>
 </Overlay>

package/addon/components/issue-form-panel.hbs

@@ -172,5 +172,6 @@
                 <CoordinatesInput @value={{this.issue.location}} @onChange={{fn (mut this.issue.location)}} />
             </InputGroup>
         </div>
+        <Spacer @height="300px" />
     </Overlay::Body>
 </Overlay>

package/addon/components/issue-panel.hbs

@@ -29,5 +29,6 @@
         <div class="tab-content tab-{{this.tab.slug}}">
             {{component this.tab.component issue=this.issue tabOptions=this.tab options=this.tab.componentParams}}
         </div>
+        <Spacer @height="300px" />
     </Overlay::Body>
 </Overlay>

package/addon/components/place-form-panel.hbs

@@ -56,5 +56,6 @@
                 <PhoneInput @value={{this.place.phone}} @autocomplete="nope" @onInput={{this.phone}} class="form-input w-full" />
             </InputGroup>
         </div>
+        <Spacer @height="300px" />
     </Overlay::Body>
 </Overlay>

package/addon/components/place-panel.hbs

@@ -29,5 +29,6 @@
         <div class="tab-content tab-{{this.tab.slug}}">
             {{component this.tab.component place=this.place tabOptions=this.tab options=this.tab.componentParams}}
         </div>
+        <Spacer @height="300px" />
     </Overlay::Body>
 </Overlay>

package/addon/components/vehicle-form-panel.hbs

@@ -180,5 +180,6 @@
                 </div>
             </ContentPanel>
         </div>
+        <Spacer @height="300px" />
     </Overlay::Body>
 </Overlay>

package/addon/components/vehicle-panel.hbs

@@ -74,5 +74,6 @@
         <div class="tab-content tab-{{this.tab.slug}}">
             {{component this.tab.component vehicle=this.vehicle tabOptions=this.tab options=this.tab.componentParams}}
         </div>
+        <Spacer @height="300px" />
     </Overlay::Body>
 </Overlay>

package/addon/components/vendor-form-panel.hbs

@@ -87,5 +87,6 @@
                 @onVendorChanged={{this.onVendorChanged}}
             />
         {{/if}}
+        <Spacer @height="300px" />
     </Overlay::Body>
 </Overlay>

package/addon/components/vendor-panel.hbs

@@ -71,5 +71,6 @@
         <div class="tab-content tab-{{this.tab.slug}}">
             {{component this.tab.component vendor=this.vendor tabOptions=this.tab params=this.tab.componentParams}}
         </div>
+        <Spacer @height="300px" />
     </Overlay::Body>
 </Overlay>

package/addon/components/widget/fleet-ops-key-metrics.hbs

@@ -0,0 +1,19 @@
+<div class="fleet-ops-key-metrics" ...attributes>
+    <div class="flex flex-col">
+        <div class="flex flex-row items-center justify-between px-4 py-2 border dark:border-gray-700 border-gray-200 dark:bg-gray-800 bg-gray-50 rounded-lg shadow-sm">
+            <span class="text-base font-bold text-black dark:text-gray-100">{{t "fleet-ops.component.widget.key-metrics.title"}}</span>
+        </div>
+
+        <div class="mt-4">
+            {{#if this.getDashboardMetrics.isRunning}}
+                <Spinner />
+            {{else}}
+                <div class="grid grid-cols-2 lg:grid-cols-12 gap-4">
+                    {{#each-in this.metrics as |title options|}}
+                        <Dashboard::Count @title={{smart-humanize title}} @options={{options}} />
+                    {{/each-in}}
+                </div>
+            {{/if}}
+        </div>
+    </div>
+</div>

package/addon/components/widget/fleet-ops-key-metrics.js

@@ -0,0 +1,92 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { task } from 'ember-concurrency-decorators';
+
+export default class WidgetFleetOpsKeyMetricsComponent extends Component {
+    /**
+     * The widget ID to use for registering.
+     *
+     * @memberof WidgetFleetOpsKeyMetricsComponent
+     */
+    static widgetId = 'fleet-ops-key-metrics-widget';
+
+    /**
+     * Inject the fetch service.
+     *
+     * @memberof WidgetKeyMetricsComponent
+     */
+    @service fetch;
+
+    /**
+     * Property for loading metrics to.
+     *
+     * @memberof WidgetKeyMetricsComponent
+     */
+    @tracked metrics = {};
+
+    /**
+     * Creates an instance of WidgetKeyMetricsComponent.
+     * @memberof WidgetKeyMetricsComponent
+     */
+    constructor() {
+        super(...arguments);
+        this.getDashboardMetrics.perform();
+    }
+
+    /**
+     * Task which fetches key metrics.
+     *
+     * @memberof WidgetKeyMetricsComponent
+     */
+    @task *getDashboardMetrics() {
+        this.metrics = yield this.fetch.get('fleet-ops/metrics').then((response) => {
+            return this.createMetricsMapFromResponse(response);
+        });
+    }
+
+    /**
+     * Creates a map of metrics from the response data. This method organizes the metrics data into a more usable format.
+     *
+     * @param {Object} metrics - The metrics object fetched from the server.
+     * @returns {Object} A map of metrics where each key is a metric name and its value is an object of metric options.
+     * @memberof WidgetKeyMetricsComponent
+     */
+    createMetricsMapFromResponse(metrics = {}) {
+        const keys = Object.keys(metrics);
+        const map = {};
+
+        for (let i = 0; i < keys.length; i++) {
+            const key = keys[i];
+            map[key] = this.createMetricOptionsHash(key, metrics[key]);
+        }
+
+        return map;
+    }
+
+    /**
+     * Creates a hash of options for a given metric. Depending on the metric key, it assigns a specific format.
+     *
+     * @param {string} key - The key representing the specific metric.
+     * @param {number} value - The value of the metric.
+     * @returns {Object} An object containing the metric value and its format.
+     * @memberof WidgetKeyMetricsComponent
+     */
+    createMetricOptionsHash(key, value) {
+        const options = { value };
+
+        if (key === 'earnings') {
+            options.format = 'money';
+        }
+
+        if (key === 'fuel_costs') {
+            options.format = 'money';
+        }
+
+        if (key === 'total_distance_traveled') {
+            options.format = 'meters';
+        }
+
+        return options;
+    }
+}

package/addon/controllers/management/contacts/index.js

@@ -327,7 +327,7 @@ export default class ManagementContactsIndexController extends BaseController {
      * @void
      */
     @action viewContact(contact) {
-        return this.transitionToRoute('management.contact.index.details', contact);
+        return this.transitionToRoute('management.contacts.index.details', contact);
     }
 
     /**
@@ -336,7 +336,7 @@ export default class ManagementContactsIndexController extends BaseController {
      * @void
      */
     @action createContact() {
-        return this.transitionToRoute('management.contact.index.new');
+        return this.transitionToRoute('management.contacts.index.new');
     }
 
     /**
@@ -346,7 +346,7 @@ export default class ManagementContactsIndexController extends BaseController {
      * @void
      */
     @action editContact(contact) {
-        return this.transitionToRoute('management.contact.index.edit', contact);
+        return this.transitionToRoute('management.contacts.index.edit', contact);
     }
 
     /**

package/addon/controllers/operations/orders/index.js

@@ -949,7 +949,7 @@ export default class OperationsOrdersIndexController extends BaseController {
      * @memberof OperationsOrdersIndexController
      */
     @action fetchActiveOrdersCount() {
-        this.fetch.get('fleet-ops/metrics/all', { discover: ['orders_in_progress'] }).then((response) => {
+        this.fetch.get('fleet-ops/metrics', { discover: ['orders_in_progress'] }).then((response) => {
             this.activeOrdersCount = response.orders_in_progress;
         });
     }

package/addon/engine.js

@@ -5,6 +5,7 @@ import config from './config/environment';
 import services from '@fleetbase/ember-core/exports/services';
 import AdminVisibilityControlsComponent from './components/admin/visibility-controls';
 import NavigatorAppConfigComponent from './components/admin/navigator-app';
+import FleetOpsKeyMetricsWidget from './components/widget/fleet-ops-key-metrics';
 
 const { modulePrefix } = config;
 const externalRoutes = ['console', 'extensions'];
@@ -40,20 +41,25 @@ export default class FleetOpsEngine extends Engine {
             }
         );
 
-        // create primary registry for engine
-        universe.createRegistry('engine:fleet-ops');
+        // widgets for registry
+        const KeyMetricsWidgetDefinition = {
+            widgetId: 'fleet-ops-key-metrics-widget',
+            name: 'Fleet-Ops Metrics',
+            description: 'Key metrics from Fleet-Ops.',
+            icon: 'truck',
+            component: FleetOpsKeyMetricsWidget,
+            grid_options: { w: 12, h: 12, minW: 8, minH: 12 },
+            options: {
+                title: 'Fleet-Ops Metrics',
+            },
+        };
 
-        // register the vehicle panel
-        universe.createRegistry('component:vehicle-panel');
+        // register widgets
+        universe.registerDefaultDashboardWidgets([KeyMetricsWidgetDefinition]);
+        universe.registerDashboardWidgets([KeyMetricsWidgetDefinition]);
 
-        // register the driver panel
-        universe.createRegistry('component:driver-panel');
-
-        // register vehicle context menu
-        universe.createRegistry('contextmenu:vehicle');
-
-        // register driver context menu
-        universe.createRegistry('contextmenu:driver');
+        // create all registries necessary
+        universe.createRegistries(['engine:fleet-ops', 'component:vehicle-panel', 'component:driver-panel', 'contextmenu:vehicle', 'contextmenu:driver']);
     };
 }
 

package/addon/styles/fleetops-engine.css

@@ -51,12 +51,12 @@ body[data-theme='dark'] .scheduler-left-sidebar {
     --fleet-summary-nav-item-base-padding: 1.5rem;
 }
 
-.next-sidebar-panel-container.next-driver-listing > .next-sidebar-panel > .next-content-panel > .next-sidebar-panel-toggle,
+.next-sidebar .next-sidebar-panel-container.next-driver-listing > .next-sidebar-panel > .next-content-panel > .next-sidebar-panel-toggle,
 .next-sidebar .next-sidebar-panel-container.next-fleet-summary > .next-sidebar-panel > .next-content-panel > .next-sidebar-panel-toggle {
     padding-left: 2rem;
 }
 
-.next-sidebar-panel-container.next-driver-listing > .next-sidebar-panel > .next-content-panel > .next-content-panel-body .next-nav-item,
+.next-sidebar .next-sidebar-panel-container.next-driver-listing > .next-sidebar-panel > .next-content-panel > .next-content-panel-body .next-nav-item,
 .next-sidebar .next-sidebar-panel-container.next-driver-listing > .next-sidebar-panel > .next-content-panel > .next-sidebar-panel-body .next-nav-item.driver-nav-item {
     padding-left: 3.5rem;
 }

package/app/components/widget/{issues.js → fleet-ops-key-metrics.js}

@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops-engine/components/widget/issues';
+export { default } from '@fleetbase/fleetops-engine/components/widget/fleet-ops-key-metrics';

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.4.4",
+    "version": "0.4.6",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -21,15 +21,15 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
-        "fleetbase/core-api": "^1.3.13",
+        "php": "^8.0",
+        "fleetbase/core-api": "^1.4.0",
         "barryvdh/laravel-dompdf": "^2.0",
         "brick/geo": "0.7.2",
         "cknow/laravel-money": "^7.1",
         "geocoder-php/google-maps-places-provider": "^1.4",
         "giggsey/libphonenumber-for-php": "^8.13",
         "league/geotools": "^1.1.0",
-        "milon/barcode": "^9.0",
+        "milon/barcode": "^10.0",
         "php-http/guzzle7-adapter": "^1.0",
         "psr/http-factory-implementation": "*",
         "toin0u/geocoder-laravel": "^4.4",
@@ -37,8 +37,8 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.34.1",
-        "nunomaduro/collision": "^5.11.0|^6.4.0",
-        "pestphp/pest": "^1.22.6",
+        "nunomaduro/collision": "^7.0",
+        "pestphp/pest": "^2.33.2",
         "phpstan/phpstan": "^1.10.38",
         "symfony/var-dumper": "^5.4.29"
     },

package/extension.json

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

package/package.json

@@ -1,10 +1,9 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.4.4",
+    "version": "0.4.6",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
-        "route": "fleet-ops",
-        "dashboard": "int/v1/fleet-ops/dashboard"
+        "route": "fleet-ops"
     },
     "keywords": [
         "fleetbase-extension",
@@ -43,7 +42,7 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.2.1",
+        "@fleetbase/ember-core": "^0.2.4",
         "@fleetbase/ember-ui": "^0.2.10",
         "@fleetbase/fleetops-data": "^0.1.8",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",

package/server/src/Casts/MultiPolygon.php

@@ -3,9 +3,9 @@
 namespace Fleetbase\FleetOps\Casts;
 
 use Fleetbase\FleetOps\Support\Utils;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialExpression;
-use Grimzy\LaravelMysqlSpatial\Types\GeometryInterface;
-use Grimzy\LaravelMysqlSpatial\Types\MultiPolygon as SpatialMultiPolygon;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialExpression;
+use Fleetbase\LaravelMysqlSpatial\Types\GeometryInterface;
+use Fleetbase\LaravelMysqlSpatial\Types\MultiPolygon as SpatialMultiPolygon;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 
 class MultiPolygon implements CastsAttributes

package/server/src/Casts/Point.php

@@ -3,8 +3,8 @@
 namespace Fleetbase\FleetOps\Casts;
 
 use Fleetbase\FleetOps\Support\Utils;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialExpression;
-use Grimzy\LaravelMysqlSpatial\Types\GeometryInterface;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialExpression;
+use Fleetbase\LaravelMysqlSpatial\Types\GeometryInterface;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Database\Query\Expression;
 
@@ -109,9 +109,13 @@ class Point implements CastsAttributes
      *
      * @return bool
      */
-    public static function isRawPoint($data)
+    public static function isRawPoint($data): bool
     {
-        return preg_match('/[\x00-\x1f]/', $data, $matches) === 1;
+        if (is_string($data)) {
+            return preg_match('/[\x00-\x1f]/', $data, $matches) === 1;
+        }
+
+        return false;
     }
 
     /**

package/server/src/Casts/Polygon.php

@@ -3,9 +3,9 @@
 namespace Fleetbase\FleetOps\Casts;
 
 use Fleetbase\FleetOps\Support\Utils;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialExpression;
-use Grimzy\LaravelMysqlSpatial\Types\GeometryInterface;
-use Grimzy\LaravelMysqlSpatial\Types\Polygon as SpatialPolygon;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialExpression;
+use Fleetbase\LaravelMysqlSpatial\Types\GeometryInterface;
+use Fleetbase\LaravelMysqlSpatial\Types\Polygon as SpatialPolygon;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 
 class Polygon implements CastsAttributes

package/server/src/Console/Commands/DispatchAdhocOrders.php

@@ -5,7 +5,7 @@ namespace Fleetbase\FleetOps\Console\Commands;
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Support\Utils;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Console\Command;
 use Illuminate\Support\Carbon;
 

package/server/src/Events/DriverSimulatedLocationChanged.php

@@ -3,7 +3,7 @@
 namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\FleetOps\Models\Driver;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;

package/server/src/Flow/Activity.php

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

package/server/src/Flow/Config.php

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

package/server/src/Flow/Logic.php

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

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;
@@ -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.');
         }
 

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

@@ -808,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
@@ -890,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
@@ -1023,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;