@fleetbase/fleetops-engine 0.6.34 → 0.6.36

package/addon/controllers/management/vehicles/index/edit.js

@@ -9,6 +9,7 @@ export default class ManagementVehiclesIndexEditController extends Controller {
     @service intl;
     @service notifications;
     @service modalsManager;
+    @service events;
     @tracked overlay;
     @tracked actionButtons = [
         {
@@ -20,6 +21,7 @@ export default class ManagementVehiclesIndexEditController extends Controller {
     @task *save(vehicle) {
         try {
             yield vehicle.save();
+            this.events.trackResourceUpdated(vehicle);
             this.overlay?.close();
 
             yield this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index.details', vehicle);

package/addon/controllers/management/vehicles/index/new.js

@@ -11,12 +11,14 @@ export default class ManagementVehiclesIndexNewController extends Controller {
     @service hostRouter;
     @service intl;
     @service notifications;
+    @service events;
     @tracked overlay;
     @tracked vehicle = this.store.createRecord('vehicle', DEFAULT_PROPERTIES);
 
     @task *save(vehicle) {
         try {
             yield vehicle.save();
+            this.events.trackResourceCreated(vehicle);
             this.overlay?.close();
 
             yield this.hostRouter.refresh();

package/addon/controllers/management/vendors/index/edit.js

@@ -9,6 +9,7 @@ export default class ManagementVendorsIndexEditController extends Controller {
     @service intl;
     @service notifications;
     @service modalsManager;
+    @service events;
     @tracked overlay;
     @tracked actionButtons = [
         {
@@ -20,6 +21,7 @@ export default class ManagementVendorsIndexEditController extends Controller {
     @task *save(vendor) {
         try {
             yield vendor.save();
+            this.events.trackResourceUpdated(vendor);
             this.overlay?.close();
 
             yield this.hostRouter.transitionTo('console.fleet-ops.management.vendors.index.details', vendor);

package/addon/controllers/management/vendors/index/new.js

@@ -9,6 +9,7 @@ export default class ManagementVendorsIndexNewController extends Controller {
     @service hostRouter;
     @service intl;
     @service notifications;
+    @service events;
     @tracked overlay;
     @tracked vendor = this.vendorActions.createNewInstance();
     @tracked integratedVendor;
@@ -18,6 +19,7 @@ export default class ManagementVendorsIndexNewController extends Controller {
 
         try {
             yield vendor.save();
+            this.events.trackResourceCreated(vendor);
             this.overlay?.close();
 
             yield this.hostRouter.refresh();

package/addon/controllers/operations/orders/index/new.js

@@ -19,6 +19,7 @@ export default class OperationsOrdersIndexNewController extends Controller {
     @service orderImport;
     @service orderCreation;
     @service orderValidation;
+    @service events;
     @tracked order = this.orderCreation.newOrder();
     @tracked overlay;
 
@@ -73,6 +74,7 @@ export default class OperationsOrdersIndexNewController extends Controller {
 
             // Save order
             const createdOrder = yield order.save();
+            this.events.trackResourceCreated(order);
 
             // Trigger created event
             this.universe.trigger('fleet-ops.order.created', createdOrder);

package/addon/controllers/operations/routes/index/new.js

@@ -6,6 +6,7 @@ import { task } from 'ember-concurrency';
 
 export default class OperationsRoutesIndexNewController extends Controller {
     @service store;
+    @service events;
     @tracked panel;
     @tracked selectedOrders = '';
     @tracked waypoints = [];

package/addon/controllers/operations/service-rates/index/edit.js

@@ -10,6 +10,7 @@ export default class OperationsServiceRatesIndexEditController extends Controlle
     @service intl;
     @service notifications;
     @service modalsManager;
+    @service events;
     @tracked overlay;
     @tracked actionButtons = [
         {
@@ -21,6 +22,7 @@ export default class OperationsServiceRatesIndexEditController extends Controlle
     @task *save(serviceRate) {
         try {
             yield serviceRate.save();
+            this.events.trackResourceUpdated(serviceRate);
             this.overlay?.close();
 
             yield this.hostRouter.transitionTo('console.fleet-ops.operations.service-rates.index.details', serviceRate);

package/addon/controllers/operations/service-rates/index/new.js

@@ -9,12 +9,14 @@ export default class OperationsServiceRatesIndexNewController extends Controller
     @service hostRouter;
     @service intl;
     @service notifications;
+    @service events;
     @tracked overlay;
     @tracked serviceRate = this.serviceRateActions.createNewInstance();
 
     @task *save(serviceRate) {
         try {
             yield serviceRate.save();
+            this.events.trackResourceCreated(serviceRate);
             this.overlay?.close();
 
             yield this.hostRouter.refresh();

package/addon/controllers/settings/avatars.js

@@ -0,0 +1,3 @@
+import Controller from '@ember/controller';
+
+export default class SettingsAvatarsController extends Controller {}

package/addon/extension.js

@@ -18,11 +18,6 @@ export default {
                     icon: 'location-arrow',
                     component: new ExtensionComponent('@fleetbase/fleetops-engine', 'admin/navigator-app'),
                 }),
-                new MenuItem({
-                    title: 'Avatar Managemenet',
-                    icon: 'images',
-                    component: new ExtensionComponent('@fleetbase/fleetops-engine', 'admin/avatar-management'),
-                }),
             ],
             {
                 slug: 'fleet-ops',

package/addon/routes/settings/avatars.js

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class SettingsAvatarsRoute extends Route {}

package/addon/routes.js

@@ -225,6 +225,7 @@ export default buildRoutes(function () {
         this.route('navigator-app');
         this.route('notifications');
         this.route('custom-fields');
+        this.route('avatars');
         this.route('routing');
         this.route('payments', function () {
             this.route('index', { path: '/' });

package/addon/templates/operations/orders/index/new.hbs

@@ -9,6 +9,7 @@
     @onOverlayReady={{fn (mut this.overlay)}}
     @width="530px"
     @onOpen={{this.setup}}
+    class="new-order-panel"
 >
     <Order::Form @resource={{this.order}} @controller={{this}} />
     <Spacer @height="300px" />

package/addon/templates/settings/avatars.hbs

@@ -0,0 +1,10 @@
+<Layout::Section::Header @title={{t "settings.avatar-management"}} />
+
+<Layout::Section::Body class="overflow-y-scroll h-full">
+    <div class="container mx-auto h-screen">
+        <div class="max-w-3xl my-10 mx-auto space-y-6">
+            <AvatarManager  />
+        </div>
+    </div>
+    <Spacer @height="600px" />
+</Layout::Section::Body>

package/app/components/avatar-manager.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/avatar-manager';

package/app/controllers/settings/avatars.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/settings/avatars';

package/app/routes/settings/avatars.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/settings/avatars';

package/app/templates/settings/avatars.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/settings/avatars';

package/composer.json

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

package/extension.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.6.34",
+    "version": "0.6.36",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -42,8 +42,8 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.3.10",
-        "@fleetbase/ember-ui": "^0.3.17",
+        "@fleetbase/ember-core": "^0.3.12",
+        "@fleetbase/ember-ui": "^0.3.21",
         "@fleetbase/fleetops-data": "^0.1.25",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fortawesome/ember-fontawesome": "^2.0.0",

package/server/config/fleetops.php

@@ -56,7 +56,7 @@ return [
     |--------------------------------------------------------------------------
     */
     'navigator' => [
-        'bypass_verification_code' => env('NAVIGATOR_BYPASS_VERIFICATION_CODE', '999000'),
+        'bypass_verification_code' => env('SMS_AUTH_BYPASS_CODE', env('NAVIGATOR_BYPASS_VERIFICATION_CODE')),
         'app_identifier' => env('NAVIGATOR_APP_IDENTIFIER', 'io.fleetbase.navigator')
     ],
 

package/server/src/Auth/Schemas/FleetOps.php

@@ -117,6 +117,10 @@ class FleetOps
             'name'    => 'custom-field',
             'actions' => [],
         ],
+        [
+            'name'    => 'avatar',
+            'actions' => [],
+        ],
         [
             'name'           => 'navigator-settings', // the navigator mobile app used by drivers
             'action'         => [],

package/server/src/Expansions/UserFilterExpansion.php

@@ -16,6 +16,37 @@ class UserFilterExpansion implements Expansion
         return \Fleetbase\Http\Filter\UserFilter::class;
     }
 
+    /**
+     * Filter where user is a driver type or has a driver profile.
+     *
+     * @return void
+     */
+    public static function isDriver()
+    {
+        return function () {
+            /** @var \Fleetbase\Http\Filter\UserFilter|\Fleetbase\Http\Filter\Filter $this */
+            $this->builder->where(function ($query) {
+                $query->where('type', 'driver');
+                $query->orwhereHas('driverProfiles', function ($query) {
+                    $query->where('company_uuid', session('company'));
+                });
+            });
+        };
+    }
+
+    /**
+     * Filter where a user is a customer.
+     *
+     * @return void
+     */
+    public static function isCustomer()
+    {
+        return function () {
+            /** @var \Fleetbase\Http\Filter\UserFilter|\Fleetbase\Http\Filter\Filter $this */
+            $this->builder->where('type', 'customer');
+        };
+    }
+
     /**
      * Filter where doesnt have driver within the CURRENT organizations.
      *

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

@@ -308,7 +308,7 @@ class OrderController extends Controller
         }
 
         // load required relations
-        $order->load(['trackingNumber', 'driverAssigned', 'purchaseRate', 'customer', 'facilitator']);
+        $order->load(['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate', 'customer', 'facilitator']);
 
         // Determine if order should be dispatched on creation
         $shouldDispatch = $request->boolean('dispatch') && $integratedVendorOrder === null;
@@ -519,7 +519,7 @@ class OrderController extends Controller
         $order->flushAttributesCache();
 
         // load required relations
-        $order->load(['trackingNumber', 'driverAssigned', 'purchaseRate', 'customer', 'facilitator']);
+        $order->load(['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate', 'customer', 'facilitator']);
 
         // response the order resource
         return new OrderResource($order);
@@ -535,6 +535,7 @@ class OrderController extends Controller
         set_time_limit(180);
 
         $results = Order::queryWithRequest($request, function (&$query, $request) {
+            $query->with(['trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'customer', 'facilitator']);
             $query->where('company_uuid', session('company'));
             $query->whereNotNull('payload_uuid');
 
@@ -728,7 +729,7 @@ class OrderController extends Controller
     {
         // find for the order
         try {
-            $order = Order::findRecordOrFail($id, ['trackingNumber', 'driverAssigned', 'purchaseRate', 'customer', 'facilitator']);
+            $order = Order::findRecordOrFail($id, ['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate', 'customer', 'facilitator']);
         } catch (ModelNotFoundException $exception) {
             return response()->json(
                 [
@@ -808,7 +809,7 @@ class OrderController extends Controller
     public function dispatchOrder(string $id)
     {
         try {
-            $order = Order::findRecordOrFail($id, ['trackingNumber', 'driverAssigned', 'purchaseRate', 'customer', 'facilitator']);
+            $order = Order::findRecordOrFail($id, ['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate', 'customer', 'facilitator']);
         } catch (ModelNotFoundException $exception) {
             return response()->json(
                 [
@@ -1223,7 +1224,7 @@ class OrderController extends Controller
     public function setDestination(string $id, string $placeId)
     {
         try {
-            $order = Order::findRecordOrFail($id, ['payload.waypoints', 'payload.pickup', 'payload.dropoff', 'driverAssigned']);
+            $order = Order::findRecordOrFail($id, ['payload.waypoints', 'payload.pickup', 'payload.dropoff', 'driverAssigned', 'vehicleAssigned', 'customer', 'facilitator']);
         } catch (ModelNotFoundException $exception) {
             return response()->apiError('Order resource not found.', 404);
         }
@@ -1567,12 +1568,8 @@ class OrderController extends Controller
      *
      * @return \Feetbase\Models\File
      */
-    protected function storeProofPhoto(
-        Proof $proof,
-        UploadedFile|string $photo,
-        string $disk,
-        string $bucket,
-    ): File {
+    protected function storeProofPhoto(Proof $proof, UploadedFile|string $photo, string $disk, string $bucket): File
+    {
         $isFile      = $photo instanceof UploadedFile;
         $contents    = $isFile
             ? file_get_contents($photo->getRealPath())

package/server/src/Http/Controllers/Internal/v1/ContactController.php

@@ -91,15 +91,18 @@ class ContactController extends FleetOpsController
     {
         $disk           = $request->input('disk', config('filesystems.default'));
         $files          = $request->resolveFilesFromIds();
+        $importedCount  = 0;
 
         foreach ($files as $file) {
             try {
-                Excel::import(new ContactImport(), $file->path, $disk);
+                $import = new ContactImport();
+                Excel::import($import, $file->path, $disk);
+                $importedCount += $import->imported;
             } catch (\Throwable $e) {
                 return response()->error('Invalid file, unable to proccess.');
             }
         }
 
-        return response()->json(['status' => 'ok', 'message' => 'Import completed']);
+        return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
     }
 }

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

@@ -137,6 +137,14 @@ class DriverController extends FleetOpsController
                     if ($input->has('user_uuid')) {
                         $user = User::where('uuid', $input->get('user_uuid'))->first();
 
+                        // Check if a driver profile already exists for this user in the current company
+                        if ($user) {
+                            $existingDriver = Driver::where(['user_uuid' => $user->uuid, 'company_uuid' => session('company')])->first();
+                            if ($existingDriver) {
+                                throw new \Exception('This user account already belongs to a driver.');
+                            }
+                        }
+
                         // If user doesn't exist with provided UUID, create new user
                         if (!$user) {
                             $userInput = $input
@@ -513,15 +521,18 @@ class DriverController extends FleetOpsController
     {
         $disk           = $request->input('disk', config('filesystems.default'));
         $files          = $request->resolveFilesFromIds();
+        $importedCount  = 0;
 
         foreach ($files as $file) {
             try {
-                Excel::import(new DriverImport(), $file->path, $disk);
+                $import = new DriverImport();
+                Excel::import($import, $file->path, $disk);
+                $importedCount += $import->imported;
             } catch (\Throwable $e) {
                 return response()->error('Invalid file, unable to proccess.');
             }
         }
 
-        return response()->json(['status' => 'ok', 'message' => 'Import completed']);
+        return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
     }
 }

package/server/src/Http/Controllers/Internal/v1/FleetController.php

@@ -221,15 +221,18 @@ class FleetController extends FleetOpsController
     {
         $disk           = $request->input('disk', config('filesystems.default'));
         $files          = $request->resolveFilesFromIds();
+        $importedCount  = 0;
 
         foreach ($files as $file) {
             try {
-                Excel::import(new FleetImport(), $file->path, $disk);
+                $import = new FleetImport();
+                Excel::import($import, $file->path, $disk);
+                $importedCount += $import->imported;
             } catch (\Throwable $e) {
                 return response()->error('Invalid file, unable to proccess.');
             }
         }
 
-        return response()->json(['status' => 'ok', 'message' => 'Import completed']);
+        return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
     }
 }

package/server/src/Http/Controllers/Internal/v1/FuelReportController.php

@@ -50,15 +50,18 @@ class FuelReportController extends FleetOpsController
     {
         $disk           = $request->input('disk', config('filesystems.default'));
         $files          = $request->resolveFilesFromIds();
+        $importedCount  = 0;
 
         foreach ($files as $file) {
             try {
-                Excel::import(new FuelReportImport(), $file->path, $disk);
+                $import = new FuelReportImport();
+                Excel::import($import, $file->path, $disk);
+                $importedCount += $import->imported;
             } catch (\Throwable $e) {
                 return response()->error('Invalid file, unable to proccess.');
             }
         }
 
-        return response()->json(['status' => 'ok', 'message' => 'Import completed']);
+        return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
     }
 }

package/server/src/Http/Controllers/Internal/v1/IssueController.php

@@ -55,15 +55,18 @@ class IssueController extends FleetOpsController
     {
         $disk           = $request->input('disk', config('filesystems.default'));
         $files          = $request->resolveFilesFromIds();
+        $importedCount  = 0;
 
         foreach ($files as $file) {
             try {
-                Excel::import(new IssueImport(), $file->path, $disk);
+                $import = new IssueImport();
+                Excel::import($import, $file->path, $disk);
+                $importedCount += $import->imported;
             } catch (\Throwable $e) {
                 return response()->error('Invalid file, unable to proccess.');
             }
         }
 
-        return response()->json(['status' => 'ok', 'message' => 'Import completed']);
+        return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
     }
 }

package/server/src/Http/Controllers/Internal/v1/PlaceController.php

@@ -170,15 +170,18 @@ class PlaceController extends FleetOpsController
     {
         $disk           = $request->input('disk', config('filesystems.default'));
         $files          = $request->resolveFilesFromIds();
+        $importedCount  = 0;
 
         foreach ($files as $file) {
             try {
-                Excel::import(new PlaceImport(), $file->path, $disk);
+                $import = new PlaceImport();
+                Excel::import($import, $file->path, $disk);
+                $importedCount += $import->imported;
             } catch (\Throwable $e) {
                 return response()->error('Invalid file, unable to proccess.');
             }
         }
 
-        return response()->json(['status' => 'ok', 'message' => 'Import completed']);
+        return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
     }
 }

package/server/src/Http/Controllers/Internal/v1/VehicleController.php

@@ -59,7 +59,9 @@ class VehicleController extends FleetOpsController
      */
     public function avatars()
     {
-        $options = Vehicle::getAvatarOptions();
+        $options = Vehicle::getAvatarOptions(function ($query) {
+            $query->where('company_uuid', session('company'));
+        });
 
         return response()->json($options);
     }
@@ -87,15 +89,18 @@ class VehicleController extends FleetOpsController
     {
         $disk           = $request->input('disk', config('filesystems.default'));
         $files          = $request->resolveFilesFromIds();
+        $importedCount  = 0;
 
         foreach ($files as $file) {
             try {
-                Excel::import(new VehicleImport(), $file->path, $disk);
+                $import = new VehicleImport();
+                Excel::import($import, $file->path, $disk);
+                $importedCount += $import->imported;
             } catch (\Throwable $e) {
                 return response()->error('Invalid file, unable to proccess.');
             }
         }
 
-        return response()->json(['status' => 'ok', 'message' => 'Import completed']);
+        return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
     }
 }

package/server/src/Http/Controllers/Internal/v1/VendorController.php

@@ -112,16 +112,19 @@ class VendorController extends FleetOpsController
     {
         $disk           = $request->input('disk', config('filesystems.default'));
         $files          = $request->resolveFilesFromIds();
+        $importedCount  = 0;
 
         foreach ($files as $file) {
             try {
-                Excel::import(new VendorImport(), $file->path, $disk);
+                $import = new VendorImport();
+                Excel::import($import, $file->path, $disk);
+                $importedCount += $import->imported;
             } catch (\Throwable $e) {
                 return response()->error('Invalid file, unable to proccess.');
             }
         }
 
-        return response()->json(['status' => 'ok', 'message' => 'Import completed']);
+        return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
     }
 
     /**

package/server/src/Imports/ContactImport.php

@@ -9,6 +9,11 @@ use Maatwebsite\Excel\Concerns\WithHeadingRow;
 
 class ContactImport implements ToCollection, WithHeadingRow
 {
+    /**
+     * Counter for successfully imported rows.
+     */
+    public int $imported = 0;
+
     /**
      * @return Collection
      */
@@ -20,6 +25,7 @@ class ContactImport implements ToCollection, WithHeadingRow
             }
 
             Contact::createFromImport($row, true);
+            $this->imported++;
         }
     }
 }

package/server/src/Imports/DriverImport.php

@@ -9,6 +9,11 @@ use Maatwebsite\Excel\Concerns\WithHeadingRow;
 
 class DriverImport implements ToCollection, WithHeadingRow
 {
+    /**
+     * Counter for successfully imported rows.
+     */
+    public int $imported = 0;
+
     /**
      * @return Collection
      */
@@ -20,6 +25,7 @@ class DriverImport implements ToCollection, WithHeadingRow
             }
 
             Driver::createFromImport($row, true);
+            $this->imported++;
         }
     }
 }

package/server/src/Imports/FleetImport.php

@@ -9,6 +9,11 @@ use Maatwebsite\Excel\Concerns\WithHeadingRow;
 
 class FleetImport implements ToCollection, WithHeadingRow
 {
+    /**
+     * Counter for successfully imported rows.
+     */
+    public int $imported = 0;
+
     /**
      * @return Collection
      */
@@ -20,6 +25,7 @@ class FleetImport implements ToCollection, WithHeadingRow
             }
 
             Fleet::createFromImport($row, true);
+            $this->imported++;
         }
     }
 }

package/server/src/Imports/FuelReportImport.php

@@ -9,6 +9,11 @@ use Maatwebsite\Excel\Concerns\WithHeadingRow;
 
 class FuelReportImport implements ToCollection, WithHeadingRow
 {
+    /**
+     * Counter for successfully imported rows.
+     */
+    public int $imported = 0;
+
     /**
      * @return Collection
      */
@@ -20,6 +25,7 @@ class FuelReportImport implements ToCollection, WithHeadingRow
             }
 
             FuelReport::createFromImport($row, true);
+            $this->imported++;
         }
     }
 }