@fleetbase/fleetops-engine 0.6.49 → 0.6.51

package/server/resources/views/labels/waypoint-label.php

@@ -1,5 +1,6 @@
 <?php
-use Fleetbase\Support\Utils; 
+use Fleetbase\Support\Utils;
+
 ?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -8,10 +9,16 @@ use Fleetbase\Support\Utils;
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title><?= $company->name ?? ($waypoint->internal_id ?? $waypoint->public_id) ?> Waypoint Label</title>
+    <title><?php echo e($company->name ?? ($waypoint->internal_id ?? $waypoint->public_id)); ?> Waypoint Label</title>
 </head>
 
 <style>
+    body {
+        font-family: "DejaVu Sans", "Noto Sans", "Noto Sans Arabic", "Noto Sans CJK SC", "Noto Sans CJK JP", sans-serif;
+        font-size: 12px;
+        line-height: 1.35;
+    }
+
     .group:after {
         content: "";
         display: table;
@@ -45,10 +52,10 @@ use Fleetbase\Support\Utils;
     <div style="width: 420px; border: 2px #414141 solid; margin: auto;">
         <div class="group" style="border-bottom: 1px #414141 solid; overflow: hidden;">
             <div style="float: left; width: 130px; height: 120px; border-right: 1px #414141 solid; text-align: center; padding: 10px; box-sizing: border-box;">
-                <img src="data:image/png;base64,<?= Utils::notEmpty($trackingNumber) ? $trackingNumber->qr_code : $order->trackingNumber->qr_code ?>" style="width: 100%; height: 100%; object-fit: cover;">
+                <img src="data:image/png;base64,<?php echo Utils::notEmpty($trackingNumber) ? $trackingNumber->qr_code : $order->trackingNumber->qr_code; ?>" style="width: 100%; height: 100%; object-fit: cover;">
             </div>
             <div style="margin-top: 10px;">
-                <span style="padding-left: 10px; font-size: 18px; font-weight: bold;"><?= strtoupper($company->name) ?></span>
+                <span style="padding-left: 10px; font-size: 18px; font-weight: bold;"><?php echo e($company->name); ?></span>
             </div>
         </div>
 
@@ -59,35 +66,35 @@ use Fleetbase\Support\Utils;
                         ADDRESS:
                     </div>
                     <div class="places--display-address" style="float: left; display: inline-block">
-                        <div class="line"><strong><?= $dropoff->name ?></strong></div>
-                        <div class="line"><?= $dropoff->street1 ?></div>
+                        <div class="line"><strong><?php echo e($dropoff->name); ?></strong></div>
+                        <div class="line"><?php echo e($dropoff->street1); ?></div>
                         <?php if (!empty($dropoff->street2)) { ?>
-                            <div class="line"><?= $dropoff->street2 ?></div>
+                            <div class="line"><?php echo e($dropoff->street2); ?></div>
                         <?php } ?>
                         <div class="line">
                             <?php if (!empty($dropoff->neighborhood)) { ?>
-                                <span class="segment"><?= $dropoff->neighborhood ?></span>
+                                <span class="segment"><?php echo e($dropoff->neighborhood); ?></span>
                             <?php } ?>
                             <?php if (!empty($dropoff->district)) { ?>
-                                <span class="segment"><?= $dropoff->district ?></span>
+                                <span class="segment"><?php echo e($dropoff->district); ?></span>
                             <?php } ?>
                         </div>
                         <div class="line">
                             <?php if (!empty($dropoff->postal_code)) { ?>
-                                <span class="segment"><?= $dropoff->postal_code ?></span>
+                                <span class="segment"><?php echo e($dropoff->postal_code); ?></span>
                             <?php } ?>
                             <?php if (!empty($dropoff->city)) { ?>
-                                <span class="segment"><?= $dropoff->city ?></span>
+                                <span class="segment"><?php echo e($dropoff->city); ?></span>
                             <?php } ?>
                             <?php if (!empty($dropoff->province)) { ?>
-                                <span class="segment"><?= $dropoff->province ?></span>
+                                <span class="segment"><?php echo e($dropoff->province); ?></span>
                             <?php } ?>
                             <?php if (!empty($dropoff->country)) { ?>
-                                <span class="segment"><?= $dropoff->country ?></span>
+                                <span class="segment"><?php echo e($dropoff->country); ?></span>
                             <?php } ?>
                         </div>
                         <?php if (!empty($dropoff->phone_number)) { ?>
-                            <div class="line"><?= $dropoff->phone_number ?></div>
+                            <div class="line"><?php echo e($dropoff->phone_number); ?></div>
                         <?php } ?>
                     </div>
                 </div>
@@ -102,11 +109,11 @@ use Fleetbase\Support\Utils;
                                 <strong>
                                     <?php
                                     if (data_get($entity, 'name')) {
-                                        echo strtoupper(data_get($entity, 'name') . ' - ' . data_get($entity, 'internal_id', ''));
+                                        echo e(data_get($entity, 'name') . ' - ' . data_get($entity, 'internal_id', ''));
                                     } else {
-                                        echo strtoupper('ITEM - ' . data_get($entity, 'internal_id', ''));
+                                        echo e('ITEM - ' . data_get($entity, 'internal_id', ''));
                                     }
-                                    ?>
+                            ?>
                                 </strong>
                             </div>
                         <?php } ?>
@@ -116,11 +123,11 @@ use Fleetbase\Support\Utils;
         <?php } ?>
         <div class="group">
             <div style="text-align: center; padding: 15px 0px; border-top: 1px #414141 solid;">
-                <img src="data:image/png;base64,<?= isset($trackingNumber) ? $trackingNumber->barcode : $order->trackingNumber->barcode ?>" style="height: 90px; margin-top: 10px;">
-                <div><?= strtoupper(isset($trackingNumber) ? $trackingNumber->tracking_number : $order->trackingNumber->tracking_number) ?></div>
+                <img src="data:image/png;base64,<?php echo isset($trackingNumber) ? $trackingNumber->barcode : $order->trackingNumber->barcode; ?>" style="height: 90px; margin-top: 10px;">
+                <div><?php echo e(strtoupper(isset($trackingNumber) ? $trackingNumber->tracking_number : $order->trackingNumber->tracking_number)); ?></div>
             </div>
         </div>
     </div>
 </body>
 
-</html>
+</html>

package/server/resources/views/mail/customer-credentials.blade.php

@@ -1,23 +1,26 @@
 <x-mail-layout>
 <h2 style="font-size: 18px; font-weight: 600;">
-@if($currentHour < 12)
-    Good Morning, {{ $customer->name }}!
-@elseif($currentHour < 18)
-    Good Afternoon, {{ $customer->name }}!
-@else
-    Good Evening, {{ $customer->name }}!
-@endif
+Your customer portal access is ready
 </h2>
 
-Your login credentials:
+Hi {{ $customer->name }},
 <br />
 <br />
-Your Email: {{ $customer->user->email }}
+{{ $customer->company->name }} has created customer portal access for you. You can use the portal to view orders, invoices, support requests, and account details when available.
 <br />
-Your Password: {{ $plaintextPassword }}
-@if($customerPortalUrl)
 <br />
-Customer Portal URL: {{ $customerPortalUrl}}
-@endif
+<a href="{{ $customerPortalUrl }}" style="display:inline-block; background:#2563eb; color:#ffffff; text-decoration:none; border-radius:6px; padding:12px 18px; font-size:14px; line-height:20px; font-weight:700;">Sign in to customer portal</a>
+<br />
+<br />
+<strong>Your sign-in details</strong>
+<br />
+Email: {{ $customer->user->email }}
+<br />
+Temporary password: {{ $plaintextPassword }}
+<br />
+Portal URL: {{ $customerPortalUrl }}
+<br />
+<br />
+You can change your password after signing in.
 
 </x-mail-layout>

package/server/seeders/Testing/ConnectivitySeeder.php

@@ -142,6 +142,7 @@ class ConnectivitySeeder extends Seeder
                 'min_threshold'       => $min,
                 'max_threshold'       => $max,
                 'threshold_inclusive' => true,
+                'last_position'       => $device?->last_position ?? $this->point(0, 0),
                 'last_reading_at'     => $this->timestamp(2),
                 'last_value'          => $lastValue,
                 'sensorable_type'     => Device::class,

package/server/seeders/Testing/FleetSeeder.php

@@ -85,30 +85,30 @@ class FleetSeeder extends Seeder
     protected function seedVehicles(Company $company): array
     {
         $vehicles = [
-            'van_central'         => ['CEN-01', 'Toyota', 'HiAce', 'GBB-1001', 1.2819, 103.8507, true, 'active', 250, 8, 2, 42],
-            'van_east'            => ['EAS-01', 'Nissan', 'NV200', 'GBB-1002', 1.3520, 103.9449, true, 'active', 160, 5, 1, 28],
+            'van_central'         => ['CEN-01', 'Toyota', 'HiAce', 'GBB-1001', 1.2819, 103.8507, true, 'available', 250, 8, 2, 42],
+            'van_east'            => ['EAS-01', 'Nissan', 'NV200', 'GBB-1002', 1.3520, 103.9449, true, 'available', 160, 5, 1, 28],
             'truck_maintenance'   => ['WRK-03', 'Isuzu', 'NPR', 'GBB-1003', 1.3347, 103.7423, false, 'maintenance', 900, 24, 8, 160],
             'bike_unassigned'     => ['RCH-04', 'Honda', 'PCX', 'GBB-1004', 1.3039, 103.8520, false, 'inactive', 25, 1, 0, 6],
-            'van_airport'         => ['CGO-05', 'Mercedes-Benz', 'Vito', 'GBB-1005', 1.3644, 103.9915, true, 'active', 220, 7, 2, 36],
-            'van_cold_chain'      => ['CLD-06', 'Hyundai', 'H350', 'GBB-1006', 1.3525, 103.9447, true, 'active', 300, 10, 3, 48],
-            'truck_west'          => ['JUR-07', 'Hino', '300 Series', 'GBB-1007', 1.3345, 103.7420, true, 'active', 1200, 30, 10, 180],
-            'van_linehaul'        => ['LNH-08', 'Ford', 'Transit', 'GBB-1008', 1.3215, 103.7055, false, 'active', 450, 14, 4, 72],
-            'van_returns'         => ['RTN-09', 'Peugeot', 'Expert', 'GBB-1009', 1.3150, 103.7649, true, 'active', 180, 6, 1, 32],
-            'van_central_2'       => ['CEN-02', 'Toyota', 'HiAce', 'GBB-1010', 1.2871, 103.8550, true, 'active', 250, 8, 2, 42],
-            'van_central_3'       => ['CEN-03', 'Nissan', 'NV350', 'GBB-1011', 1.2950, 103.8468, true, 'active', 280, 9, 2, 45],
-            'bike_rochor_2'       => ['RCH-11', 'Yamaha', 'NMAX', 'GBB-1012', 1.3042, 103.8528, true, 'active', 25, 1, 0, 6],
-            'bike_rochor_3'       => ['RCH-12', 'Honda', 'ADV160', 'GBB-1013', 1.3017, 103.8509, true, 'active', 30, 1, 0, 7],
-            'truck_alexandra_1'   => ['ALX-14', 'Mitsubishi Fuso', 'Canter', 'GBB-1014', 1.2868, 103.8054, true, 'active', 850, 20, 6, 120],
-            'van_alexandra_2'     => ['ALX-15', 'Ford', 'Transit Custom', 'GBB-1015', 1.2881, 103.8079, false, 'active', 400, 12, 3, 64],
-            'van_changi_2'        => ['CGO-16', 'Mercedes-Benz', 'Sprinter', 'GBB-1016', 1.3658, 103.9871, true, 'active', 500, 16, 4, 80],
-            'truck_changi_3'      => ['CGO-17', 'Isuzu', 'NPR', 'GBB-1017', 1.3610, 103.9954, true, 'active', 1000, 26, 8, 150],
-            'van_tampines_cold_2' => ['CLD-18', 'Hyundai', 'H350', 'GBB-1018', 1.3529, 103.9460, true, 'active', 320, 10, 3, 50],
+            'van_airport'         => ['CGO-05', 'Mercedes-Benz', 'Vito', 'GBB-1005', 1.3644, 103.9915, true, 'available', 220, 7, 2, 36],
+            'van_cold_chain'      => ['CLD-06', 'Hyundai', 'H350', 'GBB-1006', 1.3525, 103.9447, true, 'available', 300, 10, 3, 48],
+            'truck_west'          => ['JUR-07', 'Hino', '300 Series', 'GBB-1007', 1.3345, 103.7420, true, 'available', 1200, 30, 10, 180],
+            'van_linehaul'        => ['LNH-08', 'Ford', 'Transit', 'GBB-1008', 1.3215, 103.7055, false, 'available', 450, 14, 4, 72],
+            'van_returns'         => ['RTN-09', 'Peugeot', 'Expert', 'GBB-1009', 1.3150, 103.7649, true, 'available', 180, 6, 1, 32],
+            'van_central_2'       => ['CEN-02', 'Toyota', 'HiAce', 'GBB-1010', 1.2871, 103.8550, true, 'available', 250, 8, 2, 42],
+            'van_central_3'       => ['CEN-03', 'Nissan', 'NV350', 'GBB-1011', 1.2950, 103.8468, true, 'available', 280, 9, 2, 45],
+            'bike_rochor_2'       => ['RCH-11', 'Yamaha', 'NMAX', 'GBB-1012', 1.3042, 103.8528, true, 'available', 25, 1, 0, 6],
+            'bike_rochor_3'       => ['RCH-12', 'Honda', 'ADV160', 'GBB-1013', 1.3017, 103.8509, true, 'available', 30, 1, 0, 7],
+            'truck_alexandra_1'   => ['ALX-14', 'Mitsubishi Fuso', 'Canter', 'GBB-1014', 1.2868, 103.8054, true, 'available', 850, 20, 6, 120],
+            'van_alexandra_2'     => ['ALX-15', 'Ford', 'Transit Custom', 'GBB-1015', 1.2881, 103.8079, false, 'available', 400, 12, 3, 64],
+            'van_changi_2'        => ['CGO-16', 'Mercedes-Benz', 'Sprinter', 'GBB-1016', 1.3658, 103.9871, true, 'available', 500, 16, 4, 80],
+            'truck_changi_3'      => ['CGO-17', 'Isuzu', 'NPR', 'GBB-1017', 1.3610, 103.9954, true, 'available', 1000, 26, 8, 150],
+            'van_tampines_cold_2' => ['CLD-18', 'Hyundai', 'H350', 'GBB-1018', 1.3529, 103.9460, true, 'available', 320, 10, 3, 50],
             'van_tampines_cold_3' => ['CLD-19', 'Toyota', 'HiAce Refrigerated', 'GBB-1019', 1.3498, 103.9425, false, 'maintenance', 260, 8, 2, 40],
-            'truck_jurong_2'      => ['JUR-20', 'Hino', '500 Series', 'GBB-1020', 1.3340, 103.7398, true, 'active', 1400, 34, 12, 220],
-            'van_jurong_3'        => ['JUR-21', 'Nissan', 'Urvan', 'GBB-1021', 1.3362, 103.7451, true, 'active', 300, 9, 2, 52],
-            'truck_linehaul_2'    => ['LNH-22', 'Volvo', 'FL', 'GBB-1022', 1.3210, 103.7032, true, 'active', 1800, 42, 14, 260],
-            'van_linehaul_3'      => ['LNH-23', 'Ford', 'Transit', 'GBB-1023', 1.3234, 103.7088, true, 'active', 470, 14, 4, 72],
-            'van_returns_2'       => ['RTN-24', 'Peugeot', 'Expert', 'GBB-1024', 1.3168, 103.7660, true, 'active', 180, 6, 1, 32],
+            'truck_jurong_2'      => ['JUR-20', 'Hino', '500 Series', 'GBB-1020', 1.3340, 103.7398, true, 'available', 1400, 34, 12, 220],
+            'van_jurong_3'        => ['JUR-21', 'Nissan', 'Urvan', 'GBB-1021', 1.3362, 103.7451, true, 'available', 300, 9, 2, 52],
+            'truck_linehaul_2'    => ['LNH-22', 'Volvo', 'FL', 'GBB-1022', 1.3210, 103.7032, true, 'available', 1800, 42, 14, 260],
+            'van_linehaul_3'      => ['LNH-23', 'Ford', 'Transit', 'GBB-1023', 1.3234, 103.7088, true, 'available', 470, 14, 4, 72],
+            'van_returns_2'       => ['RTN-24', 'Peugeot', 'Expert', 'GBB-1024', 1.3168, 103.7660, true, 'available', 180, 6, 1, 32],
             'bike_returns_3'      => ['RTN-25', 'Honda', 'PCX', 'GBB-1025', 1.3136, 103.7629, false, 'inactive', 25, 1, 0, 6],
         ];
 
@@ -167,7 +167,7 @@ class FleetSeeder extends Seeder
                 'city'                   => 'Singapore',
                 'online'                 => $online,
                 'current_status'         => $status,
-                'status'                 => 'active',
+                'status'                 => 'available',
                 'skills'                 => $skills,
                 'max_travel_time'        => 3600,
                 'max_distance'           => 60000,

package/server/seeders/Testing/OrdersSeeder.php

@@ -82,7 +82,6 @@ class OrdersSeeder extends Seeder
             'order_started'            => ['started', 'driver_ken', 'van_east', 'customer_ben', 'airport_hub', 'tampines_store', [], 8, 1, null, true, true],
             'order_completed'          => ['completed', 'driver_ava', 'van_central', 'customer_alice', 'central_depot', 'orchard_store', [], -4, 1, null, true, true],
             'order_canceled'           => ['canceled', null, null, 'customer_ben', 'central_depot', 'rochor_store', [], -2, 1, null, false, false],
-            'order_failed'             => ['failed', 'driver_ken', 'van_east', 'customer_ben', 'airport_hub', 'tampines_store', [], -1, 1, null, true, true],
             'order_vehicle_assigned'   => ['created', null, 'van_central', 'customer_alice', 'west_depot', 'airport_hub', ['orchard_store', 'rochor_store'], 10, 3, null, false, false],
         ];
 
@@ -111,15 +110,15 @@ class OrdersSeeder extends Seeder
                 'status'                => $status,
                 'notes'                 => 'FleetOps testing fixture order: ' . $seedId,
                 'pod_method'            => 'scan',
-                'pod_required'          => in_array($status, ['completed', 'failed'], true),
-                'orchestrator_priority' => $status === 'failed' ? 90 : 50,
+                'pod_required'          => $status === 'completed',
+                'orchestrator_priority' => 50,
                 'required_skills'       => $vehicleSeedId === 'van_east' ? ['cold_chain'] : [],
                 'meta'                  => $this->meta($seedId),
                 'created_at'            => $this->timestamp($hourOffset),
                 'updated_at'            => $this->timestamp($hourOffset + 1),
             ]);
 
-            $trackingNumber = $this->createTrackingNumber($company, $order, $seedId, $status);
+            $trackingNumber = $this->createTrackingNumber($company, $order, $seedId);
             $order->forceFill(['tracking_number_uuid' => $trackingNumber->uuid])->save();
             $this->seedEntities($company, $payload, $trackingNumber, $seedId, $entityCount, $places[$dropoffSeedId]);
         }
@@ -154,7 +153,7 @@ class OrdersSeeder extends Seeder
         return $payload;
     }
 
-    protected function createTrackingNumber(Company $company, Order $order, string $seedId, string $status): TrackingNumber
+    protected function createTrackingNumber(Company $company, Order $order, string $seedId): TrackingNumber
     {
         /** @var TrackingNumber $trackingNumber */
         $trackingNumber = $this->createRecord(TrackingNumber::class, [
@@ -166,22 +165,6 @@ class OrdersSeeder extends Seeder
             'region'          => 'SG',
         ]);
 
-        $trackingStatus = $this->createRecord(TrackingStatus::class, [
-            '_key'                 => $this->fixtureKey($seedId . '_tracking_status'),
-            'company_uuid'         => $company->uuid,
-            'tracking_number_uuid' => $trackingNumber->uuid,
-            'status'               => str_replace('_', ' ', $status),
-            'details'              => 'FleetOps testing tracking status for ' . $seedId,
-            'code'                 => $status,
-            'complete'             => $status === 'completed',
-            'city'                 => 'Singapore',
-            'country'              => 'SG',
-            'location'             => $this->point(1.3048, 103.8318),
-            'meta'                 => $this->meta($seedId . '_tracking_status'),
-        ]);
-
-        $trackingNumber->forceFill(['status_uuid' => $trackingStatus->uuid])->save();
-
         return $trackingNumber;
     }
 
@@ -191,6 +174,7 @@ class OrdersSeeder extends Seeder
             $this->createRecord(Entity::class, [
                 '_key'                 => $this->fixtureKey($seedId . '_entity_' . $i),
                 '_import_id'           => $this->fixtureKey($seedId . ':entity:' . $i),
+                'public_id'            => Entity::generatePublicId(),
                 'company_uuid'         => $company->uuid,
                 'payload_uuid'         => $payload->uuid,
                 'tracking_number_uuid' => $trackingNumber->uuid,
@@ -208,7 +192,7 @@ class OrdersSeeder extends Seeder
                 'currency'             => 'SGD',
                 'declared_value'       => 1000 + ($i * 100),
                 'meta'                 => $this->meta($seedId . '_entity_' . $i),
-            ]);
+            ], true);
         }
     }
 }

package/server/seeders/Testing/VroomOrchestrationSeeder.php

@@ -257,7 +257,7 @@ class VroomOrchestrationSeeder extends Seeder
                 'model'                    => $vehicle['model'],
                 'year'                     => '2024',
                 'type'                     => 'van',
-                'status'                   => 'active',
+                'status'                   => 'available',
                 'online'                   => true,
                 'location'                 => isset($vehicle['lat'], $vehicle['lng']) ? new Point($vehicle['lat'], $vehicle['lng']) : null,
                 'skills'                   => $vehicle['skills'] ?? [],
@@ -287,22 +287,22 @@ class VroomOrchestrationSeeder extends Seeder
         $orders = [
             'endpoint_only' => [
                 'payload_seed_id' => 'endpoint_only',
-                'name'       => 'VROOM Test Order - Pickup Dropoff',
-                'pickup'     => $places['depot'],
-                'dropoff'    => $places['orchard'],
-                'waypoints'  => [],
-                'entities'   => [
+                'name'            => 'VROOM Test Order - Pickup Dropoff',
+                'pickup'          => $places['depot'],
+                'dropoff'         => $places['orchard'],
+                'waypoints'       => [],
+                'entities'        => [
                     ['name' => 'Small carton', 'type' => 'parcel', 'weight' => 12, 'weight_unit' => 'kg', 'length' => 60, 'width' => 40, 'height' => 35, 'dimensions_unit' => 'cm'],
                     ['name' => 'Fragile tote', 'type' => 'parcel', 'weight' => 8, 'weight_unit' => 'kg', 'length' => 50, 'width' => 35, 'height' => 30, 'dimensions_unit' => 'cm'],
                 ],
             ],
             'waypoint_only' => [
                 'payload_seed_id' => 'waypoint_only',
-                'name'       => 'VROOM Test Order - Waypoints Only',
-                'pickup'     => null,
-                'dropoff'    => null,
-                'waypoints'  => [$places['rochor'], $places['novena'], $places['serangoon']],
-                'entities'   => [
+                'name'            => 'VROOM Test Order - Waypoints Only',
+                'pickup'          => null,
+                'dropoff'         => null,
+                'waypoints'       => [$places['rochor'], $places['novena'], $places['serangoon']],
+                'entities'        => [
                     ['name' => 'Multi-stop parcel 1', 'type' => 'parcel', 'weight' => 25, 'weight_unit' => 'kg', 'length' => 80, 'width' => 50, 'height' => 40, 'dimensions_unit' => 'cm'],
                     ['name' => 'Multi-stop parcel 2', 'type' => 'parcel', 'weight' => 18, 'weight_unit' => 'kg', 'length' => 70, 'width' => 45, 'height' => 35, 'dimensions_unit' => 'cm'],
                     ['name' => 'Multi-stop parcel 3', 'type' => 'parcel', 'weight' => 15, 'weight_unit' => 'kg', 'length' => 65, 'width' => 40, 'height' => 35, 'dimensions_unit' => 'cm'],
@@ -310,22 +310,22 @@ class VroomOrchestrationSeeder extends Seeder
             ],
             'mixed' => [
                 'payload_seed_id' => 'mixed',
-                'name'       => 'VROOM Test Order - Mixed Stops',
-                'pickup'     => $places['depot'],
-                'dropoff'    => $places['changi'],
-                'waypoints'  => [$places['paya_lebar'], $places['tampines']],
-                'entities'   => [
+                'name'            => 'VROOM Test Order - Mixed Stops',
+                'pickup'          => $places['depot'],
+                'dropoff'         => $places['changi'],
+                'waypoints'       => [$places['paya_lebar'], $places['tampines']],
+                'entities'        => [
                     ['name' => 'Heavy equipment crate', 'type' => 'freight', 'weight' => 180, 'weight_unit' => 'kg', 'length' => 120, 'width' => 80, 'height' => 90, 'dimensions_unit' => 'cm'],
                     ['name' => 'Accessory box', 'type' => 'parcel', 'weight' => 22, 'weight_unit' => 'kg', 'length' => 75, 'width' => 55, 'height' => 45, 'dimensions_unit' => 'cm'],
                 ],
             ],
             'single_waypoint' => [
                 'payload_seed_id' => 'single_waypoint',
-                'name'       => 'VROOM Test Order - Single Waypoint',
-                'pickup'     => null,
-                'dropoff'    => null,
-                'waypoints'  => [$places['woodlands']],
-                'entities'   => [
+                'name'            => 'VROOM Test Order - Single Waypoint',
+                'pickup'          => null,
+                'dropoff'         => null,
+                'waypoints'       => [$places['woodlands']],
+                'entities'        => [
                     ['name' => 'Oversized sample case', 'type' => 'parcel', 'weight' => 60, 'weight_unit' => 'kg', 'length' => 100, 'width' => 60, 'height' => 60, 'dimensions_unit' => 'cm'],
                 ],
             ],

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

@@ -0,0 +1,75 @@
+<?php
+
+namespace Fleetbase\FleetOps\Console\Commands;
+
+use Fleetbase\FleetOps\Models\Contact;
+use Illuminate\Console\Command;
+
+class AuditCustomerUserConflicts extends Command
+{
+    protected $signature = 'fleetops:audit-customer-user-conflicts {--company= : Limit audit to a company UUID} {--json : Output JSON instead of a table}';
+
+    protected $description = 'Reports customer contacts linked to users that may have been incorrectly promoted from staff/admin accounts.';
+
+    public function handle(): int
+    {
+        $query = Contact::where('type', 'customer')->whereNotNull('user_uuid')->with(['anyUser.companyUsers.roles', 'company']);
+
+        if ($company = $this->option('company')) {
+            $query->where('company_uuid', $company);
+        }
+
+        $rows = $query->get()->map(function (Contact $contact) {
+            $user        = $contact->anyUser;
+            $companyUser = $user?->companyUsers?->firstWhere('company_uuid', $contact->company_uuid);
+            $roles       = $companyUser?->roles?->pluck('name')->filter()->values()->all() ?? [];
+            $unexpected  = array_values(array_filter($roles, fn ($role) => $role !== 'Fleet-Ops Customer'));
+            $reasons     = [];
+
+            if (!$user) {
+                $reasons[] = 'missing linked user';
+            } elseif ($user->type !== 'customer') {
+                $reasons[] = 'linked user type is ' . $user->type;
+            }
+
+            if (!empty($unexpected)) {
+                $reasons[] = 'linked user has non-customer roles: ' . implode(', ', $unexpected);
+            }
+
+            if (empty($reasons)) {
+                return null;
+            }
+
+            return [
+                'contact_id'    => $contact->public_id,
+                'contact_uuid'  => $contact->uuid,
+                'contact_name'  => $contact->name,
+                'contact_email' => $contact->email,
+                'user_uuid'     => $user?->uuid,
+                'user_email'    => $user?->email,
+                'user_type'     => $user?->type,
+                'roles'         => implode(', ', $roles),
+                'company_uuid'  => $contact->company_uuid,
+                'company_name'  => $contact->company?->name,
+                'updated_at'    => optional($contact->updated_at)->toDateTimeString(),
+                'reason'        => implode('; ', $reasons),
+            ];
+        })->filter()->values();
+
+        if ($this->option('json')) {
+            $this->line($rows->toJson(JSON_PRETTY_PRINT));
+
+            return self::SUCCESS;
+        }
+
+        if ($rows->isEmpty()) {
+            $this->info('No suspicious customer user conflicts found.');
+
+            return self::SUCCESS;
+        }
+
+        $this->table(array_keys($rows->first()), $rows->all());
+
+        return self::SUCCESS;
+    }
+}

package/server/src/Exceptions/CustomerUserConflictException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Fleetbase\FleetOps\Exceptions;
+
+use Fleetbase\Models\User;
+
+class CustomerUserConflictException extends UserAlreadyExistsException
+{
+    public function __construct(string $message = '', ?User $user = null, int $code = 0, ?\Throwable $previous = null)
+    {
+        parent::__construct($message, $user, $code, $previous);
+    }
+}

package/server/src/Expansions/UserFilterExpansion.php

@@ -47,6 +47,21 @@ class UserFilterExpansion implements Expansion
         };
     }
 
+    /**
+     * Filter where a user is not a customer.
+     *
+     * @return void
+     */
+    public static function isNotCustomer()
+    {
+        return function () {
+            /** @var \Fleetbase\Http\Filter\UserFilter|\Fleetbase\Http\Filter\Filter $this */
+            $this->builder->where(function ($query) {
+                $query->whereNull('type')->orWhere('type', '!=', 'customer');
+            });
+        };
+    }
+
     /**
      * Filter where doesnt have driver within the CURRENT organizations.
      *
@@ -62,6 +77,19 @@ class UserFilterExpansion implements Expansion
         };
     }
 
+    /**
+     * Filter where users can be driver.
+     *
+     * @return void
+     */
+    public static function canBeDriver()
+    {
+        return function () {
+            /** @var \Fleetbase\Http\Filter\UserFilter|\Fleetbase\Http\Filter\Filter $this */
+            $this->builder->whereIn('type', ['user', 'admin']);
+        };
+    }
+
     /**
      * @return void
      */

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

@@ -39,6 +39,10 @@ class ContactController extends Controller
         }
 
         try {
+            $contactCandidate               = new Contact($input);
+            $contactCandidate->company_uuid = session('company');
+            $contactCandidate->assertCustomerIdentityIsAvailable();
+
             // create the contact
             $contact = Contact::updateOrCreate(
                 [
@@ -106,8 +110,19 @@ class ContactController extends Controller
             }
         }
 
-        // update the contact
-        $contact->update($input);
+        try {
+            // update the contact
+            $contactCandidate = $contact->replicate();
+            $contactCandidate->forceFill($contact->getAttributes());
+            $contactCandidate->exists = $contact->exists;
+            $contactCandidate->forceFill($input);
+            $contactCandidate->assertCustomerIdentityIsAvailable();
+
+            $contact->update($input);
+        } catch (\Exception $e) {
+            return response()->apiError($e->getMessage());
+        }
+
         $contact->flushAttributesCache();
 
         // response the contact resource