Merge pull request #153 from fleetbase/dev-v0.6.7

Dev v0.6.7 - Patched customer/facilitator assignment on order creation API & minor Place creation API patch

Author: roncodes

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.6.6",
+    "version": "0.6.7",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.6",
+    "version": "0.6.7",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "AGPL-3.0-or-later",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.6.6",
+    "version": "0.6.7",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"

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

@@ -195,6 +195,9 @@ public function create(CreateOrderRequest $request)
                 [
                     'public_id'    => $request->input('facilitator'),
                     'company_uuid' => session('company'),
+                ],
+                [
+                    'with_table' => true,
                 ]
             );
 
@@ -217,6 +220,9 @@ public function create(CreateOrderRequest $request)
                     [
                         'public_id'    => $customer,
                         'company_uuid' => session('company'),
+                    ],
+                    [
+                        'with_table' => true,
                     ]
                 );
 
@@ -256,6 +262,10 @@ public function create(CreateOrderRequest $request)
                     }
                 }
 
+                if (Str::isUuid($customer)) {
+                    $customer = Contact::where('uuid', $customer)->first();
+                }
+
                 if ($customer instanceof Contact) {
                     $input['customer_uuid'] = $customer->uuid;
                     $input['customer_type'] = Utils::getModelClassName($customer);
@@ -449,6 +459,9 @@ public function update($id, UpdateOrderRequest $request)
                 [
                     'public_id'    => $request->input('facilitator'),
                     'company_uuid' => session('company'),
+                ],
+                [
+                    'with_table' => true,
                 ]
             );
 
@@ -465,6 +478,9 @@ public function update($id, UpdateOrderRequest $request)
                 [
                     'public_id'    => $request->input('customer'),
                     'company_uuid' => session('company'),
+                ],
+                [
+                    'with_table' => true,
                 ]
             );
 

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

@@ -116,7 +116,9 @@ public function create(CreatePlaceRequest $request)
                     'public_id'    => $id,
                     'company_uuid' => session('company'),
                 ],
-                ['full' => true]
+                [
+                    'with_table' => true,
+                ]
             );
 
             if (is_array($owner)) {
@@ -224,6 +226,9 @@ public function update($id, UpdatePlaceRequest $request)
                     [
                         'public_id'    => $id,
                         'company_uuid' => session('company'),
+                    ],
+                    [
+                        '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;