@fleetbase/fleetops-engine 0.6.18 → 0.6.20

package/server/migrations/2025_09_10_010724_create_additional_spec_columns_for_assets_vehicles_table.php

@@ -0,0 +1,77 @@
+<?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('vehicles', function (Blueprint $table) {
+            $table->mediumText('description')->after('photo_uuid')->nullable();
+            $table->string('name')->after('photo_uuid')->nullable();
+            $table->string('odometer_unit')->after('type')->nullable();
+            $table->string('odometer')->after('type')->nullable();
+            $table->string('ownership_type')->after('type')->nullable();
+            $table->string('transmission')->after('trim')->nullable();
+            $table->string('color')->after('trim')->nullable();
+            $table->string('fuel_volume_unit')->after('trim')->nullable();
+            $table->string('fuel_type')->after('trim')->nullable();
+            $table->mediumText('notes')->after('meta')->nullable();
+            $table->string('usage_type')->after('type')->nullable();
+            $table->string('measurement_system')->after('type')->nullable();
+            $table->json('vin_data')->change();
+            $table->renameColumn('model_data', 'specs');
+        });
+
+        Schema::table('assets', function (Blueprint $table) {
+            $table->string('ownership_type')->after('type')->nullable();
+            $table->string('odometer_unit')->after('odometer')->nullable();
+            $table->string('transmission')->after('engine_hours')->nullable();
+            $table->string('fuel_volume_unit')->after('engine_hours')->nullable();
+            $table->string('fuel_type')->after('engine_hours')->nullable();
+            $table->mediumText('description')->after('name')->nullable();
+            $table->mediumText('notes')->after('attributes')->nullable();
+            $table->string('usage_type')->after('code')->nullable();
+            $table->string('measurement_system')->after('code')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('assets', function (Blueprint $table) {
+            $table->dropColumn('odometer_unit');
+            $table->dropColumn('transmission');
+            $table->dropColumn('fuel_volume_unit');
+            $table->dropColumn('fuel_type');
+            $table->dropColumn('description');
+            $table->dropColumn('notes');
+            $table->dropColumn('usage_type');
+            $table->dropColumn('measurement_system');
+            $table->dropColumn('ownership_type');
+        });
+
+        Schema::table('vehicles', function (Blueprint $table) {
+            $table->dropColumn('name');
+            $table->dropColumn('description');
+            $table->dropColumn('odometer_unit');
+            $table->dropColumn('odometer');
+            $table->dropColumn('transmission');
+            $table->dropColumn('color');
+            $table->dropColumn('fuel_type');
+            $table->dropColumn('fuel_volume_unit');
+            $table->dropColumn('notes');
+            $table->dropColumn('usage_type');
+            $table->dropColumn('measurement_system');
+            $table->dropColumn('ownership_type');
+            $table->mediumText('vin_data')->change();
+            $table->renameColumn('specs', 'model_data');
+        });
+    }
+};

package/server/migrations/2025_09_14_031758_add_provider_options_column_to_integrated_vendors_tabl.php

@@ -0,0 +1,27 @@
+<?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('integrated_vendors', function (Blueprint $table) {
+            $table->json('provider_options')->nullable()->after('provider');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('integrated_vendors', function (Blueprint $table) {
+            $table->dropColumn('provider_options');
+        });
+    }
+};

package/server/migrations/2025_09_15_031052_add_title_column_to_issues_table.php

@@ -0,0 +1,27 @@
+<?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('issues', function (Blueprint $table) {
+            $table->string('title', 300)->nullable()->after('reported_by_uuid');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('issues', function (Blueprint $table) {
+            $table->dropColumn('title');
+        });
+    }
+};

package/server/migrations/2025_09_24_004700_add_vehicle_columns.php

@@ -0,0 +1,49 @@
+<?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('vehicles', function (Blueprint $table) {
+            $table->string('class')->after('type')->nullable()->index();
+            $table->string('model_type')->after('model')->nullable()->index();
+            $table->string('body_sub_type')->after('measurement_system')->nullable()->index();
+            $table->string('body_type')->after('measurement_system')->nullable()->index();
+        });
+
+        Schema::table('contacts', function (Blueprint $table) {
+            $table->mediumText('notes')->after('type')->nullable();
+        });
+
+        Schema::table('vendors', function (Blueprint $table) {
+            $table->mediumText('notes')->after('type')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('vehicles', function (Blueprint $table) {
+            $table->dropColumn('class');
+            $table->dropColumn('model_type');
+            $table->dropColumn('body_type');
+            $table->dropColumn('body_sub_type');
+        });
+
+        Schema::table('contacts', function (Blueprint $table) {
+            $table->dropColumn('notes');
+        });
+
+        Schema::table('vendors', function (Blueprint $table) {
+            $table->dropColumn('notes');
+        });
+    }
+};

package/server/migrations/2025_10_07_020406_add_max_distance_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->string('max_distance_unit')->default('km')->after('base_fee');
+            $table->integer('max_distance')->default(5)->after('base_fee');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('service_rates', function (Blueprint $table) {
+            $table->dropColumn(['max_distance_unit', 'max_distance']);
+        });
+    }
+};

package/server/migrations/2025_10_08_091812_add_details_column_to_vehicles_table.php

@@ -0,0 +1,27 @@
+<?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('vehicles', function (Blueprint $table) {
+            $table->json('details')->after('specs')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('vehicles', function (Blueprint $table) {
+            $table->dropColumn('details');
+        });
+    }
+};

package/server/src/Auth/Schemas/FleetOps.php

@@ -69,6 +69,10 @@ class FleetOps
             'name'    => 'vendor',
             'actions' => ['subcontract', 'create-order-for', 'export', 'import'],
         ],
+        [
+            'name'    => 'integrated-vendor',
+            'actions' => ['export', 'import'],
+        ],
         [
             'name'    => 'contact',
             'actions' => ['subcontract', 'create-order-for', 'export', 'import'],
@@ -77,6 +81,10 @@ class FleetOps
             'name'    => 'customer',
             'actions' => ['reset-credentials-for'],
         ],
+        [
+            'name'    => 'report',
+            'actions' => ['export', 'execute'],
+        ],
         [
             'name'    => 'facilitator',
             'actions' => [],
@@ -105,6 +113,10 @@ class FleetOps
             'name'    => 'issue',
             'actions' => ['export', 'import'],
         ],
+        [
+            'name'    => 'custom-field',
+            'actions' => [],
+        ],
         [
             'name'           => 'navigator-settings', // the navigator mobile app used by drivers
             'action'         => [],

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

@@ -78,23 +78,36 @@ class DispatchAdhocOrders extends Command
     }
 
     /**
-     * Fetches ad-hoc dispatchable orders based on certain criteria.
+     * Retrieve a collection of dispatchable orders that meet specific conditions.
      *
-     * Retrieves orders that are marked as ad-hoc and have not been dispatched yet. The orders
-     * are filtered by their scheduled dispatch time, order status, and whether a driver has been
-     * assigned to them. The method also applies filters based on sandbox mode.
+     * This method queries orders that are eligible for dispatching based on multiple constraints:
+     * - Orders must be adhoc, dispatched, but not yet started.
+     * - Orders must have a `dispatched_at` timestamp within a configurable time window:
+     *     - Not older than the given expiry limit (default 72 hours).
+     *     - At least the given interval old (default 4 minutes).
+     * - Orders must not have a driver already assigned and must not be deleted or canceled.
+     * - Orders must belong to companies that have at least one associated user with an online driver.
+     * - Orders must have an associated payload.
      *
-     * @return Collection returns a collection of orders that meet the criteria
+     * The query is executed against the appropriate database connection, depending on
+     * whether the `sandbox` option is enabled.
+     *
+     * @param int $interval    minimum age of the order in minutes to be considered dispatchable (default: 4)
+     * @param int $expiryHours maximum age of the order in hours before it expires and is no longer dispatchable (default: 72)
+     *
+     * @return \Illuminate\Support\Collection a collection of eligible `Order` models with their related `company` and `payload`
      */
-    public function getDispatchableOrders(): Collection
+    public function getDispatchableOrders(int $interval = 4, int $expiryHours = 72): Collection
     {
         $sandbox  = Utils::castBoolean($this->option('sandbox'));
-        $interval = 4;
 
         return Order::on($sandbox ? 'sandbox' : 'mysql')
             ->withoutGlobalScopes()
             ->where(['adhoc' => 1, 'dispatched' => 1, 'started' => 0])
-            ->whereDate('dispatched_at', '<=', Carbon::now()->subMinutes($interval)->toDateTimeString())
+            ->whereBetween('dispatched_at', [
+                Carbon::now()->subHours($expiryHours),           // not older than 72 hours
+                Carbon::now()->subMinutes($interval),  // older than interval minutes
+            ])
             ->whereNull('driver_assigned_uuid')
             ->whereNull('deleted_at')
             ->where('status', '!=', 'canceled')

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

@@ -73,7 +73,7 @@ class ServiceRateController extends Controller
         $serviceRate = ServiceRate::create($input);
 
         // create service rate fee's if applicable
-        if ($request->has('meter_fees') && $serviceRate->isRateCalculationMethod('fixed_meter') && is_array($request->input('meter_fees'))) {
+        if ($request->has('meter_fees') && $serviceRate->isRateCalculationMethod(['fixed_meter', 'fixed_rate']) && is_array($request->input('meter_fees'))) {
             foreach ($request->input('meter_fees') as $meterFee) {
                 ServiceRateFee::create([
                     'service_rate_uuid' => $serviceRate->uuid,

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

@@ -8,6 +8,7 @@ use Fleetbase\FleetOps\Imports\ContactImport;
 use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
+use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 
@@ -20,6 +21,17 @@ class ContactController extends FleetOpsController
      */
     public $resource = 'contact';
 
+    /**
+     * Handle post save transactions.
+     */
+    public function afterSave(Request $request, Contact $contact)
+    {
+        $customFieldValues = $request->array('contact.custom_field_values');
+        if ($customFieldValues) {
+            $contact->syncCustomFieldValues($customFieldValues);
+        }
+    }
+
     /**
      * Returns the contact as a `facilitator-contact`.
      *

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

@@ -0,0 +1,15 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+
+class DeviceController extends FleetOpsController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'device';
+}

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

@@ -0,0 +1,15 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+
+class DeviceEventController extends FleetOpsController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'device-event';
+}

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

@@ -20,6 +20,7 @@ use Fleetbase\Models\Invite;
 use Fleetbase\Models\User;
 use Fleetbase\Models\VerificationCode;
 use Fleetbase\Support\Auth;
+use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
@@ -196,16 +197,20 @@ class DriverController extends FleetOpsController
                 },
                 function ($request, &$driver) {
                     $driver->load(['user']);
+                    $customFieldValues = $request->array('driver.custom_field_values');
+                    if ($customFieldValues) {
+                        $driver->syncCustomFieldValues($customFieldValues);
+                    }
                 }
             );
 
             return ['driver' => new $this->resource($record)];
-        } catch (\Exception $e) {
-            return response()->error($e->getMessage());
-        } catch (\Illuminate\Database\QueryException $e) {
-            return response()->error($e->getMessage());
+        } catch (QueryException $e) {
+            return response()->error(env('DEBUG') ? $e->getMessage() : 'Error occurred while trying to create a ' . $this->resourceSingularlName);
         } catch (FleetbaseRequestValidationException $e) {
             return response()->error($e->getErrors());
+        } catch (\Exception $e) {
+            return response()->error($e->getMessage());
         }
     }
 
@@ -261,16 +266,20 @@ class DriverController extends FleetOpsController
                     }
 
                     $driver->setHidden(['user']);
+                    $customFieldValues = $request->array('driver.custom_field_values');
+                    if ($customFieldValues) {
+                        $driver->syncCustomFieldValues($customFieldValues);
+                    }
                 }
             );
 
             return ['driver' => new $this->resource($record)];
-        } catch (\Exception $e) {
-            return response()->error($e->getMessage());
-        } catch (\Illuminate\Database\QueryException $e) {
-            return response()->error($e->getMessage());
+        } catch (QueryException $e) {
+            return response()->error(env('DEBUG') ? $e->getMessage() : 'Error occurred while trying to update a ' . $this->resourceSingularlName);
         } catch (FleetbaseRequestValidationException $e) {
             return response()->error($e->getErrors());
+        } catch (\Exception $e) {
+            return response()->error($e->getMessage());
         }
     }
 

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

@@ -0,0 +1,15 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+
+class EquipmentController extends FleetOpsController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'equipment';
+}

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

@@ -13,6 +13,7 @@ use Fleetbase\FleetOps\Models\FleetVehicle;
 use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
+use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
@@ -26,11 +27,22 @@ class FleetController extends FleetOpsController
      */
     public $resource = 'fleet';
 
+    /**
+     * Handle post save transactions.
+     */
+    public function afterSave(Request $request, Fleet $fleet)
+    {
+        $customFieldValues = $request->array('fleet.custom_field_values');
+        if ($customFieldValues) {
+            $fleet->syncCustomFieldValues($customFieldValues);
+        }
+    }
+
     /**
      * Query callback when querying record.
      *
      * @param \Illuminate\Database\Query\Builder $query
-     * @param \Illuminate\Http\Request           $request
+     * @param Request                            $request
      */
     public static function onQueryRecord($query, $request): void
     {
@@ -94,7 +106,7 @@ class FleetController extends FleetOpsController
     /**
      * Removes a driver from a fleet.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
      * @return \Illuminate\Http\Response
      */
@@ -118,7 +130,7 @@ class FleetController extends FleetOpsController
     /**
      * Adds a driver to a fleet.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
      * @return \Illuminate\Http\Response
      */
@@ -151,7 +163,7 @@ class FleetController extends FleetOpsController
     /**
      * Removes a vehicle from a fleet.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
      * @return \Illuminate\Http\Response
      */
@@ -175,7 +187,7 @@ class FleetController extends FleetOpsController
     /**
      * Adds a vehicle to a fleet.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
      * @return \Illuminate\Http\Response
      */

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

@@ -5,8 +5,10 @@ namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 use Fleetbase\FleetOps\Exports\FuelReportExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Imports\FuelReportImport;
+use Fleetbase\FleetOps\Models\FuelReport;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
+use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 
@@ -19,6 +21,17 @@ class FuelReportController extends FleetOpsController
      */
     public $resource = 'fuel_report';
 
+    /**
+     * Handle post save transactions.
+     */
+    public function afterSave(Request $request, FuelReport $fuelReport)
+    {
+        $customFieldValues = $request->array('fuel_report.custom_field_values');
+        if ($customFieldValues) {
+            $fuelReport->syncCustomFieldValues($customFieldValues);
+        }
+    }
+
     /**
      * Export the fleets to excel or csv.
      *

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

@@ -5,8 +5,10 @@ namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 use Fleetbase\FleetOps\Exports\IssueExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Imports\IssueImport;
+use Fleetbase\FleetOps\Models\Issue;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
+use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 
@@ -19,6 +21,17 @@ class IssueController extends FleetOpsController
      */
     public $resource = 'issue';
 
+    /**
+     * Handle post save transactions.
+     */
+    public function afterSave(Request $request, Issue $issue)
+    {
+        $customFieldValues = $request->array('issue.custom_field_values');
+        if ($customFieldValues) {
+            $issue->syncCustomFieldValues($customFieldValues);
+        }
+    }
+
     /**
      * Export the issue to excel or csv.
      *

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

@@ -0,0 +1,15 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+
+class MaintenanceController extends FleetOpsController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'maintenance';
+}