@fleetbase/fleetops-engine 0.6.17 → 0.6.18

package/server/migrations/2025_08_28_054926_create_sensors_table.php

@@ -0,0 +1,62 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('sensors', function (Blueprint $table) {
+            $table->increments('id');
+            $table->uuid('uuid')->index();
+            $table->string('_key')->nullable()->index();
+            $table->foreignUuid('company_uuid')->constrained('companies', 'uuid')->cascadeOnDelete();
+
+            $table->string('name')->nullable()->index();
+            $table->string('slug')->nullable()->index();
+            $table->string('sensor_type')->index();             // temp, humidity, door, fuel, pressure, vibration, cargo-weight, etc.
+            $table->string('unit')->nullable();                 // C, F, %, psi, kg, etc.
+            $table->float('min_threshold')->nullable();
+            $table->float('max_threshold')->nullable();
+            $table->boolean('threshold_inclusive')->default(true);
+            $table->string('type')->nullable()->index();
+
+            $table->timestamp('last_reading_at')->nullable()->index();
+            $table->string('last_value')->nullable();           // use string to store raw value
+            $table->json('calibration')->nullable();            // { offset, slope, notes }
+            $table->unsignedInteger('report_frequency_sec')->nullable();
+
+            // A sensor can belong to a device, asset, or any other entity
+            $table->string('sensorable_type')->nullable();
+            $table->uuid('sensorable_uuid')->nullable();
+            $table->index(['sensorable_type', 'sensorable_uuid']);
+
+            // Optionally coupled to a device (if it streams via a device)
+            $table->foreignUuid('device_uuid')->nullable()->constrained('devices', 'uuid')->nullOnDelete();
+            $table->foreignUuid('warranty_uuid')->nullable()->constrained('warranties', 'uuid')->nullOnDelete();
+
+            $table->json('meta')->nullable();
+            $table->foreignUuid('created_by_uuid')->nullable()->constrained('users', 'uuid')->nullOnDelete();
+            $table->foreignUuid('updated_by_uuid')->nullable()->constrained('users', 'uuid')->nullOnDelete();
+
+            $table->softDeletes();
+            $table->timestamps();
+
+            $table->index(['company_uuid', 'sensor_type']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::disableForeignKeyConstraints();
+        Schema::dropIfExists('sensors');
+        Schema::enableForeignKeyConstraints();
+    }
+};

package/server/migrations/2025_08_28_054927_create_parts_table.php

@@ -0,0 +1,73 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('parts', function (Blueprint $table) {
+            $table->increments('id');
+            $table->uuid('uuid')->index();
+            $table->string('_key')->nullable()->index();
+            $table->foreignUuid('company_uuid')->constrained('companies', 'uuid')->cascadeOnDelete();
+            $table->foreignUuid('category_uuid')->nullable()->constrained('categories', 'uuid')->nullOnDelete();
+
+            $table->string('sku')->nullable()->index();
+            $table->string('name')->index();
+            $table->string('manufacturer')->nullable()->index();
+            $table->string('model')->nullable();
+            $table->string('serial_number')->nullable()->index();
+            $table->string('barcode')->nullable()->index();
+            $table->string('type')->nullable()->index();
+            $table->string('slug')->nullable()->index();
+
+            $table->text('description')->nullable();
+            $table->foreignUuid('vendor_uuid')->nullable()->constrained('vendors', 'uuid')->nullOnDelete();
+
+            $table->integer('quantity_on_hand')->default(0);
+            $table->decimal('unit_cost', 12, 2)->nullable();
+            $table->decimal('msrp', 12, 2)->nullable();
+            $table->integer('reorder_point')->default(5);
+            $table->integer('reorder_quantity')->default(10);
+            $table->integer('max_stock_level')->nullable();
+            $table->integer('reserved_quantity')->default(0);
+
+            $table->integer('allocated_quantity')->default(0); // -- Allocated but not used
+            $table->string('inventory_method')->default('fifo'); // -- fifo, lifo, weighted_average
+
+            // Optional default target (e.g., a part kept for a specific asset or vehicle)
+            $table->string('asset_type')->nullable();
+            $table->uuid('asset_uuid')->nullable();
+            $table->index(['asset_type', 'asset_uuid']);
+
+            $table->foreignUuid('warranty_uuid')->nullable()->constrained('warranties', 'uuid')->nullOnDelete();
+
+            $table->json('specs')->nullable();
+            $table->json('meta')->nullable();
+
+            $table->foreignUuid('created_by_uuid')->nullable()->constrained('users', 'uuid')->nullOnDelete();
+            $table->foreignUuid('updated_by_uuid')->nullable()->constrained('users', 'uuid')->nullOnDelete();
+
+            $table->timestamp('last_ordered_at')->nullable();
+            $table->softDeletes();
+            $table->timestamps();
+
+            $table->unique(['company_uuid', 'sku']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::disableForeignKeyConstraints();
+        Schema::dropIfExists('parts');
+        Schema::enableForeignKeyConstraints();
+    }
+};

package/server/migrations/2025_08_28_054929_create_equipments_table.php

@@ -0,0 +1,58 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('equipments', function (Blueprint $table) {
+            $table->increments('id');
+            $table->uuid('uuid')->index();
+            $table->string('_key')->nullable()->index();
+            $table->foreignUuid('company_uuid')->constrained('companies', 'uuid')->cascadeOnDelete();
+            $table->foreignUuid('category_uuid')->nullable()->constrained('categories', 'uuid')->nullOnDelete();
+
+            $table->string('name')->index();
+            $table->string('code')->nullable()->index();
+            $table->string('type')->nullable()->index();     // ppe, tool, accessory, fridge unit, etc.
+            $table->string('status')->default('active')->index();
+            $table->string('slug')->nullable()->index();
+            $table->string('serial_number')->nullable()->index();
+            $table->string('manufacturer')->nullable();
+            $table->string('model')->nullable();
+
+            // Can be assigned to an asset, device, driver, or facility
+            $table->string('equipable_type')->nullable();
+            $table->uuid('equipable_uuid')->nullable();
+            $table->index(['equipable_type', 'equipable_uuid']);
+
+            $table->date('purchased_at')->nullable();
+            $table->integer('purchase_price')->nullable();
+            $table->string('currency')->nullable();
+
+            $table->foreignUuid('warranty_uuid')->nullable()->constrained('warranties', 'uuid')->nullOnDelete();
+
+            $table->json('meta')->nullable();
+            $table->foreignUuid('created_by_uuid')->nullable()->constrained('users', 'uuid')->nullOnDelete();
+            $table->foreignUuid('updated_by_uuid')->nullable()->constrained('users', 'uuid')->nullOnDelete();
+
+            $table->softDeletes();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::disableForeignKeyConstraints();
+        Schema::dropIfExists('equipments');
+        Schema::enableForeignKeyConstraints();
+    }
+};

package/server/migrations/2025_08_28_054930_create_work_orders_table.php

@@ -0,0 +1,85 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('work_orders', function (Blueprint $table) {
+            $table->increments('id');
+            $table->uuid('uuid')->index();
+            $table->string('_key')->nullable()->index();
+            $table->foreignUuid('company_uuid')->constrained('companies', 'uuid')->cascadeOnDelete();
+            $table->foreignUuid('category_uuid')->nullable()->constrained('categories', 'uuid')->nullOnDelete();
+
+            $table->string('code')->nullable()->index(); // external WO number
+            $table->string('subject')->index();
+            $table->string('status')->default('open')->index();     // open, in_progress, blocked, done, canceled
+            $table->string('priority')->nullable()->index();        // low, normal, high, critical
+
+            // What the WO is for asset, equipment, device, place, etc.
+            $table->string('target_type')->nullable();
+            $table->uuid('target_uuid')->nullable();
+            $table->index(['target_type', 'target_uuid']);
+
+            // Who it's assigned to (contact/technician/team/user/vendor)
+            $table->string('assignee_type')->nullable();
+            $table->uuid('assignee_uuid')->nullable();
+            $table->index(['assignee_type', 'assignee_uuid']);
+
+            $table->timestamp('opened_at')->nullable()->index();
+            $table->timestamp('due_at')->nullable()->index();
+            $table->timestamp('closed_at')->nullable()->index();
+
+            // -- Resource Planning
+            $table->json('required_skills')->nullable(); // -- Skills needed for work
+            $table->json('required_certifications')->nullable(); // -- Certs needed
+            $table->integer('estimated_duration_hours')->nullable();
+            $table->integer('actual_duration_hours')->nullable();
+            $table->json('resource_requirements')->nullable(); // -- Tools, parts, etc.
+
+            // -- Scheduling & Dependencies
+            $table->timestamp('earliest_start_date')->nullable();
+            $table->timestamp('latest_completion_date')->nullable();
+            $table->string('scheduling_priority')->default('normal'); // -- low, normal, high, urgent
+            $table->boolean('can_be_split')->default(false); // -- Can work be divided
+
+            // -- Cost Management
+            $table->integer('estimated_cost')->nullable();
+            $table->integer('approved_budget')->nullable();
+            $table->integer('actual_cost')->nullable();
+            $table->string('currency')->nullable();
+            $table->json('cost_breakdown')->nullable(); // -- Labor, parts, overhead
+            $table->string('cost_center')->nullable()->index();
+            $table->string('budget_code')->nullable()->index();
+
+            $table->text('instructions')->nullable();
+            $table->text('completion_notes')->nullable();
+            $table->json('checklist')->nullable();  // [{title, required, done_at}, ...]
+            $table->json('meta')->nullable();
+
+            $table->foreignUuid('created_by_uuid')->nullable()->constrained('users', 'uuid')->nullOnDelete();
+            $table->foreignUuid('updated_by_uuid')->nullable()->constrained('users', 'uuid')->nullOnDelete();
+
+            $table->softDeletes();
+            $table->timestamps();
+
+            $table->index(['company_uuid', 'status', 'priority']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::disableForeignKeyConstraints();
+        Schema::dropIfExists('work_orders');
+        Schema::enableForeignKeyConstraints();
+    }
+};

package/server/migrations/2025_08_28_054931_create_maintenances_table.php

@@ -0,0 +1,79 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('maintenances', function (Blueprint $table) {
+            $table->increments('id');
+            $table->uuid('uuid')->index();
+            $table->string('_key')->nullable()->index();
+            $table->foreignUuid('company_uuid')->constrained('companies', 'uuid')->cascadeOnDelete();
+            $table->foreignUuid('category_uuid')->nullable()->constrained('categories', 'uuid')->nullOnDelete();
+
+            // Target of maintenance (usually an asset; could be equipment)
+            $table->string('maintainable_type')->nullable();
+            $table->uuid('maintainable_uuid')->nullable();
+            $table->index(['maintainable_type', 'maintainable_uuid']);
+
+            $table->foreignUuid('work_order_uuid')->nullable()->constrained('work_orders', 'uuid')->nullOnDelete();
+
+            $table->string('type')->nullable()->index();          // scheduled, unscheduled, inspection, corrective
+            $table->string('status')->default('open')->index();   // open, in_progress, done, canceled
+            $table->string('priority')->nullable()->index();      // low, normal, high, critical
+
+            $table->timestamp('scheduled_at')->nullable()->index();
+            $table->timestamp('started_at')->nullable()->index();
+            $table->timestamp('completed_at')->nullable()->index();
+
+            $table->unsignedBigInteger('odometer')->nullable();
+            $table->unsignedBigInteger('engine_hours')->nullable();
+
+            // Downtime
+            $table->integer('estimated_downtime_hours')->nullable();
+            $table->timestamp('downtime_start')->nullable();
+            $table->timestamp('downtime_end')->nullable();
+
+            // Vendor or internal performer
+            $table->string('performed_by_type')->nullable();
+            $table->uuid('performed_by_uuid')->nullable();
+            $table->index(['performed_by_type', 'performed_by_uuid']);
+
+            $table->text('summary')->nullable();
+            $table->text('notes')->nullable();
+            $table->json('line_items')->nullable(); // [{part_uuid, qty, unit_cost}, ...]
+            $table->integer('labor_cost')->nullable();
+            $table->integer('parts_cost')->nullable();
+            $table->integer('tax')->nullable();
+            $table->integer('total_cost')->nullable();
+            $table->string('currency')->nullable();
+
+            $table->json('attachments')->nullable();
+            $table->json('meta')->nullable();
+
+            $table->foreignUuid('created_by_uuid')->nullable()->constrained('users', 'uuid')->nullOnDelete();
+            $table->foreignUuid('updated_by_uuid')->nullable()->constrained('users', 'uuid')->nullOnDelete();
+
+            $table->softDeletes();
+            $table->timestamps();
+
+            $table->index(['company_uuid', 'status', 'type']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::disableForeignKeyConstraints();
+        Schema::dropIfExists('maintenances');
+        Schema::enableForeignKeyConstraints();
+    }
+};

package/server/migrations/2025_08_28_082002_update_vehicles_table_telematics.php

@@ -0,0 +1,60 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('vehicles', function (Blueprint $table) {
+            $table->foreignUuid('telematic_uuid')->after('company_uuid')->nullable()->constrained('telematics', 'uuid')->nullOnDelete();
+            $table->foreignUuid('warranty_uuid')->after('telematic_uuid')->nullable()->constrained('warranties', 'uuid')->nullOnDelete();
+            $table->foreignUuid('category_uuid')->after('telematic_uuid')->nullable()->constrained('categories', 'uuid')->nullOnDelete();
+
+            // Identification
+            $table->string('serial_number')->nullable()->after('plate_number');
+            $table->string('call_sign')->nullable()->after('plate_number');
+
+            // Financial Tracking
+            $table->integer('acquisition_cost')->nullable()->after('vin_data');
+            $table->integer('current_value')->nullable()->after('vin_data');
+            $table->integer('depreciation_rate')->nullable()->after('vin_data'); // -- Annual percentage
+            $table->integer('insurance_value')->nullable()->after('vin_data');
+            $table->string('currency')->nullable()->after('vin_data');
+            $table->string('financing_status')->nullable()->index()->after('vin_data'); // -- owned, leased, financed
+            $table->timestamp('lease_expires_at')->nullable()->index()->after('slug');
+            $table->timestamp('purchased_at')->nullable()->index()->after('slug');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::disableForeignKeyConstraints();
+        Schema::table('vehicles', function (Blueprint $table) {
+            $table->dropForeign(['telematic_uuid']);
+            $table->dropForeign(['warranty_uuid']);
+            $table->dropForeign(['category_uuid']);
+            $table->dropColumn('telematic_uuid');
+            $table->dropColumn('warranty_uuid');
+            $table->dropColumn('category_uuid');
+            $table->dropColumn('serial_number');
+            $table->dropColumn('call_sign');
+            $table->dropColumn('acquisition_cost');
+            $table->dropColumn('current_value');
+            $table->dropColumn('depreciation_rate');
+            $table->dropColumn('insurance_value');
+            $table->dropColumn('currency');
+            $table->dropColumn('financing_status');
+            $table->dropColumn('lease_expires_at');
+            $table->dropColumn('purchased_at');
+        });
+        Schema::enableForeignKeyConstraints();
+    }
+};

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

@@ -36,6 +36,7 @@ use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Illuminate\Validation\ValidationException;
@@ -910,7 +911,11 @@ class OrderController extends Controller
         $order->save();
 
         // trigger start event
-        event(new OrderStarted($order));
+        try {
+            event(new OrderStarted($order));
+        } catch (\Exception $e) {
+            Log::debug('Unable to complete order started event', ['error' => $e->getMessage(), 'order' => $order]);
+        }
 
         // set order as drivers current order
         $driver->current_job_uuid = $order->uuid;

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

@@ -15,68 +15,119 @@ 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([
+            // 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),
+            '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: 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,
+                $this->whenLoaded('orderConfig', function () {
+                    return $this->orderConfig;
+                }),
+                $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);
+            }),
+            '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,
+            '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 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,
+            'scheduled_at'         => $this->scheduled_at,
+            'updated_at'           => $this->updated_at,
+            'created_at'           => $this->created_at,
+        ]);
     }
 
     /**