@fleetbase/fleetops-engine 0.6.50 → 0.6.52

package/server/src/Support/Telematics/TelematicService.php

@@ -2,12 +2,15 @@
 
 namespace Fleetbase\FleetOps\Support\Telematics;
 
-use Fleetbase\FleetOps\Jobs\SyncDevicesJob;
-use Fleetbase\FleetOps\Jobs\TestConnectionJob;
+use Fleetbase\FleetOps\Jobs\SyncTelematicDevicesJob;
+use Fleetbase\FleetOps\Jobs\TestTelematicConnectionJob;
 use Fleetbase\FleetOps\Models\Device;
+use Fleetbase\FleetOps\Models\DeviceEvent;
+use Fleetbase\FleetOps\Models\Sensor;
 use Fleetbase\FleetOps\Models\Telematic;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
 use Illuminate\Validation\ValidationException;
 
 /**
@@ -58,7 +61,7 @@ class TelematicService
         $telematic->company_uuid = session('company');
         $telematic->name         = $data['name'];
         $telematic->provider     = $providerKey;
-        $telematic->credentials  = Crypt::encryptString(json_encode($data['credentials']));
+        $telematic->credentials  = $this->encryptCredentials($data['credentials']);
         $telematic->status       = 'active';
         $telematic->meta         = $data['meta'] ?? [];
         $telematic->save();
@@ -78,7 +81,7 @@ class TelematicService
         if (isset($data['credentials'])) {
             $descriptor = $this->registry->findByKey($telematic->provider);
             $this->validateCredentials($data['credentials'], $descriptor->requiredFields);
-            $telematic->credentials = Crypt::encryptString(json_encode($data['credentials']));
+            $telematic->credentials = $this->encryptCredentials($data['credentials']);
         }
 
         if (isset($data['status'])) {
@@ -110,18 +113,21 @@ class TelematicService
     public function testConnection(Telematic $telematic, bool $async = false)
     {
         if ($async) {
-            $job = new TestConnectionJob($telematic);
-            dispatch($job);
+            $jobId = (string) Str::uuid();
+            dispatch(new TestTelematicConnectionJob($telematic, $jobId));
 
-            return ['job_id' => $job->getJobId(), 'message' => 'Connection test queued'];
+            return ['job_id' => $jobId, 'message' => 'Connection test queued'];
         }
 
         $provider = $this->registry->resolve($telematic->provider);
         $provider->connect($telematic);
 
-        $credentials = json_decode(Crypt::decryptString($telematic->credentials), true);
+        $credentials = $this->getCredentials($telematic);
 
-        return $provider->testConnection($credentials);
+        $result = $provider->testConnection($credentials);
+        $this->recordConnectionTest($telematic, $result);
+
+        return $result;
     }
 
     /**
@@ -131,10 +137,19 @@ class TelematicService
      */
     public function discoverDevices(Telematic $telematic, array $options = []): string
     {
-        $job = new SyncDevicesJob($telematic, $options);
-        dispatch($job);
+        $jobId = (string) Str::uuid();
+        dispatch(new SyncTelematicDevicesJob($telematic, $options, $jobId));
+
+        $telematic->status = 'synchronizing';
+        $telematic->meta   = array_merge($telematic->meta ?? [], [
+            'last_sync_job_id'     => $jobId,
+            'last_sync_started_at' => now()->toDateTimeString(),
+            'last_sync_result'     => 'queued',
+            'last_sync_error'      => null,
+        ]);
+        $telematic->save();
 
-        return $job->getJobId();
+        return $jobId;
     }
 
     /**
@@ -142,22 +157,143 @@ class TelematicService
      */
     public function linkDevice(Telematic $telematic, array $deviceData): Device
     {
+        $externalId = $this->resolveExternalId($deviceData);
+
+        if (!$externalId) {
+            throw ValidationException::withMessages(['device_id' => ['Provider device identity is required to link a telematics device.']]);
+        }
+
         $device = Device::firstOrNew([
             'telematic_uuid' => $telematic->uuid,
-            'external_id'    => $deviceData['external_id'],
+            'device_id'      => $externalId,
         ]);
 
-        $device->device_name     = $deviceData['device_name'] ?? 'Unknown Device';
-        $device->device_model    = $deviceData['device_model'] ?? null;
-        $device->device_provider = $telematic->provider;
-        $device->status          = $deviceData['status'] ?? 'active';
-        $device->meta            = array_merge($device->meta ?? [], $deviceData['meta'] ?? []);
+        $device->company_uuid     = $telematic->company_uuid;
+        $device->name             = $deviceData['name'] ?? $deviceData['device_name'] ?? $device->name ?? 'Unknown Device';
+        $device->model            = $deviceData['model'] ?? $deviceData['device_model'] ?? $device->model;
+        $device->provider         = $deviceData['provider'] ?? $deviceData['device_provider'] ?? $telematic->provider;
+        $device->type             = $deviceData['type'] ?? null;
+        $device->internal_id      = $deviceData['internal_id'] ?? $externalId;
+        $device->imei             = $deviceData['imei'] ?? null;
+        $device->imsi             = $deviceData['imsi'] ?? null;
+        $device->serial_number    = $deviceData['serial_number'] ?? null;
+        $device->firmware_version = $deviceData['firmware_version'] ?? null;
+        $device->status           = $deviceData['status'] ?? $device->status ?? 'active';
+
+        if (array_key_exists('online', $deviceData) && $deviceData['online'] !== null) {
+            $device->online = (bool) $deviceData['online'];
+        } elseif (!$device->exists) {
+            $device->online = $device->status === 'active';
+        }
+
+        if (!empty($deviceData['last_online_at']) || !empty($deviceData['last_seen_at'])) {
+            $device->last_online_at = $deviceData['last_online_at'] ?? $deviceData['last_seen_at'];
+        }
+
+        $device->meta             = array_merge($device->meta ?? [], [
+            'external_id' => $externalId,
+        ], $deviceData['meta'] ?? []);
+
+        $location = $this->normalizeLocation($deviceData['location'] ?? null);
+        if ($location) {
+            $device->last_position = $location;
+        } elseif (!$device->exists || !$device->last_position) {
+            $device->last_position = $this->defaultLocation();
+        }
 
         $device->save();
 
         return $device;
     }
 
+    public function storeDeviceEvent(Telematic $telematic, array $eventData, ?Device $device = null): DeviceEvent
+    {
+        if (!$device) {
+            $device = $this->resolveDeviceForPayload($telematic, $eventData);
+        }
+
+        $eventKey            = $this->makeEventKey($telematic, $eventData, $device);
+        $event               = $eventKey ? DeviceEvent::firstOrNew(['_key' => $eventKey]) : new DeviceEvent();
+        $event->company_uuid = $telematic->company_uuid;
+        $event->device_uuid  = $device?->uuid;
+        $event->event_type   = $eventData['event_type'] ?? $eventData['type'] ?? 'telemetry_update';
+        $event->severity     = $eventData['severity'] ?? 'info';
+        $event->message      = $eventData['message'] ?? $eventData['reason'] ?? null;
+        $event->provider     = $telematic->provider;
+        $event->ident        = $eventData['ident'] ?? $eventData['event_id'] ?? $eventData['external_event_id'] ?? $eventData['external_id'] ?? null;
+        $event->code         = $eventData['code'] ?? null;
+        $event->state        = $eventData['state'] ?? null;
+        $event->reason       = $eventData['reason'] ?? null;
+        $event->occurred_at  = $eventData['occurred_at'] ?? $eventData['recorded_at'] ?? $eventData['timestamp'] ?? null;
+        $event->data         = $eventData['data'] ?? array_filter([
+            'speed'      => $eventData['speed'] ?? null,
+            'heading'    => $eventData['heading'] ?? null,
+            'odometer'   => $eventData['odometer'] ?? null,
+            'ignition'   => $eventData['ignition'] ?? null,
+            'fuel_level' => $eventData['fuel_level'] ?? null,
+        ], fn ($value) => $value !== null);
+        $event->payload      = $eventData['payload'] ?? $eventData['meta'] ?? $eventData;
+        $event->_key         = $eventKey;
+        $event->meta         = array_merge($eventData['meta'] ?? [], [
+            'telematic_uuid'    => $telematic->uuid,
+            'telematic_id'      => $telematic->public_id,
+            'provider_event_id' => $event->ident,
+            'occurred_at'       => $eventData['occurred_at'] ?? null,
+            'speed'             => $eventData['speed'] ?? null,
+            'heading'           => $eventData['heading'] ?? null,
+            'odometer'          => $eventData['odometer'] ?? null,
+            'ignition'          => $eventData['ignition'] ?? null,
+            'fuel_level'        => $eventData['fuel_level'] ?? null,
+        ]);
+
+        $location = $this->normalizeLocation($eventData['location'] ?? null);
+        if ($location) {
+            $event->location = $location;
+        }
+
+        $event->save();
+
+        return $event;
+    }
+
+    public function storeSensor(Telematic $telematic, array $sensorData, ?Device $device = null): Sensor
+    {
+        if (!$device) {
+            $device = $this->resolveDeviceForPayload($telematic, $sensorData);
+        }
+
+        $sensorIdentity = $sensorData['internal_id'] ?? $sensorData['sensor_id'] ?? $sensorData['external_id'] ?? null;
+        if (!$sensorIdentity && !$device) {
+            throw ValidationException::withMessages(['sensor_id' => ['Provider sensor identity or device identity is required to link a telematics sensor.']]);
+        }
+
+        $sensor = Sensor::firstOrNew([
+            'telematic_uuid' => $telematic->uuid,
+            'device_uuid'    => $device?->uuid,
+            'type'           => $sensorData['type'] ?? $sensorData['sensor_type'] ?? 'generic',
+            'internal_id'    => $sensorIdentity ?? $this->makeSensorIdentity($sensorData, $device),
+        ]);
+
+        $sensor->company_uuid     = $telematic->company_uuid;
+        $sensor->name             = $sensorData['name'] ?? $sensorData['sensor_type'] ?? $sensor->type ?? 'Sensor';
+        $sensor->unit             = $sensorData['unit'] ?? null;
+        $sensor->last_value       = isset($sensorData['value']) ? (string) $sensorData['value'] : $sensor->last_value;
+        $sensor->last_reading_at  = $sensorData['recorded_at'] ?? $sensorData['last_reading_at'] ?? $sensor->last_reading_at ?? now();
+        $sensor->status           = $sensorData['status'] ?? 'active';
+        $sensor->meta             = array_merge($sensor->meta ?? [], $sensorData['meta'] ?? []);
+
+        $location = $this->normalizeLocation($sensorData['location'] ?? null);
+        if ($location) {
+            $sensor->last_position = $location;
+        } elseif (!$sensor->exists || !$sensor->last_position) {
+            $sensor->last_position = $this->defaultLocation();
+        }
+
+        $sensor->save();
+
+        return $sensor;
+    }
+
     /**
      * Get devices for a telematic.
      *
@@ -173,14 +309,28 @@ class TelematicService
 
         if (isset($filters['search'])) {
             $query->where(function ($q) use ($filters) {
-                $q->where('device_name', 'like', "%{$filters['search']}%")
-                  ->orWhere('external_id', 'like', "%{$filters['search']}%");
+                $q->where('name', 'like', "%{$filters['search']}%")
+                    ->orWhere('device_id', 'like', "%{$filters['search']}%")
+                    ->orWhere('internal_id', 'like', "%{$filters['search']}%")
+                    ->orWhere('imei', 'like', "%{$filters['search']}%");
             });
         }
 
         return $query->get();
     }
 
+    public function recordConnectionTest(Telematic $telematic, array $result): void
+    {
+        $telematic->status = ($result['success'] ?? false) ? 'connected' : 'error';
+        $telematic->meta   = array_merge($telematic->meta ?? [], [
+            'last_connection_test' => now()->toDateTimeString(),
+            'last_test_result'     => ($result['success'] ?? false) ? 'success' : 'failed',
+            'last_error'           => ($result['success'] ?? false) ? null : ($result['message'] ?? 'Connection test failed'),
+            'last_test_metadata'   => $result['metadata'] ?? [],
+        ]);
+        $telematic->save();
+    }
+
     /**
      * Validate credentials against provider schema.
      *
@@ -218,6 +368,175 @@ class TelematicService
      */
     public function getCredentials(Telematic $telematic): array
     {
-        return json_decode(Crypt::decryptString($telematic->credentials), true);
+        if (is_array($telematic->credentials)) {
+            return $telematic->credentials;
+        }
+
+        $credentials = $telematic->credentials;
+        if (!$credentials) {
+            return [];
+        }
+
+        try {
+            return json_decode(Crypt::decryptString($credentials), true) ?? [];
+        } catch (\Throwable) {
+            return json_decode($credentials, true) ?? [];
+        }
+    }
+
+    protected function encryptCredentials(array $credentials): string
+    {
+        return Crypt::encryptString(json_encode($credentials));
+    }
+
+    protected function resolveDeviceForPayload(Telematic $telematic, array $payload): ?Device
+    {
+        $externalId = $this->resolveExternalId($payload);
+
+        if (!$externalId) {
+            return null;
+        }
+
+        return Device::where('telematic_uuid', $telematic->uuid)
+            ->where(function ($query) use ($externalId) {
+                $query->where('device_id', $externalId)
+                    ->orWhere('internal_id', $externalId)
+                    ->orWhere('imei', $externalId);
+            })
+            ->first();
+    }
+
+    public function resolveWebhookTelematic(string $providerKey, array $payload = [], array $headers = [], ?string $integrationId = null): ?Telematic
+    {
+        $query = Telematic::where('provider', $providerKey);
+
+        if ($integrationId) {
+            return (clone $query)
+                ->where(function ($query) use ($integrationId) {
+                    $query->where('public_id', $integrationId)->orWhere('uuid', $integrationId);
+                })
+                ->first();
+        }
+
+        $providerAccountId = $this->resolveProviderAccountId($payload, $headers);
+        if ($providerAccountId) {
+            $matches = (clone $query)
+                ->where(function ($query) use ($providerAccountId) {
+                    $query->where('meta->provider_account_id', $providerAccountId)
+                        ->orWhere('meta->account_id', $providerAccountId)
+                        ->orWhere('meta->organization_id', $providerAccountId)
+                        ->orWhere('meta->customer_id', $providerAccountId);
+                })
+                ->limit(2)
+                ->get();
+
+            if ($matches->count() === 1) {
+                return $matches->first();
+            }
+        }
+
+        $deviceId = $this->resolveExternalId($payload);
+        if ($deviceId) {
+            $matches = (clone $query)
+                ->whereHas('device', function ($query) use ($deviceId) {
+                    $query->where('device_id', $deviceId)
+                        ->orWhere('internal_id', $deviceId)
+                        ->orWhere('imei', $deviceId);
+                })
+                ->limit(2)
+                ->get();
+
+            if ($matches->count() === 1) {
+                return $matches->first();
+            }
+        }
+
+        return null;
+    }
+
+    protected function normalizeLocation(?array $location): mixed
+    {
+        if (!$location) {
+            return null;
+        }
+
+        $lat = $location['lat'] ?? $location['latitude'] ?? null;
+        $lng = $location['lng'] ?? $location['longitude'] ?? null;
+
+        if ($lat === null || $lng === null) {
+            return null;
+        }
+
+        return ['latitude' => (float) $lat, 'longitude' => (float) $lng];
+    }
+
+    protected function defaultLocation(): array
+    {
+        return ['latitude' => 0, 'longitude' => 0];
+    }
+
+    protected function resolveExternalId(array $payload): ?string
+    {
+        $value = $payload['device_id']
+            ?? $payload['external_id']
+            ?? $payload['ident']
+            ?? $payload['unit_id']
+            ?? $payload['vehicle_id']
+            ?? $payload['imei']
+            ?? null;
+
+        return $value === null || $value === '' ? null : (string) $value;
+    }
+
+    protected function resolveProviderAccountId(array $payload, array $headers = []): ?string
+    {
+        $headerValue = data_get($headers, 'x-provider-account.0')
+            ?? data_get($headers, 'x-organization-id.0')
+            ?? data_get($headers, 'x-customer-id.0');
+
+        $value = $payload['provider_account_id']
+            ?? $payload['account_id']
+            ?? $payload['organization_id']
+            ?? $payload['org_id']
+            ?? $payload['customer_id']
+            ?? data_get($payload, 'account.id')
+            ?? data_get($payload, 'organization.id')
+            ?? $headerValue;
+
+        return $value === null || $value === '' ? null : (string) $value;
+    }
+
+    protected function makeEventKey(Telematic $telematic, array $eventData, ?Device $device = null): ?string
+    {
+        $deviceId = $device?->device_id ?? $this->resolveExternalId($eventData);
+        if (!$deviceId) {
+            return null;
+        }
+
+        $providerEventId = $eventData['event_id'] ?? $eventData['external_event_id'] ?? $eventData['ident'] ?? $eventData['external_id'] ?? null;
+        $occurredAt      = $eventData['occurred_at'] ?? $eventData['recorded_at'] ?? $eventData['timestamp'] ?? null;
+        $eventType       = $eventData['event_type'] ?? $eventData['type'] ?? 'telemetry_update';
+
+        if (!$providerEventId && !$occurredAt) {
+            return null;
+        }
+
+        return sha1(implode('|', [
+            $telematic->provider,
+            $telematic->public_id ?? $telematic->uuid,
+            $deviceId,
+            $providerEventId,
+            $eventType,
+            $occurredAt,
+        ]));
+    }
+
+    protected function makeSensorIdentity(array $sensorData, ?Device $device = null): string
+    {
+        return sha1(implode('|', [
+            $device?->uuid ?? 'no-device',
+            $sensorData['type'] ?? $sensorData['sensor_type'] ?? 'generic',
+            $sensorData['name'] ?? $sensorData['unit'] ?? 'sensor',
+        ]));
     }
 }

package/server/src/routes.php

@@ -12,7 +12,7 @@ use Illuminate\Support\Facades\Route;
 | is assigned the "api" middleware group. Enjoy building your API!
 |
 */
-Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase\FleetOps\Http\Controllers')->group(
+Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\FleetOps\Http\Controllers')->group(
     function ($router) {
         /*
         |--------------------------------------------------------------------------
@@ -312,6 +312,7 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                                 $router->post('import', $controller('import'));
                                 $router->get('facilitators/{id}', $controller('getAsFacilitator'));
                                 $router->get('customers/{id}', $controller('getAsCustomer'));
+                                $router->post('{id}/convert-to-vendor', $controller('convertToVendor'));
                                 $router->delete('bulk-delete', $controller('bulkDelete'));
                             }
                         );
@@ -320,6 +321,12 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                             function ($router, $controller) {
                                 $router->get('statuses', $controller('statuses'));
                                 $router->get('avatars', $controller('avatars'));
+                                $router->get('{id}/assigned-orders', $controller('assignedOrders'));
+                                $router->post('{id}/assign-order', $controller('assignOrder'));
+                                $router->post('{id}/unassign-orders', $controller('unassignOrders'));
+                                $router->post('{id}/unassign-order', $controller('unassignOrder'));
+                                $router->post('{id}/assign-vehicle', $controller('assignVehicle'));
+                                $router->post('{id}/unassign-vehicle', $controller('unassignVehicle'));
                                 $router->match(['get', 'post'], 'export', $controller('export'));
                                 $router->delete('bulk-delete', $controller('bulkDelete'));
                                 $router->post('import', $controller('import'));
@@ -351,6 +358,26 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                                 $router->delete('bulk-delete', $controller('bulkDelete'));
                             }
                         );
+                        $router->fleetbaseRoutes(
+                            'fuel-provider-connections',
+                            function ($router, $controller) {
+                                $router->get('providers', $controller('providers'));
+                                $router->post('providers/{provider}/test-credentials', $controller('testCredentials'));
+                                $router->post('{id}/test-connection', $controller('testConnection'));
+                                $router->post('{id}/sync', $controller('sync'));
+                            }
+                        );
+                        $router->fleetbaseRoutes('fuel-provider-sync-runs');
+                        $router->fleetbaseRoutes(
+                            'fuel-provider-transactions',
+                            function ($router, $controller) {
+                                $router->post('{id}/match-vehicle', $controller('matchVehicle'));
+                                $router->post('{id}/match-order', $controller('matchOrder'));
+                                $router->post('{id}/reprocess', $controller('reprocess'));
+                                $router->post('{id}/review', $controller('review'));
+                            }
+                        );
+                        $router->get('issues/{id}/timeline', 'IssueController@timeline');
                         $router->fleetbaseRoutes(
                             'issues',
                             function ($router, $controller) {
@@ -457,6 +484,12 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                             function ($router, $controller) {
                                 $router->get('statuses', $controller('statuses'));
                                 $router->get('avatars', $controller('avatars'));
+                                $router->post('{id}/assign-driver', $controller('assignDriver'));
+                                $router->post('{id}/unassign-driver', $controller('unassignDriver'));
+                                $router->get('{id}/assigned-orders', $controller('assignedOrders'));
+                                $router->post('{id}/unassign-orders', $controller('unassignOrders'));
+                                $router->post('{id}/attach-device', $controller('attachDevice'));
+                                $router->post('{id}/detach-device', $controller('detachDevice'));
                                 $router->match(['get', 'post'], 'export', $controller('export'));
                                 $router->post('import', $controller('import'));
                                 $router->delete('bulk-delete', $controller('bulkDelete'));
@@ -470,6 +503,9 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                                 $router->match(['get', 'post'], 'export', $controller('export'));
                                 $router->get('facilitators/{id}', $controller('getAsFacilitator'));
                                 $router->get('customers/{id}', $controller('getAsCustomer'));
+                                $router->get('{id}/personnels', $controller('vendorPersonnels'));
+                                $router->post('{id}/personnels', $controller('addVendorPersonnel'));
+                                $router->delete('{id}/personnels/{contact}', $controller('removeVendorPersonnel'));
                                 $router->post('{id}/assign-driver', $controller('assignDriver'));
                                 $router->post('{id}/remove-driver', $controller('removeDriver'));
                                 $router->delete('bulk-delete', $controller('bulkDelete'));
@@ -477,13 +513,18 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                             }
                         );
                         $router->fleetbaseRoutes('devices');
-                        $router->fleetbaseRoutes('device-events');
+                        $router->post('devices/{id}/attach', 'DeviceController@attach');
+                        $router->post('devices/{id}/detach', 'DeviceController@detach');
+                        $router->fleetbaseRoutes('device-events', function ($router, $controller) {
+                            $router->post('{id}/mark-processed', $controller('markProcessed'));
+                        });
                         $router->fleetbaseRoutes('sensors');
                         $router->fleetbaseRoutes('telematics', function ($router, $controller) {
                             $router->get('providers', $controller('providers'));
-                            $router->get('devices', $controller('devices'));
-                            $router->post('link-device', $controller('linkDevice'));
-                            $router->post('discover', $controller('discover'));
+                            $router->get('{id}/logs', $controller('logs'));
+                            $router->get('{id}/devices', $controller('devices'));
+                            $router->post('{id}/link-device', $controller('linkDevice'));
+                            $router->post('{id}/discover', $controller('discover'));
                             $router->post('{id}/test-connection', $controller('testConnection'));
                             $router->post('{key}/test-credentials', $controller('testCredentials'));
                         });
@@ -523,7 +564,11 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                             ['prefix' => 'customers'],
                             function () use ($router) {
                                 $router->get('/', 'MorphController@queryCustomers');
+                                $router->post('create-portal-login', 'CustomerController@createPortalLogin');
                                 $router->post('reset-credentials', 'CustomerController@resetCredentials');
+                                $router->post('send-credentials', 'CustomerController@sendCredentials');
+                                $router->post('deactivate-portal-login', 'CustomerController@deactivatePortalLogin');
+                                $router->post('reactivate-portal-login', 'CustomerController@reactivatePortalLogin');
                             }
                         );
                         $router->group(
@@ -619,12 +664,19 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                                         $router->get('on-time-delivery', 'AnalyticsController@onTimeDelivery');
                                         $router->get('top-drivers', 'AnalyticsController@topDrivers');
                                         $router->get('fuel-efficiency', 'AnalyticsController@fuelEfficiency');
+                                        $router->get('fuel-providers', 'AnalyticsController@fuelProviders');
                                         $router->get('issues-insights', 'AnalyticsController@issuesInsights');
                                         $router->get('maintenance-overview', 'AnalyticsController@maintenanceOverview');
                                         $router->get('geofence-violations', 'AnalyticsController@geofenceViolations');
                                         $router->get('live-fleet', 'AnalyticsController@liveFleet');
                                     }
                                 );
+                                $router->group(
+                                    ['prefix' => 'getting-started'],
+                                    function ($router) {
+                                        $router->get('status', 'GettingStartedController@status');
+                                    }
+                                );
                                 $router->group(
                                     ['prefix' => 'orchestrator'],
                                     function ($router) {
@@ -661,3 +713,20 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
         );
     }
 );
+
+if (filled(config('fleetops.api.routing.prefix'))) {
+    Route::prefix(config('fleetops.api.routing.internal_prefix', 'int') . '/v1')
+        ->namespace('Fleetbase\FleetOps\Http\Controllers\Internal\v1')
+        ->middleware([
+            'fleetbase.protected',
+            Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class,
+            Fleetbase\FleetOps\Http\Middleware\SetupDriverSession::class,
+        ])
+        ->group(function ($router) {
+            $router->get('issues/{id}/timeline', 'IssueController@timeline');
+            $router->get('vendors/{id}/personnels', 'VendorController@vendorPersonnels');
+            $router->post('vendors/{id}/personnels', 'VendorController@addVendorPersonnel');
+            $router->delete('vendors/{id}/personnels/{contact}', 'VendorController@removeVendorPersonnel');
+            $router->post('contacts/{id}/convert-to-vendor', 'ContactController@convertToVendor');
+        });
+}

package/server/tests/AnalyticsRoutesTest.php

@@ -39,3 +39,11 @@ test('analytics controller has one method per widget', function () {
         expect($controller)->toContain("public function {$method}(");
     }
 });
+
+test('top drivers on-time sorting uses a sql aggregate expression', function () {
+    $widget = file_get_contents(dirname(__DIR__) . '/src/Support/Analytics/TopDrivers.php');
+
+    expect($widget)->toContain("'on_time'  => \"CASE");
+    expect($widget)->toContain('TIMESTAMPDIFF(SECOND, orders.scheduled_at, orders.updated_at) <= 1800');
+    expect($widget)->not->toContain("'on_time'  => 'on_time_pct'");
+});

package/server/tests/CustomerContactIdentitySafetyTest.php

@@ -52,3 +52,44 @@ test('customer conflict audit command is registered and read only', function ()
         ->not->toContain('->update(')
         ->not->toContain('forceFill');
 });
+
+test('customer portal welcome email is opt in and does not create organization invites', function () {
+    $internalContact     = file_get_contents(__DIR__ . '/../src/Http/Controllers/Internal/v1/ContactController.php');
+    $internalCustomer    = file_get_contents(__DIR__ . '/../src/Http/Controllers/Internal/v1/CustomerController.php');
+    $contactModel        = file_get_contents(__DIR__ . '/../src/Models/Contact.php');
+    $customerCredentials = file_get_contents(__DIR__ . '/../src/Mail/CustomerCredentialsMail.php');
+    $customerEmail       = file_get_contents(__DIR__ . '/../resources/views/mail/customer-credentials.blade.php');
+    $customerForm        = file_get_contents(__DIR__ . '/../../addon/components/customer/form.hbs');
+
+    expect($internalContact)
+        ->toContain('meta.customer_portal.send_welcome_email')
+        ->toContain('assertCustomerPortalCanSendWelcomeEmail')
+        ->toContain('sendCustomerPortalWelcomeEmail')
+        ->toContain('Contact::createUserFromContact($contact, false, true)')
+        ->toContain('Mail::to($user)->send(new CustomerCredentialsMail($password, $contact))')
+        ->toContain("data_forget(\$meta, 'customer_portal.send_welcome_email')")
+        ->toContain('fleetbase/customer-portal-api')
+        ->not->toContain('UserInvited')
+        ->not->toContain('Invite::create');
+
+    expect($internalCustomer)
+        ->toContain('Contact::createUserFromContact($customer, false, true)')
+        ->not->toContain('send_invite');
+
+    expect($customerCredentials)->toContain('customer portal access is ready')
+        ->and($customerCredentials)->toContain("Utils::consoleUrl(\$accessUrlSlug ?: 'customer-portal')")
+        ->and($customerEmail)->toContain('Your customer portal access is ready')
+        ->and($customerEmail)->toContain('Sign in to customer portal')
+        ->and($customerEmail)->toContain('Temporary password:')
+        ->and($customerEmail)->toContain('You can change your password after signing in.')
+        ->and($customerForm)->toContain('this.showWelcomeEmailOption')
+        ->and($customerForm)->toContain('this.toggleWelcomeEmail');
+
+    expect($contactModel)
+        ->toContain('assignUserToContactCompany')
+        ->toContain('$contact->company->addUser($user, $role)')
+        ->toContain('Deprecated and ignored. Contact and customer users do not receive organization invitations.')
+        ->not->toContain('UserInvited')
+        ->not->toContain('Invite::create')
+        ->not->toContain('->assignCompany(');
+});