@fleetbase/fleetops-engine 0.6.49 → 0.6.51

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

@@ -7,10 +7,9 @@ use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Http\Resources\v1\Place as PlaceResource;
 use Fleetbase\FleetOps\Imports\PlaceImport;
 use Fleetbase\FleetOps\Models\Place;
-use Fleetbase\FleetOps\Support\Geocoding;
+use Fleetbase\FleetOps\Support\PlaceSearch;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
-use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
@@ -50,50 +49,15 @@ class PlaceController extends FleetOpsController
 
         $query = Place::where('company_uuid', session('company'))
             ->whereNull('deleted_at')
-            ->applyDirectivesForPermissions('fleet-ops list place')
-            ->search($searchQuery);
-
-        if ($latitude && $longitude) {
-            $point = new Point($latitude, $longitude);
-            $query->whereNotNull('location')->whereRaw('
-                ST_Y(location) BETWEEN -90 AND 90
-                AND ST_X(location) BETWEEN -180 AND 180
-                AND NOT (ST_X(location) = 0 AND ST_Y(location) = 0)
-            ');
-            $query->orderByDistanceSphere('location', $point, 'asc');
-        } else {
-            $query->orderBy('name', 'desc');
-        }
-
-        if ($limit) {
-            $query->limit($limit);
-        }
+            ->applyDirectivesForPermissions('fleet-ops list place');
 
-        $results = $query->get();
-
-        if ($geo && Geocoding::canGoogleGeocode()) {
-            if ($searchQuery) {
-                try {
-                    $geocodingResults = Geocoding::query($searchQuery, $latitude, $longitude);
-
-                    foreach ($geocodingResults as $result) {
-                        $results->prepend($result);
-                    }
-                } catch (\Throwable $e) {
-                    return response()->error($e->getMessage());
-                }
-            } elseif ($latitude && $longitude) {
-                try {
-                    $geocodingResults = Geocoding::reverseFromCoordinates($latitude, $longitude, $searchQuery);
-
-                    foreach ($geocodingResults as $result) {
-                        $results->prepend($result);
-                    }
-                } catch (\Throwable $e) {
-                    return response()->error($e->getMessage());
-                }
-            }
-        }
+        $results = PlaceSearch::search($query, $searchQuery, [
+            'limit'          => $limit,
+            'geo'            => $geo,
+            'latitude'       => $latitude,
+            'longitude'      => $longitude,
+            'no_query_order' => 'name_desc',
+        ]);
 
         return PlaceResource::collection($results);
     }
@@ -108,29 +72,7 @@ class PlaceController extends FleetOpsController
         $searchQuery = $request->searchQuery();
         $latitude    = $request->input('latitude', false);
         $longitude   = $request->input('longitude', false);
-        $results     = collect();
-
-        if ($searchQuery && Geocoding::canGoogleGeocode()) {
-            try {
-                $geocodingResults = Geocoding::query($searchQuery, $latitude, $longitude);
-
-                foreach ($geocodingResults as $result) {
-                    $results->push($result);
-                }
-            } catch (\Throwable $e) {
-                return response()->error($e->getMessage());
-            }
-        } elseif ($latitude && $longitude) {
-            try {
-                $geocodingResults = Geocoding::reverseFromCoordinates($latitude, $longitude, $searchQuery);
-
-                foreach ($geocodingResults as $result) {
-                    $results->push($result);
-                }
-            } catch (\Throwable $e) {
-                return response()->error($e->getMessage());
-            }
-        }
+        $results     = PlaceSearch::geocode($searchQuery, $latitude, $longitude);
 
         return response()->json($results)->withHeaders(['Cache-Control' => 'no-cache']);
     }

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

@@ -188,7 +188,7 @@ class ServiceQuoteController extends FleetOpsController
         $service          = $request->input('service', 'all'); // the specific service rate to query - defaults to `all`
         $serviceType      = $request->input('service_type'); // the specific type of service rate to query
         $isCashOnDelivery = $request->has('cod');
-        $currency         = $request->has('currency');
+        $currency         = $request->input('currency');
         $totalDistance    = $request->input('distance');
         $totalTime        = $request->input('time');
         $pickup           = $request->or(['payload.pickup', 'payload.pickup_uuid', 'pickup']);

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

@@ -523,7 +523,7 @@ class SettingController extends Controller
         $config         = config('fleetops.tracking', []);
         $systemSettings = Setting::lookup('fleet-ops.tracking-settings', []);
 
-        $defaults = array_merge($config, is_array($systemSettings) ? $systemSettings : []);
+        $defaults           = array_merge($config, is_array($systemSettings) ? $systemSettings : []);
         $defaults['alerts'] = $this->normalizeTrackingAlertSettings(data_get($defaults, 'alerts', []));
 
         return $defaults;
@@ -541,7 +541,7 @@ class SettingController extends Controller
                 'distance_threshold_meters'  => 500,
             ],
             'prolonged_stoppages' => [
-                'enabled'                  => true,
+                'enabled'                    => true,
                 'duration_threshold_minutes' => 30,
             ],
         ];

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

@@ -5,10 +5,12 @@ namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 use Fleetbase\FleetOps\Exports\VehicleExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Imports\VehicleImport;
+use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
 use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
@@ -25,14 +27,65 @@ class VehicleController extends FleetOpsController
     /**
      * Handle post save transactions.
      */
-    public function afterSave(Request $request, Vehicle $vehicle)
+    public function afterSave(Request $request, Vehicle $vehicle, array $input = [])
     {
+        if ($this->hasDriverInput($request)) {
+            $this->syncDriverAssignment($vehicle, $this->driverIdentifierFromRequest($request));
+        }
+
         $customFieldValues = $request->array('vehicle.custom_field_values');
         if ($customFieldValues) {
             $vehicle->syncCustomFieldValues($customFieldValues);
         }
     }
 
+    protected function hasDriverInput(Request $request): bool
+    {
+        $payload = $request->all();
+
+        return Arr::has($payload, 'vehicle.driver_uuid')
+            || Arr::has($payload, 'vehicle.driver.uuid')
+            || Arr::has($payload, 'vehicle.driver.id')
+            || Arr::has($payload, 'driver_uuid')
+            || Arr::has($payload, 'driver');
+    }
+
+    protected function driverIdentifierFromRequest(Request $request): ?string
+    {
+        $payload = $request->all();
+        $driver  = data_get($payload, 'vehicle.driver') ?? data_get($payload, 'driver');
+
+        return data_get($payload, 'vehicle.driver_uuid')
+            ?? data_get($payload, 'vehicle.driver.uuid')
+            ?? data_get($payload, 'vehicle.driver.id')
+            ?? (is_string($driver) ? $driver : null)
+            ?? data_get($payload, 'driver_uuid')
+            ?? data_get($payload, 'driver.uuid')
+            ?? data_get($payload, 'driver.id');
+    }
+
+    protected function syncDriverAssignment(Vehicle $vehicle, ?string $identifier): void
+    {
+        if (empty($identifier)) {
+            $vehicle->unassignDriver();
+
+            return;
+        }
+
+        $driver = Driver::withoutGlobalScopes()
+            ->whereNull('deleted_at')
+            ->where(function ($query) use ($identifier) {
+                $query->where('uuid', $identifier)->orWhere('public_id', $identifier);
+            })
+            ->when(session('company'), fn ($query, $company) => $query->where('company_uuid', $company))
+            ->first();
+
+        if ($driver) {
+            $vehicle->assignDriver($driver);
+            $vehicle->setRelation('driver', $driver);
+        }
+    }
+
     /**
      * Get all status options for an vehicle.
      *

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

@@ -4,9 +4,12 @@ namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
 use Fleetbase\FleetOps\Exports\VendorExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+use Fleetbase\FleetOps\Http\Resources\v1\Contact as ContactResource;
 use Fleetbase\FleetOps\Imports\VendorImport;
+use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Vendor;
+use Fleetbase\FleetOps\Models\VendorPersonnel;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
 use Illuminate\Http\Request;
@@ -190,4 +193,90 @@ class VendorController extends FleetOpsController
             'status' => 'ok',
         ]);
     }
+
+    public function vendorPersonnels(string $vendorId)
+    {
+        $vendor = Vendor::findByIdOrFail($vendorId);
+
+        $personnels = VendorPersonnel::where('vendor_uuid', $vendor->uuid)
+            ->with('contact')
+            ->latest()
+            ->get()
+            ->map(fn (VendorPersonnel $personnel) => $this->vendorPersonnelPayload($personnel));
+
+        return response()->json(['personnels' => $personnels->values()]);
+    }
+
+    public function addVendorPersonnel(Request $request, string $vendorId)
+    {
+        $vendor  = Vendor::findByIdOrFail($vendorId);
+        $contact = $this->resolveOrCreatePersonnelContact($request);
+
+        $personnel = VendorPersonnel::updateOrCreate(
+            ['vendor_uuid' => $vendor->uuid, 'contact_uuid' => $contact->uuid],
+            [
+                'role'            => $request->input('role', 'member'),
+                'status'          => $request->input('status', 'active'),
+                'invited_by_uuid' => session('user'),
+            ]
+        );
+
+        if ($request->boolean('create_login', true)) {
+            $contact->createUser();
+        }
+
+        return response()->json([
+            'personnel' => $this->vendorPersonnelPayload($personnel->load('contact')),
+        ]);
+    }
+
+    public function removeVendorPersonnel(string $vendorId, string $contactId)
+    {
+        $vendor  = Vendor::findByIdOrFail($vendorId);
+        $contact = Contact::findByIdOrFail($contactId);
+
+        VendorPersonnel::where(['vendor_uuid' => $vendor->uuid, 'contact_uuid' => $contact->uuid])->delete();
+
+        return response()->json(['status' => 'ok']);
+    }
+
+    protected function resolveOrCreatePersonnelContact(Request $request): Contact
+    {
+        $contactId = $request->input('contact');
+        if ($contactId) {
+            return Contact::where('company_uuid', session('company'))
+                ->where(function ($query) use ($contactId) {
+                    $query->where('uuid', $contactId)->orWhere('public_id', $contactId);
+                })
+                ->firstOrFail();
+        }
+
+        return Contact::create([
+            'company_uuid' => session('company'),
+            'name'         => $request->input('name'),
+            'email'        => $request->input('email'),
+            'phone'        => $request->input('phone'),
+            'type'         => 'customer',
+        ]);
+    }
+
+    protected function vendorPersonnelPayload(VendorPersonnel $personnel): array
+    {
+        $contact = $personnel->contact;
+
+        return [
+            'id'              => $contact?->public_id,
+            'uuid'            => $contact?->uuid,
+            'contact_uuid'    => $contact?->uuid,
+            'public_id'       => $contact?->public_id,
+            'name'            => $contact?->name,
+            'email'           => $contact?->email,
+            'phone'           => $contact?->phone,
+            'photo_url'       => $contact?->photo_url,
+            'role'            => $personnel->role ?? 'member',
+            'status'          => $personnel->status ?? 'active',
+            'invited_by_uuid' => $personnel->invited_by_uuid,
+            'contact'         => $contact ? (new ContactResource($contact))->resolve() : null,
+        ];
+    }
 }

package/server/src/Http/Middleware/AuthenticateCustomerToken.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Middleware;
+
+use Fleetbase\FleetOps\Support\CustomerAuth;
+use Illuminate\Http\Request;
+
+/**
+ * Enforce that a Customer-Token header is present and resolves to a
+ * customer-type Contact that belongs to the same company as the request's
+ * API credential.
+ *
+ * Apply this middleware to authenticated `/v1/customers/...` routes. The
+ * public sign-up / login routes do NOT use it.
+ */
+class AuthenticateCustomerToken
+{
+    public function handle(Request $request, \Closure $next)
+    {
+        $customer = CustomerAuth::resolveFromHeader($request);
+        if (!$customer) {
+            return response()->apiError('Customer token is missing or invalid.', 401);
+        }
+
+        $sessionCompany = session('company');
+        if ($sessionCompany && $customer->company_uuid !== $sessionCompany) {
+            return response()->apiError('Customer does not belong to this company.', 403);
+        }
+
+        CustomerAuth::setCurrent($customer);
+
+        return $next($request);
+    }
+}

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

@@ -0,0 +1,63 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Requests;
+
+use Fleetbase\Http\Requests\FleetbaseRequest;
+
+/**
+ * Validates the body of `POST /v1/customers/orders`.
+ *
+ * Mirrors the canonical Fleet-Ops Order create shape used by the operator
+ * `POST /v1/orders` endpoint: `type` / `order_config`, `scheduled_at`,
+ * `notes`, `meta`, and either a nested `payload` or top-level
+ * `pickup` / `dropoff` / `return` / `waypoints` / `entities`. Place and
+ * Entity sub-objects accept the standard Fleet-Ops Place / Entity field
+ * shapes — no client-portal aliases are recognized.
+ *
+ * `customer` is intentionally not accepted: the controller forces
+ * `customer_uuid` from the authenticated Customer-Token. `status`,
+ * `driver`, `vehicle`, `facilitator`, `dispatch` and similar operator-tier
+ * fields are also out of scope for the customer surface.
+ */
+class CreateCustomerOrderRequest extends FleetbaseRequest
+{
+    public function authorize(): bool
+    {
+        return request()->session()->has('api_credential')
+            || request()->session()->has('is_sanctum_token');
+    }
+
+    public function rules(): array
+    {
+        return [
+            'type'             => 'nullable|string',
+            'order_config'     => 'nullable|string',
+            'scheduled_at'     => 'nullable|date',
+            'notes'            => 'nullable|string|max:2000',
+            'internal_id'      => 'nullable|string|max:191',
+            'meta'             => 'nullable|array',
+            // Optional ServiceQuote reference (uuid or `sqte_…` public_id).
+            // Resolved server-side via `ServiceQuote::resolveFromRequest` and
+            // consumed by `$order->purchaseServiceQuote()` after creation.
+            'service_quote'    => 'nullable|string',
+
+            // payload may be an object OR a payload public_id string
+            'payload'          => 'nullable',
+
+            // Top-level alternatives when `payload` is not provided. Each
+            // Place sub-object accepts the standard Place fillable shape.
+            'pickup'                    => 'nullable',
+            'dropoff'                   => 'nullable',
+            'return'                    => 'nullable',
+            'waypoints'                 => 'nullable|array',
+            'entities'                  => 'nullable|array',
+            'entities.*.name'           => 'nullable|string',
+            'entities.*.description'    => 'nullable|string',
+            'entities.*.weight'         => 'nullable|numeric|min:0',
+            'entities.*.weight_unit'    => 'nullable|string',
+            'entities.*.declared_value' => 'nullable|numeric|min:0',
+            'entities.*.currency'       => 'nullable|string|size:3',
+            'entities.*.meta'           => 'nullable|array',
+        ];
+    }
+}

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

@@ -0,0 +1,48 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Requests;
+
+use Fleetbase\Http\Requests\FleetbaseRequest;
+use Illuminate\Validation\Rule;
+
+/**
+ * Validates the body of `POST /v1/customers` (final account creation step).
+ *
+ * Expects the verification code previously requested via
+ * `POST /v1/customers/request-creation-code`.
+ */
+class CreateCustomerRequest extends FleetbaseRequest
+{
+    public function authorize(): bool
+    {
+        return request()->session()->has('api_credential')
+            || request()->session()->has('is_sanctum_token');
+    }
+
+    public function rules(): array
+    {
+        return [
+            'identity' => 'required|string',
+            'code'     => 'required|exists:verification_codes,code',
+            'name'     => 'required|string',
+            'password' => 'required|string|min:8',
+            'email'    => [
+                'email', 'nullable',
+                Rule::unique('contacts')->where(function ($query) {
+                    $query->where('company_uuid', session('company'));
+
+                    return $query->whereNull('deleted_at');
+                }),
+            ],
+            'phone' => [
+                'nullable', 'string',
+                Rule::unique('contacts')->where(function ($query) {
+                    $query->where('company_uuid', session('company'));
+
+                    return $query->whereNull('deleted_at');
+                }),
+            ],
+            'meta'  => 'nullable|array',
+        ];
+    }
+}

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

@@ -35,7 +35,7 @@ class CreateDriverRequest extends FleetbaseRequest
             'country'   => 'nullable|size:2',
             'city'      => 'nullable|string',
             'vehicle'   => 'nullable|string|starts_with:vehicle_|exists:vehicles,public_id',
-            'status'    => 'nullable|string|in:active,inactive',
+            'status'    => 'nullable|string|in:active,available,inactive',
             'vendor'    => 'nullable|exists:vendors,public_id',
             'job'       => 'nullable|exists:orders,public_id',
             'location'  => ['nullable', new ResolvablePoint()],

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

@@ -26,10 +26,14 @@ class CreateIssueRequest extends FleetbaseRequest
         return [
             'driver'       => ['required'],
             'location'     => ['required'],
+            'order'        => ['nullable', 'exists:orders,public_id'],
+            'order_uuid'   => ['nullable', 'exists:orders,uuid'],
             'report'       => ['required'],
             'category'     => ['nullable'],
             'type'         => ['nullable'],
             'priority'     => ['nullable'],
+            'tags'         => ['nullable', 'array'],
+            'tags.*'       => ['string'],
         ];
     }
 }

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

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Http\Requests;
 
 use Fleetbase\FleetOps\Rules\ResolvablePoint;
 use Fleetbase\Http\Requests\FleetbaseRequest;
+use Illuminate\Validation\Rule;
 
 class CreateVehicleRequest extends FleetbaseRequest
 {
@@ -25,7 +26,30 @@ class CreateVehicleRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'status'    => 'nullable|in:operational,maintenance,decommissioned',
+            'status'    => [
+                'nullable',
+                Rule::in([
+                    'active',
+                    'available',
+                    'in_use',
+                    'maintenance',
+                    'out_of_service',
+                    'reserved',
+                    'retired',
+                    'staging',
+                    'on_route',
+                    'idle',
+                    'cleaning',
+                    'awaiting_parts',
+                    'inspection_due',
+                    'inspection_failed',
+                    'accident',
+                    'compliance_hold',
+                    'stolen',
+                    'operational',
+                    'decommissioned',
+                ]),
+            ],
             'vendor'    => 'nullable|exists:vendors,public_id',
             'driver'    => 'nullable|exists:drivers,public_id',
             'location'  => ['nullable', new ResolvablePoint()],

package/server/src/Http/Requests/Internal/CreateDriverRequest.php

@@ -51,7 +51,7 @@ class CreateDriverRequest extends CreateDriverApiRequest
             'country'                => 'nullable|string|size:2',
             'city'                   => 'nullable|string|max:255',
             'vehicle'                => ['nullable', new ResolvableVehicle()],
-            'status'                 => 'nullable|string|in:active,inactive',
+            'status'                 => 'nullable|string|in:active,available,inactive',
             'vendor'                 => 'nullable|exists:vendors,public_id',
             'job'                    => 'nullable|exists:orders,public_id',
             'location'               => ['nullable', new ResolvablePoint()],

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

@@ -13,9 +13,13 @@ class UpdateIssueRequest extends CreateIssueRequest
     {
         return [
             'report'       => ['required'],
+            'order'        => ['nullable', 'exists:orders,public_id'],
+            'order_uuid'   => ['nullable', 'exists:orders,uuid'],
             'category'     => ['nullable'],
             'type'         => ['nullable'],
             'priority'     => ['nullable'],
+            'tags'         => ['nullable', 'array'],
+            'tags.*'       => ['string'],
         ];
     }
 }

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

@@ -0,0 +1,29 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Requests;
+
+use Fleetbase\Http\Requests\FleetbaseRequest;
+
+/**
+ * Validates the body of `POST /v1/customers/request-creation-code`.
+ */
+class VerifyCreateCustomerRequest extends FleetbaseRequest
+{
+    public function authorize(): bool
+    {
+        return request()->session()->has('api_credential')
+            || request()->session()->has('is_sanctum_token');
+    }
+
+    public function rules(): array
+    {
+        return [
+            'mode'     => 'required|in:email,sms',
+            'identity' => 'required|string',
+            // Optional profile context — when provided, used to greet the
+            // customer in the verification email and pre-seed the User row.
+            'name'     => 'nullable|string|max:255',
+            'phone'    => 'nullable|string|max:32',
+        ];
+    }
+}

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

@@ -0,0 +1,41 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\Internal\v1;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+
+class OrderConfig extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     */
+    public function toArray($request): array
+    {
+        return [
+            'id'            => $this->id,
+            'uuid'          => $this->uuid,
+            'public_id'     => $this->public_id,
+            'company_uuid'  => $this->company_uuid,
+            'author_uuid'   => $this->author_uuid,
+            'category_uuid' => $this->category_uuid,
+            'icon_uuid'     => $this->icon_uuid,
+            'name'          => $this->name,
+            'namespace'     => $this->namespace,
+            'description'   => $this->description,
+            'key'           => $this->key,
+            'status'        => $this->status,
+            'version'       => $this->version,
+            'core_service'  => (bool) $this->core_service,
+            'flow'          => $this->flow ?? [],
+            'entities'      => $this->entities ?? [],
+            'tags'          => $this->tags ?? [],
+            'meta'          => $this->meta ?? [],
+            'created_at'    => $this->created_at,
+            'updated_at'    => $this->updated_at,
+            'deleted_at'    => $this->deleted_at,
+            'type'          => 'order-config',
+        ];
+    }
+}