@fleetbase/fleetops-engine 0.6.49 → 0.6.51

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/Index/Order.php

@@ -44,9 +44,10 @@ class Order extends FleetbaseResource
                 $isInternal,
                 $this->whenLoaded('orderConfig', function () {
                     return [
-                        'id'   => $this->orderConfig->public_id,
-                        'name' => $this->orderConfig->name,
-                        'key'  => $this->orderConfig->key,
+                        'uuid'        => $this->orderConfig->uuid,
+                        'public_id'   => $this->orderConfig->public_id,
+                        'name'        => $this->orderConfig->name,
+                        'key'         => $this->orderConfig->key,
                     ];
                 })
             ),
@@ -104,12 +105,14 @@ class Order extends FleetbaseResource
             }),
 
             // Essential scalar fields
-            'type'                 => $this->type,
-            'status'               => $this->status,
-            'adhoc'                => (bool) data_get($this, 'adhoc', false),
-            'dispatched'           => (bool) data_get($this, 'dispatched', false),
-            'has_driver_assigned'  => $this->when($isInternal, $this->has_driver_assigned),
-            'is_scheduled'         => $this->when($isInternal, $this->is_scheduled),
+            'type'                                 => $this->type,
+            'status'                               => $this->status,
+            'adhoc'                                => (bool) data_get($this, 'adhoc', false),
+            'dispatched'                           => (bool) data_get($this, 'dispatched', false),
+            'has_driver_assigned'                  => $this->when($isInternal, $this->has_driver_assigned),
+            'is_scheduled'                         => $this->when($isInternal, $this->is_scheduled),
+            'transaction_amount'                   => $this->transaction_amount,
+            'currency'                             => $this->transaction_currency,
 
             // Timestamps
             'scheduled_at'         => $this->scheduled_at,

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

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Resources\File;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Http\Resources\User;
 use Fleetbase\LaravelMysqlSpatial\Types\Point;
@@ -26,12 +27,15 @@ class Issue extends FleetbaseResource
             'driver_uuid'                 => $this->when(Http::isInternalRequest(), $this->driver_uuid),
             'company_uuid'                => $this->when(Http::isInternalRequest(), $this->company_uuid),
             'vehicle_uuid'                => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
+            'order_uuid'                  => $this->when(Http::isInternalRequest(), $this->order_uuid ?? data_get($this, 'meta.order_uuid')),
             'assigned_to_uuid'            => $this->when(Http::isInternalRequest(), $this->assigned_to_uuid),
             'reported_by_uuid'            => $this->when(Http::isInternalRequest(), $this->reported_by_uuid),
             'assignee'                    => $this->whenLoaded('assignee', fn () => new User($this->assignee)),
             'reporter'                    => $this->whenLoaded('reporter', fn () => new User($this->reporter)),
             'vehicle'                     => $this->whenLoaded('vehicle', fn () => new Vehicle($this->vehicle)),
             'driver'                      => $this->whenLoaded('driver', fn () => new Driver($this->driver)),
+            'order'                       => $this->when(Http::isInternalRequest(), fn () => $this->resolveLinkedOrder()),
+            'files'                       => $this->whenLoaded('files', fn () => File::collection($this->files)),
             'driver_name'                 => $this->driver_name,
             'vehicle_name'                => $this->vehicle_name,
             'vehicle_id'                  => $this->vehicle_id,
@@ -55,6 +59,27 @@ class Issue extends FleetbaseResource
         ]);
     }
 
+    protected function resolveLinkedOrder()
+    {
+        if ($this->relationLoaded('order') && $this->order) {
+            $this->order->loadMissing(['payload.pickup', 'payload.dropoff', 'trackingNumber', 'customer']);
+
+            return new Order($this->order);
+        }
+
+        $orderUuid = $this->order_uuid ?? data_get($this, 'meta.order_uuid');
+        if (!$orderUuid) {
+            return null;
+        }
+
+        $order = \Fleetbase\FleetOps\Models\Order::with(['payload.pickup', 'payload.dropoff', 'trackingNumber', 'customer'])
+            ->where('uuid', $orderUuid)
+            ->where('company_uuid', $this->company_uuid)
+            ->first();
+
+        return $order ? new Order($order) : null;
+    }
+
     /**
      * Transform the resource into an webhook payload.
      *

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

@@ -73,24 +73,26 @@ class Order extends FleetbaseResource
             'tracking_statuses'    => $this->whenLoaded('trackingStatuses', function () {
                 return TrackingStatus::collection($this->trackingStatuses);
             }),
-            'tracking'             => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->tracking_number : null),
-            'barcode'              => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->barcode : null),
-            'qr_code'              => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->qr_code : null),
-            'comments'             => $this->when($isInternal, Comment::collection($this->comments)),
-            'files'                => $this->when($isInternal, $this->files, File::collection($this->files)),
-            'purchase_rate'        => new PurchaseRate($this->purchaseRate),
-            'notes'                => $this->notes,
-            'type'                 => $this->type,
-            'status'               => $this->status,
-            'pod_method'           => $this->pod_method,
-            'pod_required'         => (bool) data_get($this, 'pod_required', false),
-            'dispatched'           => (bool) data_get($this, 'dispatched', false),
-            'started'              => (bool) data_get($this, 'started', false),
-            'adhoc'                => (bool) data_get($this, 'adhoc', false),
-            'adhoc_distance'       => (int) $this->getAdhocDistance(),
-            'distance'             => (int) $this->distance,
-            'time'                 => (int) $this->time,
-            'tracker_data'         => $this->when($withTrackerData, function () use ($tracker) {
+            'tracking'                             => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->tracking_number : null),
+            'barcode'                              => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->barcode : null),
+            'qr_code'                              => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->qr_code : null),
+            'comments'                             => $this->when($isInternal, Comment::collection($this->comments)),
+            'files'                                => $this->when($isInternal, $this->files, File::collection($this->files)),
+            'purchase_rate'                        => new PurchaseRate($this->purchaseRate),
+            'notes'                                => $this->notes,
+            'type'                                 => $this->type,
+            'status'                               => $this->status,
+            'pod_method'                           => $this->pod_method,
+            'pod_required'                         => (bool) data_get($this, 'pod_required', false),
+            'dispatched'                           => (bool) data_get($this, 'dispatched', false),
+            'started'                              => (bool) data_get($this, 'started', false),
+            'adhoc'                                => (bool) data_get($this, 'adhoc', false),
+            'adhoc_distance'                       => (int) $this->getAdhocDistance(),
+            'distance'                             => (int) $this->distance,
+            'time'                                 => (int) $this->time,
+            'transaction_amount'                   => $this->transaction_amount,
+            'currency'                             => $this->transaction_currency,
+            'tracker_data'                         => $this->when($withTrackerData, function () use ($tracker) {
                 return $this->resource->tracker_data ?? ($tracker ? $tracker->toArray() : null);
             }),
             'eta'                  => $this->when($withEta, function () use ($tracker) {

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/Mail/CustomerCredentialsMail.php

@@ -45,7 +45,7 @@ class CustomerCredentialsMail extends Mailable
         $this->customer->loadMissing('company');
 
         return new Envelope(
-            subject: 'Your login credentials for ' . $this->customer->company->name . ' on ' . config('app.name'),
+            subject: 'Your ' . $this->customer->company->name . ' customer portal access is ready',
         );
     }
 
@@ -63,19 +63,18 @@ class CustomerCredentialsMail extends Mailable
                 'customer'          => $this->customer,
                 'plaintextPassword' => $this->plaintextPassword,
                 'customerPortalUrl' => $this->getCustomerPortalAccessUrl(),
-                'currentHour'       => now()->hour,
             ]
         );
     }
 
     /**
-     * Get the customer portal URL if available.
+     * Get the customer portal URL.
      */
-    private function getCustomerPortalAccessUrl(): ?string
+    private function getCustomerPortalAccessUrl(): string
     {
         $customerPortalConfig = Setting::lookupFromCompany('customer-portal-config');
-        $accessUrlSlug        = data_get($customerPortalConfig, 'accessUrlSlug');
+        $accessUrlSlug        = data_get($customerPortalConfig, 'accessUrlSlug', 'customer-portal');
 
-        return $accessUrlSlug ? Utils::consoleUrl($accessUrlSlug) : null;
+        return Utils::consoleUrl($accessUrlSlug ?: 'customer-portal');
     }
 }