@fleetbase/fleetops-engine 0.6.51 → 0.6.53

package/server/src/Models/DeviceEvent.php

@@ -3,6 +3,8 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\FleetOps\Casts\Point;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Alert;
 use Fleetbase\Models\Company;
 use Fleetbase\Models\Model;
@@ -35,6 +37,7 @@ class DeviceEvent extends Model
     use LogsActivity;
     use HasMetaAttributes;
     use Searchable;
+    use SpatialTrait;
 
     /**
      * The database table used by the model.
@@ -55,14 +58,14 @@ class DeviceEvent extends Model
      *
      * @var array
      */
-    protected $searchableColumns = ['event_type', 'message', 'public_id'];
+    protected $searchableColumns = ['event_type', 'message', 'ident', 'code', 'provider', 'public_id'];
 
     /**
      * The attributes that can be used for filtering.
      *
      * @var array
      */
-    protected $filterParams = ['event_type', 'severity', 'device_uuid'];
+    protected $filterParams = ['event_type', 'severity', 'device_uuid', 'provider', 'code'];
 
     /**
      * The attributes that are mass assignable.
@@ -73,10 +76,12 @@ class DeviceEvent extends Model
         'company_uuid',
         'device_uuid',
         'payload',
+        'data',
         'meta',
         'location',
         'event_type',
         'severity',
+        'message',
         'ident',
         'protocol',
         'provider',
@@ -86,6 +91,8 @@ class DeviceEvent extends Model
         'reason',
         'comment',
         'resolved_at',
+        'occurred_at',
+        'processed_at',
         'slug',
     ];
 
@@ -108,6 +115,13 @@ class DeviceEvent extends Model
      */
     protected $hidden = ['device'];
 
+    /**
+     * The attributes that are spatial columns.
+     *
+     * @var array
+     */
+    protected $spatialFields = ['location'];
+
     /**
      * The attributes that should be cast to native types.
      *
@@ -115,8 +129,12 @@ class DeviceEvent extends Model
      */
     protected $casts = [
         'payload'         => Json::class,
+        'data'            => Json::class,
         'meta'            => Json::class,
+        'location'        => Point::class,
         'resolved_at'     => 'datetime',
+        'occurred_at'     => 'datetime',
+        'processed_at'    => 'datetime',
     ];
 
     /**
@@ -145,7 +163,26 @@ class DeviceEvent extends Model
      */
     public function getActivitylogOptions(): LogOptions
     {
-        return LogOptions::defaults()->logAll();
+        return LogOptions::defaults()
+            ->logOnly([
+                'company_uuid',
+                'device_uuid',
+                'event_type',
+                'severity',
+                'message',
+                'ident',
+                'protocol',
+                'provider',
+                'mileage',
+                'state',
+                'code',
+                'reason',
+                'comment',
+                'resolved_at',
+                'occurred_at',
+                'processed_at',
+            ])
+            ->logOnlyDirty();
     }
 
     public function company(): BelongsTo

package/server/src/Models/Driver.php

@@ -196,7 +196,7 @@ class Driver extends Model
      *
      * @var array
      */
-    protected $filterParams = ['vendor', 'facilitator', 'customer', 'fleet', 'photo_uuid', 'avatar_uuid', 'avatar_value'];
+    protected $filterParams = ['vendor', 'facilitator', 'customer', 'fleet', 'vehicle', 'photo_uuid', 'avatar_uuid', 'avatar_value'];
 
     /**
      * The session-agnostic columns for the model.
@@ -220,7 +220,8 @@ class Driver extends Model
     {
         return SlugOptions::create()
             ->generateSlugsFrom('drivers_license_number')
-            ->saveSlugsTo('slug');
+            ->saveSlugsTo('slug')
+            ->doNotGenerateSlugsOnUpdate();
     }
 
     /**

package/server/src/Models/Equipment.php

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

package/server/src/Models/Fleet.php

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

package/server/src/Models/FuelProviderConnection.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Fleetbase\FleetOps\Models;
+
+use Fleetbase\Casts\Json;
+use Fleetbase\Models\Model;
+use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasPublicId;
+use Fleetbase\Traits\HasUuid;
+use Fleetbase\Traits\Searchable;
+use Fleetbase\Traits\TracksApiCredential;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class FuelProviderConnection extends Model
+{
+    use HasUuid;
+    use HasPublicId;
+    use TracksApiCredential;
+    use HasApiModelBehavior;
+    use Searchable;
+
+    protected $table             = 'fuel_provider_connections';
+    protected $publicIdType      = 'fuel_provider_connection';
+    protected $searchableColumns = ['public_id', 'name', 'provider', 'status', 'environment'];
+    protected $filterParams      = ['provider', 'status', 'environment'];
+
+    protected $fillable = [
+        'company_uuid',
+        'provider',
+        'name',
+        'environment',
+        'status',
+        'credentials',
+        'sync_settings',
+        'last_sync_state',
+        'last_synced_at',
+        'last_tested_at',
+        'last_error',
+        'meta',
+    ];
+
+    protected $casts = [
+        'credentials'     => Json::class,
+        'sync_settings'   => Json::class,
+        'last_sync_state' => Json::class,
+        'last_synced_at'  => 'datetime',
+        'last_tested_at'  => 'datetime',
+        'meta'            => Json::class,
+    ];
+
+    public function transactions(): HasMany
+    {
+        return $this->hasMany(FuelProviderTransaction::class, 'fuel_provider_connection_uuid', 'uuid');
+    }
+
+    public function syncRuns(): HasMany
+    {
+        return $this->hasMany(FuelProviderSyncRun::class, 'fuel_provider_connection_uuid', 'uuid');
+    }
+}

package/server/src/Models/FuelProviderSyncRun.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Fleetbase\FleetOps\Models;
+
+use Fleetbase\Casts\Json;
+use Fleetbase\Models\Model;
+use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasPublicId;
+use Fleetbase\Traits\HasUuid;
+use Fleetbase\Traits\Searchable;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class FuelProviderSyncRun extends Model
+{
+    use HasUuid;
+    use HasPublicId;
+    use HasApiModelBehavior;
+    use Searchable;
+
+    protected $table             = 'fuel_provider_sync_runs';
+    protected $publicIdType      = 'fuel_provider_sync_run';
+    protected $searchableColumns = ['public_id', 'provider', 'status'];
+    protected $filterParams      = ['provider', 'status', 'connection'];
+
+    protected $fillable = [
+        'company_uuid',
+        'fuel_provider_connection_uuid',
+        'provider',
+        'status',
+        'from',
+        'to',
+        'imported',
+        'matched',
+        'unmatched',
+        'fuel_reports_created',
+        'liters',
+        'amount',
+        'started_at',
+        'finished_at',
+        'error',
+        'summary',
+        'meta',
+    ];
+
+    protected $casts = [
+        'from'        => 'datetime',
+        'to'          => 'datetime',
+        'started_at'  => 'datetime',
+        'finished_at' => 'datetime',
+        'summary'     => Json::class,
+        'meta'        => Json::class,
+    ];
+
+    public function connection(): BelongsTo
+    {
+        return $this->belongsTo(FuelProviderConnection::class, 'fuel_provider_connection_uuid', 'uuid');
+    }
+}

package/server/src/Models/FuelProviderTransaction.php

@@ -0,0 +1,119 @@
+<?php
+
+namespace Fleetbase\FleetOps\Models;
+
+use Fleetbase\Casts\Json;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\Models\Model;
+use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasPublicId;
+use Fleetbase\Traits\HasUuid;
+use Fleetbase\Traits\Searchable;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class FuelProviderTransaction extends Model
+{
+    use HasUuid;
+    use HasPublicId;
+    use HasApiModelBehavior;
+    use Searchable;
+
+    protected $table             = 'fuel_provider_transactions';
+    protected $publicIdType      = 'fuel_provider_transaction';
+    protected $searchableColumns = ['public_id', 'provider', 'provider_transaction_id', 'vehicle_card_id', 'internal_number', 'plate_number', 'vin', 'serial_number', 'call_sign', 'station_name', 'trip_number'];
+    protected $filterParams      = ['provider', 'sync_status', 'vehicle', 'driver', 'order', 'fuel_report', 'connection'];
+
+    protected $fillable = [
+        'company_uuid',
+        'fuel_provider_connection_uuid',
+        'fuel_report_uuid',
+        'vehicle_uuid',
+        'driver_uuid',
+        'order_uuid',
+        'provider',
+        'provider_transaction_id',
+        'provider_vehicle_id',
+        'vehicle_card_id',
+        'internal_number',
+        'structure_number',
+        'plate_number',
+        'vin',
+        'serial_number',
+        'call_sign',
+        'trip_number',
+        'station_name',
+        'station_latitude',
+        'station_longitude',
+        'transaction_at',
+        'volume',
+        'metric_unit',
+        'amount',
+        'currency',
+        'odometer',
+        'sync_status',
+        'matched_at',
+        'normalized_payload',
+        'raw_payload',
+        'meta',
+    ];
+
+    protected $casts = [
+        'transaction_at'      => 'datetime',
+        'matched_at'          => 'datetime',
+        'normalized_payload'  => Json::class,
+        'raw_payload'         => Json::class,
+        'meta'                => Json::class,
+    ];
+
+    protected $appends = ['vehicle_name', 'driver_name', 'fuel_report_id', 'station_location'];
+    protected $hidden  = ['vehicle', 'driver', 'fuelReport'];
+
+    public function connection(): BelongsTo
+    {
+        return $this->belongsTo(FuelProviderConnection::class, 'fuel_provider_connection_uuid', 'uuid');
+    }
+
+    public function fuelReport(): BelongsTo
+    {
+        return $this->belongsTo(FuelReport::class, 'fuel_report_uuid', 'uuid');
+    }
+
+    public function vehicle(): BelongsTo
+    {
+        return $this->belongsTo(Vehicle::class, 'vehicle_uuid', 'uuid');
+    }
+
+    public function driver(): BelongsTo
+    {
+        return $this->belongsTo(Driver::class, 'driver_uuid', 'uuid');
+    }
+
+    public function order(): BelongsTo
+    {
+        return $this->belongsTo(Order::class, 'order_uuid', 'uuid');
+    }
+
+    public function getVehicleNameAttribute(): ?string
+    {
+        return data_get($this, 'vehicle.display_name');
+    }
+
+    public function getDriverNameAttribute(): ?string
+    {
+        return data_get($this, 'driver.name');
+    }
+
+    public function getFuelReportIdAttribute(): ?string
+    {
+        return data_get($this, 'fuelReport.public_id');
+    }
+
+    public function getStationLocationAttribute(): ?Point
+    {
+        if (!$this->station_latitude || !$this->station_longitude) {
+            return null;
+        }
+
+        return new Point($this->station_latitude, $this->station_longitude);
+    }
+}

package/server/src/Models/FuelReport.php

@@ -91,7 +91,7 @@ class FuelReport extends Model
      *
      * @var array
      */
-    protected $appends = ['vehicle_name', 'driver_name', 'reporter_name'];
+    protected $appends = ['vehicle_name', 'driver_name', 'reporter_name', 'source', 'provider', 'fuel_provider_transaction_uuid'];
 
     /**
      * The attributes excluded from the model's JSON form.
@@ -179,6 +179,21 @@ class FuelReport extends Model
         return data_get($this, 'reportedBy.name');
     }
 
+    public function getSourceAttribute(): ?string
+    {
+        return data_get($this, 'meta.source');
+    }
+
+    public function getProviderAttribute(): ?string
+    {
+        return data_get($this, 'meta.provider');
+    }
+
+    public function getFuelProviderTransactionUuidAttribute(): ?string
+    {
+        return data_get($this, 'meta.fuel_provider_transaction_uuid');
+    }
+
     public static function createFromImport(array $row, bool $saveInstance = false): FuelReport
     {
         // Filter array for null key values

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/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/Providers/FleetOpsServiceProvider.php

@@ -7,6 +7,7 @@ use Brick\Geo\Engine\GEOSEngine;
 use Fleetbase\Providers\CoreServiceProvider;
 use Fleetbase\Support\NotificationRegistry;
 use Fleetbase\Support\Utils;
+use Illuminate\Database\Eloquent\Relations\Relation;
 
 if (!Utils::classExists(CoreServiceProvider::class)) {
     throw new \Exception('FleetOps cannot be loaded without `fleetbase/core-api` installed!');
@@ -109,6 +110,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()
+        );
     }
 
     /**
@@ -120,6 +130,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
      */
     public function boot()
     {
+        $this->registerMorphMap();
         $this->registerObservers();
         $this->registerCommands();
         $this->scheduleCommands(function ($schedule) {
@@ -173,6 +184,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');
@@ -184,6 +196,14 @@ 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,
+        ]);
+    }
+
     public function registerNotifications()
     {
         // Register Notifications