@fleetbase/fleetops-engine 0.6.51 → 0.6.52

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

@@ -109,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()
+        );
     }
 
     /**
@@ -173,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/FuelProviders/FuelProviderDescriptor.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\FuelProviders;
+
+class FuelProviderDescriptor
+{
+    public string $key;
+    public string $label;
+    public string $type;
+    public ?string $driverClass;
+    public ?string $description;
+    public ?string $docsUrl;
+    public ?string $category;
+    public ?string $icon;
+    public array $requiredFields;
+    public array $capabilities;
+    public array $syncDefaults;
+    public array $setupInstructions;
+    public array $metadata;
+
+    public function __construct(array $config)
+    {
+        $this->key               = $config['key'];
+        $this->label             = $config['label'] ?? $config['key'];
+        $this->type              = $config['type'] ?? 'native';
+        $this->driverClass       = $config['driver_class'] ?? null;
+        $this->description       = $config['description'] ?? null;
+        $this->docsUrl           = $config['docs_url'] ?? null;
+        $this->category          = $config['category'] ?? null;
+        $this->icon              = $config['icon'] ?? 'gas-pump';
+        $this->requiredFields    = $config['required_fields'] ?? [];
+        $this->capabilities      = $config['capabilities'] ?? [];
+        $this->syncDefaults      = $config['sync_defaults'] ?? [];
+        $this->setupInstructions = $config['setup_instructions'] ?? [];
+        $this->metadata          = $config['metadata'] ?? [];
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'key'                => $this->key,
+            'label'              => $this->label,
+            'type'               => $this->type,
+            'description'        => $this->description,
+            'docs_url'           => $this->docsUrl,
+            'category'           => $this->category,
+            'icon'               => $this->icon,
+            'required_fields'    => $this->requiredFields,
+            'capabilities'       => $this->capabilities,
+            'sync_defaults'      => $this->syncDefaults,
+            'setup_instructions' => $this->setupInstructions,
+            'metadata'           => $this->metadata,
+        ];
+    }
+}

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

@@ -0,0 +1,75 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\FuelProviders;
+
+use Fleetbase\FleetOps\Contracts\FuelProvider;
+use Illuminate\Support\Collection;
+
+/**
+ * Registry for native and extension-provided fuel provider adapters.
+ *
+ * Third-party Fleetbase packages can register providers from their service
+ * providers with:
+ *
+ *   $this->callAfterResolving(FuelProviderRegistry::class, function ($registry) {
+ *       $registry->register(new FuelProviderDescriptor([...]));
+ *   });
+ */
+class FuelProviderRegistry
+{
+    protected Collection $providers;
+
+    public function __construct()
+    {
+        $this->providers = collect();
+        $this->loadNativeProviders();
+    }
+
+    protected function loadNativeProviders(): void
+    {
+        foreach (config('fuel-providers.providers', []) as $providerConfig) {
+            $this->register(new FuelProviderDescriptor($providerConfig));
+        }
+    }
+
+    public function register(FuelProviderDescriptor $descriptor): void
+    {
+        $this->providers->put($descriptor->key, $descriptor);
+    }
+
+    public function has(string $key): bool
+    {
+        return $this->providers->has($key);
+    }
+
+    public function all(): Collection
+    {
+        return $this->providers;
+    }
+
+    public function findByKey(string $key): ?FuelProviderDescriptor
+    {
+        return $this->providers->get($key);
+    }
+
+    public function resolve(string $key): FuelProvider
+    {
+        $descriptor = $this->findByKey($key);
+
+        if (!$descriptor || !$descriptor->driverClass) {
+            throw new \InvalidArgumentException("Fuel provider '{$key}' is not registered.");
+        }
+
+        if (!class_exists($descriptor->driverClass)) {
+            throw new \InvalidArgumentException("Fuel provider driver '{$descriptor->driverClass}' does not exist.");
+        }
+
+        $provider = app($descriptor->driverClass);
+
+        if (!$provider instanceof FuelProvider) {
+            throw new \InvalidArgumentException('Fuel provider driver must implement FuelProvider.');
+        }
+
+        return $provider;
+    }
+}