@fleetbase/fleetops-engine 0.6.18 → 0.6.19

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

@@ -29,12 +29,13 @@ use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\Internal\BulkActionRequest;
 use Fleetbase\Http\Requests\Internal\BulkDeleteRequest;
-use Fleetbase\Models\CustomFieldValue;
 use Fleetbase\Models\File;
 use Fleetbase\Models\Type;
 use Fleetbase\Support\TemplateString;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
@@ -59,6 +60,11 @@ class OrderController extends FleetOpsController
             $order->loadMissing('payload');
             $order->payload->updateWaypoints($waypoints);
         }
+
+        $customFieldValues = $request->array('order.custom_field_values');
+        if ($customFieldValues) {
+            $order->syncCustomFieldValues($customFieldValues);
+        }
     }
 
     /**
@@ -146,16 +152,7 @@ class OrderController extends FleetOpsController
 
                     // save custom field values
                     if (is_array($customFieldValues)) {
-                        foreach ($customFieldValues as $customFieldValue) {
-                            CustomFieldValue::create([
-                                'company_uuid'      => session('company'),
-                                'custom_field_uuid' => data_get($customFieldValue, 'custom_field_uuid'),
-                                'subject_uuid'      => $order->uuid,
-                                'subject_type'      => Utils::getMutationType($order),
-                                'value'             => data_get($customFieldValue, 'value'),
-                                'value_type'        => data_get($customFieldValue, 'value_type', 'text'),
-                            ]);
-                        }
+                        $order->syncCustomFieldValues($customFieldValues);
                     }
 
                     // if it's integrated vendor order apply to meta
@@ -168,19 +165,19 @@ class OrderController extends FleetOpsController
                         );
                     }
 
-                    // Run background processes on queue
-                    dispatch(function () use ($order, $serviceQuote): void {
-                        // notify driver if assigned
-                        $order->notifyDriverAssigned();
+                    // dispatch if flagged true
+                    $order->firstDispatchWithActivity();
 
-                        // set driving distance and time
-                        $order->setPreliminaryDistanceAndTime();
+                    // set driving distance and time
+                    $order->setPreliminaryDistanceAndTime();
 
-                        // if service quote attached purchase
-                        $order->purchaseServiceQuote($serviceQuote);
+                    // if service quote attached purchase
+                    $order->purchaseServiceQuote($serviceQuote);
 
-                        // dispatch if flagged true
-                        $order->firstDispatchWithActivity();
+                    // Run background processes on queue
+                    dispatch(function () use ($order): void {
+                        // notify driver if assigned
+                        $order->notifyDriverAssigned();
 
                         // Trigger order created event
                         event(new OrderReady($order));
@@ -192,12 +189,12 @@ class OrderController extends FleetOpsController
             $record->load(['payload', 'trackingNumber']);
 
             return ['order' => new $this->resource($record)];
-        } catch (\Exception $e) {
-            return response()->error($e->getMessage());
-        } catch (\Illuminate\Database\QueryException $e) {
-            return response()->error($e->getMessage());
+        } catch (QueryException $e) {
+            return response()->error(env('DEBUG') ? $e->getMessage() : 'Error occurred while trying to create a ' . $this->resourceSingularlName);
         } catch (FleetbaseRequestValidationException $e) {
             return response()->error($e->getErrors());
+        } catch (\Exception $e) {
+            return response()->error($e->getMessage());
         }
     }
 
@@ -345,7 +342,8 @@ class OrderController extends FleetOpsController
                 'status'  => 'OK',
                 'message' => 'Deleted ' . $count . ' orders',
                 'count'   => $count,
-            ]);
+            ]
+        );
     }
 
     /**
@@ -540,7 +538,7 @@ class OrderController extends FleetOpsController
         /**
          * @var Order
          */
-        $order = Order::select(['uuid', 'driver_assigned_uuid', 'order_config_uuid', 'adhoc', 'dispatched', 'dispatched_at'])->where('uuid', $request->input('order'))->withoutGlobalScopes()->first();
+        $order = Order::findById($request->input('order'), ['orderConfig', 'driverAssigned']);
         if (!$order) {
             return response()->error('No order found to dispatch.');
         }
@@ -661,14 +659,7 @@ class OrderController extends FleetOpsController
      */
     public function updateActivity(string $id, Request $request)
     {
-        $order = Order::withoutGlobalScopes()
-            ->where('uuid', $id)
-            ->with(['driverAssigned'])
-            ->whereNull('deleted_at')
-            ->orWhere('public_id', $id)
-            ->with(['payload.entities'])
-            ->first();
-
+        $order = Order::findById($id, ['driverAssigned', 'payload.entities']);
         if (!$order) {
             return response()->error('No order found.');
         }
@@ -685,7 +676,7 @@ class OrderController extends FleetOpsController
                 return response()->error('No driver assigned for order to dispatch to.');
             }
 
-            $order->dispatch();
+            $order->dispatchWithActivity();
 
             return response()->json(['status' => 'dispatched']);
         }
@@ -725,22 +716,13 @@ class OrderController extends FleetOpsController
      */
     public function nextActivity(string $id, Request $request)
     {
-        $waypointId = $request->input('waypoint');
-
         try {
-            $order = Order::findRecordOrFail($id, ['payload']);
-        } catch (ModelNotFoundException $exception) {
+            $order = Order::findByIdOrFail($id);
+        } catch (ModelNotFoundException $e) {
             return response()->error('No order found.');
         }
 
-        // Get waypoint record if available
-        $waypoint = null;
-        if ($waypointId) {
-            $waypoint = Waypoint::where('payload_uuid', $order->payload_uuid)->whereHas('place', function ($query) use ($waypointId) {
-                $query->where('public_id', $waypointId);
-            })->first();
-        }
-
+        $waypoint   = $request->filled('waypoint') ? Waypoint::findByPlace($request->input('waypoint'), $order) : null;
         $activities = $order->config()->nextActivity($waypoint);
 
         // If activity is to complete order add proof of delivery properties if required
@@ -768,11 +750,7 @@ class OrderController extends FleetOpsController
      */
     public function trackerInfo(string $id)
     {
-        $order = Order::withoutGlobalScopes()
-            ->where('uuid', $id)
-            ->orWhere('public_id', $id)
-            ->first();
-
+        $order = Order::findById($id);
         if (!$order) {
             return response()->error('No order found.');
         }
@@ -784,11 +762,7 @@ class OrderController extends FleetOpsController
 
     public function waypointEtas(string $id)
     {
-        $order = Order::withoutGlobalScopes()
-            ->where('uuid', $id)
-            ->orWhere('public_id', $id)
-            ->first();
-
+        $order = Order::findById($id);
         if (!$order) {
             return response()->error('No order found.');
         }
@@ -800,21 +774,118 @@ class OrderController extends FleetOpsController
     }
 
     /**
-     * Get all status options for an order.
+     * Retrieve all distinct order statuses for the authenticated company.
      *
-     * @return \Illuminate\Http\Response
+     * This endpoint compiles:
+     * 1. All unique `status` values from the `orders` table for the current company.
+     * 2. Optionally, all `Activity` codes defined in `OrderConfig` records that are
+     *    actually referenced by existing orders (via `order_config_uuid`).
+     *
+     * ---
+     * ### Query Parameters
+     * - `include_order_config_activities` (bool, optional)
+     *   When true, includes `Activity` codes from relevant `OrderConfig` instances.
+     *
+     * - `order_config_key` (string, optional)
+     *   Restricts both `orders` and `order_configs` to a specific configuration key.
+     *
+     * ---
+     * ### Behavior
+     * - Only includes order configs that are actually used by orders.
+     * - Uses the `activities()` method on each `OrderConfig` to extract all activity codes.
+     * - Merges and deduplicates both order statuses and activity codes.
+     *
+     * ---
+     * ### Example Response
+     * ```json
+     * [
+     *   "created",
+     *   "dispatched",
+     *   "completed",
+     *   "canceled",
+     *   "pickup_ready",
+     *   "awaiting_payment"
+     * ]
+     * ```
+     *
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function statuses()
+    public function statuses(Request $request)
     {
-        $statuses = DB::table('orders')
-            ->select('status')
-            ->where('company_uuid', session('company'))
-            ->distinct()
-            ->get()
-            ->pluck('status')
-            ->filter();
-
-        return response()->json($statuses);
+        $companyUuid = $request->user()->company_uuid ?? session('company');
+
+        $includeActivities = $request->boolean('include_order_config_activities', true);
+        $orderConfigKey    = trim((string) $request->string('order_config_key'));
+
+        // Get distinct statuses from orders
+        $ordersQuery = DB::table('orders')
+            ->where('company_uuid', $companyUuid)
+            ->whereNotNull('status');
+
+        if ($orderConfigKey !== '') {
+            $ordersQuery->whereExists(function ($q) use ($companyUuid, $orderConfigKey) {
+                $q->select(DB::raw(1))
+                  ->from('order_configs as oc')
+                  ->whereColumn('oc.uuid', 'orders.order_config_uuid')
+                  ->where('oc.company_uuid', $companyUuid)
+                  ->where('oc.key', $orderConfigKey);
+            });
+        }
+
+        $orderStatuses = $ordersQuery->distinct()->pluck('status')->filter();
+
+        // Optionally include activity codes from used order configs
+        $activityCodes = collect();
+
+        if ($includeActivities) {
+            $configUuidsOnOrders = DB::table('orders')
+                ->where('company_uuid', $companyUuid)
+                ->when($orderConfigKey !== '', function ($q) use ($companyUuid, $orderConfigKey) {
+                    $q->whereExists(function ($sub) use ($companyUuid, $orderConfigKey) {
+                        $sub->select(DB::raw(1))
+                            ->from('order_configs as oc')
+                            ->whereColumn('oc.uuid', 'orders.order_config_uuid')
+                            ->where('oc.company_uuid', $companyUuid)
+                            ->where('oc.key', $orderConfigKey);
+                    });
+                })
+                ->whereNotNull('order_config_uuid')
+                ->distinct()
+                ->pluck('order_config_uuid')
+                ->filter();
+
+            if ($configUuidsOnOrders->isNotEmpty()) {
+                $orderConfigs = OrderConfig::where('company_uuid', $companyUuid)
+                    ->whereIn('uuid', $configUuidsOnOrders)
+                    ->get();
+
+                /** @var OrderConfig $config */
+                foreach ($orderConfigs as $config) {
+                    if (!method_exists($config, 'activities')) {
+                        continue;
+                    }
+
+                    $activities = $config->activities();
+
+                    if ($activities instanceof Collection) {
+                        $codes = $activities
+                            ->map(fn ($activity) => $activity->code ?? null)
+                            ->filter()
+                            ->values();
+
+                        $activityCodes = $activityCodes->merge($codes);
+                    }
+                }
+            }
+        }
+
+        // Merge & deduplicate everything
+        $result = $orderStatuses
+            ->merge($activityCodes)
+            ->unique()
+            ->values();
+
+        return response()->json($result);
     }
 
     /**

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

@@ -0,0 +1,15 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+
+class PartController extends FleetOpsController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'part';
+}

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

@@ -25,6 +25,17 @@ class PlaceController extends FleetOpsController
      */
     public $resource = 'place';
 
+    /**
+     * Handle post save transactions.
+     */
+    public function afterSave(Request $request, Place $place)
+    {
+        $customFieldValues = $request->array('place.custom_field_values');
+        if ($customFieldValues) {
+            $place->syncCustomFieldValues($customFieldValues);
+        }
+    }
+
     /**
      * Quick search places for selection.
      *

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

@@ -0,0 +1,15 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+
+class SensorController extends FleetOpsController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'sensor';
+}

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

@@ -4,7 +4,9 @@ namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
 use Fleetbase\FleetOps\Exports\ServiceAreaExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+use Fleetbase\FleetOps\Models\ServiceArea;
 use Fleetbase\Http\Requests\ExportRequest;
+use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 
@@ -17,6 +19,17 @@ class ServiceAreaController extends FleetOpsController
      */
     public $resource = 'service_area';
 
+    /**
+     * Handle post save transactions.
+     */
+    public function afterSave(Request $request, ServiceArea $serviceArea)
+    {
+        $customFieldValues = $request->array('service_area.custom_field_values');
+        if ($customFieldValues) {
+            $serviceArea->syncCustomFieldValues($customFieldValues);
+        }
+    }
+
     /**
      * Export the fleets to excel or csv.
      *

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

@@ -0,0 +1,15 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+
+class TelematicController extends FleetOpsController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'telematic';
+}

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

@@ -8,6 +8,7 @@ use Fleetbase\FleetOps\Imports\VehicleImport;
 use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
@@ -21,6 +22,17 @@ class VehicleController extends FleetOpsController
      */
     public $resource = 'vehicle';
 
+    /**
+     * Handle post save transactions.
+     */
+    public function afterSave(Request $request, Vehicle $vehicle)
+    {
+        $customFieldValues = $request->array('vehicle.custom_field_values');
+        if ($customFieldValues) {
+            $vehicle->syncCustomFieldValues($customFieldValues);
+        }
+    }
+
     /**
      * Get all status options for an vehicle.
      *

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

@@ -24,6 +24,17 @@ class VendorController extends FleetOpsController
      */
     public $resource = 'vendor';
 
+    /**
+     * Handle post save transactions.
+     */
+    public function afterSave(Request $request, Vendor $vendor)
+    {
+        $customFieldValues = $request->array('vendor.custom_field_values');
+        if ($customFieldValues) {
+            $vendor->syncCustomFieldValues($customFieldValues);
+        }
+    }
+
     /**
      * Returns the vendor as a `facilitator-vendor`.
      *

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

@@ -0,0 +1,15 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+
+class WarrantyController extends FleetOpsController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'warranty';
+}

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

@@ -0,0 +1,15 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+
+class WorkOrderController extends FleetOpsController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'work-order';
+}

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

@@ -3,6 +3,8 @@
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+use Fleetbase\FleetOps\Models\Zone;
+use Illuminate\Http\Request;
 
 class ZoneController extends FleetOpsController
 {
@@ -12,4 +14,15 @@ class ZoneController extends FleetOpsController
      * @var string
      */
     public $resource = 'zone';
+
+    /**
+     * Handle post save transactions.
+     */
+    public function afterSave(Request $request, Zone $zone)
+    {
+        $customFieldValues = $request->array('zone.custom_field_values');
+        if ($customFieldValues) {
+            $zone->syncCustomFieldValues($customFieldValues);
+        }
+    }
 }

package/server/src/Http/Filter/DriverFilter.php

@@ -106,9 +106,12 @@ class DriverFilter extends Filter
         }
     }
 
-    public function status(?string $status)
+    public function status(string|array $status)
     {
-        $this->builder->searchWhere('status', $status);
+        $status = Utils::arrayFrom($status);
+        if ($status) {
+            $this->builder->whereIn('status', $status);
+        }
     }
 
     public function vendor(string $vendor)

package/server/src/Http/Filter/FleetFilter.php

@@ -93,9 +93,12 @@ class FleetFilter extends Filter
         $this->builder->searchWhere('name', $name);
     }
 
-    public function status(?string $status)
+    public function status(string|array $status)
     {
-        $this->builder->searchWhere('status', $status);
+        $status = Utils::arrayFrom($status);
+        if ($status) {
+            $this->builder->whereIn('status', $status);
+        }
     }
 
     public function createdAt($createdAt)

package/server/src/Http/Filter/IssueFilter.php

@@ -41,16 +41,11 @@ class IssueFilter extends Filter
         }
     }
 
-    public function status($status)
+    public function status(string|array $status)
     {
-        if (Str::contains($status, ',')) {
-            $status = explode(',', $status);
-        }
-
-        if (is_array($status)) {
+        $status = Utils::arrayFrom($status);
+        if ($status) {
             $this->builder->whereIn('status', $status);
-        } else {
-            $this->builder->where('status', $status);
         }
     }
 

package/server/src/Http/Filter/PlaceFilter.php

@@ -30,6 +30,11 @@ class PlaceFilter extends Filter
         $this->builder->searchWhere('public_id', $publicId);
     }
 
+    public function id(?string $id)
+    {
+        $this->builder->searchWhere('public_id', $id)->orWhere('uuid', $id);
+    }
+
     public function postalCode(?string $postalCode)
     {
         $this->builder->searchWhere('postal_code', $postalCode);

package/server/src/Http/Filter/VendorFilter.php

@@ -57,9 +57,12 @@ class VendorFilter extends Filter
         $this->builder->searchWhere('country', $country);
     }
 
-    public function status(?string $status)
+    public function status(string|array $status)
     {
-        $this->builder->searchWhere('status', $status);
+        $status = Utils::arrayFrom($status);
+        if ($status) {
+            $this->builder->whereIn('status', $status);
+        }
     }
 
     public function address(?string $address)

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

@@ -31,12 +31,14 @@ class CreateServiceRateRequest extends FleetbaseRequest
             'service_type'                  => [Rule::requiredIf($this->isMethod('POST')), 'string'],
             'service_area'                  => [Rule::exists('service_areas', 'public_id')->whereNull('deleted_at')],
             'zone'                          => [Rule::exists('zones', 'public_id')->whereNull('deleted_at')],
-            'rate_calculation_method'       => [Rule::requiredIf($this->isMethod('POST')), 'string', 'in:fixed_meter,per_meter,per_drop,algo'],
+            'rate_calculation_method'       => [Rule::requiredIf($this->isMethod('POST')), 'string', 'in:fixed_meter,fixed_rate,per_meter,per_drop,algo'],
             'currency'                      => ['required', 'size:3'],
             'base_fee'                      => ['numeric'],
             'per_meter_unit'                => ['required_if:rate_calculation_method,per_meter', 'string', 'in:km,m'],
             'per_meter_flat_rate_fee'       => ['required_if:rate_calculation_method,per_meter', 'numeric'],
-            'meter_fees'                    => ['required_if:rate_calculation_method,fixed_meter', 'array'],
+            'meter_fees'                    => [Rule::requiredIf(function ($input) {
+                return in_array($input->rate_calculation_method, ['fixed_meter', 'fixed_rate']);
+            }), 'array'],
             'meter_fees.*.distance'         => ['numeric'],
             'meter_fees.*.fee'              => ['numeric'],
             'algorithm'                     => ['required_if:rate_calculation_method,algo', new ComputableAlgo(), 'string'],

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

@@ -19,7 +19,9 @@ class Contact extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return [
+        $this->loadMissing(['place', 'places']);
+
+        return $this->withCustomFields([
             'id'                            => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'customer_id'                   => $this->when($this->type === 'customer' && Http::isPublicRequest(), Str::replace('contact', 'customer', $this->public_id)),
             'uuid'                          => $this->when(Http::isInternalRequest(), $this->uuid),
@@ -34,8 +36,8 @@ class Contact extends FleetbaseResource
             'email'                         => $this->email ?? null,
             'phone'                         => $this->phone ?? null,
             'photo_url'                     => $this->photo_url ?? null,
-            'place'                         => $this->whenLoaded('place', fn () => new Place($this->place)),
-            'places'                        => $this->whenLoaded('places', fn () => Place::collection($this->places)),
+            'place'                         => $this->whenLoaded('place', fn () => (new Place($this->place))->without('owner')),
+            'places'                        => $this->whenLoaded('places', fn () => Place::collection($this->places)->without('owner')),
             'user'                          => $this->when(Http::isInternalRequest(), fn () => new User($this->user), fn () => $this->user ? $this->user->public_id : null),
             'address'                       => $this->when(Http::isInternalRequest(), data_get($this, 'place.address')),
             'address_street'                => $this->when(Http::isInternalRequest(), data_get($this, 'place.street1')),
@@ -46,7 +48,7 @@ class Contact extends FleetbaseResource
             'slug'                          => $this->slug ?? null,
             'updated_at'                    => $this->updated_at,
             'created_at'                    => $this->created_at,
-        ];
+        ]);
     }
 
     /**

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

@@ -17,7 +17,7 @@ class CurrentJob extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return [
+        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),
@@ -29,6 +29,6 @@ class CurrentJob extends FleetbaseResource
             'meta'         => data_get($this, 'meta', Utils::createObject()),
             'updated_at'   => $this->updated_at,
             'created_at'   => $this->created_at,
-        ];
+        ]);
     }
 }