@fleetbase/fleetops-engine 0.6.48 → 0.6.50

package/server/tests/VroomOrchestrationEngineTest.php

@@ -157,3 +157,94 @@ test('vroom capacity-only payload uses matrix indexes instead of coordinates', f
     expect($payload['matrices']['capacity_only']['durations'])->toHaveCount(2);
     expect(array_values($reverse))->toBe(['order_capacity']);
 });
+
+test('vroom capacity-only payload minimizes vehicles by default', function () {
+    $engine  = new VroomOrchestrationEngine();
+    $method  = new ReflectionMethod($engine, 'buildCapacityOnlyPayload');
+    $reverse = [];
+
+    $method->setAccessible(true);
+
+    $payload = $method->invokeArgs($engine, [[
+        ['id' => 'order_a', 'description' => 'order_a', 'amount' => [100, 250, 1, 2]],
+        ['id' => 'order_b', 'description' => 'order_b', 'amount' => [80, 100, 0, 1]],
+    ], [
+        ['id' => 'vehicle_large', 'driver_id' => null, 'capacity' => [500, 1000, 4, 20]],
+        ['id' => 'vehicle_spare', 'driver_id' => null, 'capacity' => [500, 1000, 4, 20]],
+    ], [], &$reverse]);
+
+    expect($payload['vehicles'][0]['costs'])->toBe(['fixed' => 100000]);
+    expect($payload['vehicles'][1]['costs'])->toBe(['fixed' => 100000]);
+    expect($payload['jobs'])->toHaveCount(2);
+    expect($payload['jobs'][0]['delivery'])->toBe([100, 250, 1, 2]);
+    expect($payload['jobs'][1]['delivery'])->toBe([80, 100, 0, 1]);
+});
+
+test('vroom capacity-only payload accepts custom minimize vehicles fixed cost', function () {
+    $engine  = new VroomOrchestrationEngine();
+    $method  = new ReflectionMethod($engine, 'buildCapacityOnlyPayload');
+    $reverse = [];
+
+    $method->setAccessible(true);
+
+    $payload = $method->invokeArgs($engine, [[
+        ['id' => 'order_a', 'description' => 'order_a', 'amount' => [100, 250, 1, 2]],
+    ], [
+        ['id' => 'vehicle_large', 'driver_id' => null, 'capacity' => [500, 1000, 4, 20]],
+    ], [
+        'vehicle_packing'    => 'minimize_vehicles',
+        'vehicle_fixed_cost' => 50000,
+    ], &$reverse]);
+
+    expect($payload['vehicles'][0]['costs'])->toBe(['fixed' => 50000]);
+});
+
+test('vroom capacity-only payload can disable vehicle packing bias', function (string $packing) {
+    $engine  = new VroomOrchestrationEngine();
+    $method  = new ReflectionMethod($engine, 'buildCapacityOnlyPayload');
+    $reverse = [];
+
+    $method->setAccessible(true);
+
+    $payload = $method->invokeArgs($engine, [[
+        ['id' => 'order_a', 'description' => 'order_a', 'amount' => [100, 250, 1, 2]],
+    ], [
+        ['id' => 'vehicle_large', 'driver_id' => null, 'capacity' => [500, 1000, 4, 20]],
+    ], [
+        'vehicle_packing' => $packing,
+    ], &$reverse]);
+
+    expect($payload['vehicles'][0])->not->toHaveKey('costs');
+})->with(['balanced', 'none']);
+
+test('vroom capacity-only response can assign multiple orders to one large vehicle', function () {
+    $engine = new VroomOrchestrationEngine();
+    $method = new ReflectionMethod($engine, 'mapVroomResponse');
+
+    $method->setAccessible(true);
+
+    $result = $method->invoke($engine, [
+        'routes' => [
+            [
+                'description' => json_encode(['vehicle_id' => 'vehicle_large', 'driver_id' => null]),
+                'steps'       => [
+                    ['type' => 'start'],
+                    ['type' => 'job', 'id' => 1001],
+                    ['type' => 'job', 'id' => 1002],
+                    ['type' => 'job', 'id' => 1003],
+                    ['type' => 'end'],
+                ],
+            ],
+        ],
+        'unassigned' => [],
+        'summary'    => ['routes' => 1],
+    ], [
+        1001 => 'order_a',
+        1002 => 'order_b',
+        1003 => 'order_c',
+    ]);
+
+    expect($result['assignments'])->toHaveCount(3);
+    expect(collect($result['assignments'])->pluck('vehicle_id')->unique()->values()->all())->toBe(['vehicle_large']);
+    expect(collect($result['assignments'])->pluck('order_id')->all())->toBe(['order_a', 'order_b', 'order_c']);
+});

package/translations/en-us.yaml

@@ -8,6 +8,7 @@ common:
     dispatch-orders: Dispatch Orders
     dispatch-order: Dispatch Order
     assign-driver: Assign Driver
+    unassign-driver: Unassign Driver
     assign-drivers: Assign Drivers
     no-driver-assigned: No driver assigned
     details: Details
@@ -435,6 +436,7 @@ driver:
         vendor: Vendor
         select-vendor: Select Vendor
         driver-license: Drivers License
+        license-expiry: License Expiry
         no-vehicle-assigned: No Vehicle Assigned
     actions:
         assign-order: Assign Order to Driver
@@ -1653,6 +1655,39 @@ modals:
         description-zone: Description of Zone
 
 widget:
+    refresh: Refresh
+    kpi-earnings:
+        title: Earnings
+    kpi-distance:
+        title: Distance Travelled
+    kpi-aov:
+        title: Avg Order Value
+    kpi-active-orders:
+        title: Active Orders
+    kpi-drivers-online:
+        title: Drivers Online
+    kpi-open-issues:
+        title: Open Issues
+    operations-pulse:
+        title: Operations Pulse
+    revenue-trend:
+        title: Revenue Trend
+    orders-by-status:
+        title: Order Volume by Status
+    on-time-delivery:
+        title: On-Time Delivery
+    top-drivers:
+        title: Top Drivers
+    fuel-efficiency:
+        title: Fuel Cost & Efficiency
+    issues-insights:
+        title: Issues Insights
+    maintenance-overview:
+        title: Maintenance Overview
+    geofence-violations:
+        title: Geofence Violations
+    live-fleet:
+        title: Live Fleet Map
     fleet-ops-quickstart:
         message: Let's see what you can do to jumpstart operations...
         start-task: Start Task
@@ -1992,6 +2027,9 @@ orchestrator:
     allocation-strategy: Allocation Strategy
     allocation-strategy-route-aware: Route + Capacity
     allocation-strategy-capacity-only: Capacity Only
+    vehicle-packing: Vehicle Packing
+    vehicle-packing-minimize-vehicles: Minimize Vehicles
+    vehicle-packing-balanced: Balanced
     respect-skills: Respect Skills
     respect-capacity: Respect Capacity
     return-to-depot: Return to Depot

package/server/migrations/2026_05_13_000001_repair_customer_contact_user_types.php

@@ -1,86 +0,0 @@
-<?php
-
-use Fleetbase\FleetOps\Models\Contact;
-use Fleetbase\Models\CompanyUser;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Contact::withoutGlobalScopes()
-            ->where('type', 'customer')
-            ->whereNull('deleted_at')
-            ->chunkById(100, function ($contacts) {
-                foreach ($contacts as $contact) {
-                    try {
-                        $contact->repairCustomerTypeInvariant(true);
-                    } catch (Throwable $e) {
-                        // Skip ambiguous or unrecoverable records; runtime invariants handle new writes.
-                    }
-                }
-            });
-
-        if (!$this->canUseCustomerRoleHint()) {
-            return;
-        }
-
-        DB::table('contacts')
-            ->select('contacts.id')
-            ->join('company_users', function ($join) {
-                $join->on('company_users.user_uuid', '=', 'contacts.user_uuid');
-                $join->on('company_users.company_uuid', '=', 'contacts.company_uuid');
-            })
-            ->join('model_has_roles', function ($join) {
-                $join->on('model_has_roles.model_uuid', '=', 'company_users.uuid');
-                $join->where('model_has_roles.model_type', CompanyUser::class);
-            })
-            ->join('roles', 'roles.id', '=', 'model_has_roles.role_id')
-            ->where('roles.name', 'Fleet-Ops Customer')
-            ->whereNull('contacts.deleted_at')
-            ->where(function ($query) {
-                $query->whereNull('contacts.type');
-                $query->orWhere('contacts.type', '!=', 'customer');
-            })
-            ->distinct()
-            ->orderBy('contacts.id')
-            ->chunk(100, function ($rows) {
-                foreach ($rows as $row) {
-                    $contact = Contact::withoutGlobalScopes()->find($row->id);
-                    if (!$contact) {
-                        continue;
-                    }
-
-                    try {
-                        $contact->repairCustomerTypeInvariant(true);
-                    } catch (Throwable $e) {
-                        // Skip ambiguous or unrecoverable records; role is only a recovery hint.
-                    }
-                }
-            });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        // Data repair is intentionally not reversible.
-    }
-
-    private function canUseCustomerRoleHint(): bool
-    {
-        return Schema::hasTable('contacts')
-            && Schema::hasTable('company_users')
-            && Schema::hasTable('model_has_roles')
-            && Schema::hasTable('roles');
-    }
-};