Merge pull request #114 from fleetbase/dev-v0.5.0

v0.5.0
fleetbase · Jul 2, 2024 · 024761d · 024761d
2 parents cfc3b2e + 307be2c
commit 024761d
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 45 deletions.
diff --git a/addon/controllers/operations/orders/index/new.js b/addon/controllers/operations/orders/index/new.js
@@ -196,6 +196,11 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         return renderableComponents;
     }
 
+    get renderableEntityInputComponents() {
+        const renderableComponents = this.universe.getRenderableComponentsFromRegistry('fleet-ops:template:operations:orders:new:entities-input');
+        return renderableComponents;
+    }
+
     @not('isServicable') isNotServicable;
     @alias('currentUser.latitude') userLatitude;
     @alias('currentUser.longitude') userLongitude;
@@ -1418,6 +1423,12 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         this.entities.pushObject(entity);
     }
 
+    @action addEntities(entities = []) {
+        if (isArray(entities)) {
+            this.entities.pushObjects(entities);
+        }
+    }
+
     @action addEntity(importId = null) {
         const entity = this.store.createRecord('entity', {
             _import_id: importId,

diff --git a/addon/engine.js b/addon/engine.js
@@ -67,13 +67,15 @@ export default class FleetOpsEngine extends Engine {
         // create all registries necessary
         universe.createRegistries([
             'engine:fleet-ops',
+            'component:live-map-drawer',
             'component:vehicle-panel',
             'component:driver-panel',
             'component:order-config-manager',
             'contextmenu:vehicle',
             'contextmenu:driver',
             'fleet-ops:template:operations:orders:view',
             'fleet-ops:template:operations:orders:new',
+            'fleet-ops:template:operations:orders:new:entities-input',
         ]);
     };
 }

diff --git a/addon/templates/operations/orders/index/new.hbs b/addon/templates/operations/orders/index/new.hbs
@@ -526,7 +526,7 @@
 
         {{#if this.renderableComponents}}
             {{#each this.renderableComponents as |renderableComponent|}}
-                {{component renderableComponent order=this.order}}
+                {{component renderableComponent order=this.order controller=this}}
             {{/each}}
         {{/if}}
 
@@ -568,6 +568,11 @@
                             </div>
                         </DropdownButton>
                     {{/if}}
+                    {{#if this.renderableEntityInputComponents}}
+                        {{#each this.renderableEntityInputComponents as |renderableEntityInputComponent|}}
+                            {{component renderableEntityInputComponent order=this.order controller=this}}
+                        {{/each}}
+                    {{/if}}
                 </div>
             {{/if}}
             {{#if this.isCsvImportedOrder}}

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.4.30",
+    "version": "0.5.0",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.25",
+        "fleetbase/core-api": "^1.4.26",
         "barryvdh/laravel-dompdf": "^2.0",
         "brick/geo": "0.7.2",
         "cknow/laravel-money": "^7.1",

diff --git a/extension.json b/extension.json
@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.4.30",
+    "version": "0.5.0",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "MIT",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.4.30",
+    "version": "0.5.0",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -43,7 +43,7 @@
     "dependencies": {
         "@babel/core": "^7.23.2",
         "@fleetbase/ember-core": "^0.2.11",
-        "@fleetbase/ember-ui": "^0.2.16",
+        "@fleetbase/ember-ui": "^0.2.17",
         "@fleetbase/fleetops-data": "^0.1.15",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@fortawesome/ember-fontawesome": "^0.4.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/server/src/Http/Controllers/Api/v1/DriverController.php b/server/src/Http/Controllers/Api/v1/DriverController.php
@@ -36,8 +36,6 @@ class DriverController extends Controller
     /**
      * Creates a new Fleetbase Driver resource.
      *
-     * @param \Fleetbase\Http\Requests\CreateDriverRequest $request
-     *
      * @return \Fleetbase\Http\Resources\Driver
      */
     public function create(CreateDriverRequest $request)
@@ -52,7 +50,12 @@ public function create(CreateDriverRequest $request)
         $userDetails                 = $request->only(['name', 'password', 'email', 'phone', 'timezone']);
 
         // Get current company session
-        $company                   = Auth::getCompany();
+        $company = $request->has('company') ? Auth::getCompanyFromRequest($request) : Auth::getCompany();
+
+        // Debugging: Ensure company is retrieved correctly
+        if (!$company) {
+            return response()->apiError('Company not found.');
+        }
 
         // Apply user infos
         $userDetails = User::applyUserInfoFromRequest($request, $userDetails);
@@ -74,29 +77,29 @@ public function create(CreateDriverRequest $request)
 
         // set user id
         $input['user_uuid']    = $user->uuid;
-        $input['company_uuid'] = $company->uuid;
+        $input['company_uuid'] = $company->uuid;  // Ensure correct company_uuid is set
 
         // vehicle assignment public_id -> uuid
         if ($request->has('vehicle')) {
             $input['vehicle_uuid'] = Utils::getUuid('vehicles', [
                 'public_id'    => $request->input('vehicle'),
-                'company_uuid' => session('company'),
+                'company_uuid' => $company->uuid,  // Use $company->uuid instead of session
             ]);
         }
 
         // vendor assignment public_id -> uuid
         if ($request->has('vendor')) {
             $input['vendor_uuid'] = Utils::getUuid('vendors', [
                 'public_id'    => $request->input('vendor'),
-                'company_uuid' => session('company'),
+                'company_uuid' => $company->uuid,  // Use $company->uuid instead of session
             ]);
         }
 
         // order|alias:job assignment public_id -> uuid
         if ($request->has('job')) {
             $input['current_job_uuid'] = Utils::getUuid('orders', [
                 'public_id'    => $request->input('job'),
-                'company_uuid' => session('company'),
+                'company_uuid' => $company->uuid,  // Use $company->uuid instead of session
             ]);
         }
 

diff --git a/server/src/Http/Controllers/Api/v1/IssueController.php b/server/src/Http/Controllers/Api/v1/IssueController.php
@@ -30,6 +30,7 @@ public function create(CreateIssueRequest $request)
             'type',
             'report',
             'priority',
+            'status',
         ]);
 
         // Find driver who is reporting
@@ -83,6 +84,7 @@ public function update($id, UpdateIssueRequest $request)
                 'type',
                 'report',
                 'priority',
+                'status',
             ]);
 
         // update the issue

diff --git a/server/src/Http/Controllers/Api/v1/NavigatorController.php b/server/src/Http/Controllers/Api/v1/NavigatorController.php
@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Http\Controllers\Api\v1;
 
 use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Models\Company;
 use Fleetbase\Models\Setting;
 
 class NavigatorController extends Controller
@@ -25,7 +26,8 @@ class NavigatorController extends Controller
      */
     public function getDriverOnboardSettings($companyId)
     {
-        $driverOnboardSettings  = Setting::where('key', 'fleet-ops.driver-onboard-settings.' . $companyId)->value('value');
+        $company                = Company::select()->where('public_id', $companyId)->first();
+        $driverOnboardSettings  = Setting::where('key', 'fleet-ops.driver-onboard-settings.' . $company->uuid)->value('value');
         if (!$driverOnboardSettings) {
             $driverOnboardSettings = [];
         }

diff --git a/server/src/Http/Controllers/Api/v1/OrganizationController.php b/server/src/Http/Controllers/Api/v1/OrganizationController.php
@@ -23,7 +23,7 @@ public function listOrganizations(Request $request)
         $companies = Company::whereHas('users')->get()->map(function ($company) {
             return [
                 'name'   => $company->name,
-                'uuid'   => $company->uuid,
+                'id'     => $company->public_id,
             ];
         });