@fleetbase/fleetops-engine 0.6.17 → 0.6.19

package/server/src/Http/Controllers/Internal/v1/WarrantyController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+
+class WarrantyController extends FleetOpsController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'warranty';
+}

package/server/src/Http/Controllers/Internal/v1/WorkOrderController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+
+class WorkOrderController extends FleetOpsController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'work-order';
+}

package/server/src/Http/Controllers/Internal/v1/ZoneController.php

@@ -3,6 +3,8 @@
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+use Fleetbase\FleetOps\Models\Zone;
+use Illuminate\Http\Request;
 
 class ZoneController extends FleetOpsController
 {
@@ -12,4 +14,15 @@ class ZoneController extends FleetOpsController
      * @var string
      */
     public $resource = 'zone';
+
+    /**
+     * Handle post save transactions.
+     */
+    public function afterSave(Request $request, Zone $zone)
+    {
+        $customFieldValues = $request->array('zone.custom_field_values');
+        if ($customFieldValues) {
+            $zone->syncCustomFieldValues($customFieldValues);
+        }
+    }
 }

package/server/src/Http/Filter/DriverFilter.php

@@ -106,9 +106,12 @@ class DriverFilter extends Filter
         }
     }
 
-    public function status(?string $status)
+    public function status(string|array $status)
     {
-        $this->builder->searchWhere('status', $status);
+        $status = Utils::arrayFrom($status);
+        if ($status) {
+            $this->builder->whereIn('status', $status);
+        }
     }
 
     public function vendor(string $vendor)

package/server/src/Http/Filter/FleetFilter.php

@@ -93,9 +93,12 @@ class FleetFilter extends Filter
         $this->builder->searchWhere('name', $name);
     }
 
-    public function status(?string $status)
+    public function status(string|array $status)
     {
-        $this->builder->searchWhere('status', $status);
+        $status = Utils::arrayFrom($status);
+        if ($status) {
+            $this->builder->whereIn('status', $status);
+        }
     }
 
     public function createdAt($createdAt)

package/server/src/Http/Filter/IssueFilter.php

@@ -41,16 +41,11 @@ class IssueFilter extends Filter
         }
     }
 
-    public function status($status)
+    public function status(string|array $status)
     {
-        if (Str::contains($status, ',')) {
-            $status = explode(',', $status);
-        }
-
-        if (is_array($status)) {
+        $status = Utils::arrayFrom($status);
+        if ($status) {
             $this->builder->whereIn('status', $status);
-        } else {
-            $this->builder->where('status', $status);
         }
     }
 

package/server/src/Http/Filter/PlaceFilter.php

@@ -30,6 +30,11 @@ class PlaceFilter extends Filter
         $this->builder->searchWhere('public_id', $publicId);
     }
 
+    public function id(?string $id)
+    {
+        $this->builder->searchWhere('public_id', $id)->orWhere('uuid', $id);
+    }
+
     public function postalCode(?string $postalCode)
     {
         $this->builder->searchWhere('postal_code', $postalCode);

package/server/src/Http/Filter/VendorFilter.php

@@ -57,9 +57,12 @@ class VendorFilter extends Filter
         $this->builder->searchWhere('country', $country);
     }
 
-    public function status(?string $status)
+    public function status(string|array $status)
     {
-        $this->builder->searchWhere('status', $status);
+        $status = Utils::arrayFrom($status);
+        if ($status) {
+            $this->builder->whereIn('status', $status);
+        }
     }
 
     public function address(?string $address)

package/server/src/Http/Requests/CreateServiceRateRequest.php

@@ -31,12 +31,14 @@ class CreateServiceRateRequest extends FleetbaseRequest
             'service_type'                  => [Rule::requiredIf($this->isMethod('POST')), 'string'],
             'service_area'                  => [Rule::exists('service_areas', 'public_id')->whereNull('deleted_at')],
             'zone'                          => [Rule::exists('zones', 'public_id')->whereNull('deleted_at')],
-            'rate_calculation_method'       => [Rule::requiredIf($this->isMethod('POST')), 'string', 'in:fixed_meter,per_meter,per_drop,algo'],
+            'rate_calculation_method'       => [Rule::requiredIf($this->isMethod('POST')), 'string', 'in:fixed_meter,fixed_rate,per_meter,per_drop,algo'],
             'currency'                      => ['required', 'size:3'],
             'base_fee'                      => ['numeric'],
             'per_meter_unit'                => ['required_if:rate_calculation_method,per_meter', 'string', 'in:km,m'],
             'per_meter_flat_rate_fee'       => ['required_if:rate_calculation_method,per_meter', 'numeric'],
-            'meter_fees'                    => ['required_if:rate_calculation_method,fixed_meter', 'array'],
+            'meter_fees'                    => [Rule::requiredIf(function ($input) {
+                return in_array($input->rate_calculation_method, ['fixed_meter', 'fixed_rate']);
+            }), 'array'],
             'meter_fees.*.distance'         => ['numeric'],
             'meter_fees.*.fee'              => ['numeric'],
             'algorithm'                     => ['required_if:rate_calculation_method,algo', new ComputableAlgo(), 'string'],

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

@@ -19,7 +19,9 @@ class Contact extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return [
+        $this->loadMissing(['place', 'places']);
+
+        return $this->withCustomFields([
             'id'                            => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'customer_id'                   => $this->when($this->type === 'customer' && Http::isPublicRequest(), Str::replace('contact', 'customer', $this->public_id)),
             'uuid'                          => $this->when(Http::isInternalRequest(), $this->uuid),
@@ -34,8 +36,8 @@ class Contact extends FleetbaseResource
             'email'                         => $this->email ?? null,
             'phone'                         => $this->phone ?? null,
             'photo_url'                     => $this->photo_url ?? null,
-            'place'                         => $this->whenLoaded('place', fn () => new Place($this->place)),
-            'places'                        => $this->whenLoaded('places', fn () => Place::collection($this->places)),
+            'place'                         => $this->whenLoaded('place', fn () => (new Place($this->place))->without('owner')),
+            'places'                        => $this->whenLoaded('places', fn () => Place::collection($this->places)->without('owner')),
             'user'                          => $this->when(Http::isInternalRequest(), fn () => new User($this->user), fn () => $this->user ? $this->user->public_id : null),
             'address'                       => $this->when(Http::isInternalRequest(), data_get($this, 'place.address')),
             'address_street'                => $this->when(Http::isInternalRequest(), data_get($this, 'place.street1')),
@@ -46,7 +48,7 @@ class Contact extends FleetbaseResource
             'slug'                          => $this->slug ?? null,
             'updated_at'                    => $this->updated_at,
             'created_at'                    => $this->created_at,
-        ];
+        ]);
     }
 
     /**

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

@@ -17,7 +17,7 @@ class CurrentJob 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),
@@ -29,6 +29,6 @@ class CurrentJob 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/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

@@ -15,68 +15,90 @@ class Order extends FleetbaseResource
      * Transform the resource into an array.
      *
      * @param \Illuminate\Http\Request $request
-     *
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
-        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),
-            'internal_id'              => $this->internal_id,
-            'company_uuid'             => $this->when(Http::isInternalRequest(), $this->company_uuid),
-            'transaction_uuid'         => $this->when(Http::isInternalRequest(), $this->transaction_uuid),
-            'customer_uuid'            => $this->when(Http::isInternalRequest(), $this->customer_uuid),
-            'customer_type'            => $this->when(Http::isInternalRequest(), $this->customer_type),
-            'facilitator_uuid'         => $this->when(Http::isInternalRequest(), $this->facilitator_uuid),
-            'facilitator_type'         => $this->when(Http::isInternalRequest(), $this->facilitator_type),
-            'payload_uuid'             => $this->when(Http::isInternalRequest(), $this->payload_uuid),
-            'route_uuid'               => $this->when(Http::isInternalRequest(), $this->route_uuid),
-            'purchase_rate_uuid'       => $this->when(Http::isInternalRequest(), $this->purchase_rate_uuid),
-            'tracking_number_uuid'     => $this->when(Http::isInternalRequest(), $this->tracking_number_uuid),
-            'driver_assigned_uuid'     => $this->when(Http::isInternalRequest(), $this->driver_assigned_uuid),
-            'vehicle_assigned_uuid'    => $this->when(Http::isInternalRequest(), $this->vehicle_assigned_uuid),
-            'service_quote_uuid'       => $this->when(Http::isInternalRequest(), $this->service_quote_uuid),
-            'has_driver_assigned'      => $this->when(Http::isInternalRequest(), $this->has_driver_assigned),
-            'is_scheduled'             => $this->when(Http::isInternalRequest(), $this->is_scheduled),
-            'order_config_uuid'        => $this->when(Http::isInternalRequest(), $this->order_config_uuid),
-            'order_config'             => $this->when(Http::isInternalRequest(), $this->whenLoaded('orderConfig', fn () => $this->orderConfig), data_get($this->orderConfig, 'public_id')),
-            'custom_field_values'      => $this->when(Http::isInternalRequest(), $this->customFieldValues),
-            '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)),
-            'driver_assigned'          => new Driver($this->driverAssigned()->without(['jobs', 'currentJob'])->first()),
-            'vehicle_assigned'         => new Vehicle($this->vehicleAssigned()->without(['fleets', 'vendor'])->first()),
-            'tracking_number'          => new TrackingNumber($this->trackingNumber),
-            'tracking_statuses'        => $this->whenLoaded('trackingStatuses', fn () => TrackingStatus::collection($this->trackingStatuses)),
-            'tracking'                 => $this->when(Http::isInternalRequest(), $this->trackingNumber ? $this->trackingNumber->tracking_number : null),
-            'barcode'                  => $this->when(Http::isInternalRequest(), $this->trackingNumber ? $this->trackingNumber->barcode : null),
-            'qr_code'                  => $this->when(Http::isInternalRequest(), $this->trackingNumber ? $this->trackingNumber->qr_code : null),
-            'comments'                 => $this->when(Http::isInternalRequest(), Comment::collection($this->comments)),
-            'files'                    => $this->when(Http::isInternalRequest(), $this->files, File::collection($this->files)),
-            'purchase_rate'            => new PurchaseRate($this->purchaseRate),
-            'notes'                    => $this->notes,
-            ...$this->getCustomFieldValues(),
-            'custom_fields'         => $this->when(Http::isPublicRequest(), fn () => $this->getCustomFieldKeys()),
-            'type'                  => $this->type,
-            'status'                => $this->status,
-            'pod_method'            => $this->pod_method,
-            'pod_required'          => (bool) data_get($this, 'pod_required', false),
-            'dispatched'            => (bool) data_get($this, 'dispatched', false),
-            'adhoc'                 => (bool) data_get($this, 'adhoc', false),
-            'adhoc_distance'        => (int) $this->getAdhocDistance(),
-            'distance'              => (int) $this->distance,
-            'time'                  => (int) $this->time,
-            'tracker_data'          => $this->when($request->has('with_tracker_data') || !empty($this->resource->tracker_data), fn () => $this->resource->tracker_data ?? $this->resource->tracker()->toArray()),
-            'eta'                   => $this->when($request->has('with_eta') || !empty($this->resource->eta), fn () => $this->resource->eta ?? $this->resource->tracker()->eta()),
-            'meta'                  => data_get($this, 'meta', Utils::createObject()),
-            'dispatched_at'         => $this->dispatched_at,
-            'started_at'            => $this->started_at,
-            'scheduled_at'          => $this->scheduled_at,
-            'updated_at'            => $this->updated_at,
-            'created_at'            => $this->created_at,
-        ];
+        $isInternal = Http::isInternalRequest();
+        $isPublic   = Http::isPublicRequest();
+
+        // Precompute expensive bits safely
+        $orderConfigPublicId = data_get($this->orderConfig, 'public_id');
+
+        // Driver / vehicle relations (prevent eager noise)
+        $driverAssignedModel  = $this->driverAssigned()->without(['jobs', 'currentJob'])->first();
+        $vehicleAssignedModel = $this->vehicleAssigned()->without(['fleets', 'vendor'])->first();
+
+        // Tracker helpers (avoid calling ->tracker() twice)
+        $withTrackerData = $request->has('with_tracker_data') || !empty($this->resource->tracker_data);
+        $withEta         = $request->has('with_eta') || !empty($this->resource->eta);
+        $tracker         = ($withTrackerData || $withEta) ? $this->resource->tracker() : null;
+
+        return $this->withCustomFields([
+            '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,
+            'company_uuid'         => $this->when($isInternal, $this->company_uuid),
+            'transaction_uuid'     => $this->when($isInternal, $this->transaction_uuid),
+            'customer_uuid'        => $this->when($isInternal, $this->customer_uuid),
+            'customer_type'        => $this->when($isInternal, $this->customer_type),
+            'facilitator_uuid'     => $this->when($isInternal, $this->facilitator_uuid),
+            'facilitator_type'     => $this->when($isInternal, $this->facilitator_type),
+            'payload_uuid'         => $this->when($isInternal, $this->payload_uuid),
+            'route_uuid'           => $this->when($isInternal, $this->route_uuid),
+            'purchase_rate_uuid'   => $this->when($isInternal, $this->purchase_rate_uuid),
+            'tracking_number_uuid' => $this->when($isInternal, $this->tracking_number_uuid),
+            'driver_assigned_uuid' => $this->when($isInternal, $this->driver_assigned_uuid),
+            'vehicle_assigned_uuid'=> $this->when($isInternal, $this->vehicle_assigned_uuid),
+            '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_uuid'    => $this->when($isInternal, $this->order_config_uuid),
+            'order_config'         => $this->when(
+                $isInternal,
+                $this->whenLoaded('orderConfig', function () {
+                    return $this->orderConfig;
+                }),
+                $orderConfigPublicId
+            ),
+            '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)),
+            'driver_assigned'      => new Driver($driverAssignedModel),
+            'vehicle_assigned'     => new Vehicle($vehicleAssignedModel),
+            'tracking_number'      => new TrackingNumber($this->trackingNumber),
+            'tracking_statuses'    => $this->whenLoaded('trackingStatuses', function () {
+                return TrackingStatus::collection($this->trackingStatuses);
+            }),
+            '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'             => $this->when($isInternal, Comment::collection($this->comments)),
+            'files'                => $this->when($isInternal, $this->files, File::collection($this->files)),
+            'purchase_rate'        => new PurchaseRate($this->purchaseRate),
+            'notes'                => $this->notes,
+            'type'                 => $this->type,
+            'status'               => $this->status,
+            'pod_method'           => $this->pod_method,
+            'pod_required'         => (bool) data_get($this, 'pod_required', false),
+            'dispatched'           => (bool) data_get($this, 'dispatched', false),
+            'adhoc'                => (bool) data_get($this, 'adhoc', false),
+            'adhoc_distance'       => (int) $this->getAdhocDistance(),
+            'distance'             => (int) $this->distance,
+            'time'                 => (int) $this->time,
+            '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,
+            'scheduled_at'         => $this->scheduled_at,
+            'updated_at'           => $this->updated_at,
+            'created_at'           => $this->created_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,
-        ];
+        ]);
     }
 
     /**