@fleetbase/fleetops-engine 0.4.16 → 0.4.17

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

@@ -6,6 +6,7 @@ use Fleetbase\Exceptions\FleetbaseRequestValidationException;
 use Fleetbase\FleetOps\Events\OrderDispatchFailed;
 use Fleetbase\FleetOps\Events\OrderReady;
 use Fleetbase\FleetOps\Events\OrderStarted;
+use Fleetbase\FleetOps\Flow\Activity;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Http\Requests\CancelOrderRequest;
 use Fleetbase\FleetOps\Imports\OrdersImport;
@@ -17,9 +18,9 @@ use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\FleetOps\Models\ServiceQuote;
 use Fleetbase\FleetOps\Models\TrackingStatus;
 use Fleetbase\FleetOps\Models\Waypoint;
-use Fleetbase\FleetOps\Support\Flow;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Requests\Internal\BulkDeleteRequest;
+use Fleetbase\Models\CustomFieldValue;
 use Fleetbase\Models\File;
 use Fleetbase\Models\Type;
 use Illuminate\Http\Request;
@@ -78,11 +79,12 @@ class OrderController extends FleetOpsController
                     $isIntegratedVendorOrder = isset($requestInput['integrated_vendor_order']);
                     $serviceQuote            = ServiceQuote::resolveFromRequest($request);
 
-                    $route     = Utils::get($input, 'route');
-                    $payload   = Utils::get($input, 'payload');
-                    $waypoints = Utils::get($input, 'payload.waypoints');
-                    $entities  = Utils::get($input, 'payload.entities');
-                    $uploads   = Utils::get($input, 'files', []);
+                    $route               = Utils::get($input, 'route');
+                    $payload             = Utils::get($input, 'payload');
+                    $waypoints           = Utils::get($input, 'payload.waypoints');
+                    $entities            = Utils::get($input, 'payload.entities');
+                    $uploads             = Utils::get($input, 'files', []);
+                    $customFieldValues   = Utils::get($input, 'custom_field_values', []);
 
                     // save order route & payload with request input
                     $order
@@ -102,6 +104,20 @@ 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'),
+                            ]);
+                        }
+                    }
+
                     // if it's integrated vendor order apply to meta
                     if ($isIntegratedVendorOrder) {
                         $order->updateMeta(
@@ -357,7 +373,7 @@ class OrderController extends FleetOpsController
         /**
          * @var \Fleetbase\Models\Order
          */
-        $order = Order::select(['uuid', 'driver_assigned_uuid', 'adhoc', 'dispatched', 'dispatched_at'])->where('uuid', $request->input('order'))->withoutGlobalScopes()->first();
+        $order = Order::select(['uuid', 'driver_assigned_uuid', 'order_config_uuid', 'adhoc', 'dispatched', 'dispatched_at'])->where('uuid', $request->input('order'))->withoutGlobalScopes()->first();
 
         if (!$order->hasDriverAssigned && !$order->adhoc) {
             return response()->error('No driver assigned to dispatch!');
@@ -367,7 +383,7 @@ class OrderController extends FleetOpsController
             return response()->error('Order has already been dispatched!');
         }
 
-        $order->dispatch();
+        $order->dispatchWithActivity();
 
         return response()->json(
             [
@@ -425,7 +441,7 @@ class OrderController extends FleetOpsController
         $driver->save();
 
         // get the next order activity
-        $flow = $activity = Flow::getNextActivity($order);
+        $flow = $activity = $order->config()->nextFirstActivity();
 
         /**
          * @var \Fleetbase\LaravelMysqlSpatial\Types\Point
@@ -443,11 +459,11 @@ class OrderController extends FleetOpsController
 
             // update activity for each waypoint and entity
             foreach ($payload->waypointMarkers as $waypointMarker) {
-                $waypointMarker->insertActivity($activity['status'], $activity['details'], $location, $activity['code']);
+                $waypointMarker->insertActivity($activity, $location);
             }
 
             foreach ($payload->entities as $entity) {
-                $entity->insertActivity($activity['status'], $activity['details'], $location, $activity['code']);
+                $entity->insertActivity($activity, $location);
             }
         }
 
@@ -477,10 +493,11 @@ class OrderController extends FleetOpsController
             return response()->error('No order found.');
         }
 
-        $activity = $request->input('activity');
+        $activity = $request->array('activity');
+        $activity = new Activity($activity, $order->getConfigFlow());
 
-        // handle pickup/dropoff order activity update as normal
-        if (is_array($activity) && $activity['code'] === 'dispatched') {
+        // Handle pickup/dropoff order activity update as normal
+        if (Utils::isActivity($activity) && $activity->is('dispatched')) {
             // make sure driver is assigned if not trigger failed dispatch
             if (!$order->hasDriverAssigned && !$order->adhoc) {
                 event(new OrderDispatchFailed($order, 'No driver assigned for order to dispatch to.'));
@@ -493,28 +510,31 @@ class OrderController extends FleetOpsController
             return response()->json(['status' => 'dispatched']);
         }
 
-        if (is_array($activity) && $activity['code'] === 'completed' && $order->driverAssigned) {
-            // unset from driver current job
-            $order->driverAssigned->unassignCurrentOrder();
-            $order->notifyCompleted();
-        }
-
         /**
          * @var \Fleetbase\LaravelMysqlSpatial\Types\Point
          */
         $location = $order->getLastLocation();
-
-        $order->setStatus($activity['code']);
-        $order->insertActivity($activity['status'], $activity['details'], $location, $activity['code']);
+        $order->setStatus($activity->code);
+        $order->insertActivity($activity, $location);
 
         // 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 (!$order->payload->isMultipleDropOrder) {
             foreach ($order->payload->entities as $entity) {
-                $entity->insertActivity($activity['status'], $activity['details'], $location, $activity['code']);
+                $entity->insertActivity($activity, $location);
             }
         }
 
+        // Handle order completed
+        if (Utils::isActivity($activity) && $activity->completesOrder() && $order->driverAssigned) {
+            // unset from driver current job
+            $order->driverAssigned->unassignCurrentOrder();
+            $order->complete();
+        }
+
+        // Fire activity events
+        $activity->fireEvents($order);
+
         return response()->json(['status' => 'ok']);
     }
 
@@ -534,9 +554,9 @@ class OrderController extends FleetOpsController
             return response()->error('No order found.');
         }
 
-        $flow = Flow::getOrderFlow($order);
+        $nextActivities = $order->config()->nextActivity();
 
-        return response()->json($flow);
+        return response()->json($nextActivities);
     }
 
     /**

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

@@ -11,6 +11,15 @@ use Illuminate\Http\Request;
  */
 class SettingController extends Controller
 {
+    /**
+     * Retrieves the current visibility settings.
+     *
+     * This method fetches the visibility settings for 'fleet-ops' from the database and
+     * returns them in a JSON response. The settings are retrieved based on a specific key
+     * from the 'Setting' model.
+     *
+     * @return \Illuminate\Http\Response the visibility settings in JSON format
+     */
     public function getVisibilitySettings()
     {
         $visibilitySettings = Setting::where('key', 'fleet-ops.visibility')->value('value');
@@ -18,6 +27,17 @@ class SettingController extends Controller
         return response()->json(['visibilitySettings' => $visibilitySettings]);
     }
 
+    /**
+     * Saves the visibility settings provided in the request.
+     *
+     * This method accepts visibility settings via the request and updates them in the database.
+     * The new settings are saved using a specific key in the 'Setting' model. The method
+     * returns the updated settings in a JSON response.
+     *
+     * @param Request $request the HTTP request containing the visibility settings
+     *
+     * @return \Illuminate\Http\Response the updated visibility settings in JSON format
+     */
     public function saveVisibilitySettings(Request $request)
     {
         $visibilitySettings = $request->input('visibilitySettings', []);

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

@@ -0,0 +1,13 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\Http\Filter\Filter;
+
+class OrderConfigFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+}

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

@@ -0,0 +1,19 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Requests;
+
+use Fleetbase\Http\Requests\FleetbaseRequest;
+
+class CreateIssueRequest extends FleetbaseRequest
+{
+    public function rules()
+    {
+        return [
+            'driver'       => ['required'],
+            'location'     => ['required'],
+            'category'     => ['nullable'],
+            'type'         => ['nullable'],
+            'priority'     => ['nullable'],
+        ];
+    }
+}

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

@@ -0,0 +1,7 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Requests;
+
+class UpdateIssueRequest extends CreateIssueRequest
+{
+}

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

@@ -39,6 +39,8 @@ class Order extends FleetbaseResource
             'service_quote_uuid'   => $this->when(Http::isInternalRequest(), $this->service_quote_uuid),
             'has_driver_assigned'  => $this->when(Http::isInternalRequest(), $this->has_driver_assigned),
             'is_scheduled'         => $this->when(Http::isInternalRequest(), $this->is_scheduled),
+            'order_config'         => $this->when(Http::isInternalRequest(), $this->whenLoaded('orderConfig', $this->orderConfig)),
+            'custom_field_values'  => $this->when(Http::isInternalRequest(), $this->customFieldValues),
             'customer'             => $this->setCustomerType(Resolve::resourceForMorph($this->customer_type, $this->customer_uuid)),
             'payload'              => new Payload($this->payload),
             'facilitator'          => $this->setFacilitatorType(Resolve::resourceForMorph($this->facilitator_type, $this->facilitator_uuid)),
@@ -49,6 +51,7 @@ class Order extends FleetbaseResource
             'files'                => $this->when(Http::isInternalRequest(), $this->files, File::collection($this->files)),
             'purchase_rate'        => new PurchaseRate($this->purchaseRate),
             'notes'                => $this->notes,
+            ...$this->getCustomFieldValues(),
             'type'                 => $this->type,
             'status'               => $this->status,
             'pod_method'           => $this->pod_method,

package/server/src/Listeners/HandleOrderCanceled.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Listeners;
 
 use Fleetbase\FleetOps\Events\OrderCanceled;
+use Fleetbase\FleetOps\Flow\Activity;
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Notifications\OrderCanceled as OrderCanceledNotification;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -25,15 +26,18 @@ class HandleOrderCanceled implements ShouldQueue
         $order    = $event->getModelRecord();
         $location = $order->getLastLocation();
 
-        // update order activity
-        $order->setStatus('canceled');
-        $order->createActivity('Order canceled', 'Order was canceled', $location, $order->status);
+        // Create order cancel activity
+        $activity = $order->config()->getCanceledActivity();
+
+        // Update order activity
+        $order->setStatus($activity->status);
+        $order->createActivity($activity, $location);
 
         if ($order->isIntegratedVendorOrder()) {
             $order->facilitator->provider()->callback('onCanceled', $order);
         }
 
-        // notify driver assigned order was canceled
+        // Notify driver assigned order was canceled
         if ($order->hasDriverAssigned) {
             /** @var \Fleetbase\Models\Driver */
             $driver = Driver::where('uuid', $order->driver_assigned_uuid)->withoutGlobalScopes()->first();

package/server/src/Listeners/HandleOrderDispatched.php

@@ -5,9 +5,9 @@ namespace Fleetbase\FleetOps\Listeners;
 use Fleetbase\FleetOps\Events\OrderDispatched;
 use Fleetbase\FleetOps\Events\OrderDispatchFailed;
 use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\FleetOps\Models\TrackingStatus;
 use Fleetbase\FleetOps\Notifications\OrderDispatched as OrderDispatchedNotification;
 use Fleetbase\FleetOps\Notifications\OrderPing;
-use Fleetbase\FleetOps\Support\Flow;
 use Fleetbase\FleetOps\Support\Utils;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
@@ -39,15 +39,19 @@ class HandleOrderDispatched implements ShouldQueue
             return event(new OrderDispatchFailed($order, 'No driver assigned for order to dispatch to.'));
         }
 
-        /** check for dispatch code in activity options, if there is the correct dispatch code update activity */
-        $activity = Flow::getDispatchActivity($order);
-
-        if ($activity) {
-            /** update order activity */
-            $location = $order->getLastLocation();
-
-            $order->setStatus($activity['code']);
-            $order->createActivity($activity['status'], $activity['details'], $location, $activity['code']);
+        /**
+         * Check if dispatch activity already exists, if not -
+         * Check for dispatch code in activity options, if there is the correct dispatch code update activity.
+         **/
+        $doesntHaveDispatchActivity = TrackingStatus::where(['code' => 'DISPATCHED', 'tracking_number_uuid' => $order->tracking_number_uuid])->doesntExist();
+        if ($doesntHaveDispatchActivity) {
+            $activity = $order->config()->getDispatchActivity();
+            if ($activity) {
+                /** update order activity */
+                $location = $order->getLastLocation();
+                $order->setStatus($activity->code);
+                $order->createActivity($activity, $location);
+            }
         }
 
         /* update dispatch attributes */
@@ -59,10 +63,8 @@ class HandleOrderDispatched implements ShouldQueue
         /* if order is adhoc ping drivers within radius of pickup to accept order * */
         if ($order->adhoc) {
             $order->load(['company']);
-
             $pickup   = $order->getPickupLocation();
             $distance = $order->getAdhocDistance();
-
             if (!Utils::isPoint($pickup)) {
                 return;
             }