@fleetbase/fleetops-engine 0.6.46 → 0.6.48

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

@@ -13,6 +13,7 @@ use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\FleetOps\Models\Route;
 use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\FleetOps\Support\LiveCacheService;
+use Fleetbase\FleetOps\Support\LiveOrderQuery;
 use Fleetbase\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
@@ -110,50 +111,13 @@ class LiveController extends Controller
         ];
 
         return LiveCacheService::remember('orders', $cacheParams, function () use ($exclude, $active, $unassigned) {
-            $query = Order::where('company_uuid', session('company'))
-            ->whereHas('payload', function ($query) {
-                $query->where(
-                    function ($q) {
-                        $q->whereHas('waypoints');
-                        $q->orWhereHas('pickup');
-                        $q->orWhereHas('dropoff');
-                    }
-                );
-            })
-            ->whereNotIn('status', ['canceled', 'completed', 'expired'])
-            ->whereHas('trackingNumber')
-            ->whereHas('trackingStatuses')
-            ->whereNotIn('public_id', $exclude)
-            ->whereNull('deleted_at')
-            ->applyDirectivesForPermissions('fleet-ops list order')
-            ->with([
-                'payload.entities',
-                'payload.dropoff',
-                'payload.pickup',
-                'payload.return',
-                'payload.firstWaypointMarker.place',
-                'payload.lastWaypointMarker.place',
-                'trackingNumber',
-                'trackingStatuses',
-                'driverAssigned' => function ($query) {
-                    $query->without(['jobs', 'currentJob']);
-                },
-                'vehicleAssigned' => function ($query) {
-                    $query->without(['fleets', 'vendor']);
-                },
-                'customer',
-                'facilitator',
+            $query = LiveOrderQuery::make(session('company'), [
+                'exclude'        => $exclude,
+                'active'         => $active,
+                'unassigned'     => $unassigned,
+                'with_relations' => true,
             ]);
 
-            if ($active) {
-                $query->whereHas('driverAssigned');
-                $query->whereNotIn('status', ['created', 'completed', 'expired', 'order_canceled', 'canceled', 'pending']);
-            }
-
-            if ($unassigned) {
-                $query->whereNull('driver_assigned_uuid');
-            }
-
             $query->limit(60); // max 60 latest
             $query->latest();
 

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

@@ -573,7 +573,7 @@ class OrchestrationController extends Controller
                 $isMulti   = $orderType === 'multi_waypoint';
 
                 // ── Resolve OrderConfig ───────────────────────────────────────
-                $orderConfigUuid = null;
+                $orderConfigUuid     = null;
                 $resolvedOrderConfig = null;
                 if (!empty($firstRow['type'])) {
                     $resolvedOrderConfig = OrderConfig::resolveFromIdentifier($firstRow['type']);

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

@@ -26,16 +26,17 @@ use Fleetbase\FleetOps\Models\Proof;
 use Fleetbase\FleetOps\Models\ServiceQuote;
 use Fleetbase\FleetOps\Models\TrackingStatus;
 use Fleetbase\FleetOps\Models\Waypoint;
+use Fleetbase\FleetOps\Notifications\OrderPing;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\Internal\BulkActionRequest;
 use Fleetbase\Models\File;
 use Fleetbase\Models\Type;
+use Fleetbase\Support\Auth;
 use Fleetbase\Support\TemplateString;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
@@ -97,6 +98,8 @@ class OrderController extends FleetOpsController
                 function ($request, &$input) {
                     $serviceQuote = ServiceQuote::resolveFromRequest($request);
 
+                    $this->normalizeCustomerType($input);
+
                     // if service quote is applied, resolve it
                     if ($serviceQuote instanceof ServiceQuote && $serviceQuote->fromIntegratedVendor()) {
                         // create order with integrated vendor, then resume fleetbase order creation
@@ -119,7 +122,7 @@ class OrderController extends FleetOpsController
 
                     if ($resolvedOrderConfig) {
                         $input['order_config_uuid'] = $resolvedOrderConfig->uuid;
-                        $input['type'] = $resolvedOrderConfig->key;
+                        $input['type']              = $resolvedOrderConfig->key;
                     } elseif (!isset($input['type'])) {
                         $input['type'] = 'transport';
                     }
@@ -218,6 +221,33 @@ class OrderController extends FleetOpsController
         }
     }
 
+    /**
+     * Resolve the concrete polymorphic customer type from the submitted UUID.
+     */
+    protected function normalizeCustomerType(array &$input): void
+    {
+        $customerUuid = data_get($input, 'customer_uuid') ?? data_get($input, 'customer.uuid');
+        if (!$customerUuid) {
+            return;
+        }
+
+        $customer = Utils::getUuid(
+            ['contacts', 'vendors'],
+            [
+                'uuid'         => $customerUuid,
+                'company_uuid' => session('company'),
+            ],
+            [
+                'with_table' => true,
+            ]
+        );
+
+        if (is_array($customer)) {
+            $input['customer_uuid'] = Utils::get($customer, 'uuid');
+            $input['customer_type'] = Utils::getModelClassName(Utils::get($customer, 'table'));
+        }
+    }
+
     /**
      *  Route which enables editing of an order route.
      *
@@ -733,7 +763,7 @@ class OrderController extends FleetOpsController
             return response()->error('No order found.');
         }
 
-        $waypoint   = $request->filled('waypoint') ? Waypoint::findByPlace($request->input('waypoint'), $order) : null;
+        $waypoint    = $request->filled('waypoint') ? Waypoint::findByPlace($request->input('waypoint'), $order) : null;
         $orderConfig = $order->ensureOrderConfig();
         if (!$orderConfig) {
             return response()->error('No order config found for order.');
@@ -763,33 +793,57 @@ class OrderController extends FleetOpsController
      *
      * @return \Illuminate\Http\Response
      */
-    public function trackerInfo(string $id)
+    public function trackerInfo(Request $request, string $id)
     {
         $order = Order::findById($id);
         if (!$order) {
             return response()->error('No order found.');
         }
 
-        // Cache tracker data for 30 seconds with order-specific key
-        $cacheKey    = "order:{$order->uuid}:tracker";
-        $trackerInfo = Cache::remember($cacheKey, 30, function () use ($order) {
-            return $order->tracker()->toArray();
-        });
-
-        return response()->json($trackerInfo);
+        return response()->json($order->tracker()->toArray($request->only(['provider', 'fallbacks', 'traffic_enabled'])));
     }
 
-    public function waypointEtas(string $id)
+    public function waypointEtas(Request $request, string $id)
     {
         $order = Order::findById($id);
         if (!$order) {
             return response()->error('No order found.');
         }
 
-        // Get order tracker
-        $eta = $order->tracker()->eta();
+        return response()->json($order->tracker()->eta($request->only(['provider', 'fallbacks', 'traffic_enabled'])));
+    }
+
+    /**
+     * Ping the assigned driver to refresh/order attention in the driver app.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function pingDriver(string $id)
+    {
+        if (!Auth::can('fleet-ops update order')) {
+            return response()->error('Unauthorized.', 403);
+        }
+
+        try {
+            $order = Order::findByIdOrFail($id, ['driverAssigned']);
+        } catch (ModelNotFoundException $e) {
+            return response()->error('Order resource not found.', 404);
+        }
+
+        if (!$order->driverAssigned) {
+            return response()->error('Order does not have an assigned driver.', 422);
+        }
 
-        return response()->json($eta);
+        try {
+            $order->driverAssigned->notify(new OrderPing($order));
+
+            return response()->json([
+                'status'  => 'ok',
+                'message' => 'Driver app ping sent.',
+            ]);
+        } catch (\Throwable $e) {
+            return response()->error('Unable to ping driver app.', 500);
+        }
     }
 
     /**

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

@@ -226,7 +226,7 @@ class ServiceQuoteController extends FleetOpsController
         $entities  = collect($entities)->mapInto(Entity::class);
 
         // should all be Place like
-        $waypoints = collect([$pickup, ...$waypoints, $dropoff])->filter();
+        $waypoints     = collect([$pickup, ...$waypoints, $dropoff])->filter();
         $endpointCount = (int) ($pickup instanceof Place) + (int) ($dropoff instanceof Place);
 
         // if facilitator is an integrated partner resolve service quotes from bridge

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
+use Fleetbase\FleetOps\Tracking\TrackingProviderRegistry;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Models\Setting;
 use Fleetbase\Support\Auth;
@@ -211,12 +212,12 @@ class SettingController extends Controller
     {
         $routingSettings = Setting::lookupCompany('routing', ['router' => 'osrm', 'unit' => 'km']);
 
-        $displayEngine = data_get($routingSettings, 'display_engine', data_get($routingSettings, 'routing_display_engine', data_get($routingSettings, 'router', 'osrm')));
-        $optimizationEngine = data_get($routingSettings, 'optimization_engine', data_get($routingSettings, 'routing_optimization_engine', $displayEngine));
-        $routingSettings['router'] = $displayEngine;
-        $routingSettings['display_engine'] = $displayEngine;
-        $routingSettings['optimization_engine'] = $optimizationEngine;
-        $routingSettings['routing_display_engine'] = $displayEngine;
+        $displayEngine                                  = data_get($routingSettings, 'display_engine', data_get($routingSettings, 'routing_display_engine', data_get($routingSettings, 'router', 'osrm')));
+        $optimizationEngine                             = data_get($routingSettings, 'optimization_engine', data_get($routingSettings, 'routing_optimization_engine', $displayEngine));
+        $routingSettings['router']                      = $displayEngine;
+        $routingSettings['display_engine']              = $displayEngine;
+        $routingSettings['optimization_engine']         = $optimizationEngine;
+        $routingSettings['routing_display_engine']      = $displayEngine;
         $routingSettings['routing_optimization_engine'] = $optimizationEngine;
 
         // always default to km if no unit is set
@@ -227,6 +228,87 @@ class SettingController extends Controller
         return response()->json($routingSettings);
     }
 
+    /**
+     * Save order tracking intelligence settings.
+     *
+     * @param Request $request the HTTP request object containing tracking settings
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function saveTrackingSettings(Request $request)
+    {
+        $config    = $this->trackingDefaults();
+        $fallbacks = $request->input('fallbacks', data_get($config, 'fallbacks', ['osrm', 'calculated']));
+        if (is_string($fallbacks)) {
+            $fallbacks = array_values(array_filter(array_map('trim', explode(',', $fallbacks))));
+        }
+
+        Setting::configureCompany('tracking', [
+            'provider'                         => $request->input('provider', data_get($config, 'provider', 'google_routes')),
+            'fallbacks'                        => $fallbacks,
+            'traffic_enabled'                  => $request->boolean('traffic_enabled', data_get($config, 'traffic_enabled', true)),
+            'cache_ttl_seconds'                => (int) $request->input('cache_ttl_seconds', data_get($config, 'cache_ttl_seconds', 60)),
+            'route_cache_ttl_seconds'          => (int) $request->input('route_cache_ttl_seconds', data_get($config, 'route_cache_ttl_seconds', 600)),
+            'stale_location_threshold_seconds' => (int) $request->input('stale_location_threshold_seconds', data_get($config, 'stale_location_threshold_seconds', 300)),
+            'default_vehicle_speed_kph'        => (float) $request->input('default_vehicle_speed_kph', data_get($config, 'default_vehicle_speed_kph', 35)),
+        ]);
+
+        return response()->json([
+            'status'  => 'ok',
+            'message' => 'Tracking settings succesfully saved.',
+        ]);
+    }
+
+    /**
+     * Retrieve order tracking intelligence settings.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function getTrackingSettings()
+    {
+        $config           = $this->trackingDefaults();
+        $trackingSettings = Setting::lookupCompany('tracking', [
+            'provider'                         => data_get($config, 'provider', 'google_routes'),
+            'fallbacks'                        => data_get($config, 'fallbacks', ['osrm', 'calculated']),
+            'traffic_enabled'                  => data_get($config, 'traffic_enabled', true),
+            'cache_ttl_seconds'                => data_get($config, 'cache_ttl_seconds', 60),
+            'route_cache_ttl_seconds'          => data_get($config, 'route_cache_ttl_seconds', 600),
+            'stale_location_threshold_seconds' => data_get($config, 'stale_location_threshold_seconds', 300),
+            'default_vehicle_speed_kph'        => data_get($config, 'default_vehicle_speed_kph', 35),
+        ]);
+        $trackingSettings['providers'] = $this->trackingProviderOptions();
+
+        return response()->json($trackingSettings);
+    }
+
+    public function getAdminTrackingSettings()
+    {
+        return response()->json(array_merge($this->trackingDefaults(), [
+            'providers' => $this->trackingProviderOptions(),
+        ]));
+    }
+
+    public function saveAdminTrackingSettings(Request $request)
+    {
+        $config    = config('fleetops.tracking', []);
+        $fallbacks = $request->input('fallbacks', data_get($config, 'fallbacks', ['osrm', 'calculated']));
+        if (is_string($fallbacks)) {
+            $fallbacks = array_values(array_filter(array_map('trim', explode(',', $fallbacks))));
+        }
+
+        Setting::configure('fleet-ops.tracking-settings', [
+            'provider'                         => $request->input('provider', data_get($config, 'provider', 'google_routes')),
+            'fallbacks'                        => $fallbacks,
+            'traffic_enabled'                  => $request->boolean('traffic_enabled', data_get($config, 'traffic_enabled', true)),
+            'cache_ttl_seconds'                => (int) $request->input('cache_ttl_seconds', data_get($config, 'cache_ttl_seconds', 60)),
+            'route_cache_ttl_seconds'          => (int) $request->input('route_cache_ttl_seconds', data_get($config, 'route_cache_ttl_seconds', 600)),
+            'stale_location_threshold_seconds' => (int) $request->input('stale_location_threshold_seconds', data_get($config, 'stale_location_threshold_seconds', 300)),
+            'default_vehicle_speed_kph'        => (float) $request->input('default_vehicle_speed_kph', data_get($config, 'default_vehicle_speed_kph', 35)),
+        ]);
+
+        return response()->json($this->getAdminTrackingSettings()->getData(true));
+    }
+
     /**
      * Retrieve and return the map provider settings for the current company.
      *
@@ -244,15 +326,15 @@ class SettingController extends Controller
             'mapProvider' => 'leaflet',
         ];
 
-        $systemMapSettings = Setting::lookup('fleet-ops.map-settings', []);
-        $mapSettings = Setting::lookupFromCompany('fleet-ops.map-settings', $defaults);
+        $systemMapSettings          = Setting::lookup('fleet-ops.map-settings', []);
+        $mapSettings                = Setting::lookupFromCompany('fleet-ops.map-settings', $defaults);
         $mapSettings['mapProvider'] = data_get($mapSettings, 'mapProvider') ?: data_get($systemMapSettings, 'mapProvider', 'leaflet');
 
         // Source the Google Maps API key from the system-level services config
         // that is managed by the core-api admin settings panel. This ensures a
         // single source of truth and avoids duplicating key management.
         $mapSettings['googleMapsApiKey'] = config('services.google_maps.api_key', env('GOOGLE_MAPS_API_KEY', ''));
-        $mapSettings['googleMapsMapId'] = data_get($systemMapSettings, 'googleMapsMapId', '');
+        $mapSettings['googleMapsMapId']  = data_get($systemMapSettings, 'googleMapsMapId', '');
 
         return response()->json($mapSettings);
     }
@@ -289,7 +371,7 @@ class SettingController extends Controller
     public function getAdminMapSettings()
     {
         $defaults = [
-            'mapProvider' => 'leaflet',
+            'mapProvider'     => 'leaflet',
             'googleMapsMapId' => '',
         ];
 
@@ -299,13 +381,13 @@ class SettingController extends Controller
     public function saveAdminMapSettings(Request $request)
     {
         $allowedProviders = ['leaflet', 'google'];
-        $mapProvider = $request->input('mapProvider', 'leaflet');
+        $mapProvider      = $request->input('mapProvider', 'leaflet');
         if (!in_array($mapProvider, $allowedProviders)) {
             $mapProvider = 'leaflet';
         }
 
         $settings = [
-            'mapProvider' => $mapProvider,
+            'mapProvider'     => $mapProvider,
             'googleMapsMapId' => (string) $request->input('googleMapsMapId', ''),
         ];
 
@@ -431,4 +513,29 @@ class SettingController extends Controller
             'settings' => $normalized,
         ]);
     }
+
+    protected function trackingDefaults(): array
+    {
+        $config         = config('fleetops.tracking', []);
+        $systemSettings = Setting::lookup('fleet-ops.tracking-settings', []);
+
+        return array_merge($config, is_array($systemSettings) ? $systemSettings : []);
+    }
+
+    protected function trackingProviderOptions(): array
+    {
+        $registry = app(TrackingProviderRegistry::class);
+
+        return collect($registry->all())->map(function ($provider, $key) {
+            $label = $key === 'osrm' ? 'OSRM' : str($key)->replace('_', ' ')->title()->toString();
+
+            return [
+                'key'          => $key,
+                'name'         => $label,
+                'value'        => $key,
+                'label'        => $label,
+                'capabilities' => $provider->capabilities()->toArray(),
+            ];
+        })->values()->all();
+    }
 }

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

@@ -19,8 +19,8 @@ class Payload extends FleetbaseResource
     public function toArray($request): array
     {
         $isInternal = Http::isInternalRequest();
-        $pickup = $this->index_pickup_place;
-        $dropoff = $this->index_dropoff_place;
+        $pickup     = $this->index_pickup_place;
+        $dropoff    = $this->index_dropoff_place;
 
         return [
             'id'           => $this->when($isInternal, $this->id, $this->public_id),

package/server/src/Models/Contact.php

@@ -5,6 +5,7 @@ namespace Fleetbase\FleetOps\Models;
 use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Exceptions\UserAlreadyExistsException;
 use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Models\CompanyUser;
 use Fleetbase\Models\Invite;
 use Fleetbase\Models\Model;
 use Fleetbase\Models\User;
@@ -261,6 +262,14 @@ class Contact extends Model
         return $this->type === 'customer';
     }
 
+    /**
+     * Determines if this contact is a Fleet-Ops customer.
+     */
+    public function isCustomer(): bool
+    {
+        return $this->type === 'customer';
+    }
+
     /**
      * Creates a new contact from an import row.
      */
@@ -308,19 +317,33 @@ class Contact extends Model
     public static function createUserFromContact(Contact $contact, bool $sendInvite = false, bool $update = false): User
     {
         // Check if user already exist with email or phone number
-        $existingUser = User::where(function ($query) use ($contact) {
-            $query->where('company_uuid', $contact->company_uuid);
-            $query->where('email', $contact->email);
-            if ($contact->phone) {
-                $query->orWhere('phone', Utils::formatPhoneNumber($contact->phone));
-            }
-        })->whereNull('deleted_at')->first();
+        $existingUser = null;
+        if ($contact->email || $contact->phone) {
+            $existingUser = User::where('company_uuid', $contact->company_uuid)
+                ->where(function ($query) use ($contact) {
+                    if ($contact->email) {
+                        $query->where('email', $contact->email);
+                    }
+
+                    if ($contact->phone) {
+                        $method = $contact->email ? 'orWhere' : 'where';
+                        $query->{$method}('phone', Utils::formatPhoneNumber($contact->phone));
+                    }
+                })
+                ->whereNull('deleted_at')
+                ->first();
+        }
+
         if ($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) {
@@ -351,10 +374,10 @@ class Contact extends Model
         $user->setType($contact->type);
 
         // Assing to company
-        $user->assignCompany($contact->company, $user->type === 'customer' ? 'Fleet-Ops Customer' : 'Fleet-Ops Contact');
+        $user->assignCompany($contact->company, $contact->isCustomer() ? 'Fleet-Ops Customer' : 'Fleet-Ops Contact');
 
         // Assign customer role
-        if ($user->type === 'customer') {
+        if ($contact->isCustomer()) {
             $user->assignSingleRole('Fleet-Ops Customer');
         }
 
@@ -386,6 +409,87 @@ class Contact extends Model
         return $user;
     }
 
+    /**
+     * Normalize the linked user for a customer contact.
+     */
+    public function normalizeCustomerUser(?User $user = null, bool $quiet = false): ?User
+    {
+        if (!$this->isCustomer()) {
+            return $user;
+        }
+
+        $user ??= $this->getUser();
+        if (!$user) {
+            return null;
+        }
+
+        if ($user->type !== 'customer') {
+            if ($quiet) {
+                $user->forceFill(['type' => 'customer'])->saveQuietly();
+            } else {
+                $user->setType('customer');
+            }
+        }
+
+        $this->loadMissing('company');
+        if ($this->company) {
+            $companyUser = CompanyUser::firstOrCreate(
+                [
+                    'company_uuid' => $this->company->uuid,
+                    'user_uuid'    => $user->uuid,
+                ],
+                [
+                    'company_uuid' => $this->company->uuid,
+                    'user_uuid'    => $user->uuid,
+                    'status'       => $user->status ?? 'active',
+                ]
+            );
+            $user->forceFill(['company_uuid' => $this->company->uuid])->saveQuietly();
+            $user->setRelation('companyUser', $companyUser);
+
+            if ($companyUser) {
+                $companyUser->assignSingleRole('Fleet-Ops Customer');
+            }
+        }
+
+        $this->setRelation('user', $user);
+
+        return $user;
+    }
+
+    /**
+     * Repair a historical customer contact and its linked user.
+     */
+    public function repairCustomerTypeInvariant(bool $quiet = false): ?User
+    {
+        if (!$this->isCustomer()) {
+            $this->forceFill(['type' => 'customer'])->saveQuietly();
+        }
+
+        $user = $this->getUser();
+        if (!$user && ($this->email || $this->phone)) {
+            if ($quiet) {
+                $this->loadMissing('company');
+                $user = User::create([
+                    'company_uuid' => $this->company_uuid,
+                    'name'         => $this->name,
+                    'email'        => $this->email,
+                    'phone'        => $this->phone ? Utils::formatPhoneNumber($this->phone) : null,
+                    'username'     => Str::slug($this->name . '_' . Str::random(4), '_'),
+                    'password'     => Str::random(),
+                    'timezone'     => $this->company->timezone ?? date_default_timezone_get(),
+                    'status'       => 'pending',
+                ]);
+                $user->forceFill(['type' => 'customer'])->saveQuietly();
+                $this->forceFill(['user_uuid' => $user->uuid])->saveQuietly();
+            } else {
+                $user = $this->createUser();
+            }
+        }
+
+        return $this->normalizeCustomerUser($user, $quiet);
+    }
+
     /**
      * Assigns a user to the company and optionally sends an invitation email.
      *
@@ -406,16 +510,21 @@ class Contact extends Model
     public function assignUser(User $user, bool $sendInvite = false): self
     {
         // Load company
-        $this->loadMissing('copmany');
+        $this->loadMissing('company');
+
+        if ($this->isCustomer() && $user->type !== 'customer') {
+            $user->setType('customer');
+        }
 
         // Assing to company
-        $user->assignCompany($this->company, $this->type === 'customer' ? 'Fleet-Ops Customer' : 'Fleet-Ops Contact');
+        $user->assignCompany($this->company, $this->isCustomer() ? 'Fleet-Ops Customer' : 'Fleet-Ops Contact');
 
         // Get the company user instance
         $companyUser = $user->getCompanyUser($this->company);
 
-        // Assign customer role
-        $companyUser->assignSingleRole('Fleet-Ops Customer');
+        if ($companyUser) {
+            $companyUser->assignSingleRole($this->isCustomer() ? 'Fleet-Ops Customer' : 'Fleet-Ops Contact');
+        }
 
         // Set user to contact
         $this->update(['user_uuid' => $user->uuid]);

package/server/src/Models/Order.php

@@ -1739,7 +1739,7 @@ class Order extends Model
             }
         }
 
-        $company = $this->relationLoaded('company') ? $this->company : $this->company()->first();
+        $company     = $this->relationLoaded('company') ? $this->company : $this->company()->first();
         $orderConfig = OrderConfig::defaultOrCreate($company);
         if ($orderConfig instanceof OrderConfig) {
             $orderConfig->setOrderContext($this);