@fleetbase/fleetops-engine 0.4.16 → 0.4.18

package/server/src/Http/Requests/Internal/CreateOrderRequest.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Requests\Internal;
+
+use Fleetbase\Http\Requests\FleetbaseRequest;
+use Fleetbase\Rules\ExistsInAny;
+
+class CreateOrderRequest extends FleetbaseRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return request()->session()->has('company');
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $validations = [
+            'order_config_uuid' => 'required',
+            // 'adhoc'             => 'in:true,false,1,0',
+            'dispatch'          => ['nullable', 'boolean'],
+            // 'adhoc_distance'    => 'numeric',
+            'pod_required'      => 'in:true,false,1,0',
+            'pod_method'        => 'in:' . config('api.pod_methods'),
+            'scheduled_at'      => ['nullable', 'date'],
+            'driver'            => 'nullable|exists:drivers,uuid',
+            'service_quote'     => 'nullable|exists:service_quotes,uuid',
+            'purchase_rate'     => 'nullable|exists:purchase_rates,uuid',
+            'facilitator'       => ['nullable', new ExistsInAny(['vendors', 'contacts', 'integrated_vendors'], ['uuid', 'provider'])],
+            'customer'          => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'uuid')],
+            'status'            => 'nullable|string',
+            'type'              => 'string',
+        ];
+
+        if ($this->has('payload')) {
+            $validations['payload.entities']  = 'array';
+            $validations['payload.waypoints'] = 'array';
+
+            if ($this->isArray('payload')) {
+                $validations['payload']         = 'required';
+
+                if ($this->missing('payload.waypoints')) {
+                    $validations['payload.pickup_uuid']  = 'required';
+                    $validations['payload.dropoff_uuid'] = 'required';
+                }
+
+                if ($this->missing(['payload.pickup', 'payload.dropoff'])) {
+                    $validations['payload.waypoints'] = 'required|array|min:2';
+                }
+
+                $validations['payload.return_uuid']  = 'nullable';
+            }
+        }
+
+        return $validations;
+    }
+}

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), data_get($this->orderConfig, 'public_id')),
+            '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;
             }