@fleetbase/fleetops-engine 0.6.17 → 0.6.19

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

@@ -20,6 +20,7 @@ use Fleetbase\Models\Invite;
 use Fleetbase\Models\User;
 use Fleetbase\Models\VerificationCode;
 use Fleetbase\Support\Auth;
+use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
@@ -196,16 +197,20 @@ class DriverController extends FleetOpsController
                 },
                 function ($request, &$driver) {
                     $driver->load(['user']);
+                    $customFieldValues = $request->array('driver.custom_field_values');
+                    if ($customFieldValues) {
+                        $driver->syncCustomFieldValues($customFieldValues);
+                    }
                 }
             );
 
             return ['driver' => 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());
         }
     }
 
@@ -261,16 +266,20 @@ class DriverController extends FleetOpsController
                     }
 
                     $driver->setHidden(['user']);
+                    $customFieldValues = $request->array('driver.custom_field_values');
+                    if ($customFieldValues) {
+                        $driver->syncCustomFieldValues($customFieldValues);
+                    }
                 }
             );
 
             return ['driver' => 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 update a ' . $this->resourceSingularlName);
         } catch (FleetbaseRequestValidationException $e) {
             return response()->error($e->getErrors());
+        } catch (\Exception $e) {
+            return response()->error($e->getMessage());
         }
     }
 

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

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

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

@@ -13,6 +13,7 @@ use Fleetbase\FleetOps\Models\FleetVehicle;
 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\Str;
 use Maatwebsite\Excel\Facades\Excel;
@@ -26,11 +27,22 @@ class FleetController extends FleetOpsController
      */
     public $resource = 'fleet';
 
+    /**
+     * Handle post save transactions.
+     */
+    public function afterSave(Request $request, Fleet $fleet)
+    {
+        $customFieldValues = $request->array('fleet.custom_field_values');
+        if ($customFieldValues) {
+            $fleet->syncCustomFieldValues($customFieldValues);
+        }
+    }
+
     /**
      * Query callback when querying record.
      *
      * @param \Illuminate\Database\Query\Builder $query
-     * @param \Illuminate\Http\Request           $request
+     * @param Request                            $request
      */
     public static function onQueryRecord($query, $request): void
     {
@@ -94,7 +106,7 @@ class FleetController extends FleetOpsController
     /**
      * Removes a driver from a fleet.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
      * @return \Illuminate\Http\Response
      */
@@ -118,7 +130,7 @@ class FleetController extends FleetOpsController
     /**
      * Adds a driver to a fleet.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
      * @return \Illuminate\Http\Response
      */
@@ -151,7 +163,7 @@ class FleetController extends FleetOpsController
     /**
      * Removes a vehicle from a fleet.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
      * @return \Illuminate\Http\Response
      */
@@ -175,7 +187,7 @@ class FleetController extends FleetOpsController
     /**
      * Adds a vehicle to a fleet.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
      * @return \Illuminate\Http\Response
      */

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

@@ -5,8 +5,10 @@ namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 use Fleetbase\FleetOps\Exports\FuelReportExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Imports\FuelReportImport;
+use Fleetbase\FleetOps\Models\FuelReport;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
+use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 
@@ -19,6 +21,17 @@ class FuelReportController extends FleetOpsController
      */
     public $resource = 'fuel_report';
 
+    /**
+     * Handle post save transactions.
+     */
+    public function afterSave(Request $request, FuelReport $fuelReport)
+    {
+        $customFieldValues = $request->array('fuel_report.custom_field_values');
+        if ($customFieldValues) {
+            $fuelReport->syncCustomFieldValues($customFieldValues);
+        }
+    }
+
     /**
      * Export the fleets to excel or csv.
      *

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

@@ -5,8 +5,10 @@ namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 use Fleetbase\FleetOps\Exports\IssueExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Imports\IssueImport;
+use Fleetbase\FleetOps\Models\Issue;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
+use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 
@@ -19,6 +21,17 @@ class IssueController extends FleetOpsController
      */
     public $resource = 'issue';
 
+    /**
+     * Handle post save transactions.
+     */
+    public function afterSave(Request $request, Issue $issue)
+    {
+        $customFieldValues = $request->array('issue.custom_field_values');
+        if ($customFieldValues) {
+            $issue->syncCustomFieldValues($customFieldValues);
+        }
+    }
+
     /**
      * Export the issue to excel or csv.
      *

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

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

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`.
      *