@fleetbase/fleetops-engine 0.3.7 → 0.3.8

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/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',

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

@@ -28,7 +28,7 @@ class CreatePayloadRequest extends FleetbaseRequest
             'entities'              => 'array',
             'waypoints'             => 'array',
             'return'                => 'nullable',
-            'type'                  => 'required',
+            'type'                  => [Rule::requiredIf($this->isMethod('POST'))],
             'cod_currency'          => [Rule::requiredIf($this->has(['cod_amount'])), 'size:3'],
             'cod_payment_method'    => [Rule::requiredIf($this->has(['cod_amount'])), 'in:card,check,cash,bank_transfer'],
         ];

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

@@ -29,14 +29,56 @@ class CreatePlaceRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'name'      => [Rule::requiredIf($this->isMethod('POST'))],
-            'street1'   => [Rule::requiredIf($this->isMethod('POST'))],
+            'name'      => [
+                Rule::requiredIf(function () {
+                    $isCreating     = $this->isMethod('POST');
+                    $hasCoordiantes = $this->filled('latitude') && $this->filled('longitude');
+                    $hasLocation    = $this->filled('location');
+                    $hasStreet      = $this->filled('street1');
+
+                    // if creating then it's required
+                    if ($isCreating) {
+                        // if either has coordinated or location then it's not required
+                        if ($hasCoordiantes || $hasLocation) {
+                            return false;
+                        }
+
+                        // if street1 provided then it's not required
+                        if ($hasStreet) {
+                            return false;
+                        }
+
+                        return true;
+                    }
+
+                    return false;
+                }),
+            ],
+            'street1'   => [
+                Rule::requiredIf(function () {
+                    $isCreating     = $this->isMethod('POST');
+                    $hasCoordiantes = $this->filled('latitude') && $this->filled('longitude');
+                    $hasLocation    = $this->filled('location');
+
+                    // if creating then it's required
+                    if ($isCreating) {
+                        // if either has coordinated or location then it's not required
+                        if ($hasCoordiantes || $hasLocation) {
+                            return false;
+                        }
+
+                        return true;
+                    }
+
+                    return false;
+                }),
+            ],
             'customer'  => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'public_id')],
             'contact'   => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'public_id')],
             'vendor'    => 'nullable|exists:vendors,public_id',
             'location'  => ['nullable', new ResolvablePoint()],
-            'latitude'  => 'nullable',
-            'longitude' => 'nullable',
+            'latitude'  => ['nullable', 'required_with:longitude'],
+            'longitude' => ['nullable', 'required_with:latitude'],
         ];
     }
 }

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

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Http\Requests;
 
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Fleetbase\Rules\ExistsInAny;
+use Illuminate\Validation\Rule;
 
 class CreatePurchaseRateRequest extends FleetbaseRequest
 {
@@ -25,8 +26,8 @@ class CreatePurchaseRateRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'service_quote' => 'required|exists:service_quotes,public_id',
-            'order'         => 'nullable|exists:orders,public_id',
+            'service_quote' => ['required', Rule::exists('service_quotes', 'public_id')->whereNull('deleted_at')],
+            'order'         => ['nullable', Rule::exists('orders', 'public_id')->whereNull('deleted_at')],
             'customer'      => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'public_id')],
         ];
     }

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
+use Fleetbase\FleetOps\Rules\ResolvablePoint;
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Illuminate\Validation\Rule;
 
@@ -14,9 +15,7 @@ class CreateServiceAreaRequest extends FleetbaseRequest
      */
     public function authorize()
     {
-        return request()
-            ->session()
-            ->has('api_credential');
+        return request()->session()->has('api_credential');
     }
 
     /**
@@ -28,8 +27,29 @@ class CreateServiceAreaRequest extends FleetbaseRequest
     {
         return [
             'name'    => [Rule::requiredIf($this->isMethod('POST')), 'string'],
-            'country' => 'required',
+            'country' => [Rule::requiredIf($this->isMethod('POST')), 'string'],
             'status'  => 'in:active,inactive',
+            'border'  => ['nullable', Rule::requiredIf(function () {
+                $isCreating     = $this->isMethod('POST');
+                $hasCoordiantes = $this->filled('latitude') && $this->filled('longitude');
+                $hasLocation    = $this->filled('location');
+
+                // if creating then it's required
+                if ($isCreating) {
+                    // if either has coordinated or location then it's not required
+                    if ($hasCoordiantes || $hasLocation) {
+                        return false;
+                    }
+
+                    return true;
+                }
+
+                return false;
+            })],
+            'parent'    => ['nullable', 'exists:service_areas,public_id'],
+            'location'  => ['nullable', new ResolvablePoint()],
+            'latitude'  => ['nullable', 'required_with:longitude'],
+            'longitude' => ['nullable', 'required_with:latitude'],
         ];
     }
 }

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

@@ -29,28 +29,29 @@ class CreateServiceRateRequest extends FleetbaseRequest
         return [
             'service_name'                  => [Rule::requiredIf($this->isMethod('POST')), 'string'],
             'service_type'                  => [Rule::requiredIf($this->isMethod('POST')), 'string'],
-            'service_area'                  => 'exists:service_areas,public_id',
-            'zone'                          => 'exists:zones,public_id',
-            'rate_calculation_method'       => 'required|string|in:per_km,fixed_meter,algo',
-            'currency'                      => 'required|size:3',
-            'base_fee'                      => 'integer',
-            'per_km_flat_rate_fee'          => [Rule::requiredIf($this->input(['rate_calculation_method']) === 'rate_calculation_method'), 'integer'],
-            'meter_fees'                    => [Rule::requiredIf($this->input(['rate_calculation_method']) === 'fixed_meter'), 'array'],
-            'meter_fees.*.distance'         => 'integer',
-            'meter_fees.*.fee'              => 'integer',
-            'algorithm'                     => [Rule::requiredIf($this->input(['rate_calculation_method']) === 'algo'), new ComputableAlgo(), 'string'],
-            'has_cod_fee'                   => 'boolean',
+            'service_area'                  => [Rule::exists('service_areas', 'public_id')->whereNull('deleted_at')],
+            'zone'                          => [Rule::exists('zones', 'public_id')->whereNull('deleted_at')],
+            'rate_calculation_method'       => [Rule::requiredIf($this->isMethod('POST')), 'string', 'in:fixed_meter,per_meter,per_drop,algo'],
+            'currency'                      => ['required', 'size:3'],
+            'base_fee'                      => ['numeric'],
+            'per_meter_unit'                => ['required_if:rate_calculation_method,per_meter', 'string', 'in:km,m'],
+            'per_meter_flat_rate_fee'       => ['required_if:rate_calculation_method,per_meter', 'numeric'],
+            'meter_fees'                    => ['required_if:rate_calculation_method,fixed_meter', 'array'],
+            'meter_fees.*.distance'         => ['numeric'],
+            'meter_fees.*.fee'              => ['numeric'],
+            'algorithm'                     => ['required_if:rate_calculation_method,algo', new ComputableAlgo(), 'string'],
+            'has_cod_fee'                   => ['boolean'],
             'cod_calculation_method'        => [Rule::requiredIf(Utils::isTrue($this->input(['has_cod_fee']))), 'in:percentage,flat'],
-            'cod_flat_fee'                  => [Rule::requiredIf($this->input(['cod_calculation_method']) === 'flat'), 'integer'],
-            'cod_percent'                   => [Rule::requiredIf($this->input(['cod_calculation_method']) === 'percentage'), 'integer'],
-            'has_peak_hours_fee'            => 'boolean',
-            'peak_hours_calculation_method' => [Rule::requiredIf(Utils::isTrue($this->input(['has_peak_hours']))), 'in:percentage,flat'],
-            'peak_hours_flat_fee'           => [Rule::requiredIf($this->input(['peak_hours_calculation_method']) === 'flat'), 'integer'],
-            'peak_hours_percent'            => [Rule::requiredIf($this->input(['peak_hours_calculation_method']) === 'percentage'), 'integer'],
-            'peak_hours_start'              => [Rule::requiredIf(Utils::isTrue($this->input(['has_peak_hours']))), 'date_format:H:i'],
-            'peak_hours_end'                => [Rule::requiredIf(Utils::isTrue($this->input(['has_peak_hours']))), 'date_format:H:i'],
-            'duration_terms'                => 'string',
-            'estimated_days'                => 'numeric',
+            'cod_flat_fee'                  => [Rule::requiredIf($this->input('cod_calculation_method') === 'flat'), 'numeric'],
+            'cod_percent'                   => [Rule::requiredIf($this->input('cod_calculation_method') === 'percentage'), 'integer'],
+            'has_peak_hours_fee'            => ['boolean'],
+            'peak_hours_calculation_method' => [Rule::requiredIf(Utils::isTrue($this->input('has_peak_hours'))), 'in:percentage,flat'],
+            'peak_hours_flat_fee'           => [Rule::requiredIf($this->input('peak_hours_calculation_method') === 'flat'), 'numeric'],
+            'peak_hours_percent'            => [Rule::requiredIf($this->input('peak_hours_calculation_method') === 'percentage'), 'integer'],
+            'peak_hours_start'              => [Rule::requiredIf(Utils::isTrue($this->input('has_peak_hours'))), 'date_format:H:i'],
+            'peak_hours_end'                => [Rule::requiredIf(Utils::isTrue($this->input('has_peak_hours'))), 'date_format:H:i'],
+            'duration_terms'                => ['string'],
+            'estimated_days'                => ['integer'],
         ];
     }
 }

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

@@ -30,14 +30,15 @@ class CreateTrackingStatusRequest extends FleetbaseRequest
     {
         $validations = [
             'tracking_number' => array_filter([
-                'required',
+                Rule::requiredIf($this->isMethod('POST')),
                 $this->isMethod('POST') ? Rule::exists('tracking_numbers', 'public_id') : null,
                 $this->isMethod('POST') ? static::uniqueStatus($this) : null,
             ]),
-            'location' => [new ResolvablePoint()],
-            'code'     => 'nullable|string|min:3',
-            'status'   => ['required', 'string', 'min:3'],
-            'details'  => 'nullable|string',
+            'location' => [Rule::requiredIf($this->isMethod('POST')), new ResolvablePoint()],
+            'country'  => ['nullable', 'string', 'size:2'],
+            'code'     => [Rule::requiredIf($this->isMethod('POST')), 'string', 'min:3'],
+            'status'   => [Rule::requiredIf($this->isMethod('POST')), 'string', 'min:3'],
+            'details'  => [Rule::requiredIf($this->isMethod('POST')), 'string', 'min:3'],
         ];
 
         if ($this->isMethod('POST') && $this->missing('tracking_number') && $this->has('order')) {
@@ -50,10 +51,10 @@ class CreateTrackingStatusRequest extends FleetbaseRequest
         }
 
         if ($this->missing(['latitude', 'longitude'])) {
-            $validations['location'] = ['required', new ResolvablePoint()];
+            $validations['location'] = [Rule::requiredIf($this->isMethod('POST')), new ResolvablePoint()];
         } elseif ($this->missing('location')) {
-            $validations['latitude']  = 'required';
-            $validations['longitude'] = 'required';
+            $validations['latitude']  = [Rule::requiredIf($this->isMethod('POST'))];
+            $validations['longitude'] = [Rule::requiredIf($this->isMethod('POST'))];
         }
 
         return $validations;

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

@@ -25,10 +25,12 @@ class CreateVehicleRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'status'   => 'nullable|in:operational,maintenance,decommissioned',
-            'vendor'   => 'nullable|exists:vendors,public_id',
-            'driver'   => 'nullable|exists:drivers,public_id',
-            'location' => ['nullable', new ResolvablePoint()],
+            'status'    => 'nullable|in:operational,maintenance,decommissioned',
+            'vendor'    => 'nullable|exists:vendors,public_id',
+            'driver'    => 'nullable|exists:drivers,public_id',
+            'location'  => ['nullable', new ResolvablePoint()],
+            'latitude'  => ['nullable', 'required_with:longitude'],
+            'longitude' => ['nullable', 'required_with:latitude'],
         ];
     }
 }

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
+use Fleetbase\FleetOps\Rules\ResolvablePoint;
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Illuminate\Validation\Rule;
 
@@ -25,11 +26,29 @@ class CreateZoneRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'name' => [Rule::requiredIf($this->isMethod('POST')), 'string'],
-            // @todo properly validate boundary param
-            'boundary'     => 'required|array',
-            'service_area' => 'required|exists:service_areas,public_id',
-            'status'       => 'nullable|in:active,inactive',
+            'name'         => [Rule::requiredIf($this->isMethod('POST')), 'string'],
+            'service_area' => [Rule::requiredIf($this->isMethod('POST')), 'exists:service_areas,public_id'],
+            'border'       => ['nullable', Rule::requiredIf(function () {
+                $isCreating     = $this->isMethod('POST');
+                $hasCoordiantes = $this->filled('latitude') && $this->filled('longitude');
+                $hasLocation    = $this->filled('location');
+
+                // if creating then it's required
+                if ($isCreating) {
+                    // if either has coordinated or location then it's not required
+                    if ($hasCoordiantes || $hasLocation) {
+                        return false;
+                    }
+
+                    return true;
+                }
+
+                return false;
+            })],
+            'location'     => ['nullable', new ResolvablePoint()],
+            'latitude'     => ['nullable', 'required_with:longitude'],
+            'longitude'    => ['nullable', 'required_with:latitude'],
+            'status'       => ['nullable', 'in:active,inactive'],
         ];
     }
 }