@fleetbase/fleetops-engine 0.4.18 → 0.4.20

package/addon/components/vendor-panel.js

@@ -4,8 +4,8 @@ import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
 import VendorPanelDetailComponent from './vendor-panel/details';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 
 export default class VendorPanelComponent extends Component {
     /**

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

@@ -534,6 +534,11 @@ export default class OperationsOrdersIndexNewController extends BaseController {
             params.facilitator = this.order.facilitator.public_id;
         }
 
+        // filter by order config type
+        if (this.orderConfig) {
+            params.service_type = this.orderConfig.key;
+        }
+
         if (shouldCheck) {
             try {
                 serviceRates = await this.fetch.get(`service-rates/for-route`, params);

package/addon/controllers/operations/service-rates/index/new.js

@@ -48,11 +48,11 @@ export default class OperationsServiceRatesIndexNewController extends BaseContro
     @tracked serviceRate = this.store.createRecord('service-rate', { per_meter_unit: 'm' });
 
     /**
-     * Different service types available, based on order type.
+     * Available order configs.
      *
      * @var {Array}
      */
-    @tracked serviceTypes = [];
+    @tracked orderConfigs = [];
 
     /**
      * Service areas.
@@ -75,6 +75,13 @@ export default class OperationsServiceRatesIndexNewController extends BaseContro
      */
     @tracked isCreatingServiceRate = false;
 
+    /**
+     * The current selected order config.
+     *
+     * @var {OrderConfigModel|null}
+     */
+    @tracked orderConfig;
+
     /**
      * True if updating service rate.
      *
@@ -279,6 +286,20 @@ export default class OperationsServiceRatesIndexNewController extends BaseContro
         });
     }
 
+    @action setConfig(event) {
+        const orderConfigId = event.target.value;
+        if (!orderConfigId) {
+            return;
+        }
+
+        const orderConfig = this.store.peekRecord('order-config', orderConfigId);
+        if (orderConfig) {
+            this.orderConfig = orderConfig;
+            this.serviceRate.set('order_config_uuid', orderConfig.id);
+            this.serviceRate.set('service_type', orderConfig.key);
+        }
+    }
+
     /**
      * Adds a per drop-off rate fee
      */

package/addon/routes/operations/service-rates/index/edit.js

@@ -7,8 +7,20 @@ export default class OperationsServiceRatesIndexEditRoute extends Route {
     @service currentUser;
     @service notifications;
 
+    /**
+     * Re-use the new service rate form template.
+     *
+     * @memberof OperationsServiceRatesIndexEditRoute
+     */
     templateName = 'operations.service-rates.index.new';
 
+    /**
+     * Handle any async error.
+     *
+     * @param {*} error
+     * @return {*}
+     * @memberof OperationsServiceRatesIndexEditRoute
+     */
     @action error(error) {
         this.notifications.serverError(error);
         return this.transitionTo('operations.service-rates.index');
@@ -33,10 +45,7 @@ export default class OperationsServiceRatesIndexEditRoute extends Route {
             controller.parcelFees = model.parcel_fees;
         }
 
-        const serviceTypes = await this.currentUser.getInstalledOrderConfigs();
-        const serviceAreas = await this.store.findAll('service-area');
-
-        controller.serviceTypes = serviceTypes;
-        controller.serviceAreas = serviceAreas;
+        controller.orderConfigs = await this.store.findAll('order-config');
+        controller.serviceAreas = await this.store.findAll('service-area');
     }
 }

package/addon/routes/operations/service-rates/index/new.js

@@ -3,13 +3,9 @@ import { inject as service } from '@ember/service';
 
 export default class OperationsServiceRatesIndexNewRoute extends Route {
     @service store;
-    @service currentUser;
 
     async setupController(controller) {
-        const serviceTypes = await this.currentUser.getInstalledOrderConfigs();
-        const serviceAreas = await this.store.findAll('service-area');
-
-        controller.serviceTypes = serviceTypes;
-        controller.serviceAreas = serviceAreas;
+        controller.orderConfigs = await this.store.findAll('order-config');
+        controller.serviceAreas = await this.store.findAll('service-area');
     }
 }

package/addon/services/location.js

@@ -78,66 +78,74 @@ export default class LocationService extends Service {
     }
 
     /**
-     * Attempts to fetch the user's location from various sources.
-     * Uses cached data, navigator geolocation, or WHOIS data as fallbacks.
+     * Attempts to fetch the user's location from various sources including cached data,
+     * navigator geolocation, or WHOIS data. It first tries to get the cached coordinates.
+     * If not available or outdated, it tries the browser's geolocation API.
+     * As a fallback, it uses WHOIS data associated with the user's account.
+     *
      * @returns {Promise<Object>} A promise that resolves to an object containing latitude and longitude.
      */
-    getUserLocation() {
-        return this.fetch.cachedGet('fleet-ops/live/coordinates', {}, { expirationInterval: 1, expirationIntervalUnit: 'hour' }).then((coordinates) => {
+    async getUserLocation() {
+        // If the location has already been located, return the existing coordinates
+        if (this.located) {
+            return { latitude: this.latitude, longitude: this.longitude };
+        }
+
+        try {
+            const coordinates = await this.fetch.cachedGet('fleet-ops/live/coordinates', {}, { expirationInterval: 1, expirationIntervalUnit: 'hour' });
+
             if (isBlank(coordinates)) {
-                return this.getUserLocationFromNavigator().then((navigatorCoordinates) => {
-                    this.updateLocation(navigatorCoordinates);
-                    return navigatorCoordinates;
-                });
+                return await this.getUserLocationFromNavigator();
             }
 
-            if (isArray(coordinates)) {
-                const validCoordinates = coordinates.filter((point) => point.coordinates[0] !== 0);
+            if (isArray(coordinates) && coordinates.length > 0) {
+                // Ensure the coordinates array contains valid data
+                const validCoordinates = coordinates.find((point) => point.coordinates[0] !== 0 && point.coordinates[1] !== 0);
                 if (validCoordinates) {
-                    const [longitude, latitude] = getWithDefault(validCoordinates, '0.coordinates', [0, 0]);
-                    const userCoordinates = {
-                        latitude,
-                        longitude,
-                    };
-
-                    this.updateLocation(userCoordinates);
-                    return userCoordinates;
+                    const [longitude, latitude] = validCoordinates.coordinates;
+                    this.updateLocation({ latitude, longitude });
+                    return { latitude, longitude };
                 }
             }
 
-            return this.getUserLocationFromWhois();
-        });
+            return await this.getUserLocationFromWhois();
+        } catch (error) {
+            return await this.getUserLocationFromWhois();
+        }
     }
 
     /**
      * Retrieves the user's location using the browser's navigator geolocation API.
-     * @returns {Promise<Object>} A promise that resolves to geolocation coordinates.
+     * It creates a promise that resolves with the geolocation if successful,
+     * or with WHOIS data as a fallback in case of failure or absence of navigator geolocation.
+     *
+     * @returns {Promise<Object>} A promise that resolves to geolocation coordinates or WHOIS data.
      */
-    getUserLocationFromNavigator() {
-        return new Promise((resolve) => {
-            // eslint-disable-next-line no-undef
-            if (window.navigator && window.navigator.geolocation) {
-                // eslint-disable-next-line no-undef
-                return navigator.geolocation.getCurrentPosition(
-                    ({ coords }) => {
-                        this.updateLocation(coords);
-                        return resolve(coords);
-                    },
-                    () => {
-                        // If failed use user whois
-                        return resolve(this.getUserLocationFromWhois());
-                    }
-                );
+    async getUserLocationFromNavigator() {
+        if (window.navigator && window.navigator.geolocation) {
+            try {
+                const position = await new Promise((resolve, reject) => {
+                    navigator.geolocation.getCurrentPosition(resolve, reject, {
+                        enableHighAccuracy: true,
+                        timeout: 600,
+                    });
+                });
+                const { latitude, longitude } = position.coords;
+                this.updateLocation({ latitude, longitude });
+                return { latitude, longitude };
+            } catch (error) {
+                return await this.getUserLocationFromWhois();
             }
-
-            // default to whois lookup coordinates
-            return resolve(this.getUserLocationFromWhois());
-        });
+        } else {
+            return await this.getUserLocationFromWhois();
+        }
     }
 
     /**
-     * Retrieves the user's location based on WHOIS data associated with the user's account.
-     * @returns {Object} An object containing latitude and longitude from WHOIS data.
+     * Retrieves the user's location based on WHOIS data associated with their account.
+     * Defaults to predefined coordinates if WHOIS data is not available.
+     *
+     * @returns {Object} An object containing latitude and longitude from WHOIS data or default values.
      */
     getUserLocationFromWhois() {
         const whois = this.currentUser.getOption('whois');
@@ -151,8 +159,10 @@ export default class LocationService extends Service {
     }
 
     /**
-     * Updates the service's tracked properties with the new location data and triggers an event.
-     * @param {Object} coordinates - An object containing the latitude and longitude.
+     * Updates the service's tracked properties with the new location data.
+     * Triggers an event to notify other parts of the application that the user's location has been updated.
+     *
+     * @param {Object} coordinates - An object containing the latitude and longitude to be set.
      */
     updateLocation({ latitude, longitude }) {
         this.latitude = latitude;

package/addon/templates/operations/service-rates/index/new.hbs

@@ -17,7 +17,16 @@
 
                 <div class="input-group">
                     <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.service-order-label"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.service-order-help-text"}} />
-                    <Select class="w-full" @options={{this.serviceTypes}} @value={{this.serviceRate.service_type}} @optionLabel="name" @optionValue="key" @onSelect={{fn (mut this.serviceRate.service_type)}} @placeholder={{t "fleet-ops.operations.service-rates.index.new.service-order-placeholder"}} />
+                    <select class="form-select w-full has--placeholder" {{on "change" this.setConfig}}>
+                        <option selected disabled>
+                            {{t "fleet-ops.operations.service-rates.index.new.service-order-placeholder"}}
+                        </option>
+                        {{#each this.orderConfigs as |orderConfig|}}
+                            <option value={{orderConfig.id}} selected={{eq orderConfig.id this.serviceRate.order_config_uuid}}>
+                                {{orderConfig.name}}
+                            </option>
+                        {{/each}}
+                    </select>
                 </div>
 
                 <div class="input-group">

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.4.18",
+    "version": "0.4.20",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.12",
+        "fleetbase/core-api": "^1.4.14",
         "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.18",
+    "version": "0.4.20",
     "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.18",
+    "version": "0.4.20",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -42,9 +42,9 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.2.6",
+        "@fleetbase/ember-core": "^0.2.8",
         "@fleetbase/ember-ui": "^0.2.11",
-        "@fleetbase/fleetops-data": "^0.1.13",
+        "@fleetbase/fleetops-data": "^0.1.14",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@fortawesome/ember-fontawesome": "^0.4.1",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",

package/server/config/fleetops.php

@@ -2,10 +2,15 @@
 
 /**
  * -------------------------------------------
- * Fleetbase Core API Configuration
+ * FleetOps API Configuration
  * -------------------------------------------
  */
 return [
+    /*
+    |--------------------------------------------------------------------------
+    | API Config
+    |--------------------------------------------------------------------------
+    */
     'api' => [
         'version' => '0.0.1',
         'routing' => [
@@ -13,10 +18,128 @@ return [
             'internal_prefix' => 'int'
         ]
     ],
+    'connection' => [
+        'db' => env('DB_CONNECTION', 'mysql')
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Navigator App
+    |--------------------------------------------------------------------------
+    */
     'navigator' => [
         'bypass_verification_code' => env('NAVIGATOR_BYPASS_VERIFICATION_CODE', '999000')
     ],
-    'connection' => [
-        'db' => env('DB_CONNECTION', 'mysql')
-    ]
+
+    /*
+    |--------------------------------------------------------------------------
+    | API Events
+    |--------------------------------------------------------------------------
+    */
+    'events' => [
+        // order events
+        'order.created',
+        'order.updated',
+        'order.deleted',
+        'order.dispatched',
+        'order.dispatch_failed',
+        'order.completed',
+        'order.failed',
+        'order.driver_assigned',
+        'order.completed',
+
+        // payload events
+        'payload.created',
+        'payload.updated',
+        'payload.deleted',
+
+        // entity events
+        'entity.created',
+        'entity.updated',
+        'entity.deleted',
+        'entity.driver_assigned',
+
+        // driver events
+        'driver.created',
+        'driver.updated',
+        'driver.deleted',
+        'driver.assigned',
+        // 'driver.entered_zone',
+        // 'driver.exited_zone',
+
+        // fleet events
+        'fleet.created',
+        'fleet.updated',
+        'fleet.deleted',
+
+        // purchase_rate events
+        'purchase_rate.created',
+        'purchase_rate.updated',
+        'purchase_rate.deleted',
+
+        // contact events
+        'contact.created',
+        'contact.updated',
+        'contact.deleted',
+
+        // place events
+        'place.created',
+        'place.updated',
+        'place.deleted',
+
+        // service_area events
+        'service_area.created',
+        'service_area.updated',
+        'service_area.deleted',
+
+        // service_quote events
+        'service_quote.created',
+        'service_quote.updated',
+        'service_quote.deleted',
+
+        // service_rate events
+        'service_rate.created',
+        'service_rate.updated',
+        'service_rate.deleted',
+
+        // tracking_number events
+        'tracking_number.created',
+        'tracking_number.updated',
+        'tracking_number.deleted',
+
+        // tracking_status events
+        'tracking_status.created',
+        'tracking_status.updated',
+        'tracking_status.deleted',
+
+        // vehicle events
+        'vehicle.created',
+        'vehicle.updated',
+        'vehicle.deleted',
+
+        // vendor events
+        'vendor.created',
+        'vendor.updated',
+        'vendor.deleted',
+
+        // zone events
+        'zone.created',
+        'zone.updated',
+        'zone.deleted',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Proof of Delivery Methods
+    |--------------------------------------------------------------------------
+    */
+    'pod_methods' => 'scan,signature,photo',
+
+    /*
+    |--------------------------------------------------------------------------
+    | API/Webhook Versions
+    |--------------------------------------------------------------------------
+    */
+    'versions' => ['2020-09-30', '2024-03-12'],
+    'version' => '2024-03-12',
 ];

package/server/migrations/2024_03_13_061249_add_order_config_uuid_column_to_service_rates_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('service_rates', function (Blueprint $table) {
+            $table->foreignUuid('order_config_uuid')->nullable()->after('zone_uuid')->references('uuid')->on('order_configs')->onUpdate('CASCADE')->onDelete('CASCADE');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('service_rates', function (Blueprint $table) {
+            $table->dropForeign(['order_config_uuid']);
+            $table->dropColumn(['order_config_uuid']);
+        });
+    }
+};

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

@@ -4,9 +4,9 @@ namespace Fleetbase\FleetOps\Console\Commands;
 
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\OrderConfig;
-use Fleetbase\Support\Utils;
+use Fleetbase\FleetOps\Support\FleetOps;
+use Fleetbase\Models\Company;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Artisan;
 
 class FixLegacyOrderConfigs extends Command
 {
@@ -15,7 +15,7 @@ class FixLegacyOrderConfigs extends Command
      *
      * @var string
      */
-    protected $signature = 'fleetops:fix-legacy-order-configs';
+    protected $signature = 'fleetops:fix-legacy-order-configs {--create-configs}';
 
     /**
      * The console command description.
@@ -35,14 +35,20 @@ class FixLegacyOrderConfigs extends Command
      */
     public function handle()
     {
-        if (Utils::classExists('\\Fleetbase\\FleetOps\\Seeders\\OrderConfigSeeder')) {
-            $this->info('Starting the database seeding...');
-
-            Artisan::call('db:seed', [
-                '--class' => '\\Fleetbase\\FleetOps\\Seeders\\OrderConfigSeeder',
-            ]);
-
-            $this->info('Database seeding completed.');
+        $shouldCreateConfigs = $this->option('create-configs');
+        if ($shouldCreateConfigs) {
+            $companies      = Company::all();
+            $totalCompanies = $companies->count();
+            $this->info('Initializing transport config for ' . $totalCompanies . ' companies.');
+            $progressBar = $this->output->createProgressBar($totalCompanies);
+            $progressBar->start();
+            foreach ($companies as $company) {
+                FleetOps::createTransportConfig($company);
+                $progressBar->advance();
+            }
+            $progressBar->finish();
+            $this->line('');
+            $this->info('All transport configs created.');
         }
 
         $orders      = Order::whereNull('order_config_uuid')->get();

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

@@ -11,7 +11,6 @@ use Fleetbase\FleetOps\Http\Resources\v1\Driver as DriverResource;
 use Fleetbase\FleetOps\Jobs\SimulateDrivingRoute;
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\FleetOps\Support\Flow;
 use Fleetbase\FleetOps\Support\OSRM;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;

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

@@ -25,6 +25,7 @@ use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Models\Company;
 use Fleetbase\Models\File;
+use Fleetbase\Models\Setting;
 use Fleetbase\Support\Auth;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
@@ -433,8 +434,6 @@ 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'));
@@ -1364,4 +1363,52 @@ class OrderController extends Controller
 
         return new ProofResource($proof);
     }
+
+    /**
+     * Retrieves editable fields for a specific order entity based on its configuration.
+     *
+     * This function looks up an order by its ID and retrieves configurable editable fields
+     * associated with it, as defined in the settings. If the order is not found, it returns
+     * a 404 response with an error message. Otherwise, it returns the editable fields for
+     * the order entity.
+     *
+     * @param string  $id      the unique identifier of the order
+     * @param Request $request the incoming request instance
+     *
+     * @return \Illuminate\Http\JsonResponse returns a JSON response containing either an error message
+     *                                       or the editable fields for the order entity
+     *
+     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException thrown if the order with the given ID cannot be found
+     */
+    public function getEditableEntityFields(string $id, Request $request)
+    {
+        try {
+            $order = Order::findRecordOrFail($id);
+        } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
+            return response()->json(
+                [
+                    'error' => 'Order resource not found.',
+                ],
+                404
+            );
+        }
+
+        // Define settings as array
+        $entityEditingSettings = [];
+
+        // get the order config id
+        $orderConfigId = data_get($order, 'order_config_uuid');
+
+        // Get entity editing settings
+        $savedEntityEditingSettings = Setting::where('key', 'fleet-ops.entity-editing-settings')->value('value');
+
+        if ($orderConfigId && $savedEntityEditingSettings) {
+            $resolvedEntityEditingSettings = data_get($savedEntityEditingSettings, $orderConfigId, []);
+            if ($resolvedEntityEditingSettings) {
+                $entityEditingSettings = data_get($resolvedEntityEditingSettings, 'editable_entity_fields', []);
+            }
+        }
+
+        return response()->json($entityEditingSettings);
+    }
 }

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

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Http\Controllers\Api\v1;
 
 use Fleetbase\FleetOps\Http\Requests\QueryServiceQuotesRequest;
 use Fleetbase\FleetOps\Http\Resources\v1\ServiceQuote as ServiceQuoteResource;
+use Fleetbase\FleetOps\Models\Entity;
 use Fleetbase\FleetOps\Models\IntegratedVendor;
 use Fleetbase\FleetOps\Models\Payload;
 use Fleetbase\FleetOps\Models\Place;
@@ -76,11 +77,15 @@ class ServiceQuoteController extends Controller
 
         // if quote for single service
         if ($service && $service !== 'all') {
-            $serviceRate = ServiceRate::where('uuid', $service)->where(function ($q) use ($currency) {
-                if ($currency) {
-                    $q->where(DB::raw('lower(currency)'), strtolower($currency));
-                }
-            })->first();
+            $serviceRate = ServiceRate::where(
+                function ($query) use ($service) {
+                    $query->where('uuid', $service)->orWhere('public_id', $service);
+                })->where(
+                    function ($q) use ($currency) {
+                        if ($currency) {
+                            $q->where(DB::raw('lower(currency)'), strtolower($currency));
+                        }
+                    })->first();
             $serviceQuotes = collect();
 
             if ($serviceRate) {