@fleetbase/fleetops-engine 0.6.64 → 0.6.66

package/server/src/Models/WorkOrder.php

@@ -75,6 +75,7 @@ class WorkOrder extends Model
      */
     protected $fillable = [
         'company_uuid',
+        'schedule_uuid',
         'code',
         'subject',
         'category',
@@ -97,6 +98,8 @@ class WorkOrder extends Model
         'cost_center',
         'budget_code',
         'meta',
+        'created_by_uuid',
+        'updated_by_uuid',
     ];
 
     /**

package/server/src/Observers/WorkOrderObserver.php

@@ -61,7 +61,7 @@ class WorkOrderObserver
             'maintainable_type'  => $workOrder->target_type,
             'maintainable_uuid'  => $workOrder->target_uuid,
             'type'               => 'scheduled',
-            'status'             => 'done',
+            'status'             => 'completed',
             'priority'           => $workOrder->priority,
             'scheduled_at'       => $workOrder->opened_at,
             'completed_at'       => $workOrder->closed_at ?? now(),

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -76,6 +76,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         \Fleetbase\FleetOps\Console\Commands\SendMaintenanceReminders::class,
         \Fleetbase\FleetOps\Console\Commands\ProcessOperationalAlerts::class,
         \Fleetbase\FleetOps\Console\Commands\SyncTelematics::class,
+        \Fleetbase\FleetOps\Console\Commands\DrainTelematicInbox::class,
     ];
 
     /**
@@ -149,6 +150,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
             $schedule->command('fleetops:send-maintenance-reminders')->daily()->withoutOverlapping()->storeOutputInDb();
             $schedule->command('fleetops:process-operational-alerts')->everyMinute()->withoutOverlapping()->storeOutputInDb();
             $schedule->command('fleetops:sync-telematics')->everyMinute()->withoutOverlapping()->storeOutputInDb();
+            $schedule->command('fleetops:drain-telematic-inbox')->everyMinute()->withoutOverlapping();
         });
         $this->registerNotifications();
         $this->registerAiCapabilities();
@@ -193,6 +195,8 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         $this->loadViewsFrom(__DIR__ . '/../../resources/views', 'fleetops');
         $this->mergeConfigFrom(__DIR__ . '/../../config/fleetops.php', 'fleetops');
         $this->mergeConfigFrom(__DIR__ . '/../../config/telematics.php', 'telematics');
+        $this->mergeConfigFrom(__DIR__ . '/../../config/afaqy.php', 'telematics.afaqy');
+        $this->mergeConfigFrom(__DIR__ . '/../../config/telemetry.php', 'telematics.telemetry');
         $this->mergeConfigFrom(__DIR__ . '/../../config/fuel-providers.php', 'fuel-providers');
         $this->mergeConfigFrom(__DIR__ . '/../../config/api.php', 'api');
         $this->mergeConfigFrom(__DIR__ . '/../../config/cache.stores.php', 'cache.stores');
@@ -214,8 +218,15 @@ class FleetOpsServiceProvider extends CoreServiceProvider
     public function registerMorphMap(): void
     {
         Relation::morphMap([
-            'Fleetbase\\Models\\Vehicle'   => \Fleetbase\FleetOps\Models\Vehicle::class,
-            '\\Fleetbase\\Models\\Vehicle' => \Fleetbase\FleetOps\Models\Vehicle::class,
+            'Fleetbase\\Models\\Vehicle'    => \Fleetbase\FleetOps\Models\Vehicle::class,
+            '\\Fleetbase\\Models\\Vehicle'  => \Fleetbase\FleetOps\Models\Vehicle::class,
+            'fleet-ops:vehicle'             => \Fleetbase\FleetOps\Models\Vehicle::class,
+            'fleet-ops:trailer'             => \Fleetbase\FleetOps\Models\Trailer::class,
+            // A photo or signature filed with an inspection is a platform file
+            // whose subject is the submission. The console names that subject
+            // the way Ember names it, so the alias has to resolve here.
+            'fleet-ops:inspection-submission' => \Fleetbase\FleetOps\Models\InspectionSubmission::class,
+            'fleet-ops:inspection-form'       => \Fleetbase\FleetOps\Models\InspectionForm::class,
         ]);
     }
 

package/server/src/Rules/Base64OrUrl.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Fleetbase\FleetOps\Rules;
+
+use Illuminate\Contracts\Validation\Rule;
+
+/**
+ * A photo as the driver app sends it: either a URL to an uploaded file, or the
+ * image bytes base64 encoded — bare, or as a `data:image/...;base64,` URI.
+ *
+ * Deliberately not a regex rule. A DVIR photo is easily a megabyte of base64,
+ * and running a backtracking pattern over that many characters is the kind of
+ * thing that only fails on a real handset. `base64_decode` in strict mode is
+ * linear and rejects anything outside the alphabet.
+ */
+class Base64OrUrl implements Rule
+{
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param string $attribute
+     */
+    public function passes($attribute, $value): bool
+    {
+        return static::isBase64OrUrl($value);
+    }
+
+    public static function isBase64OrUrl(mixed $value): bool
+    {
+        if (!is_string($value) || trim($value) === '') {
+            return false;
+        }
+
+        if (filter_var($value, FILTER_VALIDATE_URL) !== false) {
+            return true;
+        }
+
+        if (preg_match('#^data:[\w.+-]+/[\w.+-]+;base64,#i', $value, $prefix)) {
+            $value = substr($value, strlen($prefix[0]));
+        }
+
+        $stripped = preg_replace('/\s+/', '', $value);
+
+        return $stripped !== '' && base64_decode($stripped, true) !== false;
+    }
+
+    /**
+     * Get the validation error message.
+     */
+    public function message(): string
+    {
+        return 'The :attribute must be a base64 encoded image or a URL.';
+    }
+}

package/server/src/Support/Ai/FleetOpsAiQueryResources.php

@@ -9,6 +9,7 @@ use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Fleet;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\ServiceArea;
+use Fleetbase\FleetOps\Models\Trailer;
 use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\FleetOps\Models\Zone;
 
@@ -82,6 +83,27 @@ class FleetOpsAiQueryResources
             maxLimit: 500,
         ));
 
+        $registry->register(new AiQueryableResource(
+            key: 'fleet-ops.trailers',
+            label: 'Fleet-Ops trailers',
+            module: 'fleet-ops',
+            modelClass: Trailer::class,
+            permission: 'fleet-ops see trailer',
+            aliases: ['trailers', 'trailer'],
+            fields: [
+                'online'         => ['column' => 'online', 'type' => 'boolean'],
+                'status'         => ['column' => 'status', 'type' => 'string'],
+                'type'           => ['column' => 'type', 'type' => 'string'],
+                'plate_number'   => ['column' => 'plate_number', 'type' => 'string'],
+                'last_online_at' => ['column' => 'last_online_at', 'type' => 'datetime'],
+                'updated_at'     => ['column' => 'updated_at', 'type' => 'datetime'],
+            ],
+            sampleFields: ['public_id', 'name', 'type', 'status', 'online', 'plate_number', 'last_online_at'],
+            locationField: 'location',
+            directivePermission: 'fleet-ops list trailer',
+            maxLimit: 500,
+        ));
+
         $registry->register(new AiQueryableResource(
             key: 'fleet-ops.orders',
             label: 'Fleet-Ops orders',

package/server/src/Support/FuelProviders/FuelProviderService.php

@@ -87,14 +87,14 @@ class FuelProviderService
 
     public function syncTransactions(FuelProviderConnection $connection, ?Carbon $from = null, ?Carbon $to = null, array $options = [], ?FuelProviderSyncRun $syncRun = null): array
     {
-        $settings = (array) $connection->sync_settings;
-        $from ??= Carbon::parse(data_get($settings, 'from', $connection->last_synced_at?->copy()->subDay() ?? now()->subDays((int) data_get($settings, 'window_days', 7))));
-        $to ??= Carbon::parse(data_get($settings, 'to', now()));
+        [$from, $to] = $this->syncWindow($connection, $from ?? $syncRun?->from, $to ?? $syncRun?->to);
 
         $syncRun ??= $this->createSyncRun($connection, $from, $to, 'running');
-        $syncRun->update(['status' => 'running', 'started_at' => now(), 'error' => null]);
+        $syncRun->update(['status' => 'running', 'from' => $from, 'to' => $to, 'started_at' => now(), 'error' => null]);
 
         $summary = [
+            'received'             => 0,
+            'updated'              => 0,
             'imported'             => 0,
             'matched'              => 0,
             'unmatched'            => 0,
@@ -109,22 +109,23 @@ class FuelProviderService
 
             foreach ($payloads as $payload) {
                 $transaction = $this->ingestTransaction($connection, $payload);
-                $summary['imported']++;
+                $summary['received']++;
+                $summary[$transaction->wasRecentlyCreated ? 'imported' : 'updated']++;
                 $summary['liters'] += (float) $transaction->volume;
                 $summary['amount'] += (int) $transaction->amount;
 
                 if ($transaction->sync_status === 'matched') {
                     $summary['matched']++;
-                } else {
+                } elseif ($transaction->sync_status === 'unmatched') {
                     $summary['unmatched']++;
                 }
 
-                if ($transaction->fuel_report_uuid) {
+                if ($transaction->fuel_report_uuid && $transaction->createdFuelReport) {
                     $summary['fuel_reports_created']++;
                 }
             }
         } catch (\Throwable $e) {
-            $syncRun->update(['status' => 'error', 'finished_at' => now(), 'error' => $e->getMessage(), 'summary' => $summary]);
+            $syncRun->update(array_merge(collect($summary)->only(['imported', 'matched', 'unmatched', 'fuel_reports_created', 'liters', 'amount'])->all(), ['status' => 'error', 'finished_at' => now(), 'error' => $e->getMessage(), 'summary' => $summary]));
             $connection->update(['status' => 'error', 'last_error' => $e->getMessage()]);
             throw $e;
         }
@@ -158,6 +159,8 @@ class FuelProviderService
 
     public function createSyncRun(FuelProviderConnection $connection, ?Carbon $from = null, ?Carbon $to = null, string $status = 'queued'): FuelProviderSyncRun
     {
+        [$from, $to] = $this->syncWindow($connection, $from, $to);
+
         return FuelProviderSyncRun::create([
             'company_uuid'                   => $connection->company_uuid,
             'fuel_provider_connection_uuid'  => $connection->uuid,
@@ -168,29 +171,42 @@ class FuelProviderService
         ]);
     }
 
+    public function syncWindow(FuelProviderConnection $connection, ?Carbon $from = null, ?Carbon $to = null): array
+    {
+        $settings = (array) $connection->sync_settings;
+        $from ??= Carbon::parse(data_get($settings, 'from') ?: now()->subDays(max(1, (int) data_get($settings, 'window_days', 7))))->startOfDay();
+        $to ??= Carbon::parse(data_get($settings, 'to') ?: now())->endOfDay();
+        if ($from->gt($to)) {
+            throw new \InvalidArgumentException('The sync start date must be on or before the end date.');
+        }
+
+        return [$from, $to];
+    }
+
     public function ingestTransaction(FuelProviderConnection $connection, array $payload): FuelProviderTransaction
     {
         return DB::transaction(function () use ($connection, $payload) {
             $provider              = $payload['provider'] ?? $connection->provider;
             $providerTransactionId = $payload['provider_transaction_id'];
-            // The match must include company_uuid. Provider transaction ids are only
-            // unique within the account they were issued for, so keying on
-            // (provider, provider_transaction_id) alone let one company's sync find
-            // and overwrite another company's transaction — reassigning its
-            // company_uuid. Mirrors fuel_provider_txn_company_provider_unique.
+            // Provider IDs are scoped to the connected account/environment.
             $transaction           = FuelProviderTransaction::updateOrCreate(
                 [
-                    'company_uuid'            => $connection->company_uuid,
-                    'provider'                => $provider,
-                    'provider_transaction_id' => $providerTransactionId,
+                    'company_uuid'                  => $connection->company_uuid,
+                    'fuel_provider_connection_uuid' => $connection->uuid,
+                    'provider'                      => $provider,
+                    'provider_transaction_id'       => $providerTransactionId,
                 ],
                 array_merge($payload, [
                     'company_uuid'                  => $connection->company_uuid,
                     'fuel_provider_connection_uuid' => $connection->uuid,
-                    'sync_status'                   => 'imported',
                 ])
             );
 
+            $created   = $transaction->wasRecentlyCreated;
+            $hadReport = (bool) $transaction->fuel_report_uuid;
+            if (!$created && in_array($transaction->sync_status, ['reviewed', 'ignored'], true)) {
+                return $transaction;
+            }
             event(new FuelProviderTransactionImported($transaction));
 
             $this->matchTransaction($transaction, $connection);
@@ -211,7 +227,11 @@ class FuelProviderService
                 event(new FuelProviderTransactionUnmatched($transaction));
             }
 
-            return $transaction->fresh(['vehicle', 'driver', 'fuelReport']);
+            $result                     = $transaction->fresh(['vehicle', 'driver', 'fuelReport']);
+            $result->wasRecentlyCreated = $created;
+            $result->createdFuelReport  = !$hadReport && (bool) $result->fuel_report_uuid;
+
+            return $result;
         });
     }
 
@@ -228,7 +248,9 @@ class FuelProviderService
         $transaction->sync_status  = 'matched';
         $transaction->matched_at ??= now();
         $transaction->save();
-        $this->ensureFuelReport($transaction);
+        if (!$transaction->connection || $this->shouldCreateFuelReport($transaction->connection)) {
+            $this->ensureFuelReport($transaction);
+        }
 
         event(new FuelProviderTransactionMatched($transaction));
 
@@ -257,7 +279,9 @@ class FuelProviderService
 
         $this->matchTransaction($transaction, $transaction->connection);
         if ($transaction->vehicle_uuid) {
-            $this->ensureFuelReport($transaction);
+            if (!$transaction->connection || $this->shouldCreateFuelReport($transaction->connection)) {
+                $this->ensureFuelReport($transaction);
+            }
             $transaction->sync_status = 'matched';
             $transaction->matched_at ??= now();
             event(new FuelProviderTransactionMatched($transaction));
@@ -313,7 +337,11 @@ class FuelProviderService
 
     protected function matchingOrder(?FuelProviderConnection $connection = null): Collection
     {
-        $configuredFields = collect(data_get((array) $connection?->sync_settings, 'matching_order', []))->filter()->values();
+        $settings = (array) $connection?->sync_settings;
+        if (array_key_exists('matching_order', $settings) && $settings['matching_order'] === []) {
+            return collect();
+        }
+        $configuredFields = collect(data_get($settings, 'matching_order', []))->filter()->values();
 
         if ($configuredFields->all() === self::LEGACY_DEFAULT_MATCHING_ORDER) {
             return collect(self::DEFAULT_MATCHING_ORDER);
@@ -334,14 +362,16 @@ class FuelProviderService
 
     protected function resolveOrder(FuelProviderTransaction $transaction): ?Order
     {
-        return Order::where('company_uuid', $transaction->company_uuid)
+        $matches = Order::where('company_uuid', $transaction->company_uuid)
             ->where(function ($query) use ($transaction) {
                 $query->where('public_id', $transaction->trip_number)
                     ->orWhere('internal_id', $transaction->trip_number)
                     ->orWhereHas('trackingNumber', function ($trackingNumberQuery) use ($transaction) {
                         $trackingNumberQuery->where('tracking_number', $transaction->trip_number);
                     });
-            })->first();
+            })->limit(2)->get();
+
+        return $matches->count() === 1 ? $matches->first() : null;
     }
 
     protected function resolveVehicle(FuelProviderTransaction $transaction, string $field): ?Vehicle
@@ -373,14 +403,16 @@ class FuelProviderService
 
         $normalized = $this->normalizeIdentifier($identifier);
 
-        return Vehicle::where('company_uuid', $transaction->company_uuid)
+        $matches = Vehicle::where('company_uuid', $transaction->company_uuid)
             ->where(function ($query) use ($identifier, $normalized, $vehicleFields) {
                 foreach ($vehicleFields as $vehicleField) {
                     $query->orWhere($vehicleField, $identifier)
                         ->orWhereRaw("REPLACE(REPLACE(UPPER({$vehicleField}), ' ', ''), '-', '') = ?", [$normalized]);
                 }
             })
-            ->first();
+            ->limit(2)->get();
+
+        return $matches->count() === 1 ? $matches->first() : null;
     }
 
     protected function resolveVehicleByProviderId(FuelProviderTransaction $transaction): ?Vehicle
@@ -389,12 +421,14 @@ class FuelProviderService
             return null;
         }
 
-        return Vehicle::where('company_uuid', $transaction->company_uuid)
+        $matches = Vehicle::where('company_uuid', $transaction->company_uuid)
             ->where(function ($query) use ($transaction) {
                 $query->where('meta->fuel_provider_vehicle_id', $transaction->provider_vehicle_id)
                     ->orWhere("meta->fuel_provider_ids->{$transaction->provider}", $transaction->provider_vehicle_id);
             })
-            ->first();
+            ->limit(2)->get();
+
+        return $matches->count() === 1 ? $matches->first() : null;
     }
 
     protected function normalizeMatchingField(string $field): string
@@ -433,12 +467,15 @@ class FuelProviderService
                 'source'                         => 'fuel_provider',
                 'provider'                       => $transaction->provider,
                 'fuel_provider_transaction_uuid' => $transaction->uuid,
+                'fuel_provider_connection_uuid'  => $transaction->fuel_provider_connection_uuid,
+                'transaction_at'                 => $transaction->transaction_at?->toIso8601String(),
                 'station_name'                   => $transaction->station_name,
                 'trip_number'                    => $transaction->trip_number,
             ],
         ]);
 
         $transaction->fuel_report_uuid = $fuelReport->uuid;
+        $transaction->save();
         event(new FuelReportCreatedFromProvider($transaction, $fuelReport));
 
         return $fuelReport;

package/server/src/Support/FuelProviders/Providers/PetroAppFuelProvider.php

@@ -3,11 +3,17 @@
 namespace Fleetbase\FleetOps\Support\FuelProviders\Providers;
 
 use Fleetbase\FleetOps\Models\FuelProviderConnection;
+use Illuminate\Http\Client\Response;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 
 class PetroAppFuelProvider extends AbstractFuelProvider
 {
+    public const BASE_URLS = [
+        'sandbox'    => 'https://app-public.staging.petroapp.app/webservice',
+        'production' => 'https://app.petroapp.com.sa/webservice',
+    ];
+
     public function key(): string
     {
         return 'petroapp';
@@ -21,22 +27,28 @@ class PetroAppFuelProvider extends AbstractFuelProvider
     public function testConnection(FuelProviderConnection $connection): array
     {
         try {
-            $response = $this->client($connection)->get('vehicles', ['page' => 1]);
+            [$response, $authType] = $this->getResponse($connection, 'vehicles', ['page' => 1]);
+            $metadata              = [
+                'environment' => $connection->environment ?? 'production',
+                'host'        => parse_url($this->baseUrl($connection), PHP_URL_HOST),
+                'auth_type'   => $authType,
+                'status'      => $response->status(),
+            ];
 
-            if (!$response->successful()) {
+            if (!$this->successfulResponse($response) || !is_array($response->json('data.data'))) {
                 return [
                     'success'  => false,
                     'message'  => $response->json('message') ?? 'Unable to connect to PetroApp.',
-                    'metadata' => ['status' => $response->status()],
+                    'metadata' => $metadata,
                 ];
             }
 
             return [
                 'success'  => true,
                 'message'  => 'PetroApp connection successful.',
-                'metadata' => [
-                    'total_vehicles' => $response->json('data.total'),
-                ],
+                'metadata' => array_merge($metadata, [
+                    'total_vehicles' => $response->json('data.total') ?? $response->json('data.meta.total'),
+                ]),
             ];
         } catch (\Throwable $e) {
             return ['success' => false, 'message' => $e->getMessage(), 'metadata' => []];
@@ -69,13 +81,15 @@ class PetroAppFuelProvider extends AbstractFuelProvider
     {
         $credentials = (array) $connection->credentials;
 
-        return rtrim(data_get($credentials, 'base_url', 'https://app-public.staging.petroapp.app/webservice'), '/');
+        $override = trim((string) data_get($credentials, 'base_url', ''));
+
+        return rtrim($override ?: self::BASE_URLS[$connection->environment ?? 'production'], '/');
     }
 
     protected function headers(FuelProviderConnection $connection): array
     {
         $credentials = (array) $connection->credentials;
-        $token       = data_get($credentials, 'api_token') ?? data_get($credentials, 'api_key');
+        $token       = trim((string) (data_get($credentials, 'api_token') ?? data_get($credentials, 'api_key')));
 
         if (data_get($credentials, 'auth_type') === 'ws_sk_header') {
             return [
@@ -99,28 +113,80 @@ class PetroAppFuelProvider extends AbstractFuelProvider
         $items = collect();
 
         do {
-            $response = $this->client($connection)->get($endpoint, array_merge($params, ['page' => $page]));
+            [$response] = $this->getResponse($connection, $endpoint, array_merge($params, ['page' => $page]));
 
-            if (!$response->successful()) {
+            if (!$this->successfulResponse($response)) {
                 throw new \RuntimeException($response->json('message') ?? "PetroApp {$endpoint} request failed.");
             }
 
             $payload = $response->json();
-            $data    = $dataKey ? data_get($payload, $dataKey, []) : data_get($payload, 'data.data', []);
+            $data    = $dataKey ? data_get($payload, $dataKey) : data_get($payload, 'data.data');
+            if (!is_array($data)) {
+                throw new \RuntimeException("PetroApp {$endpoint} returned an invalid response.");
+            }
             $items   = $items->merge($data);
 
-            $lastPage = (int) data_get($payload, 'data.last_page', $page);
-            $hasMore  = data_get($payload, 'data.next_page_url') || $page < $lastPage;
+            $lastPage = (int) data_get($payload, 'data.last_page', data_get($payload, 'data.meta.last_page', $page));
+            $hasMore  = data_get($payload, 'data.next_page_url') || data_get($payload, 'data.links.next') || $page < $lastPage;
             $page++;
         } while ($hasMore && $page <= $maxPages);
 
+        if ($hasMore) {
+            throw new \RuntimeException('PetroApp returned more pages than the sync limit. Choose a shorter date range and retry; the import was not marked complete.');
+        }
+
         return $items;
     }
 
+    protected function getResponse(FuelProviderConnection $connection, string $endpoint, array $params): array
+    {
+        $credentials = (array) $connection->credentials;
+        $authType    = data_get($credentials, 'auth_type') ?: 'bearer_token';
+        $response    = $this->client($connection)->get($endpoint, $params);
+
+        // Older forms supplied only api_token. Preserve working Bearer tokens,
+        // but support WS-SK tokens when PetroApp explicitly requests a secret key.
+        if (blank(data_get($credentials, 'auth_type')) && $response->json('message') === 'Secret key is not found') {
+            $retryConnection              = clone $connection;
+            $retryConnection->credentials = array_merge($credentials, ['auth_type' => 'ws_sk_header']);
+            $response                     = $this->client($retryConnection)->get($endpoint, $params);
+            $authType                     = 'ws_sk_header';
+        }
+
+        return [$response, $authType];
+    }
+
+    protected function successfulResponse(Response $response): bool
+    {
+        $payload = $response->json();
+        if (!$response->successful() || !is_array($payload)) {
+            return false;
+        }
+
+        foreach (['success', 'status'] as $key) {
+            if (array_key_exists($key, $payload) && in_array($payload[$key], [false, 0, '0', 'false', 'error'], true)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    protected function billPlate(array $bill): ?string
+    {
+        $number  = $this->compactIdentifier($bill['plate_snum'] ?? null);
+        $letters = $this->compactIdentifier($bill['plate_letter'] ?? null);
+        if (!$letters || !$number || str_contains($number, $letters)) {
+            return $number;
+        }
+
+        return $this->compactIdentifier($letters . ' ' . $number);
+    }
+
     protected function normalizeBill(array $bill): array
     {
         $transactionAt = $this->dateFrom($bill['bill_date'] ?? $bill['billDate'] ?? null);
-        $providerId    = $bill['id'] ?? $bill['bill_id'] ?? null;
+        $providerId    = $bill['id'] ?? $bill['bill_id'] ?? $bill['bill_number'] ?? null;
         $fallbackId    = $this->transactionHash([
             $bill['bill_date'] ?? $bill['billDate'] ?? null,
             $bill['trip_number'] ?? null,
@@ -139,7 +205,7 @@ class PetroAppFuelProvider extends AbstractFuelProvider
             'vehicle_card_id'         => $this->compactIdentifier($bill['vehicle_card_id'] ?? $bill['fuel_card_number'] ?? $bill['card_number'] ?? null),
             'internal_number'         => $this->compactIdentifier($bill['internal_number'] ?? null),
             'structure_number'        => $this->compactIdentifier($bill['structure_number'] ?? null),
-            'plate_number'            => $this->compactIdentifier($bill['plate_snum'] ?? null),
+            'plate_number'            => $this->billPlate($bill),
             'vin'                     => $this->compactIdentifier($bill['vin'] ?? $bill['vin_number'] ?? null),
             'serial_number'           => $this->compactIdentifier($bill['serial_number'] ?? null),
             'call_sign'               => $this->compactIdentifier($bill['call_sign'] ?? null),