@fleetbase/fleetops-engine 0.6.50 → 0.6.52

package/server/src/Http/Resources/v1/Index/Order.php

@@ -44,9 +44,10 @@ class Order extends FleetbaseResource
                 $isInternal,
                 $this->whenLoaded('orderConfig', function () {
                     return [
-                        'id'   => $this->orderConfig->public_id,
-                        'name' => $this->orderConfig->name,
-                        'key'  => $this->orderConfig->key,
+                        'uuid'        => $this->orderConfig->uuid,
+                        'public_id'   => $this->orderConfig->public_id,
+                        'name'        => $this->orderConfig->name,
+                        'key'         => $this->orderConfig->key,
                     ];
                 })
             ),
@@ -104,12 +105,14 @@ class Order extends FleetbaseResource
             }),
 
             // Essential scalar fields
-            'type'                 => $this->type,
-            'status'               => $this->status,
-            'adhoc'                => (bool) data_get($this, 'adhoc', false),
-            'dispatched'           => (bool) data_get($this, 'dispatched', false),
-            'has_driver_assigned'  => $this->when($isInternal, $this->has_driver_assigned),
-            'is_scheduled'         => $this->when($isInternal, $this->is_scheduled),
+            'type'                                 => $this->type,
+            'status'                               => $this->status,
+            'adhoc'                                => (bool) data_get($this, 'adhoc', false),
+            'dispatched'                           => (bool) data_get($this, 'dispatched', false),
+            'has_driver_assigned'                  => $this->when($isInternal, $this->has_driver_assigned),
+            'is_scheduled'                         => $this->when($isInternal, $this->is_scheduled),
+            'transaction_amount'                   => $this->transaction_amount,
+            'currency'                             => $this->transaction_currency,
 
             // Timestamps
             'scheduled_at'         => $this->scheduled_at,

package/server/src/Http/Resources/v1/Index/Vehicle.php

@@ -23,28 +23,30 @@ class Vehicle extends FleetbaseResource
         $isInternal = Http::isInternalRequest();
 
         return [
-            'id'              => $this->when($isInternal, $this->id, $this->public_id),
-            'uuid'            => $this->when($isInternal, $this->uuid),
-            'public_id'       => $this->when($isInternal, $this->public_id),
-            'company_uuid'    => $this->when($isInternal, $this->company_uuid),
-            'vendor_uuid'     => $this->when($isInternal, $this->vendor_uuid),
-            'photo_uuid'      => $this->when($isInternal, $this->photo_uuid),
-            'internal_id'     => $this->internal_id,
-            'display_name'    => $this->display_name,
-            'driver_name'     => $this->driver_name,
-            'plate_number'    => $this->plate_number,
-            'serial_number'   => $this->serial_number,
-            'vin'             => $this->vin,
-            'make'            => $this->make,
-            'model'           => $this->model,
-            'year'            => $this->year,
-            'photo_url'       => $this->photo_url,
-            'status'          => $this->status,
-            'location'        => Utils::castPoint($this->location),
-            'heading'         => (int) data_get($this, 'heading', 0),
-            'altitude'        => (int) data_get($this, 'altitude', 0),
-            'speed'           => (int) data_get($this, 'speed', 0),
-            'online'          => (bool) data_get($this, 'online', false),
+            'id'                    => $this->when($isInternal, $this->id, $this->public_id),
+            'uuid'                  => $this->when($isInternal, $this->uuid),
+            'public_id'             => $this->when($isInternal, $this->public_id),
+            'company_uuid'          => $this->when($isInternal, $this->company_uuid),
+            'vendor_uuid'           => $this->when($isInternal, $this->vendor_uuid),
+            'photo_uuid'            => $this->when($isInternal, $this->photo_uuid),
+            'internal_id'           => $this->internal_id,
+            'display_name'          => $this->display_name,
+            'driver_name'           => $this->driver_name,
+            'plate_number'          => $this->plate_number,
+            'serial_number'         => $this->serial_number,
+            'fuel_card_number'      => $this->fuel_card_number,
+            'vin'                   => $this->vin,
+            'make'                  => $this->make,
+            'model'                 => $this->model,
+            'year'                  => $this->year,
+            'photo_url'             => $this->photo_url,
+            'status'                => $this->status,
+            'location'              => Utils::castPoint($this->location),
+            'heading'               => (int) data_get($this, 'heading', 0),
+            'altitude'              => (int) data_get($this, 'altitude', 0),
+            'speed'                 => (int) data_get($this, 'speed', 0),
+            'online'                => (bool) data_get($this, 'online', false),
+            'assigned_orders_count' => $this->when($isInternal, $this->assignedOrdersCount()),
 
             // Meta flag to indicate this is an index resource
             'meta'            => [
@@ -58,6 +60,11 @@ class Vehicle extends FleetbaseResource
         ];
     }
 
+    protected function assignedOrdersCount(): int
+    {
+        return Order::where('vehicle_assigned_uuid', $this->uuid)->count();
+    }
+
     protected function currentOrderReference(): ?string
     {
         $this->loadMissing('driver.currentOrder');

package/server/src/Http/Resources/v1/Issue.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Resources\File;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Http\Resources\User;
 use Fleetbase\LaravelMysqlSpatial\Types\Point;
@@ -26,12 +27,15 @@ class Issue extends FleetbaseResource
             'driver_uuid'                 => $this->when(Http::isInternalRequest(), $this->driver_uuid),
             'company_uuid'                => $this->when(Http::isInternalRequest(), $this->company_uuid),
             'vehicle_uuid'                => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
+            'order_uuid'                  => $this->when(Http::isInternalRequest(), $this->order_uuid ?? data_get($this, 'meta.order_uuid')),
             'assigned_to_uuid'            => $this->when(Http::isInternalRequest(), $this->assigned_to_uuid),
             'reported_by_uuid'            => $this->when(Http::isInternalRequest(), $this->reported_by_uuid),
             'assignee'                    => $this->whenLoaded('assignee', fn () => new User($this->assignee)),
             'reporter'                    => $this->whenLoaded('reporter', fn () => new User($this->reporter)),
             'vehicle'                     => $this->whenLoaded('vehicle', fn () => new Vehicle($this->vehicle)),
             'driver'                      => $this->whenLoaded('driver', fn () => new Driver($this->driver)),
+            'order'                       => $this->when(Http::isInternalRequest(), fn () => $this->resolveLinkedOrder()),
+            'files'                       => $this->whenLoaded('files', fn () => File::collection($this->files)),
             'driver_name'                 => $this->driver_name,
             'vehicle_name'                => $this->vehicle_name,
             'vehicle_id'                  => $this->vehicle_id,
@@ -55,6 +59,27 @@ class Issue extends FleetbaseResource
         ]);
     }
 
+    protected function resolveLinkedOrder()
+    {
+        if ($this->relationLoaded('order') && $this->order) {
+            $this->order->loadMissing(['payload.pickup', 'payload.dropoff', 'trackingNumber', 'customer']);
+
+            return new Order($this->order);
+        }
+
+        $orderUuid = $this->order_uuid ?? data_get($this, 'meta.order_uuid');
+        if (!$orderUuid) {
+            return null;
+        }
+
+        $order = \Fleetbase\FleetOps\Models\Order::with(['payload.pickup', 'payload.dropoff', 'trackingNumber', 'customer'])
+            ->where('uuid', $orderUuid)
+            ->where('company_uuid', $this->company_uuid)
+            ->first();
+
+        return $order ? new Order($order) : null;
+    }
+
     /**
      * Transform the resource into an webhook payload.
      *

package/server/src/Http/Resources/v1/Order.php

@@ -73,24 +73,26 @@ class Order extends FleetbaseResource
             'tracking_statuses'    => $this->whenLoaded('trackingStatuses', function () {
                 return TrackingStatus::collection($this->trackingStatuses);
             }),
-            'tracking'             => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->tracking_number : null),
-            'barcode'              => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->barcode : null),
-            'qr_code'              => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->qr_code : null),
-            'comments'             => $this->when($isInternal, Comment::collection($this->comments)),
-            'files'                => $this->when($isInternal, $this->files, File::collection($this->files)),
-            'purchase_rate'        => new PurchaseRate($this->purchaseRate),
-            'notes'                => $this->notes,
-            'type'                 => $this->type,
-            'status'               => $this->status,
-            'pod_method'           => $this->pod_method,
-            'pod_required'         => (bool) data_get($this, 'pod_required', false),
-            'dispatched'           => (bool) data_get($this, 'dispatched', false),
-            'started'              => (bool) data_get($this, 'started', false),
-            'adhoc'                => (bool) data_get($this, 'adhoc', false),
-            'adhoc_distance'       => (int) $this->getAdhocDistance(),
-            'distance'             => (int) $this->distance,
-            'time'                 => (int) $this->time,
-            'tracker_data'         => $this->when($withTrackerData, function () use ($tracker) {
+            'tracking'                             => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->tracking_number : null),
+            'barcode'                              => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->barcode : null),
+            'qr_code'                              => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->qr_code : null),
+            'comments'                             => $this->when($isInternal, Comment::collection($this->comments)),
+            'files'                                => $this->when($isInternal, $this->files, File::collection($this->files)),
+            'purchase_rate'                        => new PurchaseRate($this->purchaseRate),
+            'notes'                                => $this->notes,
+            'type'                                 => $this->type,
+            'status'                               => $this->status,
+            'pod_method'                           => $this->pod_method,
+            'pod_required'                         => (bool) data_get($this, 'pod_required', false),
+            'dispatched'                           => (bool) data_get($this, 'dispatched', false),
+            'started'                              => (bool) data_get($this, 'started', false),
+            'adhoc'                                => (bool) data_get($this, 'adhoc', false),
+            'adhoc_distance'                       => (int) $this->getAdhocDistance(),
+            'distance'                             => (int) $this->distance,
+            'time'                                 => (int) $this->time,
+            'transaction_amount'                   => $this->transaction_amount,
+            'currency'                             => $this->transaction_currency,
+            'tracker_data'                         => $this->when($withTrackerData, function () use ($tracker) {
                 return $this->resource->tracker_data ?? ($tracker ? $tracker->toArray() : null);
             }),
             'eta'                  => $this->when($withEta, function () use ($tracker) {

package/server/src/Http/Resources/v1/Vehicle.php

@@ -39,6 +39,8 @@ class Vehicle extends FleetbaseResource
             'description'            => $this->description,
             'driver_name'            => $this->when(Http::isInternalRequest(), $this->driver_name),
             'vendor_name'            => $this->when(Http::isInternalRequest(), $this->vendor_name),
+            'assigned_orders_count'  => $this->when(Http::isInternalRequest(), $this->assignedOrdersCount()),
+            'current_order_reference'=> $this->when(Http::isInternalRequest(), $this->currentOrderReference()),
             // Relationships
             'driver'                 => $this->whenLoaded('driver', fn () => new Driver($this->driver)),
             'devices'                => $this->whenLoaded('devices', fn () => $this->devices),
@@ -54,6 +56,7 @@ class Vehicle extends FleetbaseResource
             'serial_number'          => $this->serial_number,
             'plate_number'           => $this->plate_number,
             'call_sign'              => $this->call_sign,
+            'fuel_card_number'       => $this->fuel_card_number,
             // VIN & specs blobs
             'vin'                    => $this->vin ?? null,
             'vin_data'               => data_get($this, 'vin_data', Utils::createObject()),
@@ -142,6 +145,19 @@ class Vehicle extends FleetbaseResource
         ]);
     }
 
+    protected function assignedOrdersCount(): int
+    {
+        return \Fleetbase\FleetOps\Models\Order::where('vehicle_assigned_uuid', $this->uuid)->count();
+    }
+
+    protected function currentOrderReference(): ?string
+    {
+        $this->loadMissing('driver.currentOrder');
+        $order = data_get($this, 'driver.currentOrder');
+
+        return data_get($order, 'tracking') ?? data_get($order, 'public_id');
+    }
+
     /**
      * Transform the resource into a webhook payload.
      *
@@ -161,6 +177,7 @@ class Vehicle extends FleetbaseResource
             'vin'                        => $this->vin,
             'plate_number'               => $this->plate_number,
             'serial_number'              => $this->serial_number,
+            'fuel_card_number'           => $this->fuel_card_number,
             'make'                       => $this->make,
             'model'                      => $this->model,
             'model_type'                 => $this->model_type,

package/server/src/Http/Resources/v1/VehicleWithoutDriver.php

@@ -53,6 +53,7 @@ class VehicleWithoutDriver extends FleetbaseResource
             'serial_number'          => $this->serial_number,
             'plate_number'           => $this->plate_number,
             'call_sign'              => $this->call_sign,
+            'fuel_card_number'       => $this->fuel_card_number,
             // VIN & specs blobs
             'vin'                    => $this->vin ?? null,
             'vin_data'               => data_get($this, 'vin_data', Utils::createObject()),
@@ -160,6 +161,7 @@ class VehicleWithoutDriver extends FleetbaseResource
             'vin'                        => $this->vin,
             'plate_number'               => $this->plate_number,
             'serial_number'              => $this->serial_number,
+            'fuel_card_number'           => $this->fuel_card_number,
             'make'                       => $this->make,
             'model'                      => $this->model,
             'model_type'                 => $this->model_type,

package/server/src/Jobs/SyncFuelProviderTransactionsJob.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Fleetbase\FleetOps\Jobs;
+
+use Fleetbase\FleetOps\Models\FuelProviderConnection;
+use Fleetbase\FleetOps\Models\FuelProviderSyncRun;
+use Fleetbase\FleetOps\Support\FuelProviders\FuelProviderService;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Carbon;
+
+class SyncFuelProviderTransactionsJob implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    public function __construct(public string $connectionUuid, public ?string $from = null, public ?string $to = null, public array $options = [], public ?string $syncRunUuid = null)
+    {
+    }
+
+    public function handle(FuelProviderService $fuelProviderService): void
+    {
+        $connection = FuelProviderConnection::where('uuid', $this->connectionUuid)->firstOrFail();
+        $syncRun    = $this->syncRunUuid ? FuelProviderSyncRun::where('uuid', $this->syncRunUuid)->first() : null;
+
+        try {
+            $fuelProviderService->syncTransactions(
+                $connection,
+                $this->from ? Carbon::parse($this->from) : null,
+                $this->to ? Carbon::parse($this->to) : null,
+                $this->options,
+                $syncRun
+            );
+        } catch (\Throwable $e) {
+            $syncRun?->update([
+                'status'      => 'error',
+                'finished_at' => now(),
+                'error'       => $e->getMessage(),
+            ]);
+            $connection->update([
+                'status'          => 'error',
+                'last_error'      => $e->getMessage(),
+                'last_sync_state' => [
+                    'failed_at' => now()->toIso8601String(),
+                    'message'   => $e->getMessage(),
+                ],
+            ]);
+
+            throw $e;
+        }
+    }
+}

package/server/src/Jobs/SyncTelematicDevicesJob.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Jobs;
 
 use Fleetbase\FleetOps\Models\Telematic;
+use Fleetbase\FleetOps\Support\Telematics\TelematicProviderRegistry;
 use Fleetbase\FleetOps\Support\Telematics\TelematicService;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -25,23 +26,24 @@ class SyncTelematicDevicesJob implements ShouldQueue
 
     public Telematic $telematic;
     public array $options;
+    public string $jobId;
     public int $tries   = 3;
     public int $timeout = 300;
 
     /**
      * Create a new job instance.
      */
-    public function __construct(Telematic $telematic, array $options = [])
+    public function __construct(Telematic $telematic, array $options = [], ?string $jobId = null)
     {
         $this->telematic = $telematic;
         $this->options   = $options;
-        $this->queue     = 'telematics-sync';
+        $this->jobId     = $jobId ?? \Illuminate\Support\Str::uuid()->toString();
     }
 
     /**
      * Execute the job.
      */
-    public function handle(ProviderRegistry $registry, TelematicService $service): void
+    public function handle(TelematicProviderRegistry $registry, TelematicService $service): void
     {
         $correlationId = \Illuminate\Support\Str::uuid()->toString();
 
@@ -67,8 +69,15 @@ class SyncTelematicDevicesJob implements ShouldQueue
 
                 foreach ($response['devices'] as $devicePayload) {
                     $normalizedDevice = $provider->normalizeDevice($devicePayload);
-                    $service->linkDevice($this->telematic, $normalizedDevice);
-                    $totalSynced++;
+                    try {
+                        $service->linkDevice($this->telematic, $normalizedDevice);
+                        $totalSynced++;
+                    } catch (\Illuminate\Validation\ValidationException $e) {
+                        Log::warning('Skipping telematics device without provider identity', [
+                            'correlation_id' => $correlationId,
+                            'provider'       => $this->telematic->provider,
+                        ]);
+                    }
                 }
 
                 $cursor = $response['next_cursor'];
@@ -86,11 +95,32 @@ class SyncTelematicDevicesJob implements ShouldQueue
                 'correlation_id' => $correlationId,
                 'total_synced'   => $totalSynced,
             ]);
+
+            $this->telematic->status = 'active';
+            $this->telematic->meta   = array_merge($this->telematic->meta ?? [], [
+                'last_sync_job_id'       => $this->jobId,
+                'last_sync_completed_at' => now()->toDateTimeString(),
+                'last_sync_result'       => 'success',
+                'last_sync_total'        => $totalSynced,
+                'last_sync_error'        => null,
+            ]);
+            $this->telematic->save();
         } catch (\Exception $e) {
             Log::error('Device discovery failed', [
                 'correlation_id' => $correlationId,
                 'error'          => $e->getMessage(),
+                'exception'      => get_class($e),
+            ]);
+
+            $this->telematic->status = 'error';
+            $this->telematic->meta   = array_merge($this->telematic->meta ?? [], [
+                'last_sync_job_id'     => $this->jobId,
+                'last_sync_result'     => 'failed',
+                'last_sync_error'      => 'Device sync failed. Review the provider connection and server logs, then try again.',
+                'last_sync_error_type' => class_basename($e),
+                'last_sync_failed_at'  => now()->toDateTimeString(),
             ]);
+            $this->telematic->save();
 
             throw $e;
         }
@@ -101,6 +131,6 @@ class SyncTelematicDevicesJob implements ShouldQueue
      */
     public function getJobId(): string
     {
-        return $this->job->getJobId() ?? \Illuminate\Support\Str::uuid()->toString();
+        return $this->jobId;
     }
 }

package/server/src/Jobs/TestTelematicConnectionJob.php

@@ -3,12 +3,13 @@
 namespace Fleetbase\FleetOps\Jobs;
 
 use Fleetbase\FleetOps\Models\Telematic;
+use Fleetbase\FleetOps\Support\Telematics\TelematicProviderRegistry;
+use Fleetbase\FleetOps\Support\Telematics\TelematicService;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 
@@ -25,22 +26,23 @@ class TestTelematicConnectionJob implements ShouldQueue
     use SerializesModels;
 
     public Telematic $telematic;
+    public string $jobId;
     public int $tries   = 1;
     public int $timeout = 30;
 
     /**
      * Create a new job instance.
      */
-    public function __construct(Telematic $telematic)
+    public function __construct(Telematic $telematic, ?string $jobId = null)
     {
         $this->telematic = $telematic;
-        $this->queue     = 'telematics-priority';
+        $this->jobId     = $jobId ?? Str::uuid()->toString();
     }
 
     /**
      * Execute the job.
      */
-    public function handle(ProviderRegistry $registry): void
+    public function handle(TelematicProviderRegistry $registry, TelematicService $service): void
     {
         $correlationId = Str::uuid()->toString();
 
@@ -52,26 +54,11 @@ class TestTelematicConnectionJob implements ShouldQueue
 
         try {
             $provider    = $registry->resolve($this->telematic->provider);
-            $credentials = json_decode(Crypt::decryptString($this->telematic->credentials), true);
+            $credentials = $service->getCredentials($this->telematic);
 
             $result = $provider->testConnection($credentials);
 
-            if ($result['success']) {
-                $this->telematic->status = 'active';
-                $this->telematic->meta   = array_merge($this->telematic->meta ?? [], [
-                    'last_connection_test' => now()->toDateTimeString(),
-                    'last_test_result'     => 'success',
-                ]);
-            } else {
-                $this->telematic->status = 'error';
-                $this->telematic->meta   = array_merge($this->telematic->meta ?? [], [
-                    'last_connection_test' => now()->toDateTimeString(),
-                    'last_test_result'     => 'failed',
-                    'last_error'           => $result['message'],
-                ]);
-            }
-
-            $this->telematic->save();
+            $service->recordConnectionTest($this->telematic, $result);
 
             Log::info('Connection test completed', [
                 'correlation_id' => $correlationId,
@@ -97,6 +84,6 @@ class TestTelematicConnectionJob implements ShouldQueue
      */
     public function getJobId(): string
     {
-        return $this->job->getJobId() ?? Str::uuid()->toString();
+        return $this->jobId;
     }
 }

package/server/src/Mail/CustomerCredentialsMail.php

@@ -45,7 +45,7 @@ class CustomerCredentialsMail extends Mailable
         $this->customer->loadMissing('company');
 
         return new Envelope(
-            subject: 'Your login credentials for ' . $this->customer->company->name . ' on ' . config('app.name'),
+            subject: 'Your ' . $this->customer->company->name . ' customer portal access is ready',
         );
     }
 
@@ -63,19 +63,18 @@ class CustomerCredentialsMail extends Mailable
                 'customer'          => $this->customer,
                 'plaintextPassword' => $this->plaintextPassword,
                 'customerPortalUrl' => $this->getCustomerPortalAccessUrl(),
-                'currentHour'       => now()->hour,
             ]
         );
     }
 
     /**
-     * Get the customer portal URL if available.
+     * Get the customer portal URL.
      */
-    private function getCustomerPortalAccessUrl(): ?string
+    private function getCustomerPortalAccessUrl(): string
     {
         $customerPortalConfig = Setting::lookupFromCompany('customer-portal-config');
-        $accessUrlSlug        = data_get($customerPortalConfig, 'accessUrlSlug');
+        $accessUrlSlug        = data_get($customerPortalConfig, 'accessUrlSlug', 'customer-portal');
 
-        return $accessUrlSlug ? Utils::consoleUrl($accessUrlSlug) : null;
+        return Utils::consoleUrl($accessUrlSlug ?: 'customer-portal');
     }
 }

package/server/src/Models/Asset.php

@@ -197,7 +197,8 @@ class Asset extends Model
     {
         return SlugOptions::create()
             ->generateSlugsFrom(['name', 'code'])
-            ->saveSlugsTo('slug');
+            ->saveSlugsTo('slug')
+            ->doNotGenerateSlugsOnUpdate();
     }
 
     /**