Merge pull request #103 from fleetbase/dev-v0.4.25

v0.4.25

addon/components/layout/fleet-ops-sidebar/driver-listing.js

@@ -19,13 +19,12 @@ export default class LayoutFleetOpsSidebarDriverListingComponent extends Compone
     }
 
     displayPanelDropdown = true;
-
     panelDropdownButtonActions = [
         {
             label: 'Create new driver...',
             onClick: () => {
                 const driver = this.store.createRecord('driver');
-                this.contextPanel.focus(driver);
+                this.contextPanel.focus(driver, 'editing');
             },
         },
     ];

composer.json

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

extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.4.24",
+    "version": "0.4.25",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "MIT",

package.json

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

server/src/Console/Commands/FixInvalidPolymorphicRelationTypeNamespaces.php

@@ -36,7 +36,7 @@ public function handle()
             ['model' => \Fleetbase\FleetOps\Models\Order::class, 'columns' => ['customer_type', 'facilitator_type']],
             ['model' => \Fleetbase\FleetOps\Models\Place::class, 'columns' => ['owner_type']],
             ['model' => \Fleetbase\FleetOps\Models\Entity::class, 'columns' => ['customer_type']],
-            ['model' => \Fleetbase\FleetOps\Models\PurchaseRate::class, 'columns' => ['customer_type']]
+            ['model' => \Fleetbase\FleetOps\Models\PurchaseRate::class, 'columns' => ['customer_type']],
         ];
 
         foreach ($models as $modelConfig) {

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

@@ -148,7 +148,10 @@ public function update($id, UpdateDriverRequest $request)
         $userDetails = $request->only(['name', 'password', 'email', 'phone']);
 
         // update driver user details
-        $driver->user->update($userDetails);
+        $driverUser = $driver->getUser();
+        if ($driverUser) {
+            $driverUser->update($userDetails);
+        }
 
         // vehicle assignment public_id -> uuid
         if ($request->has('vehicle')) {
@@ -776,4 +779,4 @@ private static function phone(?string $phone = null): string
 
         return $phone;
     }
-}
+}

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

@@ -498,7 +498,7 @@ public function query(Request $request)
 
             if ($request->filled('on')) {
                 $on = Carbon::parse($request->input('on'));
-        
+
                 $query->where(function ($q) use ($on) {
                     $q->whereDate('created_at', $on);
                     $q->orWhereDate('scheduled_at', $on);
@@ -1408,4 +1408,4 @@ public function getEditableEntityFields(string $id, Request $request)
 
         return response()->json($entityEditingSettings);
     }
-}
+}

server/src/Http/Controllers/FleetOpsController.php

@@ -2,7 +2,6 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers;
 
-use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\Http\Controllers\FleetbaseController;
 
 class FleetOpsController extends FleetbaseController

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

@@ -255,14 +255,18 @@ function (&$request, &$driver, &$input) {
                     }
                     $input     = $input->except(['name', 'password', 'email', 'phone', 'meta', 'avatar_uuid', 'photo_uuid'])->toArray();
 
-                    $driver->user->update($userInput);
-                    $driver->flushAttributesCache();
+                    // Update driver user details
+                    $driverUser = $driver->getUser();
+                    if ($driverUser) {
+                        $driverUser->update($userInput);
+                        $input['slug'] = $driverUser->slug;
+                    }
 
-                    $input['slug'] = $driver->user->slug;
+                    // Flush cache
+                    $driver->flushAttributesCache();
                 },
                 function ($request, &$driver) {
                     $driver->load(['user']);
-
                     if ($driver->user) {
                         $driver->user->setHidden(['driver']);
                     }

server/src/Http/Requests/CreateContactRequest.php

@@ -14,7 +14,7 @@ class CreateContactRequest extends FleetbaseRequest
      */
     public function authorize()
     {
-        return request()->session()->has('storefront_key') || request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');;
+        return request()->session()->has('storefront_key') || request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
 
     /**

server/src/Http/Requests/CreateEntityRequest.php

@@ -14,7 +14,7 @@ class CreateEntityRequest extends FleetbaseRequest
      */
     public function authorize()
     {
-        return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');;
+        return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
 
     /**

server/src/Http/Requests/CreateIssueRequest.php

@@ -13,7 +13,7 @@ class CreateIssueRequest extends FleetbaseRequest
      */
     public function authorize()
     {
-        return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');;
+        return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
 
     /**

server/src/Http/Requests/CreatePlaceRequest.php

@@ -16,7 +16,7 @@ class CreatePlaceRequest extends FleetbaseRequest
      */
     public function authorize()
     {
-        return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');;
+        return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
 
     /**

server/src/Http/Requests/CreateVehicleRequest.php

@@ -14,7 +14,7 @@ class CreateVehicleRequest extends FleetbaseRequest
      */
     public function authorize()
     {
-        return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');;
+        return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
 
     /**