@fleetbase/fleetops-engine 0.6.50 → 0.6.52

package/server/src/Models/Issue.php

@@ -14,7 +14,11 @@ use Fleetbase\Traits\HasCustomFields;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\TracksApiCredential;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Str;
+use Spatie\Activitylog\LogOptions;
+use Spatie\Activitylog\Traits\LogsActivity;
 
 class Issue extends Model
 {
@@ -24,6 +28,7 @@ class Issue extends Model
     use SpatialTrait;
     use HasApiModelBehavior;
     use HasApiModelCache;
+    use LogsActivity;
     use HasCustomFields;
 
     /**
@@ -60,6 +65,7 @@ class Issue extends Model
         'assigned_to_uuid',
         'vehicle_uuid',
         'driver_uuid',
+        'order_uuid',
         'issue_id',
         'location',
         'category',
@@ -106,6 +112,31 @@ class Issue extends Model
      */
     protected $appends = ['driver_name', 'vehicle_name', 'assignee_name', 'reporter_name'];
 
+    /**
+     * Get the activity log options for the model.
+     */
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()
+            ->logOnly([
+                'title',
+                'report',
+                'status',
+                'priority',
+                'assigned_to_uuid',
+                'vehicle_uuid',
+                'driver_uuid',
+                'order_uuid',
+                'type',
+                'category',
+                'tags',
+                'resolved_at',
+                'meta',
+            ])
+            ->logOnlyDirty()
+            ->dontSubmitEmptyLogs();
+    }
+
     /**
      * The attributes excluded from the model's JSON form.
      *
@@ -114,7 +145,7 @@ class Issue extends Model
     protected $hidden = [];
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return BelongsTo
      */
     public function reportedBy()
     {
@@ -122,7 +153,7 @@ class Issue extends Model
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return BelongsTo
      */
     public function reporter()
     {
@@ -130,7 +161,7 @@ class Issue extends Model
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return BelongsTo
      */
     public function assignedTo()
     {
@@ -138,7 +169,7 @@ class Issue extends Model
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return BelongsTo
      */
     public function assignee()
     {
@@ -146,7 +177,7 @@ class Issue extends Model
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return BelongsTo
      */
     public function vehicle()
     {
@@ -154,13 +185,23 @@ class Issue extends Model
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return BelongsTo
      */
     public function driver()
     {
         return $this->belongsTo(Driver::class);
     }
 
+    public function order(): BelongsTo
+    {
+        return $this->belongsTo(Order::class, 'order_uuid', 'uuid')->without(['comments', 'files']);
+    }
+
+    public function files(): HasMany
+    {
+        return $this->hasMany(\Fleetbase\Models\File::class, 'subject_uuid', 'uuid')->latest();
+    }
+
     /**
      * Set the title attribute for the Issue model.
      *

package/server/src/Models/Order.php

@@ -169,6 +169,7 @@ class Order extends Model
         'tracking',
         'total_entities',
         'transaction_amount',
+        'transaction_currency',
         'customer_name',
         'customer_phone',
         'facilitator_name',
@@ -508,6 +509,16 @@ class Order extends Model
         return data_get($this, 'transaction.amount');
     }
 
+    /**
+     * The transaction amount for the order.
+     *
+     * @return string
+     */
+    public function getTransactionCurrencyAttribute()
+    {
+        return data_get($this, 'transaction.currency');
+    }
+
     /**
      * The customer name for the order.
      *
@@ -1143,7 +1154,17 @@ class Order extends Model
             $this->setRelation('purchaseRate', $purchaseRate);
 
             if ($purchaseRate->transaction_uuid) {
-                $this->setRelation('transaction', Transaction::where('uuid', $purchaseRate->transaction_uuid)->first());
+                $transaction = Transaction::where('uuid', $purchaseRate->transaction_uuid)->first();
+                if ($transaction instanceof Transaction) {
+                    $transaction->update([
+                        'subject_uuid' => $this->uuid,
+                        'subject_type' => static::class,
+                        'context_uuid' => $purchaseRate->uuid,
+                        'context_type' => PurchaseRate::class,
+                        'direction'    => Transaction::DIRECTION_CREDIT,
+                    ]);
+                    $this->setRelation('transaction', $transaction);
+                }
             }
 
             if (
@@ -1176,12 +1197,17 @@ class Order extends Model
                 'company_uuid'           => session('company', $this->company_uuid),
                 'customer_uuid'          => $this->customer_uuid,
                 'customer_type'          => $this->customer_type,
+                'subject_uuid'           => $this->uuid,
+                'subject_type'           => static::class,
+                'context_uuid'           => $this->uuid,
+                'context_type'           => static::class,
                 'gateway_transaction_id' => Transaction::generateNumber(),
                 'gateway'                => 'internal',
                 'amount'                 => 0,
                 'currency'               => Utils::getCompanyTransactionCurrency($this->company ?? $this->company_uuid),
                 'description'            => 'Dispatch order',
                 'type'                   => 'dispatch',
+                'direction'              => Transaction::DIRECTION_CREDIT,
                 'status'                 => 'success',
             ]);
 
@@ -1379,8 +1405,9 @@ class Order extends Model
      *
      * The process involves the following steps:
      * 1. Creating a new Activity instance with the 'completed' code and relevant details.
-     * 2. Notifying that the order has been completed via `notifyCompleted`.
-     * 3. Updating the order's activity with the new 'completed' activity through `updateActivity`.
+     * 2. Updating the order's activity with the new 'completed' activity through `updateActivity`,
+     *    which applies and persists the 'completed' status.
+     * 3. Notifying that the order has been completed via `notifyCompleted`.
      *
      * @param Proof|null $proof Optional. Additional proof or details for the activity update.
      *
@@ -1388,15 +1415,15 @@ class Order extends Model
      */
     public function complete(?Proof $proof = null): self
     {
-        $this->notifyCompleted();
-
         $doesntHaveCompletedActivity = TrackingStatus::where(['tracking_number_uuid' => $this->tracking_number_uuid, 'code' => 'COMPLETED'])->doesntExist();
         if ($doesntHaveCompletedActivity) {
             $activity = $this->config()->getCompletedActivity();
 
-            return $this->updateActivity($activity, $proof);
+            $this->updateActivity($activity, $proof);
         }
 
+        $this->notifyCompleted();
+
         return $this;
     }
 

package/server/src/Models/Part.php

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

package/server/src/Models/Sensor.php

@@ -66,14 +66,14 @@ class Sensor extends Model
      *
      * @var array
      */
-    protected $searchableColumns = ['name', 'sensor_type', 'unit', 'public_id'];
+    protected $searchableColumns = ['name', 'type', 'internal_id', 'unit', 'public_id'];
 
     /**
      * The attributes that can be used for filtering.
      *
      * @var array
      */
-    protected $filterParams = ['sensor_type', 'status', 'device_uuid', 'warranty_uuid', 'sensorable_type'];
+    protected $filterParams = ['type', 'sensor_type', 'status', 'device_uuid', 'warranty_uuid', 'sensorable_type', 'telematic_uuid'];
 
     /**
      * The attributes that are mass assignable.
@@ -178,7 +178,8 @@ class Sensor extends Model
     {
         return SlugOptions::create()
             ->generateSlugsFrom(['name', 'sensor_type'])
-            ->saveSlugsTo('slug');
+            ->saveSlugsTo('slug')
+            ->doNotGenerateSlugsOnUpdate();
     }
 
     /**
@@ -186,7 +187,23 @@ class Sensor extends Model
      */
     public function getActivitylogOptions(): LogOptions
     {
-        return LogOptions::defaults()->logAll();
+        return LogOptions::defaults()
+            ->logOnly([
+                'company_uuid',
+                'telematic_uuid',
+                'device_uuid',
+                'sensorable_uuid',
+                'sensorable_type',
+                'type',
+                'sensor_type',
+                'internal_id',
+                'name',
+                'unit',
+                'last_value',
+                'last_reading_at',
+                'status',
+            ])
+            ->logOnlyDirty();
     }
 
     public function telematic(): BelongsTo

package/server/src/Models/ServiceArea.php

@@ -123,7 +123,7 @@ class ServiceArea extends Model
      */
     public function zones()
     {
-        return $this->hasMany(Zone::class)->without(['serviceArea']);
+        return $this->hasMany(Zone::class, 'service_area_uuid', 'uuid')->without(['serviceArea']);
     }
 
     /**

package/server/src/Models/ServiceRate.php

@@ -1130,8 +1130,9 @@ class ServiceRate extends Model
         $stopCount        = collect($stops)->filter()->count();
         $endpointCount    = max(0, min($endpointCount, $stopCount));
         $waypointCount    = max($stopCount - $endpointCount, 0);
+        $weightVariables  = $this->buildAlgorithmWeightVariables($entityCollection);
 
-        return Algo::normalizeVariables([
+        return Algo::normalizeVariables(array_merge([
             'distance_m' => $totalDistance ?? 0,
             'time_s'     => $totalTime ?? 0,
             'stops'      => $stopCount,
@@ -1139,7 +1140,43 @@ class ServiceRate extends Model
             'parcels'    => $entityCollection->where('type', 'parcel')->count(),
             'entities'   => $entityCollection->count(),
             'base_fee'   => Utils::numbersOnly($this->base_fee ?? 0),
-        ]);
+        ], $weightVariables));
+    }
+
+    protected function buildAlgorithmWeightVariables($entities): array
+    {
+        $weightKg = collect($entities)->sum(fn ($entity) => $this->normalizeEntityWeightToKilograms($entity));
+
+        return [
+            'weight'       => $weightKg,
+            'weight_kg'    => $weightKg,
+            'weight_g'     => $weightKg * 1000,
+            'weight_lb'    => $weightKg / 0.45359237,
+            'weight_oz'    => $weightKg / 0.028349523125,
+            'weight_tonne' => $weightKg / 1000,
+            'weight_t'     => $weightKg / 1000,
+        ];
+    }
+
+    protected function normalizeEntityWeightToKilograms($entity): float
+    {
+        $weight = data_get($entity, 'weight');
+
+        if ($weight === null || $weight === '' || !is_numeric($weight)) {
+            return 0;
+        }
+
+        $weight = (float) $weight;
+        $unit   = strtolower(trim((string) data_get($entity, 'weight_unit', 'kg')));
+
+        return match ($unit) {
+            'g', 'gram', 'grams'                       => $weight / 1000,
+            'oz', 'ounce', 'ounces'                    => $weight * 0.028349523125,
+            'lb', 'lbs', 'pound', 'pounds'             => $weight * 0.45359237,
+            't', 'mt', 'tonne', 'tonnes', 'metric_ton',
+            'metric_tons'                              => $weight * 1000,
+            default                                    => $weight,
+        };
     }
 
     protected function inferEndpointCountFromStops($stops = []): int

package/server/src/Models/Vehicle.php

@@ -65,7 +65,7 @@ class Vehicle extends Model
      *
      * @var array
      */
-    protected $searchableColumns = ['name', 'description', 'make', 'model', 'trim', 'model_type', 'body_type', 'body_sub_type', 'year', 'plate_number', 'vin', 'call_sign', 'public_id'];
+    protected $searchableColumns = ['name', 'description', 'make', 'model', 'trim', 'model_type', 'body_type', 'body_sub_type', 'year', 'internal_id', 'plate_number', 'vin', 'serial_number', 'call_sign', 'fuel_card_number', 'public_id'];
 
     /**
      * Attributes that is filterable on this model.
@@ -96,7 +96,8 @@ class Vehicle extends Model
     {
         return SlugOptions::create()
             ->generateSlugsFrom(['year', 'make', 'model', 'trim', 'plate_number'])
-            ->saveSlugsTo('slug');
+            ->saveSlugsTo('slug')
+            ->doNotGenerateSlugsOnUpdate();
     }
 
     /**
@@ -142,6 +143,7 @@ class Vehicle extends Model
         'internal_id',
         'plate_number',
         'call_sign',
+        'fuel_card_number',
         'serial_number',
         'vin',
         'vin_data',
@@ -701,8 +703,12 @@ class Vehicle extends Model
         $year             = Utils::or($row, ['year', 'vehicle_year', 'build_year', 'release_year']);
         $trim             = Utils::or($row, ['trim', 'vehicle_trim', 'brand_trim']);
         $type             = Utils::or($row, ['type', 'vehicle_type'], 'vehicle');
+        $internalId       = Utils::or($row, ['internal_id', 'internal_number', 'fleet_number', 'vehicle_number']);
         $plateNumber      = Utils::or($row, ['plate_number', 'license_plate', 'license_place_number', 'vehicle_plate', 'registration_plate', 'tag_number', 'tail_number', 'head_number']);
         $vin              = Utils::or($row, ['vin', 'vin_number', 'vin_id', 'vehicle_identification_number', 'serial_number']);
+        $serialNumber     = Utils::or($row, ['serial_number', 'serial', 'vehicle_serial_number']);
+        $callSign         = Utils::or($row, ['call_sign', 'callsign', 'call_number']);
+        $fuelCardNumber   = Utils::or($row, ['fuel_card_number', 'fuel_card', 'fuel_card_id', 'vehicle_card_id', 'card_number']);
         $driverAssigned   = Utils::or($row, ['driver', 'driver_name', 'driver_assigned', 'driver_assignee']);
 
         // Handle when only a vehicle name is provided
@@ -741,8 +747,12 @@ class Vehicle extends Model
             'model'                  => $model,
             'year'                   => $year,
             'trim'                   => $trim,
+            'internal_id'            => $internalId,
             'plate_number'           => $plateNumber,
             'vin'                    => $vin,
+            'serial_number'          => $serialNumber,
+            'call_sign'              => $callSign,
+            'fuel_card_number'       => $fuelCardNumber,
             'type'                   => $type,
             'status'                 => 'available',
             'online'                 => 0,
@@ -769,10 +779,12 @@ class Vehicle extends Model
 
         return static::where(function ($query) use ($vehicleName) {
             $query->where('public_id', $vehicleName)
+                    ->orWhere('internal_id', $vehicleName)
                     ->orWhere('plate_number', $vehicleName)
                     ->orWhere('vin', $vehicleName)
                     ->orWhere('serial_number', $vehicleName)
                     ->orWhere('call_sign', $vehicleName)
+                    ->orWhere('fuel_card_number', $vehicleName)
                     ->orWhereRaw("CONCAT(make, ' ', model, ' ', year) LIKE ?", ["%{$vehicleName}%"])
                     ->orWhereRaw("CONCAT(year, ' ', make, ' ', model) LIKE ?", ["%{$vehicleName}%"]);
         })->first();

package/server/src/Models/Vendor.php

@@ -134,7 +134,8 @@ class Vendor extends Model
     {
         return SlugOptions::create()
             ->generateSlugsFrom('name')
-            ->saveSlugsTo('slug');
+            ->saveSlugsTo('slug')
+            ->doNotGenerateSlugsOnUpdate();
     }
 
     /**

package/server/src/Models/VendorPersonnel.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Models\Model;
+use Fleetbase\Models\User;
 use Fleetbase\Traits\HasUuid;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
@@ -22,7 +23,7 @@ class VendorPersonnel extends Model
      *
      * @var array
      */
-    protected $fillable = ['vendor_uuid', 'contact_uuid'];
+    protected $fillable = ['vendor_uuid', 'contact_uuid', 'role', 'status', 'invited_by_uuid'];
 
     /**
      * These attributes that can be queried.
@@ -60,4 +61,12 @@ class VendorPersonnel extends Model
     {
         return $this->belongsTo(Contact::class);
     }
+
+    /**
+     * The Fleetbase user who invited this personnel.
+     */
+    public function invitedBy(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'invited_by_uuid');
+    }
 }

package/server/src/Models/Zone.php

@@ -118,7 +118,7 @@ class Zone extends Model
      */
     public function serviceArea()
     {
-        return $this->belongsTo(ServiceArea::class);
+        return $this->belongsTo(ServiceArea::class, 'service_area_uuid', 'uuid');
     }
 
     /**

package/server/src/Observers/PurchaseRateObserver.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Observers;
 
+use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\PurchaseRate;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Company;
@@ -18,7 +19,12 @@ class PurchaseRateObserver
      */
     public function creating(PurchaseRate $purchaseRate)
     {
+        if (!$purchaseRate->uuid) {
+            $purchaseRate->uuid = PurchaseRate::generateUuid();
+        }
+
         $purchaseRate->load(['serviceQuote.items', 'serviceQuote.serviceRate']);
+        $order = $this->resolveOrder($purchaseRate);
 
         // get company
         $company = Company::where('uuid', session('company', $purchaseRate->company_uuid))->first();
@@ -32,12 +38,17 @@ class PurchaseRateObserver
             'company_uuid'           => session('company', $purchaseRate->company_uuid),
             'customer_uuid'          => $purchaseRate->customer_uuid,
             'customer_type'          => $purchaseRate->customer_type,
+            'subject_uuid'           => $order?->uuid,
+            'subject_type'           => $order ? Order::class : null,
+            'context_uuid'           => $purchaseRate->uuid,
+            'context_type'           => PurchaseRate::class,
             'gateway_transaction_id' => $purchaseRate->getMeta('transaction_id', Transaction::generateNumber()),
             'gateway'                => 'internal',
             'amount'                 => data_get($purchaseRate, 'serviceQuote.amount', 0),
             'currency'               => $currency,
             'description'            => 'Dispatch order',
             'type'                   => 'dispatch',
+            'direction'              => Transaction::DIRECTION_CREDIT,
             'status'                 => 'success',
         ]);
 
@@ -56,4 +67,13 @@ class PurchaseRateObserver
         $purchaseRate->transaction_uuid = $transaction->uuid;
         $purchaseRate->status           = $purchaseRate->status ?: Transaction::STATUS_SUCCESS;
     }
+
+    protected function resolveOrder(PurchaseRate $purchaseRate): ?Order
+    {
+        if (!$purchaseRate->payload_uuid) {
+            return null;
+        }
+
+        return Order::where('payload_uuid', $purchaseRate->payload_uuid)->first();
+    }
 }

package/server/src/Observers/ZoneObserver.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Fleetbase\FleetOps\Observers;
+
+use Fleetbase\FleetOps\Models\ServiceArea;
+use Fleetbase\FleetOps\Models\Zone;
+
+class ZoneObserver
+{
+    /**
+     * Handle the Zone "created" event.
+     */
+    public function created(Zone $zone): void
+    {
+        $this->invalidateServiceAreaCache($zone);
+    }
+
+    /**
+     * Handle the Zone "updated" event.
+     */
+    public function updated(Zone $zone): void
+    {
+        $this->invalidateServiceAreaCache($zone, $zone->getOriginal('service_area_uuid'));
+        $this->invalidateServiceAreaCache($zone);
+    }
+
+    /**
+     * Handle the Zone "deleted" event.
+     */
+    public function deleted(Zone $zone): void
+    {
+        $this->invalidateServiceAreaCache($zone);
+    }
+
+    /**
+     * Handle the Zone "restored" event.
+     */
+    public function restored(Zone $zone): void
+    {
+        $this->invalidateServiceAreaCache($zone);
+    }
+
+    /**
+     * Invalidate service area API cache because service area responses embed zones.
+     */
+    protected function invalidateServiceAreaCache(Zone $zone, ?string $serviceAreaUuid = null): void
+    {
+        $serviceAreaUuid ??= $zone->service_area_uuid;
+        if (!$serviceAreaUuid) {
+            return;
+        }
+
+        ServiceArea::invalidateApiCacheManually($zone->company_uuid);
+        ServiceArea::invalidateApiCacheManually();
+    }
+}

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -29,6 +29,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         \Fleetbase\FleetOps\Models\ServiceRate::class            => \Fleetbase\FleetOps\Observers\ServiceRateObserver::class,
         \Fleetbase\FleetOps\Models\PurchaseRate::class           => \Fleetbase\FleetOps\Observers\PurchaseRateObserver::class,
         \Fleetbase\FleetOps\Models\ServiceArea::class            => \Fleetbase\FleetOps\Observers\ServiceAreaObserver::class,
+        \Fleetbase\FleetOps\Models\Zone::class                   => \Fleetbase\FleetOps\Observers\ZoneObserver::class,
         \Fleetbase\FleetOps\Models\TrackingNumber::class         => \Fleetbase\FleetOps\Observers\TrackingNumberObserver::class,
         \Fleetbase\FleetOps\Models\Driver::class                 => \Fleetbase\FleetOps\Observers\DriverObserver::class,
         \Fleetbase\FleetOps\Models\Vehicle::class                => \Fleetbase\FleetOps\Observers\VehicleObserver::class,
@@ -108,6 +109,15 @@ class FleetOpsServiceProvider extends CoreServiceProvider
             \Fleetbase\FleetOps\Tracking\TrackingProviderRegistry::class,
             fn () => new \Fleetbase\FleetOps\Tracking\TrackingProviderRegistry()
         );
+
+        // Register the fuel provider registry as a singleton so FleetOps core
+        // and third-party extensions can share fuel card and fuel billing
+        // providers. Extensions can register providers from their own service
+        // providers with callAfterResolving(FuelProviderRegistry::class, ...).
+        $this->app->singleton(
+            \Fleetbase\FleetOps\Support\FuelProviders\FuelProviderRegistry::class,
+            fn () => new \Fleetbase\FleetOps\Support\FuelProviders\FuelProviderRegistry()
+        );
     }
 
     /**
@@ -172,6 +182,7 @@ 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/fuel-providers.php', 'fuel-providers');
         $this->mergeConfigFrom(__DIR__ . '/../../config/api.php', 'api');
         $this->mergeConfigFrom(__DIR__ . '/../../config/cache.stores.php', 'cache.stores');
         $this->mergeConfigFrom(__DIR__ . '/../../config/geocoder.php', 'geocoder');

package/server/src/Support/Analytics/FuelProviderSummary.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\Analytics;
+
+use Fleetbase\FleetOps\Models\FuelProviderConnection;
+use Fleetbase\FleetOps\Models\FuelProviderTransaction;
+
+class FuelProviderSummary extends AbstractAnalytics
+{
+    public function get(): array
+    {
+        $transactions = FuelProviderTransaction::where('company_uuid', $this->company->uuid)
+            ->whereBetween('transaction_at', [$this->start, $this->end])
+            ->get();
+
+        $connections = FuelProviderConnection::where('company_uuid', $this->company->uuid)->get();
+
+        $byProvider = $transactions
+            ->groupBy('provider')
+            ->map(fn ($rows, $provider) => [
+                'provider'     => $provider,
+                'transactions' => $rows->count(),
+                'spend'        => (int) $rows->sum('amount'),
+                'volume'       => (float) $rows->sum('volume'),
+                'unmatched'    => $rows->where('sync_status', 'unmatched')->count(),
+            ])
+            ->values();
+
+        return [
+            'summary' => [
+                'connections'        => $connections->count(),
+                'active_connections' => $connections->whereIn('status', ['connected', 'active'])->count(),
+                'transactions'       => $transactions->count(),
+                'unmatched'          => $transactions->where('sync_status', 'unmatched')->count(),
+                'spend'              => (int) $transactions->sum('amount'),
+                'volume'             => (float) $transactions->sum('volume'),
+                'currency'           => $transactions->first()?->currency ?? $this->companyCurrency(),
+            ],
+            'providers' => $byProvider,
+        ];
+    }
+}

package/server/src/Support/Analytics/TopDrivers.php

@@ -38,7 +38,15 @@ class TopDrivers extends AbstractAnalytics
 
         $sortColumn = match ($this->sortBy) {
             'distance' => 'distance_m',
-            'on_time'  => 'on_time_pct',
+            'on_time'  => 'CASE
+                WHEN SUM(CASE WHEN orders.scheduled_at IS NOT NULL THEN 1 ELSE 0 END) > 0
+                THEN SUM(CASE
+                    WHEN orders.scheduled_at IS NOT NULL
+                     AND TIMESTAMPDIFF(SECOND, orders.scheduled_at, orders.updated_at) <= 1800
+                    THEN 1 ELSE 0 END)
+                    / SUM(CASE WHEN orders.scheduled_at IS NOT NULL THEN 1 ELSE 0 END)
+                ELSE -1
+            END',
             default    => 'orders_completed',
         };