@fleetbase/fleetops-engine 0.6.18 → 0.6.20

package/server/src/Http/Resources/v1/Driver.php

@@ -21,7 +21,7 @@ class Driver extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return [
+        return $this->withCustomFields([
             'id'                            => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'uuid'                          => $this->when(Http::isInternalRequest(), $this->uuid),
             'user_uuid'                     => $this->when(Http::isInternalRequest(), $this->user_uuid),
@@ -63,7 +63,7 @@ class Driver extends FleetbaseResource
             'meta'                          => data_get($this, 'meta', Utils::createObject()),
             'updated_at'                    => $this->updated_at,
             'created_at'                    => $this->created_at,
-        ];
+        ]);
     }
 
     public function getJobs(): AnonymousResourceCollection|FleetbaseResourceCollection

package/server/src/Http/Resources/v1/Fleet.php

@@ -25,7 +25,7 @@ class Fleet extends FleetbaseResource
             $this->load($with);
         }
 
-        return [
+        return $this->withCustomFields([
             'id'                    => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'uuid'                  => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id'             => $this->when(Http::isInternalRequest(), $this->public_id),
@@ -45,7 +45,7 @@ class Fleet extends FleetbaseResource
             'vehicles'              => $this->whenLoaded('vehicles', fn () => Vehicle::collection($this->vehicles)),
             'updated_at'            => $this->updated_at,
             'created_at'            => $this->created_at,
-        ];
+        ]);
     }
 
     /**

package/server/src/Http/Resources/v1/FuelReport.php

@@ -17,7 +17,7 @@ class FuelReport extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return [
+        return $this->withCustomFields([
             'id'                => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'uuid'              => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id'         => $this->when(Http::isInternalRequest(), $this->public_id),
@@ -40,7 +40,7 @@ class FuelReport extends FleetbaseResource
             'location'          => $this->location ?? new Point(0, 0),
             'updated_at'        => $this->updated_at,
             'created_at'        => $this->created_at,
-        ];
+        ]);
     }
 
     /**

package/server/src/Http/Resources/v1/Issue.php

@@ -19,37 +19,40 @@ class Issue extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return [
-            'id'                         => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid'                       => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id'                  => $this->when(Http::isInternalRequest(), $this->public_id),
-            'driver_uuid'                => $this->when(Http::isInternalRequest(), $this->driver_uuid),
-            'vehicle_uuid'               => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
-            'assigned_to_uuid'           => $this->when(Http::isInternalRequest(), $this->assigned_to_uuid),
-            'reported_by_uuid'           => $this->when(Http::isInternalRequest(), $this->reported_by_uuid),
-            'assignee'                   => $this->whenLoaded('assignee', fn () => new User($this->assignee)),
-            'reporter'                   => $this->whenLoaded('reporter', fn () => new User($this->reporter)),
-            'vehicle'                    => $this->whenLoaded('vehicle', fn () => new Vehicle($this->vehicle)),
-            'driver'                     => $this->whenLoaded('driver', fn () => new Driver($this->driver)),
-            'driver_name'                => $this->driver_name,
-            'vehicle_name'               => $this->vehicle_name,
-            'vehicle_id'                 => $this->vehicle_id,
-            'assignee_name'              => $this->assignee_name,
-            'assignee_id'                => $this->assignee_id,
-            'reporter_name'              => $this->reporter_name,
-            'reporter_id'                => $this->reporter_id,
-            'issue_id'                   => $this->issue_id,
-            'report'                     => $this->report,
-            'priority'                   => $this->priority,
-            'meta'                       => data_get($this, 'meta', Utils::createObject()),
-            'type'                       => $this->type,
-            'category'                   => $this->category,
-            'status'                     => $this->status,
-            'location'                   => data_get($this, 'location', new Point(0, 0)),
-            'resolved_at'                => $this->resolved_at,
-            'updated_at'                 => $this->updated_at,
-            'created_at'                 => $this->created_at,
-        ];
+        return $this->withCustomFields([
+            'id'                          => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                        => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'                   => $this->when(Http::isInternalRequest(), $this->public_id),
+            'driver_uuid'                 => $this->when(Http::isInternalRequest(), $this->driver_uuid),
+            'company_uuid'                => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'vehicle_uuid'                => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
+            'assigned_to_uuid'            => $this->when(Http::isInternalRequest(), $this->assigned_to_uuid),
+            'reported_by_uuid'            => $this->when(Http::isInternalRequest(), $this->reported_by_uuid),
+            'assignee'                    => $this->whenLoaded('assignee', fn () => new User($this->assignee)),
+            'reporter'                    => $this->whenLoaded('reporter', fn () => new User($this->reporter)),
+            'vehicle'                     => $this->whenLoaded('vehicle', fn () => new Vehicle($this->vehicle)),
+            'driver'                      => $this->whenLoaded('driver', fn () => new Driver($this->driver)),
+            'driver_name'                 => $this->driver_name,
+            'vehicle_name'                => $this->vehicle_name,
+            'vehicle_id'                  => $this->vehicle_id,
+            'assignee_name'               => $this->assignee_name,
+            'assignee_id'                 => $this->assignee_id,
+            'reporter_name'               => $this->reporter_name,
+            'reporter_id'                 => $this->reporter_id,
+            'issue_id'                    => $this->issue_id,
+            'title'                       => $this->title,
+            'report'                      => $this->report,
+            'priority'                    => $this->priority,
+            'meta'                        => data_get($this, 'meta', Utils::createObject()),
+            'type'                        => $this->type,
+            'category'                    => $this->category,
+            'tags'                        => $this->tags ?? [],
+            'status'                      => $this->status,
+            'location'                    => data_get($this, 'location', new Point(0, 0)),
+            'resolved_at'                 => $this->resolved_at,
+            'updated_at'                  => $this->updated_at,
+            'created_at'                  => $this->created_at,
+        ]);
     }
 
     /**

package/server/src/Http/Resources/v1/Order.php

@@ -34,13 +34,10 @@ class Order extends FleetbaseResource
         $tracker         = ($withTrackerData || $withEta) ? $this->resource->tracker() : null;
 
         return $this->withCustomFields([
-            // IDs
             'id'                   => $this->when($isInternal, $this->id, $this->public_id),
             'uuid'                 => $this->when($isInternal, $this->uuid),
             'public_id'            => $this->when($isInternal, $this->public_id),
             'internal_id'          => $this->internal_id,
-
-            // FKs (internal only)
             'company_uuid'         => $this->when($isInternal, $this->company_uuid),
             'transaction_uuid'     => $this->when($isInternal, $this->transaction_uuid),
             'customer_uuid'        => $this->when($isInternal, $this->customer_uuid),
@@ -56,8 +53,6 @@ class Order extends FleetbaseResource
             'service_quote_uuid'   => $this->when($isInternal, $this->service_quote_uuid),
             'has_driver_assigned'  => $this->when($isInternal, $this->has_driver_assigned),
             'is_scheduled'         => $this->when($isInternal, $this->is_scheduled),
-
-            // Order config: internal gets the relation; public gets the public_id (or null)
             'order_config_uuid'    => $this->when($isInternal, $this->order_config_uuid),
             'order_config'         => $this->when(
                 $isInternal,
@@ -66,21 +61,11 @@ class Order extends FleetbaseResource
                 }),
                 $orderConfigPublicId
             ),
-
-            // Custom field values (internal only) — the relation collection is fine for internal,
-            // public callers will not see this key at all
-            'custom_field_values'  => $this->when($isInternal, $this->customFieldValues),
-
-            // Morph resources
             'customer'             => $this->setCustomerType(Resolve::resourceForMorph($this->customer_type, $this->customer_uuid)),
             'payload'              => new Payload($this->payload),
             'facilitator'          => $this->setFacilitatorType(Resolve::resourceForMorph($this->facilitator_type, $this->facilitator_uuid)),
-
-            // Assigned entities
             'driver_assigned'      => new Driver($driverAssignedModel),
             'vehicle_assigned'     => new Vehicle($vehicleAssignedModel),
-
-            // Tracking
             'tracking_number'      => new TrackingNumber($this->trackingNumber),
             'tracking_statuses'    => $this->whenLoaded('trackingStatuses', function () {
                 return TrackingStatus::collection($this->trackingStatuses);
@@ -88,21 +73,10 @@ class Order extends FleetbaseResource
             'tracking'             => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->tracking_number : null),
             'barcode'              => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->barcode : null),
             'qr_code'              => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->qr_code : null),
-
-            // Comments & files (internal gets raw; public gets resource collections)
             'comments'             => $this->when($isInternal, Comment::collection($this->comments)),
             'files'                => $this->when($isInternal, $this->files, File::collection($this->files)),
-
-            // Pricing / notes
             'purchase_rate'        => new PurchaseRate($this->purchaseRate),
             'notes'                => $this->notes,
-
-            // Expose only keys list publicly
-            'custom_fields'        => $this->when($isPublic, function () {
-                return $this->getCustomFieldKeys();
-            }),
-
-            // Basic attrs
             'type'                 => $this->type,
             'status'               => $this->status,
             'pod_method'           => $this->pod_method,
@@ -112,15 +86,12 @@ class Order extends FleetbaseResource
             'adhoc_distance'       => (int) $this->getAdhocDistance(),
             'distance'             => (int) $this->distance,
             'time'                 => (int) $this->time,
-
-            // Tracker derived data (computed only when requested/present)
             'tracker_data'         => $this->when($withTrackerData, function () use ($tracker) {
                 return $this->resource->tracker_data ?? ($tracker ? $tracker->toArray() : null);
             }),
             'eta'                  => $this->when($withEta, function () use ($tracker) {
                 return $this->resource->eta ?? ($tracker ? $tracker->eta() : null);
             }),
-
             'meta'                 => data_get($this, 'meta', Utils::createObject()),
             'dispatched_at'        => $this->dispatched_at,
             'started_at'           => $this->started_at,

package/server/src/Http/Resources/v1/ParentFleet.php

@@ -16,7 +16,7 @@ class ParentFleet extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return [
+        return $this->withCustomFields([
             'id'                    => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'uuid'                  => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id'             => $this->when(Http::isInternalRequest(), $this->public_id),
@@ -36,7 +36,7 @@ class ParentFleet extends FleetbaseResource
             'type'                  => 'fleet',
             'updated_at'            => $this->updated_at,
             'created_at'            => $this->created_at,
-        ];
+        ]);
     }
 
     /**

package/server/src/Http/Resources/v1/Place.php

@@ -20,7 +20,7 @@ class Place extends FleetbaseResource
     {
         $this->loadMissing('owner');
 
-        return [
+        return $this->withCustomFields([
             'id'                    => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'uuid'                  => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id'             => $this->when(Http::isInternalRequest(), $this->public_id),
@@ -45,14 +45,14 @@ class Place extends FleetbaseResource
             'country'               => $this->country ?? null,
             'country_name'          => $this->when(Http::isInternalRequest(), $this->country_name),
             'phone'                 => $this->phone ?? null,
-            'owner'                 => Resolve::resourceForMorph($this->owner_type, $this->owner_uuid),
+            'owner'                 => $this->whenLoaded('owner', fn () => Resolve::resourceForMorph($this->owner_type, $this->owner_uuid)?->without(['place', 'places'])),
             'tracking_number'       => $this->whenLoaded('trackingNumber', fn () => $this->trackingNumber),
             'type'                  => $this->type ?? 'place',
             'meta'                  => data_get($this, 'meta', Utils::createObject()),
             'eta'                   => $this->when($this->eta, $this->eta),
             'updated_at'            => $this->updated_at,
             'created_at'            => $this->created_at,
-        ];
+        ]);
     }
 
     /**

package/server/src/Http/Resources/v1/ServiceArea.php

@@ -16,7 +16,7 @@ class ServiceArea extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return [
+        return $this->withCustomFields([
             'id'         => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'uuid'       => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id'  => $this->when(Http::isInternalRequest(), $this->public_id),
@@ -28,7 +28,7 @@ class ServiceArea extends FleetbaseResource
             'status'     => $this->status,
             'updated_at' => $this->updated_at,
             'created_at' => $this->created_at,
-        ];
+        ]);
     }
 
     /**

package/server/src/Http/Resources/v1/ServiceRate.php

@@ -17,41 +17,52 @@ class ServiceRate extends FleetbaseResource
      */
     public function toArray($request)
     {
+        $orderConfigPublicId = data_get($this->orderConfig, 'public_id');
+
         return [
-            'id'                                         => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid'                                       => $this->when(Http::isInternalRequest(), $this->uuid),
-            'service_area_uuid'                          => $this->when(Http::isInternalRequest(), $this->service_area_uuid),
-            'zone_uuid'                                  => $this->when(Http::isInternalRequest(), $this->zone_uuid),
-            'order_config_uuid'                          => $this->when(Http::isInternalRequest(), $this->order_config_uuid),
-            'public_id'                                  => $this->when(Http::isInternalRequest(), $this->public_id),
-            'service_area'                               => $this->whenLoaded('serviceArea', fn () => new ServiceArea($this->serviceArea)),
-            'service_area_name'                          => $this->when(Http::isInternalRequest(), data_get($this, 'serviceArea.name')),
-            'zone'                                       => $this->whenLoaded('zone', fn () => new Zone($this->zone)),
-            'zone_name'                                  => $this->when(Http::isInternalRequest(), data_get($this, 'zone.name')),
-            'service_name'                               => $this->service_name,
-            'service_type'                               => $this->service_type,
-            'base_fee'                                   => $this->base_fee,
-            'rate_calculation_method'                    => $this->rate_calculation_method,
-            'per_meter_flat_rate_fee'                    => $this->per_meter_flat_rate_fee,
-            'per_meter_unit'                             => $this->per_meter_unit,
-            'meter_fees'                                 => ServiceRateFee::collection($this->rateFees ?? []),
-            'parcel_fees'                                => ServiceRateParcelFee::collection($this->rateFees ?? []),
-            'algorithm'                                  => $this->algorithm,
-            'has_cod_fee'                                => Utils::castBoolean($this->has_cod_fee),
-            'cod_calculation_method'                     => $this->cod_calculation_method,
-            'cod_flat_fee'                               => $this->cod_flat_fee,
-            'cod_percent'                                => $this->cod_percent,
-            'has_peak_hours_fee'                         => Utils::castBoolean($this->has_peak_hours_fee),
-            'peak_hours_calculation_method'              => $this->peak_hours_calculation_method,
-            'peak_hours_flat_fee'                        => $this->peak_hours_flat_fee,
-            'peak_hours_percent'                         => $this->peak_hours_percent,
-            'peak_hours_start'                           => $this->peak_hours_start,
-            'peak_hours_end'                             => $this->peak_hours_end,
-            'currency'                                   => $this->currency,
-            'duration_terms'                             => $this->duration_terms,
-            'estimated_days'                             => $this->estimated_days,
-            'updated_at'                                 => $this->updated_at,
-            'created_at'                                 => $this->created_at,
+            'id'                                            => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                                          => $this->when(Http::isInternalRequest(), $this->uuid),
+            'service_area_uuid'                             => $this->when(Http::isInternalRequest(), $this->service_area_uuid),
+            'zone_uuid'                                     => $this->when(Http::isInternalRequest(), $this->zone_uuid),
+            'order_config_uuid'                             => $this->when(Http::isInternalRequest(), $this->order_config_uuid),
+            'public_id'                                     => $this->when(Http::isInternalRequest(), $this->public_id),
+            'order_config'                                  => $this->when(
+                Http::isInternalRequest(),
+                $this->whenLoaded('orderConfig', function () {
+                    return $this->orderConfig;
+                }),
+                $orderConfigPublicId
+            ),
+            'service_area'                                  => $this->whenLoaded('serviceArea', fn () => new ServiceArea($this->serviceArea)),
+            'service_area_name'                             => $this->when(Http::isInternalRequest(), data_get($this, 'serviceArea.name')),
+            'zone'                                          => $this->whenLoaded('zone', fn () => new Zone($this->zone)),
+            'zone_name'                                     => $this->when(Http::isInternalRequest(), data_get($this, 'zone.name')),
+            'service_name'                                  => $this->service_name,
+            'service_type'                                  => $this->service_type,
+            'base_fee'                                      => $this->base_fee,
+            'rate_calculation_method'                       => $this->rate_calculation_method,
+            'per_meter_flat_rate_fee'                       => $this->per_meter_flat_rate_fee,
+            'per_meter_unit'                                => $this->per_meter_unit,
+            'max_distance_unit'                             => $this->max_distance_unit,
+            'max_distance'                                  => $this->max_distance,
+            'meter_fees'                                    => ServiceRateFee::collection($this->rateFees ?? []),
+            'parcel_fees'                                   => ServiceRateParcelFee::collection($this->rateFees ?? []),
+            'algorithm'                                     => $this->algorithm,
+            'has_cod_fee'                                   => Utils::castBoolean($this->has_cod_fee),
+            'cod_calculation_method'                        => $this->cod_calculation_method,
+            'cod_flat_fee'                                  => $this->cod_flat_fee,
+            'cod_percent'                                   => $this->cod_percent,
+            'has_peak_hours_fee'                            => Utils::castBoolean($this->has_peak_hours_fee),
+            'peak_hours_calculation_method'                 => $this->peak_hours_calculation_method,
+            'peak_hours_flat_fee'                           => $this->peak_hours_flat_fee,
+            'peak_hours_percent'                            => $this->peak_hours_percent,
+            'peak_hours_start'                              => $this->peak_hours_start,
+            'peak_hours_end'                                => $this->peak_hours_end,
+            'currency'                                      => $this->currency,
+            'duration_terms'                                => $this->duration_terms,
+            'estimated_days'                                => $this->estimated_days,
+            'updated_at'                                    => $this->updated_at,
+            'created_at'                                    => $this->created_at,
         ];
     }
 

package/server/src/Http/Resources/v1/SubFleet.php

@@ -16,7 +16,7 @@ class SubFleet extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return [
+        return $this->withCustomFields([
             'id'                    => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'uuid'                  => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id'             => $this->when(Http::isInternalRequest(), $this->public_id),
@@ -36,7 +36,7 @@ class SubFleet extends FleetbaseResource
             'type'                  => 'fleet',
             'updated_at'            => $this->updated_at,
             'created_at'            => $this->created_at,
-        ];
+        ]);
     }
 
     /**

package/server/src/Http/Resources/v1/Vehicle.php

@@ -18,12 +18,12 @@ class Vehicle extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return [
+        return $this->withCustomFields([
             'id'                     => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'uuid'                   => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id'              => $this->when(Http::isInternalRequest(), $this->public_id),
             'photo_uuid'             => $this->when(Http::isInternalRequest(), $this->photo_uuid),
-            'name'                   => $this->display_name,
+            'name'                   => $this->name,
             'display_name'           => $this->when(Http::isInternalRequest(), $this->display_name),
             'vin'                    => $this->vin ?? null,
             'driver'                 => $this->whenLoaded('driver', fn () => new Driver($this->driver)),
@@ -48,7 +48,7 @@ class Vehicle extends FleetbaseResource
             'meta'                   => data_get($this, 'meta', Utils::createObject()),
             'updated_at'             => $this->updated_at,
             'created_at'             => $this->created_at,
-        ];
+        ]);
     }
 
     /**

package/server/src/Http/Resources/v1/Vendor.php

@@ -17,7 +17,9 @@ class Vendor extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return [
+        $this->loadMissing(['place', 'places']);
+
+        return $this->withCustomFields([
             'id'                         => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'uuid'                       => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id'                  => $this->when(Http::isInternalRequest(), $this->public_id),
@@ -33,7 +35,7 @@ class Vendor extends FleetbaseResource
             'logo_url'                   => $this->logo_url,
             'photo_url'                  => Utils::or($this, ['logo_url', 'photo_url']),
             'place'                      => $this->whenLoaded('place', new Place($this->place)),
-            'places'                     => $this->whenLoaded('place', Place::collection($this->places)),
+            'places'                     => $this->whenLoaded('places', Place::collection($this->places)),
             'personnels'                 => $this->whenLoaded('personnels', Contact::collection($this->personnels)),
             'address'                    => $this->when(Http::isInternalRequest(), data_get($this, 'place.address')),
             'address_street'             => $this->when(Http::isInternalRequest(), data_get($this, 'place.street1')),
@@ -45,7 +47,7 @@ class Vendor extends FleetbaseResource
             'updated_at'                 => $this->updated_at,
             'created_at'                 => $this->created_at,
             'website_url'                => $this->website_url,
-        ];
+        ]);
     }
 
     /**

package/server/src/Http/Resources/v1/Zone.php

@@ -16,7 +16,7 @@ class Zone extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return [
+        return $this->withCustomFields([
             'id'                => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'public_id'         => $this->when(Http::isInternalRequest(), $this->public_id),
             'uuid'              => $this->when(Http::isInternalRequest(), $this->uuid),
@@ -30,7 +30,7 @@ class Zone extends FleetbaseResource
             'status'            => $this->status,
             'updated_at'        => $this->updated_at,
             'created_at'        => $this->created_at,
-        ];
+        ]);
     }
 
     /**

package/server/src/Models/Asset.php

@@ -95,6 +95,7 @@ class Asset extends Model
         'current_place_uuid',
         'photo_uuid',
         'name',
+        'description',
         'code',
         'type',
         'location',
@@ -102,6 +103,7 @@ class Asset extends Model
         'heading',
         'altitude',
         'status',
+        'usage_type',
         'vin',
         'plate_number',
         'make',
@@ -109,12 +111,19 @@ class Asset extends Model
         'year',
         'color',
         'serial_number',
+        'measurement_system',
         'odometer',
+        'odometer_unit',
+        'transmission',
+        'fuel_volume_unit',
+        'fuel_Type',
+        'ownership_type',
         'engine_hours',
         'gvw',
         'capacity',
         'specs',
         'attributes',
+        'notes',
         'slug',
     ];
 

package/server/src/Models/Contact.php

@@ -71,7 +71,23 @@ class Contact extends Model
      *
      * @var array
      */
-    protected $fillable = ['_key', 'public_id', 'internal_id', 'company_uuid', 'user_uuid', 'place_uuid', 'photo_uuid', 'name', 'title', 'email', 'phone', 'type', 'meta', 'slug'];
+    protected $fillable = [
+        '_key',
+        'public_id',
+        'internal_id',
+        'company_uuid',
+        'user_uuid',
+        'place_uuid',
+        'photo_uuid',
+        'name',
+        'title',
+        'email',
+        'phone',
+        'type',
+        'notes',
+        'meta',
+        'slug',
+    ];
 
     /**
      * The attributes that should be cast to native types.
@@ -173,6 +189,11 @@ class Contact 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();
+    }
+
     /**
      * Specifies the user's FCM tokens.
      */

package/server/src/Models/Driver.php

@@ -238,7 +238,7 @@ class Driver extends Model
             'year',
             'make',
             'model',
-            'model_data',
+            'specs',
             'vin_data',
             'telematics',
             'meta',

package/server/src/Models/IntegratedVendor.php

@@ -59,6 +59,7 @@ class IntegratedVendor extends Model
         'namespace',
         'webhook_url',
         'provider',
+        'provider_options',
         'sandbox',
         'options',
         'credentials',
@@ -84,8 +85,9 @@ class IntegratedVendor extends Model
      * @var array
      */
     protected $casts = [
-        'credentials' => Json::class,
-        'options'     => Json::class,
+        'provider_options' => Json::class,
+        'credentials'      => Json::class,
+        'options'          => Json::class,
     ];
 
     /**

package/server/src/Models/Issue.php

@@ -63,6 +63,8 @@ class Issue extends Model
         'category',
         'type',
         'report',
+        'title',
+        'tags',
         'priority',
         'meta',
         'resolved_at',
@@ -84,6 +86,7 @@ class Issue extends Model
     protected $casts = [
         'location'        => Point::class,
         'meta'            => Json::class,
+        'tags'            => Json::class,
         'resolved_at'     => 'date',
     ];
 
@@ -156,6 +159,24 @@ class Issue extends Model
         return $this->belongsTo(Driver::class);
     }
 
+    /**
+     * Set the title attribute for the Issue model.
+     *
+     * If no value is provided, a default title is generated in the form:
+     * "Issue reported on {created_at date, e.g., 15 Sep 25, 14:30}".
+     *
+     * @param string|null $value
+     *
+     * @return void
+     */
+    public function setTitleAttribute($value)
+    {
+        $created      = $this->created_at ?? now();
+        $defaultTitle = 'Issue reported on ' . $created->format('d M y, H:i');
+
+        $this->attributes['title'] = $value !== null ? trim($value) : $defaultTitle;
+    }
+
     /**
      * Set a default status if none is provided, and always dasherize status input.
      *