@fleetbase/fleetops-engine 0.6.18 → 0.6.19

package/server/src/Models/Order.php

@@ -711,7 +711,6 @@ class Order extends Model
      */
     public function createPayload(?array $attributes = [], bool $setPayload = true): Payload
     {
-        // set payload type if not set
         if (!isset($attributes['type'])) {
             $attributes['type'] = $this->type;
         }
@@ -760,7 +759,6 @@ class Order extends Model
      */
     public function insertPayload(?array $attributes = [], bool $setPayload = true): Payload
     {
-        // set payload type if not set
         if (!isset($attributes['type'])) {
             $attributes['type'] = $this->type;
         }
@@ -785,7 +783,7 @@ class Order extends Model
 
         $fillable   = $this->getFillable();
         $insertKeys = array_keys($attributes);
-        // clean insert data
+
         foreach ($insertKeys as $key) {
             if (!in_array($key, $fillable)) {
                 unset($attributes[$key]);
@@ -804,10 +802,8 @@ class Order extends Model
             return $this->createPayload($attributes);
         }
 
-        // get newly inserted payload
         $payload = Payload::find($uuid);
 
-        // manyally trigger payload created event
         $payload->fireModelEvent('created', false);
 
         if ($setPayload) {
@@ -951,8 +947,6 @@ class Order extends Model
      */
     public function purchaseQuote(string $serviceQuoteId, $meta = [])
     {
-        // $serviceQuote = ServiceQuote::where('uuid', $serviceQuoteId)->first();
-        // create purchase rate for order
         $purchasedRate = PurchaseRate::create([
             'customer_uuid'      => $this->customer_uuid,
             'customer_type'      => $this->customer_type,
@@ -980,7 +974,6 @@ class Order extends Model
     public function purchaseServiceQuote($serviceQuote, $meta = [])
     {
         if (!$serviceQuote) {
-            // create transaction for order
             $this->createOrderTransactionWithoutServiceQuote();
 
             return $this;
@@ -1024,7 +1017,6 @@ class Order extends Model
         $transaction = null;
 
         try {
-            // create transaction and transaction items
             $transaction = Transaction::create([
                 'company_uuid'           => session('company', $this->company_uuid),
                 'customer_uuid'          => $this->customer_uuid,
@@ -1038,10 +1030,8 @@ class Order extends Model
                 'status'                 => 'success',
             ]);
 
-            // set transaction to order
             $this->update(['transaction_uuid' => $transaction->uuid]);
         } catch (\Throwable $e) {
-            // log error unable to create order transaction
         }
 
         return $transaction;
@@ -1072,21 +1062,16 @@ class Order extends Model
      *
      * @throws \LogicException if the order is already dispatched
      */
-    public function dispatch(bool $save = true): static
+    public function dispatch(bool $save = true): self
     {
         $this->dispatched    = true;
         $this->dispatched_at = now();
 
         if ($save) {
-            // Save quietly to avoid duplicate model events;
-            // wrap in a transaction if your code is not already in one.
             $this->saveQuietly();
-
-            // Flush any attribute cache that depends on persisted state
             $this->flushAttributesCache();
         }
 
-        // Queue the OrderDispatched event to run after the DB commit succeeds
         dispatch(fn () => event(new OrderDispatched($this)))->afterCommit();
 
         return $this;
@@ -1100,7 +1085,6 @@ class Order extends Model
      */
     public function insertDispatchActivity(): Order
     {
-        // get dispatch activity if any and apply to order
         $dispatchActivity = $this->config()->getDispatchActivity();
 
         if ($dispatchActivity) {
@@ -1147,7 +1131,7 @@ class Order extends Model
      */
     public function firstDispatchWithActivity(): Order
     {
-        if (!$this->dispatched) {
+        if (!$this->hasDispatchedStatus()) {
             $this->dispatchWithActivity();
         }
 
@@ -1164,12 +1148,10 @@ class Order extends Model
     {
         $this->status = 'canceled';
 
-        // if saving update the status and add the cancel activity
         $this->loadMissing('orderConfig');
         $canceledActivity = $this->orderConfig->getCanceledActivity();
         $this->updateActivity($canceledActivity);
 
-        // trigger integrated vendor cancelation
         if ($this->isIntegratedVendorOrder()) {
             $api = $this->facilitator->api();
 
@@ -1209,16 +1191,12 @@ class Order extends Model
             return $this;
         }
 
-        // Get location
         $location = $this->getLastLocation();
 
-        // Insert dispatch activity
         $this->insertActivity($activity, $location, $proof);
 
-        // Update status using code
         $this->setStatus($activity->get('code'), true);
 
-        // Fire activity events
         $activity->fireEvents($this);
 
         return $this;
@@ -1292,8 +1270,6 @@ class Order extends Model
             $doesNotStartWithFleetOps = !Str::startsWith($type, 'fleet-ops');
             $isValidType              = $type === 'contact' || $type === 'vendor';
 
-            // preprend fleet-ops IF not a namespace and does not start with fleet-ops
-            // this is for handling ember style registry spacing
             if ($isNotNamespace && $doesNotStartWithFleetOps && $isValidType) {
                 $type = 'fleet-ops:' . $type;
             }
@@ -1315,8 +1291,6 @@ class Order extends Model
             $doesNotStartWithFleetOps = !Str::startsWith($type, 'fleet-ops');
             $isValidType              = $type === 'contact' || $type === 'vendor';
 
-            // preprend fleet-ops IF not a namespace and does not start with fleet-ops
-            // this is for handling ember style registry spacing
             if ($isNotNamespace && $doesNotStartWithFleetOps && $isValidType) {
                 $type = 'fleet-ops:' . $type;
             }
@@ -1341,8 +1315,6 @@ class Order extends Model
             }
         }
 
-        // if payload is using a special key `pickup_is_driver_location`
-        // and driver is assigned set the pickup point as the drivers current location
         if ($this->isDirty('driver_assigned_uuid') && !empty($this->driver_assigned_uuid) && $this->payload && $this->payload->hasMeta('pickup_is_driver_location')) {
             $this->load('driverAssigned');
 
@@ -1372,7 +1344,6 @@ class Order extends Model
      */
     public function updateStatus($code = null)
     {
-        // update multiple status codes
         if (is_array($code)) {
             return collect($code)->every(function ($activityCode) {
                 return $this->updateStatus($activityCode);
@@ -1380,7 +1351,7 @@ class Order extends Model
         }
 
         $orderConfig = $this->config();
-        // @todo if no order config set the order config based on order type
+
         $flow         = $orderConfig->activities();
         $activity     = $orderConfig->nextActivity();
 
@@ -1408,7 +1379,6 @@ class Order extends Model
         $this->setStatus($activity->code);
         $this->insertActivity($activity, $location);
 
-        // fire events if any
         $activity->fireEvents($this);
 
         return true;
@@ -1657,8 +1627,7 @@ class Order extends Model
      */
     public function resolveDynamicProperty(string $property)
     {
-        // Special payload shortcuts
-        $root       = Str::before($property, '.');   // e.g. "pickup" in "pickup.address"
+        $root       = Str::before($property, '.');
         $payloadMap = [
             'pickup'                => 'payload.pickup',
             'dropoff'               => 'payload.dropoff',
@@ -1671,15 +1640,12 @@ class Order extends Model
             $this->loadMissing($payloadMap[$root]);
             $target = data_get($this, $payloadMap[$root]);
 
-            // “pickup”, “dropoff”, or “currentWaypoint” on their own
             if ($property === $root) {
                 return $target;
             }
 
-            // e.g. "address.city" part of "pickup.address.city"
             $subKey = Str::after($property, $root . '.');
 
-            // if waypoint we can do "waypoint.place.address" or "waypoint.address" for resolution
             $isWaypointMarker = Str::startsWith($root, 'currentWaypoint') || $root === 'waypoint';
             if ($isWaypointMarker && $target instanceof Waypoint) {
                 $target->loadMissing('place');
@@ -1690,13 +1656,11 @@ class Order extends Model
             return data_get($target, $subKey);
         }
 
-        // Direct attribute on the model
         $snake = Str::snake($property);
         if (array_key_exists($snake, $this->getAttributes())) {
             return $this->getAttribute($snake);
         }
 
-        // Custom-field / meta look-ups
         if ($this->isCustomField($property)) {
             return $this->getCustomFieldValueByKey($property);
         }
@@ -1705,7 +1669,6 @@ class Order extends Model
             return $this->getMeta($property);
         }
 
-        // Fallback deep-path access
         return data_get($this, $property);
     }
 
@@ -1788,12 +1751,10 @@ class Order extends Model
     public function resolveDynamicNotifiable(string $property)
     {
         if ($property === 'customer') {
-            // Load payload and waypoint markers if not already loaded
             $this->loadMissing(['payload', 'payload.waypointMarkers']);
 
             $payload = $this->payload;
 
-            // Attempt to resolve customer from the current waypoint
             if ($payload && $payload->current_waypoint_uuid) {
                 $currentWaypoint = $payload->waypointMarkers
                     ?->firstWhere('place_uuid', $payload->current_waypoint_uuid);
@@ -1807,11 +1768,9 @@ class Order extends Model
                 }
             }
 
-            // Fallback to the order's customer
             return $this->customer;
         }
 
-        // For other relationships, load dynamically
         if (!$this->relationLoaded($property)) {
             $this->load($property);
         }
@@ -1819,6 +1778,27 @@ class Order extends Model
         return $this->{$property};
     }
 
+    /**
+     * Determine whether this order already has a "dispatched" tracking status.
+     *
+     * Uses the in-memory relationship when available to avoid extra queries.
+     * Falls back to a lightweight EXISTS query when the relationship isn't loaded.
+     *
+     * @return bool true if a tracking status with code "dispatched" exists; otherwise false
+     */
+    public function hasDispatchedStatus(): bool
+    {
+        if ($this->relationLoaded('trackingStatuses')) {
+            return $this->trackingStatuses->contains(
+                fn ($ts) => strcasecmp((string) $ts->code, 'dispatched') === 0
+            );
+        }
+
+        return TrackingStatus::where('tracking_number_uuid', $this->tracking_number_uuid)
+            ->whereRaw('LOWER(code) = ?', ['dispatched'])
+            ->exists();
+    }
+
     public function findClosestDrivers(int $distance = 6000): Collection
     {
         $pickup   = $this->getPickupLocation();

package/server/src/Models/Place.php

@@ -12,6 +12,7 @@ use Fleetbase\LaravelMysqlSpatial\Types\Point as SpatialPoint;
 use Fleetbase\Models\File;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasCustomFields;
 use Fleetbase\Traits\HasMetaAttributes;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
@@ -32,6 +33,7 @@ class Place extends Model
     use TracksApiCredential;
     use SpatialTrait;
     use HasMetaAttributes;
+    use HasCustomFields;
 
     /**
      * The database table used by the model.

package/server/src/Models/ServiceArea.php

@@ -11,6 +11,7 @@ use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\LaravelMysqlSpatial\Types\Polygon;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasCustomFields;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\SendsWebhooks;
@@ -29,6 +30,7 @@ class ServiceArea extends Model
     use TracksApiCredential;
     use SpatialTrait;
     use HasApiModelBehavior;
+    use HasCustomFields;
 
     /**
      * The database table used by the model.

package/server/src/Models/ServiceRate.php

@@ -60,6 +60,8 @@ class ServiceRate extends Model
         'per_meter_unit',
         'base_fee',
         'algorithm',
+        'max_distance_unit',
+        'max_distance',
         'rate_calculation_method',
         'has_cod_fee',
         'cod_calculation_method',
@@ -182,17 +184,29 @@ class ServiceRate extends Model
      *
      * @param string $method
      */
-    public function isRateCalculationMethod($method): bool
+    public function isRateCalculationMethod(string|array $method): bool
     {
+        if (is_array($method)) {
+            return in_array($this->rate_calculation_method, $method);
+        }
+
         return $this->rate_calculation_method === $method;
     }
 
     /**
-     * Check if the rate calculation method is "fixed_meter".
+     * Check if the rate calculation method is "fixed_meter" or "fixed_rate".
      */
     public function isFixedMeter(): bool
     {
-        return $this->rate_calculation_method === 'fixed_meter';
+        return $this->rate_calculation_method === 'fixed_meter' || $this->rate_calculation_method === 'fixed_rate';
+    }
+
+    /**
+     * Check if the rate calculation method is "fixed_meter" or "fixed_rate".
+     */
+    public function isFixedRate(): bool
+    {
+        return $this->rate_calculation_method === 'fixed_meter' || $this->rate_calculation_method === 'fixed_rate';
     }
 
     /**
@@ -473,7 +487,10 @@ class ServiceRate extends Model
             $place = Place::createFromMixed($place);
 
             if ($place instanceof Place) {
-                return $place->getLocationAsPoint();
+                $point = $place->getLocationAsPoint();
+
+                // Conver to brick gis point
+                return \Brick\Geo\Point::fromText(sprintf('POINT (%F %F)', $point->getLng(), $point->getLat()), 4326);
             }
         });
 
@@ -483,6 +500,7 @@ class ServiceRate extends Model
                 foreach ($serviceRate->serviceArea->border as $polygon) {
                     $polygon = $reader->read($polygon->toJson());
 
+                    /** @var \Brick\Geo\Point $waypoint */
                     foreach ($waypoints as $waypoint) {
                         if (!$polygon->contains($waypoint)) {
                             // waypoint outside of service area, not applicable to route

package/server/src/Models/Vehicle.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\Casts\Money;
 use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\FleetOps\Support\VehicleData;
@@ -106,23 +107,51 @@ class Vehicle extends Model
         'warranty_uuid',
         'photo_uuid',
         'avatar_url',
+        'name',
+        'description',
         'make',
+        'model',
+        'model_type',
+        'year',
+        'color',
         'location',
         'speed',
         'heading',
         'altitude',
-        'model',
-        'year',
+        'odometer',
+        'odometer_unit',
+        'fuel_type',
+        'fuel_volume_unit',
         'trim',
+        'transmission',
+        'measurement_system',
+        'body_type',
+        'body_sub_type',
+        'usage_type',
+        'ownership_type',
         'type',
+        'class',
         'plate_number',
+        'call_sign',
+        'serial_number',
+        'financing_status',
+        'currency',
+        'insurance_value',
+        'depreciation_rate',
+        'current_value',
+        'acquisition_cost',
         'vin',
         'vin_data',
+        'specs',
+        'details',
+        'notes',
         'meta',
         'telematics',
         'status',
         'online',
         'slug',
+        'purchased_at',
+        'lease_expires_at',
     ];
 
     /**
@@ -164,12 +193,18 @@ class Vehicle extends Model
      * @var array
      */
     protected $casts = [
-        'location'   => Point::class,
-        'meta'       => Json::class,
-        'telematics' => Json::class,
-        'model_data' => Json::class,
-        'vin_data'   => Json::class,
-        'online'     => 'boolean',
+        'current_value'          => Money::class,
+        'insurance_value'        => Money::class,
+        'acquisition_cost'       => Money::class,
+        'location'               => Point::class,
+        'meta'                   => Json::class,
+        'telematics'             => Json::class,
+        'specs'                  => Json::class,
+        'details'                => Json::class,
+        'vin_data'               => Json::class,
+        'online'                 => 'boolean',
+        'purchased_at'           => 'datetime',
+        'lease_expires_at'       => 'datetime',
     ];
 
     public function photo(): BelongsTo
@@ -179,7 +214,7 @@ class Vehicle extends Model
 
     public function driver(): HasOne
     {
-        return $this->hasOne(Driver::class)->without(['vehicle']);
+        return $this->hasOne(Driver::class, 'vehicle_uuid', 'uuid')->without(['vehicle']);
     }
 
     public function category(): BelongsTo
@@ -219,20 +254,17 @@ class Vehicle extends Model
 
     public function equipments(): HasMany
     {
-        return $this->hasMany(Equipment::class, 'equipable_uuid', 'uuid')
-            ->where('equipable_type', static::class);
+        return $this->hasMany(Equipment::class, 'equipable_uuid', 'uuid')->where('equipable_type', static::class);
     }
 
     public function maintenances(): HasMany
     {
-        return $this->hasMany(Maintenance::class, 'maintainable_uuid', 'uuid')
-            ->where('maintainable_type', static::class);
+        return $this->hasMany(Maintenance::class, 'maintainable_uuid', 'uuid')->where('maintainable_type', static::class);
     }
 
     public function sensors(): HasMany
     {
-        return $this->hasMany(Sensor::class, 'sensorable_uuid', 'uuid')
-            ->where('sensorable_type', static::class);
+        return $this->hasMany(Sensor::class, 'sensorable_uuid', 'uuid')->where('sensorable_type', static::class);
     }
 
     public function parts(): MorphMany
@@ -261,7 +293,7 @@ class Vehicle extends Model
         $nameSegments = [];
 
         // Populate the nameSegments array with the values of the attributes
-        $keys = ['year', 'make', 'model', 'trim', 'plate_number'];
+        $keys = ['year', 'make', 'model', 'trim'];
         foreach ($keys as $key) {
             if (!empty($this->{$key})) {
                 $nameSegments[] = $this->{$key};
@@ -584,8 +616,48 @@ class Vehicle extends Model
             $query->where('public_id', $vehicleName)
                     ->orWhere('plate_number', $vehicleName)
                     ->orWhere('vin', $vehicleName)
+                    ->orWhere('serial_number', $vehicleName)
+                    ->orWhere('call_sign', $vehicleName)
                     ->orWhereRaw("CONCAT(make, ' ', model, ' ', year) LIKE ?", ["%{$vehicleName}%"])
                     ->orWhereRaw("CONCAT(year, ' ', make, ' ', model) LIKE ?", ["%{$vehicleName}%"]);
         })->first();
     }
+
+    /**
+     * Set or update a single key/value pair in the `details` JSON column.
+     *
+     * Uses Laravel's `data_set` helper to allow dot notation for nested keys.
+     *
+     * @param string|array $key   the key (or array path) to set within the details
+     * @param mixed        $value the value to assign to the given key
+     *
+     * @return array the updated details array
+     */
+    public function setDetail(string|array $key, mixed $value): array
+    {
+        $details = is_array($this->details) ? $this->details : (array) $this->details;
+        data_set($details, $key, $value);
+        $this->details = $details;
+
+        return $details;
+    }
+
+    /**
+     * Merge multiple values into the `details` JSON column.
+     *
+     * By default this performs a shallow merge (overwrites duplicate keys).
+     * Use `array_replace_recursive` if you need nested merges.
+     *
+     * @param array $newDetails key/value pairs to merge into details
+     *
+     * @return array the updated details array
+     */
+    public function setDetails(array $newDetails = []): array
+    {
+        $details       = is_array($this->details) ? $this->details : (array) $this->details;
+        $details       = array_merge($details, $newDetails);
+        $this->details = $details;
+
+        return $details;
+    }
 }

package/server/src/Models/VehicleDeviceEvent.php

@@ -24,7 +24,7 @@ class VehicleDeviceEvent extends Model
      *
      * @var string
      */
-    protected $table = 'vehicle_device_events';
+    protected $table = 'device_events';
 
     /**
      * Attributes that is filterable on this model.

package/server/src/Models/Vendor.php

@@ -59,6 +59,7 @@ class Vendor extends Model
         'public_id',
         'internal_id',
         'company_uuid',
+        'place_uuid',
         'logo_uuid',
         'type_uuid',
         'connect_company_uuid',
@@ -72,6 +73,7 @@ class Vendor extends Model
         'place_uuid',
         'country',
         'status',
+        'notes',
         'type',
         'slug',
     ];
@@ -186,6 +188,11 @@ class Vendor extends Model
         return $this->hasMany(Order::class, 'customer_uuid')->whereNull('deleted_at')->withoutGlobalScopes();
     }
 
+    public function files(): HasMany
+    {
+        return $this->hasMany(\Fleetbase\Models\File::class, 'subject_uuid')->latest();
+    }
+
     /**
      * Get the vendor logo url.
      *
@@ -233,6 +240,9 @@ class Vendor extends Model
      */
     public function setTypeAttribute(?string $type)
     {
+        if (!$type && isset($this->type)) {
+            return;
+        }
         $this->attributes['type'] = $type ?? 'vendor';
     }
 
@@ -243,6 +253,9 @@ class Vendor extends Model
      */
     public function setStatusAttribute(?string $status = 'active')
     {
+        if (!$status && isset($this->status)) {
+            return;
+        }
         $this->attributes['status'] = $status ?? 'active';
     }
 

package/server/src/Models/Waypoint.php

@@ -15,6 +15,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Str;
 
 class Waypoint extends Model
 {
@@ -236,4 +237,61 @@ class Waypoint extends Model
 
         return $this->place ?? Place::where('uuid', $this->place_uuid)->first();
     }
+
+    /**
+     * Find the first waypoint for a given place and order/payload.
+     *
+     * This method attempts to locate a waypoint belonging to the provided order's payload
+     * that is associated with the given place. It supports lookup by:
+     * - `Place` model instance (direct UUID match),
+     * - UUID string (direct lookup on `place_uuid`),
+     * - or public identifier string (fallback through `whereHas('place')`).
+     *
+     * @param \Fleetbase\Models\Place|string                    $place   the place instance or identifier (UUID or public_id)
+     * @param \Fleetbase\Models\Order|\Fleetbase\Models\Payload $order   the order or payload model to scope the search
+     * @param array                                             $with    optional relationships to eager load
+     * @param array                                             $columns columns to select from the waypoints table
+     *
+     * @return static|null the matching waypoint, or null if none is found
+     *
+     * @throws \InvalidArgumentException if the provided order or payload is missing a payload UUID
+     */
+    public static function findByPlace(
+        Place|string $place,
+        Order|Payload $order,
+        array $with = [],
+        array $columns = ['*'],
+    ): ?self {
+        $payloadId = match (true) {
+            $order instanceof Order   => $order->payload_uuid,
+            $order instanceof Payload => $order->uuid,
+            default                   => null,
+        };
+
+        if (!$payloadId) {
+            throw new \InvalidArgumentException('Missing payload UUID for lookup.');
+        }
+
+        if ($place instanceof Place) {
+            return static::with($with)
+                ->select($columns)
+                ->where('payload_uuid', $payloadId)
+                ->where('place_uuid', $place->uuid)
+                ->first();
+        }
+
+        if (Str::isUuid($place)) {
+            return static::with($with)
+                ->select($columns)
+                ->where('payload_uuid', $payloadId)
+                ->where('place_uuid', $place)
+                ->first();
+        }
+
+        return static::with($with)
+            ->select($columns)
+            ->where('payload_uuid', $payloadId)
+            ->whereHas('place', fn ($q) => $q->where('public_id', $place))
+            ->first();
+    }
 }