@fleetbase/fleetops-engine 0.6.50 → 0.6.52

package/server/migrations/2026_06_04_000001_backfill_order_transaction_subjects.php

@@ -0,0 +1,39 @@
+<?php
+
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\PurchaseRate;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        DB::table('orders')
+            ->whereNotNull('transaction_uuid')
+            ->orderBy('id')
+            ->select(['id', 'uuid', 'transaction_uuid', 'purchase_rate_uuid'])
+            ->chunkById(500, function ($orders) {
+                foreach ($orders as $order) {
+                    $updates = [
+                        'subject_uuid' => $order->uuid,
+                        'subject_type' => Order::class,
+                        'updated_at'   => now(),
+                    ];
+
+                    if ($order->purchase_rate_uuid) {
+                        $updates['context_uuid'] = $order->purchase_rate_uuid;
+                        $updates['context_type'] = PurchaseRate::class;
+                    }
+
+                    DB::table('transactions')
+                        ->where('uuid', $order->transaction_uuid)
+                        ->update($updates);
+                }
+            });
+    }
+
+    public function down(): void
+    {
+        // Intentionally no-op: this migration corrects broken order transaction linkage.
+    }
+};

package/server/migrations/2026_06_04_000002_backfill_order_transaction_directions.php

@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration {
+    /**
+     * Backfill null directions for transactions linked to FleetOps orders.
+     */
+    public function up(): void
+    {
+        DB::table('transactions')
+            ->join('orders', 'orders.transaction_uuid', '=', 'transactions.uuid')
+            ->whereNull('transactions.direction')
+            ->update(['transactions.direction' => 'credit']);
+    }
+
+    /**
+     * Direction backfills are not reversible without losing real data.
+     */
+    public function down(): void
+    {
+    }
+};

package/server/migrations/2026_06_06_000001_harden_device_events_telematics_contract.php

@@ -0,0 +1,59 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        if (!Schema::hasTable('device_events')) {
+            return;
+        }
+
+        Schema::table('device_events', function (Blueprint $table) {
+            if (!Schema::hasColumn('device_events', 'message')) {
+                $table->text('message')->nullable()->after('severity');
+            }
+
+            if (!Schema::hasColumn('device_events', 'occurred_at')) {
+                $table->timestamp('occurred_at')->nullable()->index()->after('message');
+            }
+
+            if (!Schema::hasColumn('device_events', 'processed_at')) {
+                $table->timestamp('processed_at')->nullable()->index()->after('occurred_at');
+            }
+
+            if (!Schema::hasColumn('device_events', 'data')) {
+                $table->json('data')->nullable()->after('payload');
+            }
+        });
+    }
+
+    public function down(): void
+    {
+        if (!Schema::hasTable('device_events')) {
+            return;
+        }
+
+        Schema::table('device_events', function (Blueprint $table) {
+            if (Schema::hasColumn('device_events', 'data')) {
+                $table->dropColumn('data');
+            }
+
+            if (Schema::hasColumn('device_events', 'processed_at')) {
+                $table->dropIndex(['processed_at']);
+                $table->dropColumn('processed_at');
+            }
+
+            if (Schema::hasColumn('device_events', 'occurred_at')) {
+                $table->dropIndex(['occurred_at']);
+                $table->dropColumn('occurred_at');
+            }
+
+            if (Schema::hasColumn('device_events', 'message')) {
+                $table->dropColumn('message');
+            }
+        });
+    }
+};

package/server/migrations/2026_06_08_000001_create_fuel_provider_connections_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up()
+    {
+        Schema::create('fuel_provider_connections', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('uuid', 191)->nullable()->unique();
+            $table->string('public_id', 191)->nullable()->unique();
+            $table->uuid('company_uuid')->nullable()->index();
+            $table->string('provider', 80)->index();
+            $table->string('name')->nullable();
+            $table->string('environment', 40)->default('production')->index();
+            $table->string('status', 50)->default('configured')->index();
+            $table->json('credentials')->nullable();
+            $table->json('sync_settings')->nullable();
+            $table->json('last_sync_state')->nullable();
+            $table->timestamp('last_synced_at')->nullable()->index();
+            $table->timestamp('last_tested_at')->nullable();
+            $table->text('last_error')->nullable();
+            $table->json('meta')->nullable();
+            $table->softDeletes();
+            $table->timestamps();
+
+            $table->unique(['company_uuid', 'provider', 'environment'], 'fuel_provider_connection_unique');
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('fuel_provider_connections');
+    }
+};

package/server/migrations/2026_06_08_000002_create_fuel_provider_transactions_table.php

@@ -0,0 +1,53 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up()
+    {
+        Schema::create('fuel_provider_transactions', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('uuid', 191)->nullable()->unique();
+            $table->string('public_id', 191)->nullable()->unique();
+            $table->uuid('company_uuid')->nullable()->index();
+            $table->uuid('fuel_provider_connection_uuid')->nullable()->index();
+            $table->uuid('fuel_report_uuid')->nullable()->index();
+            $table->uuid('vehicle_uuid')->nullable()->index();
+            $table->uuid('driver_uuid')->nullable()->index();
+            $table->uuid('order_uuid')->nullable()->index();
+            $table->string('provider', 80)->index();
+            $table->string('provider_transaction_id', 191)->index();
+            $table->string('provider_vehicle_id')->nullable()->index();
+            $table->string('vehicle_card_id')->nullable()->index();
+            $table->string('internal_number')->nullable()->index();
+            $table->string('structure_number')->nullable()->index();
+            $table->string('plate_number')->nullable()->index();
+            $table->string('trip_number')->nullable()->index();
+            $table->string('station_name')->nullable()->index();
+            $table->decimal('station_latitude', 10, 7)->nullable();
+            $table->decimal('station_longitude', 10, 7)->nullable();
+            $table->timestamp('transaction_at')->nullable()->index();
+            $table->decimal('volume', 12, 3)->nullable();
+            $table->string('metric_unit', 20)->default('l');
+            $table->unsignedBigInteger('amount')->nullable();
+            $table->string('currency', 10)->default('SAR');
+            $table->string('odometer')->nullable();
+            $table->string('sync_status', 50)->default('imported')->index();
+            $table->timestamp('matched_at')->nullable();
+            $table->json('normalized_payload')->nullable();
+            $table->json('raw_payload')->nullable();
+            $table->json('meta')->nullable();
+            $table->softDeletes();
+            $table->timestamps();
+
+            $table->unique(['provider', 'provider_transaction_id'], 'fuel_provider_txn_provider_unique');
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('fuel_provider_transactions');
+    }
+};

package/server/migrations/2026_06_08_000003_create_fuel_provider_sync_runs_table.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up()
+    {
+        Schema::create('fuel_provider_sync_runs', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('uuid', 191)->nullable()->unique();
+            $table->string('public_id', 191)->nullable()->unique();
+            $table->uuid('company_uuid')->nullable()->index();
+            $table->uuid('fuel_provider_connection_uuid')->nullable()->index();
+            $table->string('provider', 80)->index();
+            $table->string('status', 50)->default('queued')->index();
+            $table->timestamp('from')->nullable();
+            $table->timestamp('to')->nullable();
+            $table->unsignedInteger('imported')->default(0);
+            $table->unsignedInteger('matched')->default(0);
+            $table->unsignedInteger('unmatched')->default(0);
+            $table->unsignedInteger('fuel_reports_created')->default(0);
+            $table->decimal('liters', 12, 3)->default(0);
+            $table->unsignedBigInteger('amount')->default(0);
+            $table->timestamp('started_at')->nullable();
+            $table->timestamp('finished_at')->nullable();
+            $table->text('error')->nullable();
+            $table->json('summary')->nullable();
+            $table->json('meta')->nullable();
+            $table->softDeletes();
+            $table->timestamps();
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('fuel_provider_sync_runs');
+    }
+};

package/server/migrations/2026_06_10_000001_add_fuel_card_number_to_vehicles_table.php

@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up()
+    {
+        if (!Schema::hasColumn('vehicles', 'fuel_card_number')) {
+            Schema::table('vehicles', function (Blueprint $table) {
+                $table->string('fuel_card_number')->nullable()->index()->after('call_sign');
+            });
+        }
+    }
+
+    public function down()
+    {
+        if (Schema::hasColumn('vehicles', 'fuel_card_number')) {
+            Schema::table('vehicles', function (Blueprint $table) {
+                $table->dropColumn('fuel_card_number');
+            });
+        }
+    }
+};

package/server/migrations/2026_06_10_000002_add_vehicle_identity_columns_to_fuel_provider_transactions_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up()
+    {
+        if (!Schema::hasColumn('fuel_provider_transactions', 'vin')) {
+            Schema::table('fuel_provider_transactions', function (Blueprint $table) {
+                $table->string('vin')->nullable()->index()->after('plate_number');
+            });
+        }
+
+        if (!Schema::hasColumn('fuel_provider_transactions', 'serial_number')) {
+            Schema::table('fuel_provider_transactions', function (Blueprint $table) {
+                $table->string('serial_number')->nullable()->index()->after('vin');
+            });
+        }
+
+        if (!Schema::hasColumn('fuel_provider_transactions', 'call_sign')) {
+            Schema::table('fuel_provider_transactions', function (Blueprint $table) {
+                $table->string('call_sign')->nullable()->index()->after('serial_number');
+            });
+        }
+    }
+
+    public function down()
+    {
+        foreach (['call_sign', 'serial_number', 'vin'] as $column) {
+            if (Schema::hasColumn('fuel_provider_transactions', $column)) {
+                Schema::table('fuel_provider_transactions', function (Blueprint $table) use ($column) {
+                    $table->dropColumn($column);
+                });
+            }
+        }
+    }
+};

package/server/resources/views/mail/customer-credentials.blade.php

@@ -1,23 +1,26 @@
 <x-mail-layout>
 <h2 style="font-size: 18px; font-weight: 600;">
-@if($currentHour < 12)
-    Good Morning, {{ $customer->name }}!
-@elseif($currentHour < 18)
-    Good Afternoon, {{ $customer->name }}!
-@else
-    Good Evening, {{ $customer->name }}!
-@endif
+Your customer portal access is ready
 </h2>
 
-Your login credentials:
+Hi {{ $customer->name }},
 <br />
 <br />
-Your Email: {{ $customer->user->email }}
+{{ $customer->company->name }} has created customer portal access for you. You can use the portal to view orders, invoices, support requests, and account details when available.
 <br />
-Your Password: {{ $plaintextPassword }}
-@if($customerPortalUrl)
 <br />
-Customer Portal URL: {{ $customerPortalUrl}}
-@endif
+<a href="{{ $customerPortalUrl }}" style="display:inline-block; background:#2563eb; color:#ffffff; text-decoration:none; border-radius:6px; padding:12px 18px; font-size:14px; line-height:20px; font-weight:700;">Sign in to customer portal</a>
+<br />
+<br />
+<strong>Your sign-in details</strong>
+<br />
+Email: {{ $customer->user->email }}
+<br />
+Temporary password: {{ $plaintextPassword }}
+<br />
+Portal URL: {{ $customerPortalUrl }}
+<br />
+<br />
+You can change your password after signing in.
 
 </x-mail-layout>

package/server/src/Contracts/FuelProvider.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Fleetbase\FleetOps\Contracts;
+
+use Fleetbase\FleetOps\Models\FuelProviderConnection;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
+
+interface FuelProvider
+{
+    public function key(): string;
+
+    public function name(): string;
+
+    public function authenticate(FuelProviderConnection $connection): array;
+
+    public function testConnection(FuelProviderConnection $connection): array;
+
+    public function listVehicles(FuelProviderConnection $connection, array $options = []): Collection;
+
+    public function listTransactions(FuelProviderConnection $connection, Carbon $from, Carbon $to, array $options = []): Collection;
+
+    public function listStations(FuelProviderConnection $connection, array $options = []): Collection;
+
+    public function pushTrip(FuelProviderConnection $connection, array $trip): array;
+
+    public function syncVehicle(FuelProviderConnection $connection, array $vehicle): array;
+
+    public function webhookPayloadToTransaction(FuelProviderConnection $connection, array $payload): ?array;
+}

package/server/src/Contracts/TelematicProviderDescriptor.php

@@ -12,6 +12,8 @@ use Fleetbase\FleetOps\Support\Utils;
  */
 class TelematicProviderDescriptor
 {
+    public const DEFAULT_ICON = '/engines-dist/images/telematics/providers/default.webp';
+
     public string $key;
     public string $label;
     public string $type; // 'native' or 'custom'
@@ -33,7 +35,7 @@ class TelematicProviderDescriptor
         $this->label             = $data['label'];
         $this->type              = $data['type'] ?? 'native';
         $this->driverClass       = $data['driver_class'] ?? null;
-        $this->icon              = $data['icon'] ?? null;
+        $this->icon              = $data['icon'] ?? self::DEFAULT_ICON;
         $this->description       = $data['description'] ?? null;
         $this->docsUrl           = $data['docs_url'] ?? null;
         $this->requiredFields    = $data['required_fields'] ?? [];

package/server/src/Events/FuelProviderTransactionImported.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Fleetbase\FleetOps\Events;
+
+use Fleetbase\FleetOps\Models\FuelProviderTransaction;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class FuelProviderTransactionImported
+{
+    use Dispatchable;
+    use SerializesModels;
+
+    public function __construct(public FuelProviderTransaction $transaction)
+    {
+    }
+}

package/server/src/Events/FuelProviderTransactionMatched.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Fleetbase\FleetOps\Events;
+
+use Fleetbase\FleetOps\Models\FuelProviderTransaction;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class FuelProviderTransactionMatched
+{
+    use Dispatchable;
+    use SerializesModels;
+
+    public function __construct(public FuelProviderTransaction $transaction)
+    {
+    }
+}

package/server/src/Events/FuelProviderTransactionUnmatched.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Fleetbase\FleetOps\Events;
+
+use Fleetbase\FleetOps\Models\FuelProviderTransaction;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class FuelProviderTransactionUnmatched
+{
+    use Dispatchable;
+    use SerializesModels;
+
+    public function __construct(public FuelProviderTransaction $transaction)
+    {
+    }
+}

package/server/src/Events/FuelReportCreatedFromProvider.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Fleetbase\FleetOps\Events;
+
+use Fleetbase\FleetOps\Models\FuelProviderTransaction;
+use Fleetbase\FleetOps\Models\FuelReport;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class FuelReportCreatedFromProvider
+{
+    use Dispatchable;
+    use SerializesModels;
+
+    public function __construct(public FuelProviderTransaction $transaction, public FuelReport $fuelReport)
+    {
+    }
+}

package/server/src/Expansions/UserFilterExpansion.php

@@ -47,6 +47,21 @@ class UserFilterExpansion implements Expansion
         };
     }
 
+    /**
+     * Filter where a user is not a customer.
+     *
+     * @return void
+     */
+    public static function isNotCustomer()
+    {
+        return function () {
+            /** @var \Fleetbase\Http\Filter\UserFilter|\Fleetbase\Http\Filter\Filter $this */
+            $this->builder->where(function ($query) {
+                $query->whereNull('type')->orWhere('type', '!=', 'customer');
+            });
+        };
+    }
+
     /**
      * Filter where doesnt have driver within the CURRENT organizations.
      *
@@ -62,6 +77,19 @@ class UserFilterExpansion implements Expansion
         };
     }
 
+    /**
+     * Filter where users can be driver.
+     *
+     * @return void
+     */
+    public static function canBeDriver()
+    {
+        return function () {
+            /** @var \Fleetbase\Http\Filter\UserFilter|\Fleetbase\Http\Filter\Filter $this */
+            $this->builder->whereIn('type', ['user', 'admin']);
+        };
+    }
+
     /**
      * @return void
      */

package/server/src/Http/Controllers/Api/v1/IssueController.php

@@ -30,6 +30,7 @@ class IssueController extends Controller
             'type',
             'report',
             'priority',
+            'tags',
             'status',
         ]);
 
@@ -85,6 +86,7 @@ class IssueController extends Controller
             'type',
             'report',
             'priority',
+            'tags',
             'status',
         ]);
 

package/server/src/Http/Controllers/Api/v1/OrderController.php

@@ -1013,11 +1013,10 @@ class OrderController extends Controller
         $driver->current_job_uuid = $order->uuid;
         $driver->save();
 
-        /** @var \Fleetbase\LaravelMysqlSpatial\Types\Point */
-        $location = $order->getLastLocation();
-
-        // set first destination for payload
-        $payload->setFirstWaypoint($activity, $location);
+        // set first service stop destination for multi-stop routes
+        if ($this->payloadUsesServiceStopActivity($payload)) {
+            $this->ensurePayloadCurrentServiceStop($payload);
+        }
         $order->setRelation('payload', $payload);
 
         // update order activity
@@ -1108,37 +1107,35 @@ class OrderController extends Controller
         /** @var \Fleetbase\LaravelMysqlSpatial\Types\Point */
         $location = $order->getLastLocation();
 
-        // Check if multiple waypoint order to update activity for.
-        $isMultipleWaypointOrder = $this->payloadHasWaypoints($order->payload);
+        $usesServiceStopActivity = $this->payloadUsesServiceStopActivity($order->payload);
+        $isLifecycleActivity     = Utils::isActivity($activity) && in_array($activity->code, ['created', 'dispatched', 'started'], true);
 
-        // also update for each order entities if not multiple drop order
-        // all entities will share the same activity status as is one drop order
-        if (!$isMultipleWaypointOrder) {
+        // Classic pickup/dropoff orders and static lifecycle statuses update the order.
+        if (!$usesServiceStopActivity || $isLifecycleActivity) {
             // Update order activity
             $order->updateActivity($activity, $proof);
 
-            // Only update entities belonging to the waypoint
-            foreach ($order->payload->entities as $entity) {
-                $entity->insertActivity($activity, $location, $proof);
+            if (!$usesServiceStopActivity) {
+                foreach ($order->payload->entities as $entity) {
+                    $entity->insertActivity($activity, $location, $proof);
+                }
+            }
+
+            if ($usesServiceStopActivity && $activity->is('started')) {
+                $this->ensurePayloadCurrentServiceStop($order->payload);
             }
+
             // Handle order completion
             if (Utils::isActivity($activity) && $activity->completesOrder()) {
                 $order->driverAssigned?->unassignCurrentJob();
                 $order->complete($this->resolveProof($proof));
             }
 
-            return new OrderResource($order);
+            return new OrderResource($order->refresh());
         }
 
-        if ($activity->is('started')) {
-            $order->updateActivity($activity, $proof);
-
-            $this->ensurePayloadCurrentServiceStop($order->payload);
-            if (!$this->payloadHasCurrentServiceStopActivity($order->payload, $activity)) {
-                $this->updateCurrentServiceStopActivity($order, $activity, $location, $proof);
-            }
-
-            return new OrderResource($order->refresh());
+        if (!$order->started && in_array($order->status, ['created', 'dispatched'], true)) {
+            return response()->apiError('Order must be started before waypoint activity can be updated.', 422);
         }
 
         $currentStop               = $this->ensurePayloadCurrentServiceStop($order->payload);
@@ -1192,9 +1189,13 @@ class OrderController extends Controller
             );
         }
 
+        $canUpdateServiceStopActivity = $this->payloadUsesServiceStopActivity($order->payload)
+            && ($order->started || $order->started_at || !in_array($order->status, ['created', 'dispatched'], true));
         $stop = null;
-        if ($waypointId) {
-            $stop = $this->resolveServiceStopFromKey($order->payload, $waypointId);
+        if ($canUpdateServiceStopActivity) {
+            $stop = $waypointId
+                ? $this->resolveServiceStopFromKey($order->payload, $waypointId)
+                : $this->payloadCurrentServiceStop($order->payload);
         }
 
         $orderConfig = $order->ensureOrderConfig();