patched place creation with address attribute, patched customer & facilitator resolution for order creation

Author: roncodes

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

@@ -197,7 +197,7 @@ public function create(CreateOrderRequest $request)
                     'company_uuid' => session('company'),
                 ],
                 [
-                    'with_table' => true
+                    'with_table' => true,
                 ]
             );
 
@@ -222,7 +222,7 @@ public function create(CreateOrderRequest $request)
                         'company_uuid' => session('company'),
                     ],
                     [
-                        'with_table' => true
+                        'with_table' => true,
                     ]
                 );
 
@@ -461,7 +461,7 @@ public function update($id, UpdateOrderRequest $request)
                     'company_uuid' => session('company'),
                 ],
                 [
-                    'with_table' => true
+                    'with_table' => true,
                 ]
             );
 
@@ -480,7 +480,7 @@ public function update($id, UpdateOrderRequest $request)
                     'company_uuid' => session('company'),
                 ],
                 [
-                    'with_table' => true
+                    'with_table' => true,
                 ]
             );
 

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

@@ -117,7 +117,7 @@ public function create(CreatePlaceRequest $request)
                     'company_uuid' => session('company'),
                 ],
                 [
-                    'with_table' => true
+                    'with_table' => true,
                 ]
             );
 
@@ -228,7 +228,7 @@ public function update($id, UpdatePlaceRequest $request)
                         'company_uuid' => session('company'),
                     ],
                     [
-                        'with_table' => true
+                        'with_table' => true,
                     ]
                 );
 

server/src/Http/Requests/CreatePlaceRequest.php

@@ -33,11 +33,12 @@ public function rules()
                     $hasCoordiantes = $this->filled('latitude') && $this->filled('longitude');
                     $hasLocation    = $this->filled('location');
                     $hasStreet      = $this->filled('street1');
+                    $hasAddress     = $this->filled('address');
 
                     // if creating then it's required
                     if ($isCreating) {
                         // if either has coordinated or location then it's not required
-                        if ($hasCoordiantes || $hasLocation) {
+                        if ($hasCoordiantes || $hasLocation || $hasAddress) {
                             return false;
                         }
 
@@ -57,11 +58,12 @@ public function rules()
                     $isCreating     = $this->isMethod('POST');
                     $hasCoordiantes = $this->filled('latitude') && $this->filled('longitude');
                     $hasLocation    = $this->filled('location');
+                    $hasAddress     = $this->filled('address');
 
                     // if creating then it's required
                     if ($isCreating) {
                         // if either has coordinated or location then it's not required
-                        if ($hasCoordiantes || $hasLocation) {
+                        if ($hasCoordiantes || $hasLocation || $hasAddress) {
                             return false;
                         }
 
@@ -71,6 +73,7 @@ public function rules()
                     return false;
                 }),
             ],
+            'address'   => ['nullable'],
             'customer'  => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'public_id')],
             'contact'   => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'public_id')],
             'vendor'    => 'nullable|exists:vendors,public_id',

server/src/Support/Utils.php

@@ -191,6 +191,10 @@ public static function getPointFromMixed($coordinates): ?Point
             $coordinates = $coordinates->location;
         }
 
+        if ($coordinates instanceof \Fleetbase\FleetOps\Models\Vehicle) {
+            $coordinates = $coordinates->location;
+        }
+
         // any model with spatial location point
         if ($coordinates instanceof \Illuminate\Database\Eloquent\Model && $coordinates->isFillable('location')) {
             $coordinates = $coordinates->location;