@fleetbase/fleetops-engine 0.6.49 → 0.6.50

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/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/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',
+        ];
+    }
+}

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

@@ -0,0 +1,79 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Models\Company;
+use Fleetbase\Support\Http;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+
+/**
+ * Public API resource for FleetOps customers.
+ *
+ * Wraps a {@see \Fleetbase\FleetOps\Models\Contact} of `type='customer'` and
+ * exposes the auth `token` field that login/signup endpoints attach.
+ */
+class Customer extends FleetbaseResource
+{
+    public function toArray($request): array
+    {
+        $this->loadMissing(['place', 'places']);
+
+        return [
+            'id'           => $this->when(Http::isInternalRequest(), $this->id, Str::replaceFirst('contact', 'customer', $this->public_id)),
+            'uuid'         => $this->when(Http::isInternalRequest(), $this->uuid),
+            'user_uuid'    => $this->when(Http::isInternalRequest(), $this->user_uuid),
+            'company_uuid' => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'public_id'    => $this->when(Http::isInternalRequest(), $this->public_id),
+            'internal_id'  => $this->internal_id,
+            'name'         => $this->name,
+            'title'        => $this->title,
+            'photo_url'    => $this->photo_url,
+            'email'        => $this->email,
+            'phone'        => $this->phone,
+            'address'      => data_get($this, 'place.address'),
+            'addresses'    => $this->whenLoaded('places', fn () => Place::collection($this->places)),
+            'token'        => $this->when($this->token, $this->token),
+            'orders_count' => $this->getOrdersCount($request),
+            'company'      => $this->when($this->company_uuid, fn () => $this->buildCompanyPayload()),
+            'meta'         => data_get($this, 'meta', Utils::createObject()),
+            'slug'         => $this->slug,
+            'created_at'   => $this->created_at,
+            'updated_at'   => $this->updated_at,
+        ];
+    }
+
+    private function getOrdersCount(Request $request): int
+    {
+        return Order::where('customer_uuid', $this->uuid)
+            ->whereNull('deleted_at')
+            ->withoutGlobalScopes()
+            ->count();
+    }
+
+    /**
+     * Public-safe projection of the customer's company. Returns the same
+     * fields any caller could fetch through other public endpoints — name,
+     * resolved currency, country, phone — plus the company's public id.
+     * Currency falls back through company.currency → ledger base_currency
+     * → "USD" via {@see Utils::getCompanyTransactionCurrency}.
+     */
+    private function buildCompanyPayload(): ?array
+    {
+        $company = Company::find($this->company_uuid);
+        if (!$company) {
+            return null;
+        }
+
+        return [
+            'id'       => $company->public_id,
+            'name'     => $company->name,
+            'currency' => Utils::getCompanyTransactionCurrency($company),
+            'country'  => $company->country,
+            'phone'    => $company->phone,
+        ];
+    }
+}

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');
                         });
                     });