@fleetbase/fleetops-engine 0.3.7 → 0.3.9

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

@@ -66,6 +66,28 @@ class PlaceController extends Controller
             }
         }
 
+        // if we have only latitude/longitude or location BUT no street1 do a reverse lookup
+        $requestHasCoordinates = $request->filled(['latitude', 'longitude']);
+        $requestHasLocation    = $request->filled(['location']);
+        $requestMissingStreet  = $request->missing('street1');
+        if ($requestMissingStreet && ($requestHasCoordinates || $requestHasLocation)) {
+            if ($requestHasLocation) {
+                $point = Utils::getPointFromMixed($request->input('location'));
+            }
+
+            if ($requestHasCoordinates) {
+                $point = Utils::getPointFromMixed($request->only(['latitude', 'longitude']));
+            }
+
+            if ($point instanceof Point) {
+                $place = Place::createFromReverseGeocodingLookup($point);
+
+                if ($place instanceof Place) {
+                    $input = $place->toArray();
+                }
+            }
+        }
+
         // latitude / longitude
         if ($request->has(['latitude', 'longitude'])) {
             $input['location'] = Utils::getPointFromCoordinates($request->only(['latitude', 'longitude']));
@@ -141,7 +163,7 @@ class PlaceController extends Controller
         try {
             $place = Place::findRecordOrFail($id);
         } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
-            return response()->error('Place resource not found.');
+            return response()->apiError('Place resource not found.');
         }
 
         // get request input
@@ -307,7 +329,7 @@ class PlaceController extends Controller
         try {
             $place = Place::findRecordOrFail($id);
         } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
-            return response()->error('Place resource not found.');
+            return response()->apiError('Place resource not found.');
         }
 
         return new PlaceResource($place);
@@ -323,7 +345,7 @@ class PlaceController extends Controller
         try {
             $place = Place::findRecordOrFail($id);
         } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
-            return response()->error('Place resource not found.');
+            return response()->apiError('Place resource not found.');
         }
 
         $place->delete();

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

@@ -97,7 +97,7 @@ class PurchaseRateController extends Controller
             try {
                 $integratedVendorOrder = $serviceQuote->integratedVendor->api()->createOrderFromServiceQuote($serviceQuote, $request);
             } catch (\Exception $e) {
-                return response()->error($e->getMessage());
+                return response()->apiError($e->getMessage());
             }
         }
 

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

@@ -7,7 +7,9 @@ use Fleetbase\FleetOps\Http\Requests\UpdateServiceAreaRequest;
 use Fleetbase\FleetOps\Http\Resources\v1\DeletedResource;
 use Fleetbase\FleetOps\Http\Resources\v1\ServiceArea as ServiceAreaResource;
 use Fleetbase\FleetOps\Models\ServiceArea;
+use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
+use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 
 class ServiceAreaController extends Controller
@@ -24,13 +26,48 @@ class ServiceAreaController extends Controller
         // get request input
         $input = $request->only(['name', 'type', 'status']);
 
+        // get radius for creating service area border - default to 500 meters
+        $radius = (int) $request->input('radius', 500);
+
         // make sure company is set
         $input['company_uuid'] = session('company');
 
-        // @todo some geocoding here
+        // if parent service area set
+        if ($request->filled('parent')) {
+            $input['parent_uuid'] = Utils::getUuid('service_areas', [
+                'public_id'    => $request->input('parent'),
+                'company_uuid' => session('company'),
+            ]);
+        }
+
+        // if latitude and longitude is provided
+        if ($request->has(['latitude', 'longitude'])) {
+            // create a polygon given the radius
+            $latitude  = $request->input('latitude');
+            $longitude = $request->input('longitude');
+            $point     = new Point($latitude, $longitude);
+
+            if ($point instanceof Point) {
+                $input['border'] = ServiceArea::createMultiPolygonFromPoint($point, $radius);
+            }
+        }
+
+        // if a location is provided
+        if ($request->has('location')) {
+            $location = $request->input('location');
+            $point    = Utils::getPointFromMixed($location);
+
+            if ($point instanceof Point) {
+                $input['border'] = ServiceArea::createMultiPolygonFromPoint($point, $radius);
+            }
+        }
 
         // create the serviceArea
-        $serviceArea = ServiceArea::create($input);
+        try {
+            $serviceArea = ServiceArea::create($input);
+        } catch (\Throwable $e) {
+            dd($e->getMessage());
+        }
 
         // response the driver resource
         return new ServiceAreaResource($serviceArea);
@@ -61,7 +98,38 @@ class ServiceAreaController extends Controller
         // get request input
         $input = $request->only(['name', 'type', 'status']);
 
-        // @todo some geocoding here
+        // get radius for creating service area border - default to 500 meters
+        $radius = $request->input('radius', 500);
+
+        // if parent service area set
+        if ($request->filled('parent')) {
+            $input['parent_uuid'] = Utils::getUuid('service_areas', [
+                'public_id'    => $request->input('parent'),
+                'company_uuid' => session('company'),
+            ]);
+        }
+
+        // if latitude and longitude is provided
+        if ($request->has(['latitude', 'longitude'])) {
+            // create a polygon given the radius
+            $latitude  = $request->input('latitude');
+            $longitude = $request->input('longitude');
+            $point     = new Point($latitude, $longitude);
+
+            if ($point instanceof Point) {
+                $input['border'] = ServiceArea::createMultiPolygonFromPoint($point, $radius);
+            }
+        }
+
+        // if a location is provided
+        if ($request->has('location')) {
+            $location = $request->input('location');
+            $point    = Utils::getPointFromMixed($location);
+
+            if ($point instanceof Point) {
+                $input['border'] = ServiceArea::createMultiPolygonFromPoint($point, $radius);
+            }
+        }
 
         // update the serviceArea
         $serviceArea->update($input);

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

@@ -72,7 +72,7 @@ class ServiceQuoteController extends Controller
         }
 
         // get all waypoints
-        $waypoints = $payload->getAllStops()->mapInto(Place::class);
+        $waypoints = $payload->getAllStops();
 
         // if quote for single service
         if ($service && $service !== 'all') {

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

@@ -30,7 +30,8 @@ class ServiceRateController extends Controller
             'rate_calculation_method',
             'currency',
             'base_fee',
-            'per_km_flat_rate_fee',
+            'per_meter_unit',
+            'per_meter_flat_rate_fee',
             'meter_fees',
             'meter_fees.*.distance',
             'meter_fees.*.fee',
@@ -77,7 +78,7 @@ class ServiceRateController extends Controller
                 ServiceRateFee::create([
                     'service_rate_uuid' => $serviceRate->uuid,
                     'distance'          => Utils::get($meterFee, 'distance'),
-                    'distance_unit'     => 'm',
+                    'distance_unit'     => $request->input('per_meter_unit', 'm'),
                     'fee'               => Utils::get($meterFee, 'fee'),
                     'currency'          => $serviceRate->currency,
                 ]);

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

@@ -39,8 +39,8 @@ class TrackingNumberController extends Controller
             );
 
             if (is_array($owner)) {
-                $input['owner_uuid'] = Utils::get($owner, 'uuid');
-                $input['type']       = Utils::getModelClassName(Utils::get($owner, 'table'));
+                $input['owner_uuid']       = Utils::get($owner, 'uuid');
+                $input['owner_type']       = Utils::getModelClassName(Utils::get($owner, 'table'));
             }
         }
 

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

@@ -105,8 +105,8 @@ class TrackingStatusController extends Controller
         }
 
         // if no code set create a code from the status
-        if (empty($input['code'])) {
-            $input['code'] = TrackingStatus::prepareCode($input['status']);
+        if (empty($trackingStatus->code)) {
+            $input['code'] = TrackingStatus::prepareCode(data_get($input, 'status', $trackingStatus->status));
         }
 
         // update the trackingStatus

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

@@ -24,13 +24,18 @@ class VehicleController extends Controller
     public function create(CreateVehicleRequest $request)
     {
         // get request input
-        $input = $request->only(['status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin', 'meta', 'location', 'altitude', 'heading', 'speed']);
+        $input = $request->only(['status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin', 'meta', 'online', 'location', 'altitude', 'heading', 'speed']);
         // make sure company is set
         $input['company_uuid'] = session('company');
 
         // create instance of vehicle model
         $vehicle = new Vehicle();
 
+        // set default online
+        if (!isset($input['online'])) {
+            $input['online'] = 0;
+        }
+
         // vendor assignment
         if ($request->has('vendor')) {
             $input['vendor_uuid'] = Utils::getUuid('vendors', [
@@ -39,6 +44,11 @@ class VehicleController extends Controller
             ]);
         }
 
+        // latitude / longitude
+        if ($request->has(['latitude', 'longitude'])) {
+            $input['location'] = Utils::getPointFromCoordinates($request->only(['latitude', 'longitude']));
+        }
+
         // apply user input to vehicle
         $vehicle = $vehicle->fill($input);
 
@@ -90,7 +100,7 @@ class VehicleController extends Controller
         }
 
         // get request input
-        $input = $request->only(['status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin', 'meta', 'location', 'altitude', 'heading', 'speed']);
+        $input = $request->only(['status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin', 'meta', 'location', 'online', 'altitude', 'heading', 'speed']);
 
         // vendor assignment
         if ($request->has('vendor')) {
@@ -100,6 +110,16 @@ class VehicleController extends Controller
             ]);
         }
 
+        // set default online
+        if (!isset($input['online'])) {
+            $input['online'] = 0;
+        }
+
+        // latitude / longitude
+        if ($request->has(['latitude', 'longitude'])) {
+            $input['location'] = Utils::getPointFromCoordinates($request->only(['latitude', 'longitude']));
+        }
+
         // update the vehicle w/ user input
         $vehicle->fill($input);
 

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

@@ -9,6 +9,7 @@ use Fleetbase\FleetOps\Http\Resources\v1\Zone as ZoneResource;
 use Fleetbase\FleetOps\Models\Zone;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
+use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 
 class ZoneController extends Controller
@@ -23,7 +24,10 @@ class ZoneController extends Controller
     public function create(CreateZoneRequest $request)
     {
         // get request input
-        $input = $request->only(['name', 'boundary', 'status', 'description', 'color', 'stroke_color']);
+        $input = $request->only(['name', 'border', 'status', 'description', 'color', 'stroke_color']);
+
+        // get radius for creating zone border - default to 500 meters
+        $radius = $request->input('radius', 500);
 
         // make sure company is set
         $input['company_uuid'] = session('company');
@@ -36,10 +40,37 @@ class ZoneController extends Controller
             ]);
         }
 
+        // if latitude and longitude is provided
+        if ($request->has(['latitude', 'longitude'])) {
+            // create a polygon given the radius
+            $latitude  = $request->input('latitude');
+            $longitude = $request->input('longitude');
+            $point     = new Point($latitude, $longitude);
+
+            if ($point instanceof Point) {
+                $input['border'] = Zone::createPolygonFromPoint($point, $radius);
+            }
+        }
+
+        // if a location is provided
+        if ($request->has('location')) {
+            $location = $request->input('location');
+            $point    = Utils::getPointFromMixed($location);
+
+            if ($point instanceof Point) {
+                $input['border'] = Zone::createPolygonFromPoint($point, $radius);
+            }
+        }
+
+        /**
+         * @todo if missing location, latitude, longitude and border
+         * then create a zone from the center of the service area provided
+         */
+
         // create the zone
         $zone = Zone::create($input);
 
-        // response the driver resource
+        // response the zone resource
         return new ZoneResource($zone);
     }
 
@@ -66,7 +97,10 @@ class ZoneController extends Controller
         }
 
         // get request input
-        $input = $request->only(['name', 'boundary', 'status', 'description', 'color', 'stroke_color']);
+        $input = $request->only(['name', 'border', 'status', 'description', 'color', 'stroke_color']);
+
+        // get radius for creating zone border - default to 500 meters
+        $radius = $request->input('radius', 500);
 
         // service area assignment
         if ($request->has('service_area')) {
@@ -76,6 +110,28 @@ class ZoneController extends Controller
             ]);
         }
 
+        // if latitude and longitude is provided
+        if ($request->has(['latitude', 'longitude'])) {
+            // create a polygon given the radius
+            $latitude  = $request->input('latitude');
+            $longitude = $request->input('longitude');
+            $point     = new Point($latitude, $longitude);
+
+            if ($point instanceof Point) {
+                $input['border'] = Zone::createPolygonFromPoint($point, $radius);
+            }
+        }
+
+        // if a location is provided
+        if ($request->has('location')) {
+            $location = $request->input('location');
+            $point    = Utils::getPointFromMixed($location);
+
+            if ($point instanceof Point) {
+                $input['border'] = Zone::createPolygonFromPoint($point, $radius);
+            }
+        }
+
         // update the zone
         $zone->update($input);
 

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

@@ -17,6 +17,7 @@ use Fleetbase\Models\Invite;
 use Fleetbase\Models\User;
 use Fleetbase\Models\VerificationCode;
 use Fleetbase\Notifications\UserInvited;
+use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
@@ -79,6 +80,12 @@ class DriverController extends FleetOpsController
                     // if exists in organization create driver profile for user
                     $isOrganizationMember = $existingUser->companies()->where('company_uuid', session('company'))->exists();
 
+                    // Check if driver profile also already exists
+                    $existingDriverProfile = Driver::where(['company_uuid' => session('company'), 'user_uuid' => $existingUser->uuid])->first();
+                    if ($existingDriverProfile) {
+                        return ['driver' => new $this->resource($existingDriverProfile)];
+                    }
+
                     // create driver profile for user
                     $input = collect($input)
                         ->except(['name', 'password', 'email', 'phone', 'meta', 'avatar_uuid', 'photo_uuid'])
@@ -90,6 +97,11 @@ class DriverController extends FleetOpsController
                     $input['user_uuid']    = $existingUser->uuid;
                     $input['slug']         = $existingUser->slug;
 
+                    // If no location provided set
+                    if (empty($input['location'])) {
+                        $input['location'] = new Point(0, 0);
+                    }
+
                     // create the profile
                     $driverProfile = Driver::create($input);
 
@@ -109,7 +121,7 @@ class DriverController extends FleetOpsController
                         $existingUser->notify(new UserInvited($invitation));
                     }
 
-                    return response()->json(['driver' => $driverProfile]);
+                    return ['driver' => new $this->resource($driverProfile)];
                 }
             }
 
@@ -138,15 +150,19 @@ class DriverController extends FleetOpsController
                         ->filter()
                         ->toArray();
 
-                    if (!isset($input['password'])) {
-                        $input['password'] = data_get($userInput, 'phone', Str::random(14));
+                    // Make sure password is set
+                    if (empty($userInput['password'])) {
+                        $userInput['password'] = Str::random(14);
                     }
 
                     $userInput['company_uuid'] = session('company');
-                    $userInput['type']         = 'driver';
 
+                    // Create user account
                     $user = User::create($userInput);
 
+                    // Set user type as driver
+                    $user->setUserType('driver');
+
                     // send invitation to user
                     $invitation = Invite::create([
                         'company_uuid'    => session('company'),
@@ -163,6 +179,11 @@ class DriverController extends FleetOpsController
 
                     $input['user_uuid'] = $user->uuid;
                     $input['slug']      = $user->slug;
+
+                    // If no location provided set
+                    if (empty($input['location'])) {
+                        $input['location'] = new Point(0, 0);
+                    }
                 },
                 function ($request, &$driver) {
                     $driver->load(['user']);

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

@@ -82,26 +82,19 @@ class LiveController extends Controller
     }
 
     /**
-     * Get online drivers with active jobs for the current company.
+     * Get drivers for the current company.
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function drivers()
     {
-        $drivers = Driver::where(['company_uuid' => session('company'), 'online' => 1])
-            ->whereHas(
-                'currentJob',
-                function ($q) {
-                    $q->whereNotIn('status', ['canceled', 'completed']);
-                }
-            )
-            ->get();
+        $drivers = Driver::where(['company_uuid' => session('company')])->get();
 
         return DriverResource::collection($drivers);
     }
 
     /**
-     * Get online vehicles for the current company.
+     * Get vehicles for the current company.
      *
      * @return \Illuminate\Http\JsonResponse
      */

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

@@ -30,7 +30,7 @@ class NavigatorController extends Controller
                 ]
             );
 
-            return redirect()->away('flbnavigator://configure?key=' . $apiCredential->key . '&host=' . url()->secure('/'));
+            return redirect()->away('flbnavigator://configure?key=' . $apiCredential->key . '&host=' . url()->secure('/') . '&socketcluster_host=' . env('SOCKETCLUSTER_HOST', 'socket') . '&socketcluster_port=' . env('SOCKETCLUSTER_PORT', 8000));
         }
 
         return response()->error('Organization for linking not found.');

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

@@ -62,6 +62,16 @@ class OrderController extends FleetOpsController
 
                         $input['integrated_vendor_order'] = $integratedVendorOrder;
                     }
+
+                    // if no type is set its default to default
+                    if (!isset($input['type'])) {
+                        $input['type'] = 'default';
+                    }
+
+                    // if no status is set its default to `created`
+                    if (!isset($input['status'])) {
+                        $input['status'] = 'created';
+                    }
                 },
                 function (&$request, Order &$order, &$requestInput) {
                     $input                   = $request->input('order');
@@ -101,7 +111,7 @@ class OrderController extends FleetOpsController
                     $order->purchaseServiceQuote($serviceQuote);
 
                     // dispatch if flagged true
-                    $order->firstDispatch();
+                    $order->firstDispatchWithActivity();
 
                     // load tracking number
                     $order->load(['trackingNumber']);

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

@@ -11,6 +11,16 @@ class TrackingStatusFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function trackingNumber(string $trackingNumber)
+    {
+        $this->builder->whereHas('trackingNumber', function ($query) use ($trackingNumber) {
+            $query->where(function ($query) use ($trackingNumber) {
+                $query->where('public_id', $trackingNumber);
+                $query->orWhere('uuid', $trackingNumber);
+            });
+        });
+    }
+
     public function order(string $order)
     {
         $this->builder->whereHas(

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

@@ -2,7 +2,6 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
-use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Requests\FleetbaseRequest;
 
 class CancelOrderRequest extends FleetbaseRequest
@@ -14,7 +13,7 @@ class CancelOrderRequest extends FleetbaseRequest
      */
     public function authorize()
     {
-        return Utils::notEmpty(session('user'));
+        return request()->session()->has('api_credential');
     }
 
     /**

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

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Http\Requests;
 
 use Fleetbase\Http\Requests\FleetbaseRequest;
+use Illuminate\Validation\Rules\RequiredIf;
 
 class CreateContactRequest extends FleetbaseRequest
 {
@@ -24,10 +25,10 @@ class CreateContactRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'name'  => 'required',
-            'type'  => 'required',
-            'email' => 'nullable|email',
-            'phone' => 'nullable',
+            'name'  => ['required'],
+            'type'  => [new RequiredIf($this->isMethod('POST'))],
+            'email' => ['nullable', 'email'],
+            'phone' => ['nullable'],
         ];
     }
 }

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

@@ -28,17 +28,19 @@ class CreateDriverRequest extends FleetbaseRequest
         $isCreating = $this->isMethod('POST');
 
         return [
-            'name'     => [Rule::requiredIf($isCreating)],
-            'email'    => [Rule::requiredIf($isCreating), Rule::when($this->filled('email'), ['email']), Rule::when($isCreating, [Rule::unique('users')->whereNull('deleted_at')])],
-            'phone'    => [Rule::requiredIf($isCreating), Rule::when($isCreating, [Rule::unique('users')->whereNull('deleted_at')])],
-            'password' => 'nullable|string',
-            'country'  => 'nullable|size:2',
-            'city'     => 'nullable|string',
-            'vehicle'  => 'nullable|string|starts_with:vehicle_|exists:drivers,public_id',
-            'status'   => 'nullable|string|in:active,inactive',
-            'vendor'   => 'nullable|exists:vendors,public_id',
-            'job'      => 'nullable|exists:orders,public_id',
-            'location' => ['nullable', new ResolvablePoint()],
+            'name'      => [Rule::requiredIf($isCreating)],
+            'email'     => [Rule::requiredIf($isCreating), Rule::when($this->filled('email'), ['email']), Rule::when($isCreating, [Rule::unique('users')->whereNull('deleted_at')])],
+            'phone'     => [Rule::requiredIf($isCreating), Rule::when($isCreating, [Rule::unique('users')->whereNull('deleted_at')])],
+            'password'  => 'nullable|string',
+            'country'   => 'nullable|size:2',
+            'city'      => 'nullable|string',
+            'vehicle'   => 'nullable|string|starts_with:vehicle_|exists:drivers,public_id',
+            'status'    => 'nullable|string|in:active,inactive',
+            'vendor'    => 'nullable|exists:vendors,public_id',
+            'job'       => 'nullable|exists:orders,public_id',
+            'location'  => ['nullable', new ResolvablePoint()],
+            'latitude'  => ['nullable', 'required_with:longitude'],
+            'longitude' => ['nullable', 'required_with:latitude'],
         ];
     }
 

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

@@ -27,16 +27,19 @@ class CreateEntityRequest extends FleetbaseRequest
         return [
             'name'            => [Rule::requiredIf($this->isMethod('POST'))],
             'type'            => [Rule::requiredIf($this->isMethod('POST'))],
-            'email'           => 'nullable|email',
+            'destination'     => ['nullable', Rule::exists('places', 'public_id')->whereNull('deleted_at')],
+            'waypoint'        => ['nullable', Rule::exists('places', 'public_id')->whereNull('deleted_at')],
+            'payload'         => ['nullable', Rule::exists('payloads', 'public_id')->whereNull('deleted_at'), 'required_with:destination,waypoint'],
+            'email'           => ['nullable', 'email'],
             'weight'          => 'nullable',
             'weight_unit'     => [Rule::requiredIf($this->has('weight')), 'in:g,oz,lb,kg'],
             'length'          => 'nullable',
             'width'           => 'nullable',
             'height'          => 'nullable',
             'dimensions_unit' => [Rule::requiredIf($this->has(['length', 'width', 'height'])), 'in:cm,in,ft,mm,m,yd'],
-            'declared_value'  => 'nullable',
-            'price'           => 'nullable',
-            'sales_price'     => 'nullable',
+            'declared_value'  => ['nullable', 'numeric'],
+            'price'           => ['nullable', 'numeric'],
+            'sales_price'     => ['nullable', 'numeric'],
             'currency'        => [Rule::requiredIf($this->has(['declared_value', 'price', 'sales_price'])), 'size:3'],
         ];
     }

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

@@ -26,11 +26,11 @@ class CreateOrderRequest extends FleetbaseRequest
     {
         $validations = [
             'adhoc'          => 'in:true,false,1,0',
-            'dispatch'       => 'boolean',
+            'dispatch'       => ['nullable', 'boolean'],
             'adhoc_distance' => 'numeric',
             'pod_required'   => 'in:true,false,1,0',
             'pod_method'     => 'in:' . config('api.pod_methods'),
-            'scheduled_at'   => 'date',
+            'scheduled_at'   => ['nullable', 'date'],
             'driver'         => 'nullable|exists:drivers,public_id',
             'service_quote'  => 'nullable|exists:service_quotes,public_id',
             'purchase_rate'  => 'nullable|exists:purchase_rates,public_id',