@fleetbase/fleetops-engine 0.6.49 → 0.6.51

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

@@ -50,7 +50,7 @@ class DriverController extends Controller
         $input = $request->except(['name', 'password', 'email', 'phone', 'location', 'altitude', 'heading', 'speed', 'meta']);
 
         // Add default status
-        $input['status'] = 'active';
+        $input['status'] = $request->input('status', 'available');
 
         // get user details for driver
         $userDetails                 = $request->only(['name', 'password', 'email', 'phone', 'timezone']);

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

@@ -30,6 +30,7 @@ class IssueController extends Controller
             'type',
             'report',
             'priority',
+            'tags',
             'status',
         ]);
 
@@ -85,6 +86,7 @@ class IssueController extends Controller
             'type',
             'report',
             'priority',
+            'tags',
             'status',
         ]);
 

package/server/src/Http/Controllers/Api/v1/OrderConfigController.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Api\v1;
+
+use Fleetbase\FleetOps\Http\Resources\v1\OrderConfig as OrderConfigResource;
+use Fleetbase\FleetOps\Models\OrderConfig;
+use Fleetbase\Http\Controllers\Controller;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Http\Request;
+
+/**
+ * Public, read-only API surface for OrderConfigs.
+ *
+ * The internal admin console manages the full OrderConfig lifecycle through
+ * `/int/v1/order-configs`. This public endpoint exposes the projected,
+ * non-sensitive subset (flow activities + metadata) that consumers like a
+ * customer portal need to render status filter chips, activity labels, and
+ * other UI driven by the active flow.
+ */
+class OrderConfigController extends Controller
+{
+    /**
+     * List the OrderConfigs for the company resolved from the API credential.
+     *
+     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
+     */
+    public function query(Request $request)
+    {
+        $results = OrderConfig::queryWithRequest($request);
+
+        return OrderConfigResource::collection($results);
+    }
+
+    /**
+     * Find a single OrderConfig. The `{id}` segment accepts any identifier
+     * supported by {@see OrderConfig::resolveFromIdentifier} — `uuid`,
+     * `public_id`, `namespace`, or short `key` (e.g. `transport`).
+     *
+     * @return OrderConfigResource|\Illuminate\Http\JsonResponse
+     */
+    public function find(string $id)
+    {
+        $orderConfig = OrderConfig::resolveFromIdentifier($id);
+        if (!$orderConfig) {
+            try {
+                $orderConfig = OrderConfig::findRecordOrFail($id);
+            } catch (ModelNotFoundException $e) {
+                return response()->apiError('Order config not found.', 404);
+            }
+        }
+
+        return new OrderConfigResource($orderConfig);
+    }
+}

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

@@ -5,6 +5,7 @@ namespace Fleetbase\FleetOps\Http\Controllers\Api\v1;
 use Fleetbase\FleetOps\Events\OrderDispatchFailed;
 use Fleetbase\FleetOps\Events\OrderReady;
 use Fleetbase\FleetOps\Events\OrderStarted;
+use Fleetbase\FleetOps\Exceptions\CustomerUserConflictException;
 use Fleetbase\FleetOps\Exceptions\UserAlreadyExistsException;
 use Fleetbase\FleetOps\Flow\Activity;
 use Fleetbase\FleetOps\Http\Requests\CreateOrderRequest;
@@ -23,6 +24,7 @@ use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\FleetOps\Models\Proof;
 use Fleetbase\FleetOps\Models\ServiceQuote;
 use Fleetbase\FleetOps\Models\Waypoint;
+use Fleetbase\FleetOps\Support\ResolvesOrderServiceStops;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Http\Resources\Comment as CommentResource;
@@ -43,6 +45,8 @@ use Illuminate\Validation\ValidationException;
 
 class OrderController extends Controller
 {
+    use ResolvesOrderServiceStops;
+
     /**
      * Creates a new Fleetbase Order resource.
      *
@@ -251,6 +255,13 @@ class OrderController extends Controller
                 $customer = Arr::only($customer, ['internal_id', 'name', 'title', 'email', 'phone', 'meta']);
 
                 try {
+                    $customerCandidate = new Contact([
+                        ...$customer,
+                        'company_uuid' => session('company'),
+                        'type'         => 'customer',
+                    ]);
+                    $customerCandidate->assertCustomerIdentityIsAvailable();
+
                     $customer = Contact::firstOrCreate(
                         [
                             'company_uuid' => session('company'),
@@ -263,19 +274,12 @@ class OrderController extends Controller
                             'type'         => 'customer',
                         ]
                     );
+                } catch (CustomerUserConflictException $e) {
+                    return response()->apiError($e->getMessage());
+                } catch (UserAlreadyExistsException $e) {
+                    return response()->apiError($e->getMessage());
                 } catch (\Exception $e) {
                     return response()->apiError('Failed to find or create customer for order.');
-                } catch (UserAlreadyExistsException $e) {
-                    try {
-                        // If user already exist then assign user to this customer and the company
-                        $existingUser = $e->getUser();
-                        // Assign user to customer
-                        if ($existingUser && $customer) {
-                            $customer->assignUser($existingUser);
-                        }
-                    } catch (\Exception $e) {
-                        return response()->apiError('Failed to find or create customer for order.');
-                    }
                 }
 
                 if (Str::isUuid($customer)) {
@@ -1009,11 +1013,10 @@ class OrderController extends Controller
         $driver->current_job_uuid = $order->uuid;
         $driver->save();
 
-        /** @var \Fleetbase\LaravelMysqlSpatial\Types\Point */
-        $location = $order->getLastLocation();
-
-        // set first destination for payload
-        $payload->setFirstWaypoint($activity, $location);
+        // set first service stop destination for multi-stop routes
+        if ($this->payloadUsesServiceStopActivity($payload)) {
+            $this->ensurePayloadCurrentServiceStop($payload);
+        }
         $order->setRelation('payload', $payload);
 
         // update order activity
@@ -1043,7 +1046,17 @@ class OrderController extends Controller
         // if string $id
         if (!$order) {
             try {
-                $order = Order::findRecordOrFail($id, ['driverAssigned', 'payload.entities', 'payload.currentWaypoint', 'payload.waypoints']);
+                $order = Order::findRecordOrFail($id, [
+                    'driverAssigned',
+                    'payload.entities',
+                    'payload.pickup',
+                    'payload.dropoff',
+                    'payload.return',
+                    'payload.currentWaypoint',
+                    'payload.waypoints',
+                    'payload.waypointMarkers.place',
+                    'payload.waypointMarkers.trackingNumber.status',
+                ]);
             } catch (ModelNotFoundException $exception) {
                 return response()->apiError('Order resource not found.', 404);
             }
@@ -1094,65 +1107,59 @@ class OrderController extends Controller
         /** @var \Fleetbase\LaravelMysqlSpatial\Types\Point */
         $location = $order->getLastLocation();
 
-        // Check if multiple waypoint order to update activity for
-        $isMultipleWaypointOrder = (bool) $order->payload->isMultipleDropOrder;
-
-        // if is multi drop order and no current destination set it
-        if ($isMultipleWaypointOrder && !$order->payload->current_waypoint_uuid) {
-            $order->payload->setFirstWaypoint($activity, $location);
-        }
+        $usesServiceStopActivity = $this->payloadUsesServiceStopActivity($order->payload);
+        $isLifecycleActivity     = Utils::isActivity($activity) && in_array($activity->code, ['created', 'dispatched', 'started'], true);
 
-        // Handle multiple dropoff waypoint activity
-        if (Utils::isActivity($activity) && $activity->completesOrder() && $isMultipleWaypointOrder) {
-            // Check if every waypoint is completed
-            $isCompleted = $order->payload->waypointMarkers->every(function ($waypoint) {
-                return $waypoint->complete;
-            });
+        // Classic pickup/dropoff orders and static lifecycle statuses update the order.
+        if (!$usesServiceStopActivity || $isLifecycleActivity) {
+            // Update order activity
+            $order->updateActivity($activity, $proof);
 
-            // only update activity for waypoint
-            if (!$isCompleted) {
-                $order->payload->updateWaypointActivity($activity, $location, $proof);
-                $order->payload->setNextWaypointDestination();
-                $order->payload->load('waypointMarkers');
+            if (!$usesServiceStopActivity) {
+                foreach ($order->payload->entities as $entity) {
+                    $entity->insertActivity($activity, $location, $proof);
+                }
+            }
 
-                // recheck if order is completed
-                $isFullyCompleted = $order->payload->waypointMarkers->every(function ($waypoint) {
-                    return $waypoint->complete;
-                });
+            if ($usesServiceStopActivity && $activity->is('started')) {
+                $this->ensurePayloadCurrentServiceStop($order->payload);
+            }
 
-                if (!$isFullyCompleted) {
-                    return new OrderResource($order);
-                }
+            // Handle order completion
+            if (Utils::isActivity($activity) && $activity->completesOrder()) {
+                $order->driverAssigned?->unassignCurrentJob();
+                $order->complete($this->resolveProof($proof));
             }
+
+            return new OrderResource($order->refresh());
         }
 
-        // also update for each order entities if not multiple drop order
-        // all entities will share the same activity status as is one drop order
-        if (!$isMultipleWaypointOrder) {
-            // Update order activity
-            $order->updateActivity($activity, $proof);
+        if (!$order->started && in_array($order->status, ['created', 'dispatched'], true)) {
+            return response()->apiError('Order must be started before waypoint activity can be updated.', 422);
+        }
 
-            // Only update entities belonging to the waypoint
-            foreach ($order->payload->entities as $entity) {
-                $entity->insertActivity($activity, $location, $proof);
-            }
-        } else {
-            // Update parent order when status is `dispatched` or `started`
-            if (in_array($activity->code, ['started', 'dispatched'])) {
-                $order->updateActivity($activity, $proof);
-            }
+        $currentStop               = $this->ensurePayloadCurrentServiceStop($order->payload);
+        $isCompletingCurrentStop   = Utils::isActivity($activity) && $activity->complete();
 
-            $order->payload->updateWaypointActivity($activity, $location);
+        $this->updateCurrentServiceStopActivity($order, $activity, $location, $proof);
+
+        if (Utils::isActivity($activity) && $activity->is('canceled')) {
+            $order->driverAssigned?->unassignCurrentJob();
+            $order->cancel();
+
+            return new OrderResource($order->refresh());
         }
 
-        // Handle order completion
         if (Utils::isActivity($activity) && $activity->completesOrder()) {
-            // unset from driver current job
-            $order->driverAssigned->unassignCurrentJob();
-            $order->complete();
+            $nextStop = $isCompletingCurrentStop ? $this->advanceCurrentServiceStopDestination($order, $order->payload) : null;
+
+            if (!$nextStop || !$currentStop) {
+                $order->driverAssigned?->unassignCurrentJob();
+                $order->complete($this->resolveProof($proof));
+            }
         }
 
-        return new OrderResource($order);
+        return new OrderResource($order->refresh());
     }
 
     /**
@@ -1165,7 +1172,14 @@ class OrderController extends Controller
         $waypointId = $request->input('waypoint');
 
         try {
-            $order = Order::findRecordOrFail($id, ['payload']);
+            $order = Order::findRecordOrFail($id, [
+                'payload.pickup',
+                'payload.dropoff',
+                'payload.return',
+                'payload.waypoints',
+                'payload.waypointMarkers.place',
+                'payload.waypointMarkers.trackingNumber.status',
+            ]);
         } catch (ModelNotFoundException $exception) {
             return response()->json(
                 [
@@ -1175,19 +1189,20 @@ class OrderController extends Controller
             );
         }
 
-        // 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();
+        $canUpdateServiceStopActivity = $this->payloadUsesServiceStopActivity($order->payload)
+            && ($order->started || $order->started_at || !in_array($order->status, ['created', 'dispatched'], true));
+        $stop = null;
+        if ($canUpdateServiceStopActivity) {
+            $stop = $waypointId
+                ? $this->resolveServiceStopFromKey($order->payload, $waypointId)
+                : $this->payloadCurrentServiceStop($order->payload);
         }
 
         $orderConfig = $order->ensureOrderConfig();
         if (!$orderConfig) {
             return response()->apiError('No order config found for order.');
         }
-        $activities = $orderConfig->nextActivity($waypoint);
+        $activities = $stop ? $this->nextActivitiesForServiceStop($order, $order->payload, $stop) : $orderConfig->nextActivity();
 
         // If activity is to complete order add proof of delivery properties if required
         // This is a temporary fix until activity is updated to handle POD on it's own
@@ -1282,7 +1297,18 @@ class OrderController extends Controller
     public function setDestination(string $id, string $placeId)
     {
         try {
-            $order = Order::findRecordOrFail($id, ['payload.waypoints', 'payload.pickup', 'payload.dropoff', 'driverAssigned', 'vehicleAssigned', 'customer', 'facilitator']);
+            $order = Order::findRecordOrFail($id, [
+                'payload.pickup',
+                'payload.dropoff',
+                'payload.return',
+                'payload.waypoints',
+                'payload.waypointMarkers.place',
+                'payload.waypointMarkers.trackingNumber.status',
+                'driverAssigned',
+                'vehicleAssigned',
+                'customer',
+                'facilitator',
+            ]);
         } catch (ModelNotFoundException $exception) {
             return response()->apiError('Order resource not found.', 404);
         }
@@ -1290,17 +1316,13 @@ class OrderController extends Controller
         // Get the order payload
         $payload = $order->payload;
 
-        // Resolve the place
-        $place = $payload->waypoints->firstWhere('public_id', $placeId)
-            ?? (($payload->pickup && $payload->pickup->public_id === $placeId) ? $payload->pickup : null)
-            ?? (($payload->dropoff && $payload->dropoff->public_id === $placeId) ? $payload->dropoff : null);
-
-        if (!$place) {
+        $stop = $this->resolveServiceStopFromKey($payload, $placeId);
+        if (!$stop) {
             return response()->apiError('Place resource is not a valid destination.', 422);
         }
 
         // Persist destination choice
-        $payload->setCurrentWaypoint($place);
+        $this->setPayloadCurrentServiceStop($payload, $stop);
 
         return new OrderResource($order->refresh());
     }
@@ -1385,7 +1407,7 @@ class OrderController extends Controller
 
         // Load Order
         try {
-            $order = Order::findRecordOrFail($id);
+            $order = Order::findRecordOrFail($id, ['payload.pickup', 'payload.dropoff', 'payload.return', 'payload.waypoints', 'payload.waypointMarkers.place']);
         } catch (ModelNotFoundException $e) {
             return response()->apiError('Order resource not found.', 404);
         }
@@ -1580,7 +1602,7 @@ class OrderController extends Controller
 
         // Load Order
         try {
-            $order = Order::findRecordOrFail($id);
+            $order = Order::findRecordOrFail($id, ['payload.pickup', 'payload.dropoff', 'payload.return', 'payload.waypoints', 'payload.waypointMarkers.place']);
         } catch (ModelNotFoundException $e) {
             return response()->apiError('Order resource not found.', 404);
         }
@@ -1678,6 +1700,13 @@ class OrderController extends Controller
             return $order;
         }
 
+        if (in_array($type, ['place', 'waypoint'], true)) {
+            $stop = $this->resolveServiceStopFromKey($order->payload, $subjectId);
+            if ($stop) {
+                return ($stop['waypoint'] ?? null) instanceof Waypoint ? $stop['waypoint'] : ($stop['place'] ?? $order);
+            }
+        }
+
         return match ($type) {
             'place', 'waypoint' => Waypoint::withoutGlobalScopes()
                 ->where('payload_uuid', $order->payload_uuid)

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

@@ -7,15 +7,11 @@ use Fleetbase\FleetOps\Http\Requests\UpdatePlaceRequest;
 use Fleetbase\FleetOps\Http\Resources\v1\DeletedResource;
 use Fleetbase\FleetOps\Http\Resources\v1\Place as PlaceResource;
 use Fleetbase\FleetOps\Models\Place;
+use Fleetbase\FleetOps\Support\PlaceSearch;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\LaravelMysqlSpatial\Types\Point;
-use Geocoder\Laravel\Facades\Geocoder;
-use Geocoder\Provider\GoogleMapsPlaces\GoogleMapsPlaces;
-use Geocoder\Query\GeocodeQuery;
-use Http\Adapter\Guzzle7\Client;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
 class PlaceController extends Controller
@@ -283,63 +279,19 @@ class PlaceController extends Controller
     {
         $searchQuery = strtolower($request->input('query'));
         $limit       = $request->input('limit', 10);
-        $geo         = $request->input('geo', false);
+        $geo         = $request->boolean('geo');
         $latitude    = $request->input('latitude', false);
         $longitude   = $request->input('longitude', false);
 
-        $results = DB::table('places')
-            ->where('company_uuid', session('company'))
-            ->whereNull('deleted_at')
-            ->where(function ($q) use ($searchQuery) {
-                if (Utils::notEmpty($searchQuery)) {
-                    $q->orWhere(DB::raw('lower(name)'), 'like', '%' . $searchQuery . '%');
-                    $q->orWhere(DB::raw('lower(street1)'), 'like', '%' . $searchQuery . '%');
-                    $q->orWhere(DB::raw('lower(postal_code)'), 'like', '%' . $searchQuery . '%');
-                }
-            })
-            ->limit($limit)
-            ->orderBy('name', 'desc')
-            ->get()
-            ->map(function ($place) {
-                $place             = (array) $place;
-                $place['location'] = Utils::mysqlPointAsGeometry($place['location']);
-                $place             = new Place($place);
-                $place->address    = $place->toAddressString();
-
-                return $place;
-            })
-            ->values();
-
-        if ($geo && Utils::notEmpty($searchQuery)) {
-            $httpClient = new Client();
-            $provider   = new \Geocoder\Provider\GoogleMaps\GoogleMaps($httpClient, null, env('GOOGLE_MAPS_API_KEY'));
-            $geocoder   = new \Geocoder\StatefulGeocoder($provider, 'en');
-
-            if ($latitude && $longitude) {
-                $geoResults = $geocoder->geocodeQuery(
-                    GeocodeQuery::create($searchQuery)
-                        ->withData('mode', GoogleMapsPlaces::GEOCODE_MODE_SEARCH)
-                        ->withData('location', "$latitude, $longitude")
-                );
-
-                $geoResults = collect($geoResults->all());
-            } else {
-                $geoResults = Geocoder::geocode($searchQuery)->get();
-            }
+        $query = Place::where('company_uuid', session('company'))->whereNull('deleted_at');
 
-            $geoResults = $geoResults
-                ->map(function ($googleAddress) {
-                    return Place::createFromGoogleAddress($googleAddress);
-                })
-                ->values();
-
-            $results = $results->merge($geoResults);
-        }
-
-        $results = $results
-            ->sortBy('name')
-            ->values()
-            ->toArray();
+        $results = PlaceSearch::search($query, $searchQuery, [
+            'limit'          => $limit,
+            'geo'            => $geo,
+            'latitude'       => $latitude,
+            'longitude'      => $longitude,
+            'no_query_order' => 'name_desc',
+        ]);
 
         return PlaceResource::collection($results);
     }

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

@@ -24,7 +24,7 @@ class ServiceAreaController extends Controller
     public function create(CreateServiceAreaRequest $request)
     {
         // get request input
-        $input = $request->only(['name', 'type', 'status', 'country', 'color', 'stroke_color', 'trigger_on_entry', 'trigger_on_exit', 'dwell_threshold_minutes', 'speed_limit_kmh']);
+        $input = $request->only(['name', 'type', 'status', 'country', 'border', 'color', 'stroke_color', 'trigger_on_entry', 'trigger_on_exit', 'dwell_threshold_minutes', 'speed_limit_kmh']);
 
         // get radius for creating service area border - default to 500 meters
         $radius = (int) $request->input('radius', 500);
@@ -99,7 +99,7 @@ class ServiceAreaController extends Controller
         }
 
         // get request input
-        $input = $request->only(['name', 'type', 'status', 'country', 'color', 'stroke_color', 'trigger_on_entry', 'trigger_on_exit', 'dwell_threshold_minutes', 'speed_limit_kmh']);
+        $input = $request->only(['name', 'type', 'status', 'country', 'border', 'color', 'stroke_color', 'trigger_on_entry', 'trigger_on_exit', 'dwell_threshold_minutes', 'speed_limit_kmh']);
 
         // get radius for creating service area border - default to 500 meters
         $radius = $request->input('radius', 500);

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

@@ -67,7 +67,7 @@ class VehicleController extends Controller
         $vehicle = Vehicle::create($input);
 
         // driver assignment
-        if ($request->has('driver')) {
+        if ($request->exists('driver') && !empty($request->input('driver'))) {
             // set this vehicle to the driver
             try {
                 $driver = Driver::findRecordOrFail($request->input('driver'));
@@ -80,8 +80,7 @@ class VehicleController extends Controller
                 );
             }
 
-            $driver->vehicle_uuid = $vehicle->uuid;
-            $driver->save();
+            $vehicle->assignDriver($driver);
         }
 
         // response the driver resource
@@ -150,6 +149,24 @@ class VehicleController extends Controller
         // save the update
         $vehicle->save();
 
+        if ($request->exists('driver')) {
+            if (empty($request->input('driver'))) {
+                $vehicle->unassignDriver();
+            } else {
+                try {
+                    $driver = Driver::findRecordOrFail($request->input('driver'));
+                    $vehicle->assignDriver($driver);
+                } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
+                    return response()->json(
+                        [
+                            'error' => 'The driver attempted to assign this vehicle was not found.',
+                        ],
+                        404
+                    );
+                }
+            }
+        }
+
         // get udpated vehicle
         $vehicle = $vehicle->refresh();