@fleetbase/fleetops-engine 0.6.49 → 0.6.50

package/server/src/Models/ServiceRateFee.php

@@ -7,6 +7,7 @@ use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\TracksApiCredential;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class ServiceRateFee extends Model
 {
@@ -32,7 +33,22 @@ class ServiceRateFee extends Model
      *
      * @var array
      */
-    protected $fillable = ['_key', 'service_rate_uuid', 'distance', 'distance_unit', 'min', 'max', 'unit', 'fee', 'currency'];
+    protected $fillable = [
+        '_key',
+        'service_rate_uuid',
+        'service_area_uuid',
+        'zone_uuid',
+        'label',
+        'priority',
+        'is_fallback',
+        'distance',
+        'distance_unit',
+        'min',
+        'max',
+        'unit',
+        'fee',
+        'currency',
+    ];
 
     /**
      * The attributes that should be cast to native types.
@@ -40,10 +56,12 @@ class ServiceRateFee extends Model
      * @var array
      */
     protected $casts = [
-        'min'      => 'integer',
-        'max'      => 'integer',
-        'fee'      => Money::class,
-        'distance' => 'integer',
+        'min'         => 'integer',
+        'max'         => 'integer',
+        'fee'         => Money::class,
+        'distance'    => 'integer',
+        'priority'    => 'integer',
+        'is_fallback' => 'boolean',
     ];
 
     /**
@@ -62,14 +80,26 @@ class ServiceRateFee extends Model
 
     public static function onRowInsert($row)
     {
-        $row['fee']      = Money::apply($row['fee'] ?? 0);
-        $row['distance'] = Utils::numbersOnly($row['distance'] ?? null);
-        $row['min']      = Utils::numbersOnly($row['min'] ?? null);
-        $row['max']      = Utils::numbersOnly($row['max'] ?? null);
+        $row['fee']         = Money::apply($row['fee'] ?? 0);
+        $row['distance']    = Utils::numbersOnly($row['distance'] ?? null);
+        $row['min']         = Utils::numbersOnly($row['min'] ?? null);
+        $row['max']         = Utils::numbersOnly($row['max'] ?? null);
+        $row['priority']    = Utils::numbersOnly($row['priority'] ?? 0);
+        $row['is_fallback'] = Utils::castBoolean($row['is_fallback'] ?? false);
 
         return $row;
     }
 
+    public function serviceArea(): BelongsTo
+    {
+        return $this->belongsTo(ServiceArea::class, 'service_area_uuid', 'uuid');
+    }
+
+    public function zone(): BelongsTo
+    {
+        return $this->belongsTo(Zone::class, 'zone_uuid', 'uuid');
+    }
+
     public function setDistanceAttribute($value)
     {
         $this->attributes['distance'] = Utils::numbersOnly($value);

package/server/src/Models/TrackingNumber.php

@@ -14,6 +14,7 @@ use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Str;
 use Milon\Barcode\Facades\DNS2DFacade as DNS2D;
 
@@ -242,7 +243,7 @@ class TrackingNumber extends Model
         $status = strtolower($trackingStatus->code);
         $owner  = $this->load(['owner'])->getRelationValue('owner');
 
-        if ($owner && $owner->isFillable('status') && $owner->status !== $status) {
+        if ($owner && static::ownerHasStatusColumn($owner) && $owner->isFillable('status') && $owner->status !== $status) {
             $this->owner->status = $status;
 
             $this->owner->save();
@@ -303,7 +304,7 @@ class TrackingNumber extends Model
         TrackingNumber::where('uuid', $uuid)->update(['status_uuid' => $trackingStatusId]);
 
         // update owner status
-        if ($owner && $owner instanceof Model && $owner->isFillable('status')) {
+        if ($owner && $owner instanceof Model && static::ownerHasStatusColumn($owner) && $owner->isFillable('status')) {
             // runs event cycles
             // $model->update([ 'status' => 'created' ]);
 
@@ -313,4 +314,9 @@ class TrackingNumber extends Model
 
         return $uuid;
     }
+
+    protected static function ownerHasStatusColumn(Model $owner): bool
+    {
+        return Schema::hasColumn($owner->getTable(), 'status');
+    }
 }

package/server/src/Models/Vehicle.php

@@ -223,6 +223,7 @@ class Vehicle extends Model
      */
     protected $attributes = [
         'avatar_url' => 'https://flb-assets.s3-ap-southeast-1.amazonaws.com/static/vehicle-icons/mini_bus.svg',
+        'status'     => 'available',
     ];
 
     /**
@@ -324,6 +325,14 @@ class Vehicle extends Model
         return $this->hasOne(Driver::class, 'vehicle_uuid', 'uuid')->without(['vehicle']);
     }
 
+    /**
+     * Set the vehicle status attribute.
+     */
+    public function setStatusAttribute(?string $status = 'available'): void
+    {
+        $this->attributes['status'] = $status === null || $status === 'active' ? 'available' : $status;
+    }
+
     public function category(): BelongsTo
     {
         return $this->belongsTo(Category::class, 'category_uuid', 'uuid');
@@ -597,6 +606,14 @@ class Vehicle extends Model
         return $this;
     }
 
+    public function unassignDriver(): self
+    {
+        Driver::where('vehicle_uuid', $this->uuid)->update(['vehicle_uuid' => null]);
+        $this->unsetRelation('driver');
+
+        return $this;
+    }
+
     /**
      * Retrieves the last known position of the driver within the current company context.
      *
@@ -727,9 +744,8 @@ class Vehicle extends Model
             'plate_number'           => $plateNumber,
             'vin'                    => $vin,
             'type'                   => $type,
-            'status'                 => 'active',
+            'status'                 => 'available',
             'online'                 => 0,
-            'status'                 => 'active',
         ]);
 
         // If driver was resolved assign driver to vehicle

package/server/src/Models/Waypoint.php

@@ -2,8 +2,8 @@
 
 namespace Fleetbase\FleetOps\Models;
 
-use Barryvdh\DomPDF\Facade\Pdf;
 use Fleetbase\Casts\PolymorphicType;
+use Fleetbase\FleetOps\Support\LabelPdf;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\FleetOps\Traits\HasTrackingNumber;
 use Fleetbase\FleetOps\Traits\PayloadAccessors;
@@ -94,7 +94,7 @@ class Waypoint extends Model
      */
     public function pdfLabel()
     {
-        return Pdf::loadHTML($this->label());
+        return LabelPdf::fromHtml($this->label());
     }
 
     /**

package/server/src/Notifications/LateDeparture.php

@@ -12,9 +12,9 @@ class LateDeparture extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public static string $name = 'Late Departure';
+    public static string $name        = 'Late Departure';
     public static string $description = 'Notify when an order has not departed after the configured grace period.';
-    public static string $package = 'fleet-ops';
+    public static string $package     = 'fleet-ops';
 
     public function __construct(public Order $order, public array $context = [])
     {

package/server/src/Notifications/ProlongedStoppage.php

@@ -12,9 +12,9 @@ class ProlongedStoppage extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public static string $name = 'Prolonged Stoppage';
+    public static string $name        = 'Prolonged Stoppage';
     public static string $description = 'Notify when a vehicle remains stopped during an active trip beyond the configured threshold.';
-    public static string $package = 'fleet-ops';
+    public static string $package     = 'fleet-ops';
 
     public function __construct(public Order $order, public array $context = [])
     {

package/server/src/Notifications/RouteDeviation.php

@@ -12,9 +12,9 @@ class RouteDeviation extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public static string $name = 'Route Deviation';
+    public static string $name        = 'Route Deviation';
     public static string $description = 'Notify when tracked vehicle location deviates from the active route beyond the configured threshold.';
-    public static string $package = 'fleet-ops';
+    public static string $package     = 'fleet-ops';
 
     public function __construct(public Order $order, public array $context = [])
     {

package/server/src/Observers/ContactObserver.php

@@ -31,6 +31,8 @@ class ContactObserver
             throw new \Exception('Customer contact type cannot be changed.');
         }
 
+        $contact->assertCustomerIdentityIsAvailable();
+
         // Get the contacts assosciated user
         if ($contact->doesntHaveUser()) {
             $contact->createUser();

package/server/src/Observers/ServiceRateObserver.php

@@ -14,10 +14,10 @@ class ServiceRateObserver
      */
     public function created(ServiceRate $serviceRate)
     {
-        $serviceRateFees       = request()->input('serviceRate.rate_fees');
-        $serviceRateParcelFees = request()->input('serviceRate.parcel_fees');
+        $serviceRateFees       = request()->input('serviceRate.rate_fees', request()->input('service_rate.rate_fees'));
+        $serviceRateParcelFees = request()->input('serviceRate.parcel_fees', request()->input('service_rate.parcel_fees'));
 
-        if ($serviceRate->isFixedMeter() || $serviceRate->isPerDrop()) {
+        if ($serviceRate->isFixedMeter() || $serviceRate->isPerDrop() || $serviceRate->isMultiZoneDistance()) {
             $serviceRate->setServiceRateFees($serviceRateFees);
         }
 
@@ -33,10 +33,10 @@ class ServiceRateObserver
      */
     public function updated(ServiceRate $serviceRate)
     {
-        $serviceRateFees       = request()->input('serviceRate.rate_fees');
-        $serviceRateParcelFees = request()->input('serviceRate.parcel_fees');
+        $serviceRateFees       = request()->input('serviceRate.rate_fees', request()->input('service_rate.rate_fees'));
+        $serviceRateParcelFees = request()->input('serviceRate.parcel_fees', request()->input('service_rate.parcel_fees'));
 
-        if ($serviceRate->isFixedMeter() || $serviceRate->isPerDrop()) {
+        if ($serviceRate->isFixedMeter() || $serviceRate->isPerDrop() || $serviceRate->isMultiZoneDistance()) {
             $serviceRate->setServiceRateFees($serviceRateFees);
         }
 

package/server/src/Orchestration/Engines/VroomOrchestrationEngine.php

@@ -85,7 +85,7 @@ class VroomOrchestrationEngine implements OrchestrationEngineInterface
         $vroomPayload = [
             'jobs'      => [],
             'shipments' => [],
-            'vehicles' => array_map(function (array $v) use ($profile) {
+            'vehicles'  => array_map(function (array $v) use ($profile) {
                 $vehicle = [
                     'id'          => crc32($v['id']), // VROOM requires integer IDs
                     'description' => json_encode(['vehicle_id' => $v['id'], 'driver_id' => $v['driver_id']]),

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -56,6 +56,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         \Fleetbase\FleetOps\Console\Commands\FixInvalidPolymorphicRelationTypeNamespaces::class,
         \Fleetbase\FleetOps\Console\Commands\AssignDriverRoles::class,
         \Fleetbase\FleetOps\Console\Commands\AssignCustomerRoles::class,
+        \Fleetbase\FleetOps\Console\Commands\AuditCustomerUserConflicts::class,
         \Fleetbase\FleetOps\Console\Commands\SimulateOrderRouteNavigation::class,
         \Fleetbase\FleetOps\Console\Commands\DebugOrderTracker::class,
         \Fleetbase\FleetOps\Console\Commands\PurgeUnpurchasedServiceQuotes::class,

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

@@ -40,12 +40,12 @@ abstract class AbstractAnalytics
     {
         if ($period !== null && $period !== '') {
             $days = match ($period) {
-                '7d'   => 7,
-                '14d'  => 14,
-                '30d'  => 30,
-                '90d'  => 90,
-                '180d' => 180,
-                '365d' => 365,
+                '7d'    => 7,
+                '14d'   => 14,
+                '30d'   => 30,
+                '90d'   => 90,
+                '180d'  => 180,
+                '365d'  => 365,
                 default => null,
             };
 

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

@@ -22,7 +22,7 @@ class FuelEfficiency extends AbstractAnalytics
         $fuelByWeek = FuelReport::where('company_uuid', $this->company->uuid)
             ->where('currency', $currency)
             ->whereBetween('created_at', [$start, $end])
-            ->selectRaw("YEARWEEK(created_at, 1) as wk, MIN(DATE(created_at)) as wk_start, SUM(amount) as total_cost")
+            ->selectRaw('YEARWEEK(created_at, 1) as wk, MIN(DATE(created_at)) as wk_start, SUM(amount) as total_cost')
             ->groupBy('wk')
             ->orderBy('wk')
             ->get();
@@ -30,7 +30,7 @@ class FuelEfficiency extends AbstractAnalytics
         $distanceByWeek = Order::where('company_uuid', $this->company->uuid)
             ->where('status', 'completed')
             ->whereBetween('updated_at', [$start, $end])
-            ->selectRaw("YEARWEEK(updated_at, 1) as wk, SUM(distance) as total_distance")
+            ->selectRaw('YEARWEEK(updated_at, 1) as wk, SUM(distance) as total_distance')
             ->groupBy('wk')
             ->orderBy('wk')
             ->pluck('total_distance', 'wk');

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

@@ -41,7 +41,7 @@ class OrdersByStatus extends AbstractAnalytics
         while ($cursor <= $endDay) {
             $labels[] = $cursor->format('M j');
             foreach (array_keys(self::STATUS_PALETTE) as $status) {
-                $match = $rows->first(fn ($r) => $r->bucket === $cursor->format('Y-m-d') && $r->status === $status);
+                $match               = $rows->first(fn ($r) => $r->bucket === $cursor->format('Y-m-d') && $r->status === $status);
                 $byStatus[$status][] = $match ? (int) $match->total : 0;
             }
             $cursor->addDay();

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

@@ -4,7 +4,6 @@ namespace Fleetbase\FleetOps\Support\Analytics;
 
 use Fleetbase\Models\Transaction;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\DB;
 
 /**
  * Time-series of revenue (sum of transactions) per bucket, filtered to the

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

@@ -12,7 +12,7 @@ use Illuminate\Support\Carbon;
  */
 class TopDrivers extends AbstractAnalytics
 {
-    protected int $limit = 10;
+    protected int $limit     = 10;
     protected string $sortBy = 'orders_completed';
 
     public function limit(int $limit): self

package/server/src/Support/CustomerAuth.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support;
+
+use Fleetbase\FleetOps\Models\Contact;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+use Laravel\Sanctum\PersonalAccessToken;
+
+/**
+ * Helper for resolving the authenticated customer from a request.
+ *
+ * The customer token is issued by `CustomerController` as a Sanctum
+ * `PersonalAccessToken` whose `name` column carries the owning Contact's UUID.
+ * Mirrors {@see \Fleetbase\Storefront\Support\Storefront::getCustomerFromToken}
+ * but with no Storefront-specific session.
+ */
+class CustomerAuth
+{
+    public const HEADER = 'Customer-Token';
+
+    public const APP_BINDING = 'currentCustomer';
+
+    /**
+     * Resolve the Contact represented by the `Customer-Token` header.
+     *
+     * Preference order when a User has more than one customer-type Contact:
+     *   1. Contact whose UUID matches the token's `name` column (Storefront convention).
+     *   2. Contact in the same company as the resolved API credential (`session('company')`).
+     *   3. The first remaining customer-type Contact for the token's User.
+     */
+    public static function resolveFromHeader(?Request $request = null): ?Contact
+    {
+        $request = $request ?? request();
+        $token   = $request->header(self::HEADER);
+        if (!$token) {
+            return null;
+        }
+
+        $accessToken = PersonalAccessToken::findToken($token);
+        if (!$accessToken) {
+            return null;
+        }
+
+        // Storefront convention: token name = Contact UUID.
+        if (is_string($accessToken->name) && Str::isUuid($accessToken->name)) {
+            $contact = Contact::where('uuid', $accessToken->name)
+                ->where('type', 'customer')
+                ->first();
+            if ($contact) {
+                return $contact;
+            }
+        }
+
+        // Fallback: pick the customer Contact bound to the token's user, preferring
+        // the same company as the API credential when available.
+        $userId         = $accessToken->tokenable_id ?? null;
+        $userIdentifier = $accessToken->tokenable->uuid ?? $userId;
+        if (!$userIdentifier) {
+            return null;
+        }
+
+        $contactQuery = Contact::where('user_uuid', $userIdentifier)
+            ->where('type', 'customer');
+
+        $sessionCompany = session('company');
+        if ($sessionCompany) {
+            $companyPreferred = (clone $contactQuery)
+                ->where('company_uuid', $sessionCompany)
+                ->first();
+            if ($companyPreferred) {
+                return $companyPreferred;
+            }
+        }
+
+        return $contactQuery->first();
+    }
+
+    /**
+     * Return the currently-bound customer (set by AuthenticateCustomerToken middleware).
+     */
+    public static function current(): ?Contact
+    {
+        return app()->bound(self::APP_BINDING) ? app(self::APP_BINDING) : null;
+    }
+
+    /**
+     * Bind the resolved customer for the current request lifecycle.
+     */
+    public static function setCurrent(Contact $contact): void
+    {
+        app()->instance(self::APP_BINDING, $contact);
+        session([
+            'customer_id' => $contact->uuid,
+            'contact_id'  => $contact->uuid,
+        ]);
+    }
+}

package/server/src/Support/LabelPdf.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support;
+
+use Barryvdh\DomPDF\Facade\Pdf;
+
+class LabelPdf
+{
+    /**
+     * Create a PDF instance for FleetOps labels with UTF-8 and embedded-font
+     * options applied consistently across order, waypoint, and entity labels.
+     */
+    public static function fromHtml(string $html)
+    {
+        $pdf = Pdf::loadHTML($html, 'UTF-8');
+
+        if (method_exists($pdf, 'setOptions')) {
+            $pdf->setOptions(static::options());
+        }
+
+        if (method_exists($pdf, 'getDomPDF')) {
+            $dompdf = $pdf->getDomPDF();
+            foreach (static::dompdfOptions() as $key => $value) {
+                if (method_exists($dompdf, 'set_option')) {
+                    $dompdf->set_option($key, $value);
+                }
+            }
+        }
+
+        return $pdf;
+    }
+
+    public static function options(): array
+    {
+        return [
+            'defaultFont'             => 'DejaVu Sans',
+            'isHtml5ParserEnabled'    => true,
+            'isFontSubsettingEnabled' => true,
+            'isRemoteEnabled'         => false,
+        ];
+    }
+
+    public static function dompdfOptions(): array
+    {
+        return [
+            'defaultFont'             => 'DejaVu Sans',
+            'isHtml5ParserEnabled'    => true,
+            'isFontSubsettingEnabled' => true,
+            'isRemoteEnabled'         => false,
+        ];
+    }
+}

package/server/src/Support/Metrics/AbstractMetric.php

@@ -14,12 +14,12 @@ use Illuminate\Support\Carbon;
 abstract class AbstractMetric
 {
     protected Company $company;
-    protected ?\DateTimeInterface $start = null;
-    protected ?\DateTimeInterface $end   = null;
+    protected ?\DateTimeInterface $start        = null;
+    protected ?\DateTimeInterface $end          = null;
     protected ?\DateTimeInterface $compareStart = null;
     protected ?\DateTimeInterface $compareEnd   = null;
-    protected int $sparklineBuckets = 0;
-    protected string $sparklineUnit = 'day';
+    protected int $sparklineBuckets             = 0;
+    protected string $sparklineUnit             = 'day';
 
     /**
      * Period boundaries for the currently-executing aggregate call.