@fleetbase/fleetops-engine 0.6.48 → 0.6.50

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

@@ -0,0 +1,74 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+/**
+ * Public, read-only projection of an OrderConfig.
+ *
+ * Exposes the activity `flow` so consumers can render status filter chips,
+ * activity labels, and progress UI without learning the internal config
+ * schema. Internal-only fields (entities JSON, version, namespace columns
+ * that aren't part of the public contract) are filtered out.
+ */
+class OrderConfig extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $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),
+            'company_uuid' => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'key'          => $this->key,
+            'name'         => $this->name,
+            'namespace'    => $this->namespace,
+            'description'  => $this->description,
+            'tags'         => $this->tags,
+            'status'       => $this->status,
+            'version'      => $this->version,
+            'flow'         => $this->projectFlow(),
+            'created_at'   => $this->created_at,
+            'updated_at'   => $this->updated_at,
+        ];
+    }
+
+    /**
+     * Project the flow JSON into an ordered list of activities, keeping only
+     * the public-safe per-activity fields. `code` and `status` (the label)
+     * are the contract; `complete`, `color`, `details`, `pod_method`, and
+     * `require_pod` are useful UI hints that can ride along.
+     */
+    protected function projectFlow(): array
+    {
+        $flow = $this->flow;
+        if (!is_array($flow) || empty($flow)) {
+            return [];
+        }
+
+        $activities = [];
+        foreach ($flow as $activity) {
+            if (!is_array($activity)) {
+                continue;
+            }
+            $activities[] = [
+                'code'        => $activity['code'] ?? ($activity['key'] ?? null),
+                'status'      => $activity['status'] ?? null,
+                'details'     => $activity['details'] ?? null,
+                'color'       => $activity['color'] ?? null,
+                'complete'    => (bool) ($activity['complete'] ?? false),
+                'pod_method'  => $activity['pod_method'] ?? null,
+                'require_pod' => (bool) ($activity['require_pod'] ?? false),
+            ];
+        }
+
+        return $activities;
+    }
+}

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

@@ -22,26 +22,29 @@ class Payload extends FleetbaseResource
         $withRouteETA = $request->has('with_route_eta');
 
         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),
-            'current_waypoint_uuid' => $this->when(Http::isInternalRequest(), $this->current_waypoint_uuid),
-            'pickup_uuid'           => $this->when(Http::isInternalRequest(), $this->pickup_uuid),
-            'dropoff_uuid'          => $this->when(Http::isInternalRequest(), $this->dropoff_uuid),
-            'return_uuid'           => $this->when(Http::isInternalRequest(), $this->return_uuid),
-            'current_waypoint'      => $this->when(Http::isPublicRequest() && $this->currentWaypoint, data_get($this, 'currentWaypoint.public_id')),
-            'pickup'                => $this->getPlace($this->pickup),
-            'dropoff'               => $this->getPlace($this->dropoff),
-            'return'                => new Place($this->return),
-            'waypoints'             => Waypoint::collection($this->getWaypoints($withRouteETA)),
-            'entities'              => Entity::collection($this->entities),
-            'cod_amount'            => $this->cod_amount ?? null,
-            'cod_currency'          => $this->cod_currency ?? null,
-            'cod_payment_method'    => $this->cod_payment_method ?? null,
-            'payment_method'        => $this->payment_method ?? null,
-            'meta'                  => data_get($this, 'meta', Utils::createObject()),
-            '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),
+            'public_id'                    => $this->when(Http::isInternalRequest(), $this->public_id),
+            'current_waypoint_uuid'        => $this->when(Http::isInternalRequest(), $this->current_waypoint_uuid),
+            'pickup_uuid'                  => $this->when(Http::isInternalRequest(), $this->pickup_uuid),
+            'pickup_tracking_number_uuid'  => $this->when(Http::isInternalRequest(), $this->pickup_tracking_number_uuid),
+            'dropoff_uuid'                 => $this->when(Http::isInternalRequest(), $this->dropoff_uuid),
+            'dropoff_tracking_number_uuid' => $this->when(Http::isInternalRequest(), $this->dropoff_tracking_number_uuid),
+            'return_uuid'                  => $this->when(Http::isInternalRequest(), $this->return_uuid),
+            'return_tracking_number_uuid'  => $this->when(Http::isInternalRequest(), $this->return_tracking_number_uuid),
+            'current_waypoint'             => $this->when(Http::isPublicRequest() && $this->currentWaypoint, data_get($this, 'currentWaypoint.public_id')),
+            'pickup'                       => $this->getPlace($this->pickup),
+            'dropoff'                      => $this->getPlace($this->dropoff),
+            'return'                       => new Place($this->return),
+            'waypoints'                    => Waypoint::collection($this->getWaypoints($withRouteETA)),
+            'entities'                     => Entity::collection($this->entities),
+            'cod_amount'                   => $this->cod_amount ?? null,
+            'cod_currency'                 => $this->cod_currency ?? null,
+            'cod_payment_method'           => $this->cod_payment_method ?? null,
+            'payment_method'               => $this->payment_method ?? null,
+            'meta'                         => data_get($this, 'meta', Utils::createObject()),
+            'updated_at'                   => $this->updated_at,
+            'created_at'                   => $this->created_at,
         ];
     }
 

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

@@ -17,17 +17,24 @@ class ServiceArea extends FleetbaseResource
     public function toArray($request)
     {
         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),
-            'name'       => $this->name,
-            'type'       => $this->type,
-            'center'     => $this->location,
-            'border'     => $this->border,
-            'zones'      => $this->whenLoaded('zones', fn () => Zone::collection($this->zones)),
-            'status'     => $this->status,
-            '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),
+            'public_id'               => $this->when(Http::isInternalRequest(), $this->public_id),
+            'name'                    => $this->name,
+            'type'                    => $this->type,
+            'center'                  => $this->location,
+            'border'                  => $this->border,
+            'zones'                   => $this->whenLoaded('zones', fn () => Zone::collection($this->zones)),
+            'color'                   => $this->color,
+            'stroke_color'            => $this->stroke_color,
+            'trigger_on_entry'        => $this->trigger_on_entry,
+            'trigger_on_exit'         => $this->trigger_on_exit,
+            'dwell_threshold_minutes' => $this->dwell_threshold_minutes,
+            'speed_limit_kmh'         => $this->speed_limit_kmh,
+            'country'                 => $this->country,
+            'status'                  => $this->status,
+            'updated_at'              => $this->updated_at,
+            'created_at'              => $this->created_at,
         ]);
     }
 
@@ -39,14 +46,21 @@ class ServiceArea extends FleetbaseResource
     public function toWebhookPayload()
     {
         return [
-            'id'         => $this->public_id,
-            'name'       => $this->name,
-            'type'       => $this->type,
-            'center'     => $this->location,
-            'border'     => $this->border,
-            'status'     => $this->status,
-            'updated_at' => $this->updated_at,
-            'created_at' => $this->created_at,
+            'id'                      => $this->public_id,
+            'name'                    => $this->name,
+            'type'                    => $this->type,
+            'center'                  => $this->location,
+            'border'                  => $this->border,
+            'color'                   => $this->color,
+            'stroke_color'            => $this->stroke_color,
+            'trigger_on_entry'        => $this->trigger_on_entry,
+            'trigger_on_exit'         => $this->trigger_on_exit,
+            'dwell_threshold_minutes' => $this->dwell_threshold_minutes,
+            'speed_limit_kmh'         => $this->speed_limit_kmh,
+            'country'                 => $this->country,
+            'status'                  => $this->status,
+            'updated_at'              => $this->updated_at,
+            'created_at'              => $this->created_at,
         ];
     }
 }

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

@@ -20,6 +20,13 @@ class ServiceRateFee extends FleetbaseResource
             'id'                      => $this->when(Http::isInternalRequest(), $this->id),
             'uuid'                    => $this->when(Http::isInternalRequest(), $this->uuid),
             'service_rate_uuid'       => $this->when(Http::isInternalRequest(), $this->service_rate_uuid),
+            'service_area_uuid'       => $this->when(Http::isInternalRequest(), $this->service_area_uuid),
+            'zone_uuid'               => $this->when(Http::isInternalRequest(), $this->zone_uuid),
+            'service_area'            => $this->whenLoaded('serviceArea', fn () => new ServiceArea($this->serviceArea)),
+            'zone'                    => $this->whenLoaded('zone', fn () => new Zone($this->zone)),
+            'label'                   => $this->label,
+            'priority'                => $this->priority,
+            'is_fallback'             => (bool) $this->is_fallback,
             'fee'                     => $this->fee,
             'currency'                => $this->currency,
             'min'                     => $this->min,

package/server/src/Listeners/HandleOrderDispatched.php

@@ -69,11 +69,11 @@ class HandleOrderDispatched implements ShouldQueue
                 return;
             }
 
-            $drivers = Driver::where(['status' => 'active', 'online' => 1])
+            $drivers = Driver::where(['status' => 'available', 'online' => 1])
                 ->whereHas('company', function ($q) {
                     $q->whereHas('users', function ($q) {
                         $q->whereHas('driver', function ($q) {
-                            $q->where(['status' => 'active', 'online' => 1]);
+                            $q->where(['status' => 'available', 'online' => 1]);
                             $q->whereNull('deleted_at');
                         });
                     });

package/server/src/Models/Contact.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\FleetOps\Exceptions\CustomerUserConflictException;
 use Fleetbase\FleetOps\Exceptions\UserAlreadyExistsException;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\CompanyUser;
@@ -319,7 +320,12 @@ class Contact extends Model
         // Check if user already exist with email or phone number
         $existingUser = null;
         if ($contact->email || $contact->phone) {
-            $existingUser = User::where('company_uuid', $contact->company_uuid)
+            $existingUser = User::where(function ($query) use ($contact) {
+                $query->where('company_uuid', $contact->company_uuid)
+                    ->orWhereHas('companyUsers', function ($query) use ($contact) {
+                        $query->where('company_uuid', $contact->company_uuid);
+                    });
+            })
                 ->where(function ($query) use ($contact) {
                     if ($contact->email) {
                         $query->where('email', $contact->email);
@@ -335,15 +341,15 @@ class Contact extends Model
         }
 
         if ($existingUser) {
+            if ($contact->isCustomer()) {
+                $contact->assertCustomerUserCanBeAssigned($existingUser);
+            }
+
             // Check if existing user belongs to another contact
             $existingUserContact = Contact::where(['user_uuid' => $existingUser->uuid, 'company_uuid' => $contact->company_uuid])->whereHas('user')->first();
             if ($existingUserContact) {
                 throw new UserAlreadyExistsException('User already exists, try to assigning the user to this contact.', $existingUser);
             } else {
-                if ($contact->isCustomer()) {
-                    $contact->normalizeCustomerUser($existingUser);
-                }
-
                 // Assign the user to this contact instead
                 $contact->setAttribute('user_uuid', $existingUser->uuid);
                 if ($update) {
@@ -423,13 +429,7 @@ class Contact extends Model
             return null;
         }
 
-        if ($user->type !== 'customer') {
-            if ($quiet) {
-                $user->forceFill(['type' => 'customer'])->saveQuietly();
-            } else {
-                $user->setType('customer');
-            }
-        }
+        $this->assertCustomerUserCanBeAssigned($user);
 
         $this->loadMissing('company');
         if ($this->company) {
@@ -463,7 +463,7 @@ class Contact extends Model
     public function repairCustomerTypeInvariant(bool $quiet = false): ?User
     {
         if (!$this->isCustomer()) {
-            $this->forceFill(['type' => 'customer'])->saveQuietly();
+            return $this->getUser();
         }
 
         $user = $this->getUser();
@@ -512,8 +512,17 @@ class Contact extends Model
         // Load company
         $this->loadMissing('company');
 
-        if ($this->isCustomer() && $user->type !== 'customer') {
-            $user->setType('customer');
+        if ($this->isCustomer()) {
+            $this->assertCustomerUserCanBeAssigned($user);
+
+            $existingUserContact = static::where(['user_uuid' => $user->uuid, 'company_uuid' => $this->company_uuid])
+                ->whereNot('uuid', $this->uuid)
+                ->whereHas('user')
+                ->first();
+
+            if ($existingUserContact) {
+                throw new UserAlreadyExistsException('User already exists, try to assigning the user to this contact.', $user);
+            }
         }
 
         // Assing to company
@@ -551,6 +560,74 @@ class Contact extends Model
         return $this;
     }
 
+    public function assertCustomerIdentityIsAvailable(): void
+    {
+        if (!$this->isCustomer()) {
+            return;
+        }
+
+        $assignedUser = $this->getAssignedUserWithoutTypeScope();
+        if ($assignedUser) {
+            $this->assertCustomerUserCanBeAssigned($assignedUser);
+        }
+
+        $matchedUser = $this->findExistingUserByIdentity();
+        if ($matchedUser && $matchedUser->uuid !== $this->user_uuid) {
+            $this->assertCustomerUserCanBeAssigned($matchedUser);
+        }
+    }
+
+    public function assertCustomerUserCanBeAssigned(User $user): void
+    {
+        if ($user->type === 'customer') {
+            return;
+        }
+
+        throw new CustomerUserConflictException(static::customerUserConflictMessage($user), $user);
+    }
+
+    public static function customerUserConflictMessage(?User $user = null): string
+    {
+        $field = $user?->email ? 'email' : ($user?->phone ? 'phone number' : 'user account');
+
+        return 'This ' . $field . ' belongs to an existing staff user and cannot be used for a customer account.';
+    }
+
+    private function findExistingUserByIdentity(): ?User
+    {
+        if (!$this->email && !$this->phone) {
+            return null;
+        }
+
+        return User::where(function ($query) {
+            $query->where('company_uuid', $this->company_uuid)
+                ->orWhereHas('companyUsers', function ($query) {
+                    $query->where('company_uuid', $this->company_uuid);
+                });
+        })
+            ->where(function ($query) {
+                if ($this->email) {
+                    $query->where('email', $this->email);
+                }
+
+                if ($this->phone) {
+                    $method = $this->email ? 'orWhere' : 'where';
+                    $query->{$method}('phone', Utils::formatPhoneNumber($this->phone));
+                }
+            })
+            ->whereNull('deleted_at')
+            ->first();
+    }
+
+    private function getAssignedUserWithoutTypeScope(): ?User
+    {
+        if (!Str::isUuid($this->user_uuid)) {
+            return null;
+        }
+
+        return User::where('uuid', $this->user_uuid)->first();
+    }
+
     public function syncWithUser(): bool
     {
         $updates = [];

package/server/src/Models/Customer.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace Fleetbase\FleetOps\Models;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Str;
+
+/**
+ * Fleet-Ops customer.
+ *
+ * A thin specialization of {@see Contact} that is scoped to rows with
+ * `type='customer'` and forces that type on create. This is what the public
+ * customer API surface (`/v1/customers/...`) operates on.
+ *
+ * Mirrors {@see \Fleetbase\Storefront\Models\Customer} but lives directly in
+ * FleetOps so that customer auth + customer-scoped orders work without the
+ * Storefront publishable-key + Store/Network gating.
+ */
+class Customer extends Contact
+{
+    /**
+     * The key to use in the payload responses.
+     */
+    protected string $payloadKey = 'customer';
+
+    /**
+     * Boot the model.
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function ($model) {
+            $model->type = 'customer';
+        });
+
+        static::addGlobalScope('type', function (Builder $builder) {
+            $builder->where('type', 'customer');
+        });
+    }
+
+    /**
+     * Orders owned by this customer.
+     */
+    public function orders(): HasMany
+    {
+        return $this->hasMany(Order::class, 'customer_uuid')
+            ->whereNull('deleted_at')
+            ->withoutGlobalScopes();
+    }
+
+    /**
+     * Find a customer by either a `customer_xxx` or `contact_xxx` public id.
+     */
+    public static function findFromCustomerId(string $publicId): ?self
+    {
+        if (Str::startsWith($publicId, 'customer')) {
+            $publicId = Str::replaceFirst('customer', 'contact', $publicId);
+        }
+
+        return static::where('public_id', $publicId)->first();
+    }
+}

package/server/src/Models/Driver.php

@@ -97,6 +97,7 @@ class Driver extends Model
         'signup_token_used',
         'avatar_url',
         'drivers_license_number',
+        'license_expiry',
         'location',
         'heading',
         'bearing',
@@ -118,6 +119,15 @@ class Driver extends Model
         'time_window_end',
     ];
 
+    /**
+     * Set attributes and defaults.
+     *
+     * @var array
+     */
+    protected $attributes = [
+        'status' => 'available',
+    ];
+
     /**
      * The attributes that are guarded and not mass assignable.
      *
@@ -141,6 +151,7 @@ class Driver extends Model
         'location'        => Point::class,
         'online'          => 'boolean',
         'meta'            => Json::class,
+        'license_expiry'  => 'date',
         // Orchestrator
         'skills'          => Json::class,
         'max_travel_time' => 'integer',
@@ -593,9 +604,9 @@ class Driver extends Model
     /**
      * Set the driver status attribute.
      */
-    public function setStatusAttribute(?string $status = 'active'): void
+    public function setStatusAttribute(?string $status = 'available'): void
     {
-        $this->attributes['status'] = $status;
+        $this->attributes['status'] = $status === null || $status === 'active' ? 'available' : $status;
     }
 
     /**
@@ -852,7 +863,7 @@ class Driver extends Model
             'user_uuid'              => $user->uuid,
             'drivers_license_number' => $driversLicenseNumber,
             'country'                => $country,
-            'status'                 => 'active',
+            'status'                 => 'available',
             'location'               => Utils::parsePointToWkt(new Point(0, 0)),
         ]);
 

package/server/src/Models/Entity.php

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

package/server/src/Models/Order.php

@@ -2,7 +2,6 @@
 
 namespace Fleetbase\FleetOps\Models;
 
-use Barryvdh\DomPDF\Facade\Pdf;
 use Fleetbase\Casts\Json;
 use Fleetbase\Casts\PolymorphicType;
 use Fleetbase\FleetOps\Events\OrderCanceled;
@@ -10,6 +9,7 @@ use Fleetbase\FleetOps\Events\OrderCompleted;
 use Fleetbase\FleetOps\Events\OrderDispatched;
 use Fleetbase\FleetOps\Events\OrderDriverAssigned;
 use Fleetbase\FleetOps\Flow\Activity;
+use Fleetbase\FleetOps\Support\LabelPdf;
 use Fleetbase\FleetOps\Support\OrderTracker;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\FleetOps\Traits\HasTrackingNumber;
@@ -275,7 +275,32 @@ class Order extends Model
      */
     public function pdfLabel()
     {
-        return Pdf::loadHTML($this->label());
+        return LabelPdf::fromHtml($this->label());
+    }
+
+    public function attachFiles($uploads): self
+    {
+        $ids = collect($uploads)
+            ->map(function ($upload) {
+                if (is_string($upload)) {
+                    return $upload;
+                }
+
+                return data_get($upload, 'uuid') ?? data_get($upload, 'id');
+            })
+            ->filter()
+            ->unique()
+            ->values();
+
+        if ($ids->isEmpty()) {
+            return $this;
+        }
+
+        \Fleetbase\Models\File::whereIn('uuid', $ids)->get()->each(function ($file) {
+            $file->setKey($this);
+        });
+
+        return $this;
     }
 
     /**
@@ -1991,11 +2016,11 @@ class Order extends Model
             return collect();
         }
 
-        $drivers = Driver::where(['status' => 'active', 'online' => 1])
+        $drivers = Driver::where(['status' => 'available', 'online' => 1])
             ->whereHas('company', function ($q) {
                 $q->whereHas('users', function ($q) {
                     $q->whereHas('driver', function ($q) {
-                        $q->where(['status' => 'active', 'online' => 1]);
+                        $q->where(['status' => 'available', 'online' => 1]);
                         $q->whereNull('deleted_at');
                     });
                 });

package/server/src/Models/OrderConfig.php

@@ -458,28 +458,31 @@ class OrderConfig extends Model
     /**
      * Resolves an OrderConfig from a given identifier or an array of identifiers within an optional company context.
      *
-     * @param string|array $orderConfigIdentifier the identifier(s) for the OrderConfig (namespace, public_id, or key)
+     * @param string|array $orderConfigIdentifier the identifier(s) for the OrderConfig (uuid, namespace, public_id, or key)
      * @param Company|null $company               the company context, if any, to narrow down the search
      *
      * @return OrderConfig|null the found OrderConfig or null if none found
      */
     public static function resolveFromIdentifier($orderConfigIdentifier, ?Company $company = null): ?OrderConfig
     {
-        $query = static::query();
+        $companyUuid  = $company instanceof Company ? $company->uuid : session('company');
+        $identifiers  = is_array($orderConfigIdentifier) ? $orderConfigIdentifier : [$orderConfigIdentifier];
+        $identifiers  = collect($identifiers)->filter(fn ($identifier) => filled($identifier))->values();
+
+        if ($identifiers->isEmpty()) {
+            return static::default($company);
+        }
+
+        foreach ($identifiers as $identifier) {
+            $query = static::query();
 
-        if ($company instanceof Company) {
-            $query->where('company_uuid', $company->uuid);
-        } else {
-            $companyUuid = session('company');
             if ($companyUuid) {
                 $query->where('company_uuid', $companyUuid);
             }
-        }
 
-        $identifiers = is_array($orderConfigIdentifier) ? $orderConfigIdentifier : [$orderConfigIdentifier];
-        foreach ($identifiers as $identifier) {
             $orderConfig = $query->where(function ($query) use ($identifier) {
-                $query->where('namespace', $identifier)
+                $query->where('uuid', $identifier)
+                      ->orWhere('namespace', $identifier)
                       ->orWhere('public_id', $identifier)
                       ->orWhere('key', $identifier);
             })->first();
@@ -489,7 +492,7 @@ class OrderConfig extends Model
             }
         }
 
-        return static::default($company);
+        return null;
     }
 
     /**

package/server/src/Models/Payload.php

@@ -61,7 +61,23 @@ class Payload extends Model
      *
      * @var array
      */
-    protected $fillable = ['_key', 'company_uuid', 'pickup_uuid', 'dropoff_uuid', 'return_uuid', 'current_waypoint_uuid', 'meta', 'payment_method', 'cod_amount', 'cod_currency', 'cod_payment_method', 'type'];
+    protected $fillable = [
+        '_key',
+        'company_uuid',
+        'pickup_uuid',
+        'pickup_tracking_number_uuid',
+        'dropoff_uuid',
+        'dropoff_tracking_number_uuid',
+        'return_uuid',
+        'return_tracking_number_uuid',
+        'current_waypoint_uuid',
+        'meta',
+        'payment_method',
+        'cod_amount',
+        'cod_currency',
+        'cod_payment_method',
+        'type',
+    ];
 
     /**
      * The attributes that should be cast to native types.