@fleetbase/fleetops-engine 0.6.50 → 0.6.52

package/addon/controllers/management/fuel-transactions/index.js

@@ -0,0 +1,240 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import { task } from 'ember-concurrency';
+
+export default class ManagementFuelTransactionsIndexController extends Controller {
+    @service tableContext;
+    @service fetch;
+    @service notifications;
+    @service hostRouter;
+
+    @tracked queryParams = ['page', 'limit', 'sort', 'query', 'provider', 'sync_status', 'vehicle', 'connection', 'transaction_at'];
+    @tracked page = 1;
+    @tracked limit;
+    @tracked sort = '-transaction_at';
+    @tracked query;
+    @tracked provider;
+    @tracked sync_status;
+    @tracked vehicle;
+    @tracked connection;
+    @tracked transaction_at;
+    @tracked table;
+
+    get hasRecords() {
+        return Array.from(this.model ?? []).length > 0;
+    }
+
+    get emptyStateTitle() {
+        if (this.sync_status === 'unmatched') {
+            return 'No unmatched fuel transactions';
+        }
+
+        if (this.connection) {
+            return 'No transactions imported for this integration';
+        }
+
+        return 'No fuel transactions imported yet';
+    }
+
+    get emptyStateMessage() {
+        if (this.sync_status === 'unmatched') {
+            return 'FleetOps did not find imported provider bills that still need vehicle or trip matching.';
+        }
+
+        if (this.connection) {
+            return 'Run a sync from the fuel integration detail page to import provider bills into this ledger.';
+        }
+
+        return 'Connect PetroApp or another fuel integration, then run a transaction sync. Imported provider bills appear here before linked Fuel Reports are created.';
+    }
+
+    get actionButtons() {
+        return [
+            {
+                icon: 'refresh',
+                onClick: this.refresh,
+                helpText: 'Refresh',
+            },
+            {
+                icon: 'gas-pump',
+                text: 'Fuel Integrations',
+                onClick: () => this.hostRouter.transitionTo('console.fleet-ops.connectivity.fuel-providers.index'),
+            },
+        ];
+    }
+
+    @action refresh() {
+        this.target.send('refresh');
+    }
+
+    get bulkActions() {
+        const selected = this.tableContext.getSelectedRows();
+
+        return [
+            {
+                label: `Reprocess ${selected.length} selected`,
+                fn: () => selected.forEach((transaction) => this.reprocessTransaction.perform(transaction)),
+            },
+        ];
+    }
+
+    get columns() {
+        return [
+            {
+                sticky: true,
+                label: 'Transaction',
+                valuePath: 'provider_transaction_id',
+                cellComponent: 'click-to-copy',
+                resizable: true,
+                sortable: true,
+                filterable: true,
+                filterParam: 'query',
+                filterComponent: 'filter/string',
+            },
+            {
+                label: 'Provider',
+                valuePath: 'provider',
+                resizable: true,
+                sortable: true,
+                filterable: true,
+                filterComponent: 'filter/string',
+            },
+            {
+                label: 'Status',
+                valuePath: 'sync_status',
+                cellComponent: 'table/cell/status',
+                resizable: true,
+                sortable: true,
+                filterable: true,
+                filterComponent: 'filter/multi-option',
+                filterOptions: ['imported', 'matched', 'unmatched', 'reviewed', 'ignored', 'duplicate', 'error'],
+            },
+            {
+                label: 'Vehicle',
+                valuePath: 'vehicle_name',
+                resizable: true,
+                sortable: false,
+                filterable: true,
+                filterParam: 'vehicle',
+                filterComponent: 'filter/model',
+                model: 'vehicle',
+                modelNamePath: 'displayName',
+            },
+            {
+                label: 'Card / Internal',
+                valuePath: 'vehicle_card_id',
+                resizable: true,
+            },
+            {
+                label: 'Trip',
+                valuePath: 'trip_number',
+                resizable: true,
+                hidden: true,
+            },
+            {
+                label: 'Station',
+                valuePath: 'station_name',
+                resizable: true,
+            },
+            {
+                label: 'Liters',
+                valuePath: 'volume',
+                resizable: true,
+                sortable: true,
+            },
+            {
+                label: 'Amount',
+                valuePath: 'amount',
+                cellComponent: 'table/cell/currency',
+                resizable: true,
+                sortable: true,
+            },
+            {
+                label: 'Fuel Report',
+                valuePath: 'fuel_report_id',
+                cellComponent: 'table/cell/anchor',
+                action: this.openFuelReport,
+                resizable: true,
+            },
+            {
+                label: 'Date',
+                valuePath: 'transactionAt',
+                sortParam: 'transaction_at',
+                resizable: true,
+                sortable: true,
+                filterable: true,
+                filterParam: 'transaction_at',
+                filterComponent: 'filter/date',
+            },
+            {
+                label: '',
+                cellComponent: 'table/cell/dropdown',
+                ddButtonText: false,
+                ddButtonIcon: 'ellipsis-h',
+                ddButtonIconPrefix: 'fas',
+                ddMenuLabel: 'Fuel Transaction Actions',
+                cellClassNames: 'overflow-visible',
+                wrapperClass: 'flex items-center justify-end mx-2',
+                sticky: 'right',
+                width: 60,
+                actions: [
+                    { label: 'Review Details', fn: this.openDetails },
+                    { label: 'Open Fuel Report', fn: this.openFuelReport },
+                    { separator: true },
+                    { label: 'Match to Vehicle', fn: this.matchVehicle },
+                    { label: 'Match to Order', fn: this.matchOrder },
+                    { label: 'Reprocess / Rematch', fn: (transaction) => this.reprocessTransaction.perform(transaction) },
+                    { label: 'Ignore Transaction', fn: (transaction) => this.markReviewed.perform(transaction, 'ignored') },
+                    { label: 'Mark Reviewed', fn: (transaction) => this.markReviewed.perform(transaction, 'reviewed') },
+                ],
+                sortable: false,
+                filterable: false,
+                resizable: false,
+                searchable: false,
+            },
+        ];
+    }
+
+    @action openDetails(transaction) {
+        return this.hostRouter.transitionTo('console.fleet-ops.management.fuel-transactions.index.details', transaction);
+    }
+
+    @action openFuelReport(transaction) {
+        if (!transaction?.fuel_report_id) {
+            this.notifications.info('This transaction does not have a linked Fuel Report yet.');
+            return;
+        }
+
+        return this.hostRouter.transitionTo('console.fleet-ops.management.fuel-reports.index.details', transaction.fuel_report_id);
+    }
+
+    @action matchVehicle(transaction) {
+        return this.hostRouter.transitionTo('console.fleet-ops.management.fuel-transactions.index.details', transaction);
+    }
+
+    @action matchOrder(transaction) {
+        return this.hostRouter.transitionTo('console.fleet-ops.management.fuel-transactions.index.details', transaction);
+    }
+
+    @task *reprocessTransaction(transaction) {
+        try {
+            yield this.fetch.post(`fuel-provider-transactions/${transaction.id}/reprocess`);
+            this.notifications.success('Fuel transaction reprocessed.');
+            this.target.send('refresh');
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    @task *markReviewed(transaction, status) {
+        try {
+            yield this.fetch.post(`fuel-provider-transactions/${transaction.id}/review`, { status });
+            this.notifications.success(status === 'ignored' ? 'Fuel transaction ignored.' : 'Fuel transaction marked reviewed.');
+            this.target.send('refresh');
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+}

package/addon/controllers/management/issues/index/details.js

@@ -4,16 +4,62 @@ import { inject as service } from '@ember/service';
 
 export default class ManagementIssuesIndexDetailsController extends Controller {
     @service hostRouter;
+    @service issueActions;
+
     @tracked tabs = [
         {
             route: 'management.issues.index.details.index',
             label: 'Overview',
         },
     ];
-    @tracked actionButtons = [
-        {
-            icon: 'pencil',
-            fn: () => this.hostRouter.transitionTo('console.fleet-ops.management.issues.index.edit', this.model),
-        },
-    ];
+
+    get isClosed() {
+        return ['closed', 'resolved', 'completed'].includes(this.model?.status);
+    }
+
+    get actionButtons() {
+        const workflowItems = [
+            {
+                label: 'Change Status',
+                icon: 'arrows-rotate',
+                fn: () => this.issueActions.openStatusModal(this.model, { onSaved: () => this.refreshIssue() }),
+            },
+            {
+                label: 'Assign Issue',
+                icon: 'user-check',
+                fn: () => this.issueActions.openAssignModal(this.model, { onSaved: () => this.refreshIssue() }),
+            },
+        ];
+
+        if (this.isClosed) {
+            workflowItems.push({
+                label: 'Re-open Issue',
+                icon: 'rotate-left',
+                fn: () => this.issueActions.confirmReopenIssue(this.model, { onSaved: () => this.refreshIssue() }),
+            });
+        } else {
+            workflowItems.push({
+                label: 'Close Issue',
+                icon: 'circle-check',
+                class: 'text-green-600 dark:text-green-400',
+                fn: () => this.issueActions.openCloseIssueModal(this.model, { onSaved: () => this.refreshIssue() }),
+            });
+        }
+
+        return [
+            {
+                icon: 'pencil',
+                fn: () => this.hostRouter.transitionTo('console.fleet-ops.management.issues.index.edit', this.model),
+            },
+            {
+                icon: 'ellipsis',
+                type: 'default',
+                items: workflowItems,
+            },
+        ];
+    }
+
+    refreshIssue() {
+        return this.model?.reload?.();
+    }
 }

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

@@ -1,9 +1,11 @@
 import Controller from '@ember/controller';
+import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
 
 export default class ManagementVehiclesIndexDetailsController extends Controller {
     @service vehicleActions;
+    @service issueActions;
     @service('universe/menu-service') menuService;
     @service hostRouter;
     @service intl;
@@ -58,6 +60,22 @@ export default class ManagementVehiclesIndexDetailsController extends Controller
                         fn: () => this.vehicleActions.locate(this.model),
                         permission: 'fleet-ops view vehicle',
                     },
+                    {
+                        text: this.intl.t('vehicle.actions.attach-device'),
+                        icon: 'link',
+                        fn: () => this.vehicleActions.attachDevice(this.model),
+                        permission: 'fleet-ops update vehicle',
+                    },
+                    ...(Number(this.model.assigned_orders_count) > 0
+                        ? [
+                              {
+                                  text: this.intl.t('vehicle.actions.unassign-orders'),
+                                  icon: 'truck-ramp-box',
+                                  fn: () => this.vehicleActions.unassignOrders(this.model),
+                                  permission: 'fleet-ops update vehicle',
+                              },
+                          ]
+                        : []),
                     {
                         separator: true,
                     },
@@ -79,6 +97,12 @@ export default class ManagementVehiclesIndexDetailsController extends Controller
                         fn: () => this.vehicleActions.logMaintenance(this.model),
                         permission: 'fleet-ops create maintenance',
                     },
+                    {
+                        text: this.intl.t('vehicle.actions.create-issue'),
+                        icon: 'triangle-exclamation',
+                        fn: () => this.createIssue(this.model),
+                        permission: 'fleet-ops create issue',
+                    },
                     {
                         separator: true,
                     },
@@ -98,4 +122,12 @@ export default class ManagementVehiclesIndexDetailsController extends Controller
             },
         ];
     }
+
+    @action createIssue(vehicle) {
+        this.issueActions.modal.create({
+            vehicle,
+            vehicle_uuid: vehicle.id,
+            title: this.intl.t('vehicle.prompts.issue-title', { vehicleName: vehicle.displayName ?? vehicle.name }),
+        });
+    }
 }

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

@@ -1,9 +1,11 @@
 import Controller from '@ember/controller';
+import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
 export default class ManagementVehiclesIndexController extends Controller {
     @service vehicleActions;
+    @service issueActions;
     @service driverActions;
     @service tableContext;
     @service intl;
@@ -292,6 +294,17 @@ export default class ManagementVehiclesIndexController extends Controller {
                         fn: this.vehicleActions.locate,
                         permission: 'fleet-ops view vehicle',
                     },
+                    {
+                        label: this.intl.t('vehicle.actions.attach-device'),
+                        fn: this.vehicleActions.attachDevice,
+                        permission: 'fleet-ops update vehicle',
+                    },
+                    {
+                        label: this.intl.t('vehicle.actions.unassign-orders'),
+                        fn: this.vehicleActions.unassignOrders,
+                        permission: 'fleet-ops update vehicle',
+                        isVisible: (vehicle) => Number(vehicle.assigned_orders_count) > 0,
+                    },
                     {
                         separator: true,
                     },
@@ -310,6 +323,11 @@ export default class ManagementVehiclesIndexController extends Controller {
                         fn: this.vehicleActions.logMaintenance,
                         permission: 'fleet-ops create maintenance',
                     },
+                    {
+                        label: this.intl.t('vehicle.actions.create-issue'),
+                        fn: this.createIssue,
+                        permission: 'fleet-ops create issue',
+                    },
                     {
                         separator: true,
                     },
@@ -326,4 +344,12 @@ export default class ManagementVehiclesIndexController extends Controller {
             },
         ];
     }
+
+    @action createIssue(vehicle) {
+        this.issueActions.modal.create({
+            vehicle,
+            vehicle_uuid: vehicle.id,
+            title: this.intl.t('vehicle.prompts.issue-title', { vehicleName: vehicle.displayName ?? vehicle.name }),
+        });
+    }
 }

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

@@ -9,6 +9,10 @@ export default class ManagementVendorsIndexDetailsController extends Controller
             route: 'management.vendors.index.details.index',
             label: 'Overview',
         },
+        {
+            route: 'management.vendors.index.details.personnel',
+            label: 'Personnel',
+        },
     ];
     @tracked actionButtons = [
         {

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

@@ -1,5 +1,6 @@
 import Controller, { inject as controller } from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
 import { task } from 'ember-concurrency';
@@ -19,6 +20,7 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
     @tracked routingControl;
     @tracked routingCompleted = false;
     @tracked realtimeOrderPublicId = null;
+    @tracked proofReloadToken = 0;
 
     get routePoints() {
         return buildRoutePointsFromPayload(this.model?.payload);
@@ -97,9 +99,7 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
                         disabled: this.model.status === 'canceled',
                         fn: () =>
                             this.orderActions.updateActivity(this.model, {
-                                onFinish: () => {
-                                    this.refresh.perform();
-                                },
+                                onFinish: this.handleActivityModalFinish,
                             }),
                     },
                     {
@@ -154,6 +154,14 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
         ];
     }
 
+    @action handleActivityModalFinish(options) {
+        this.refresh.perform();
+
+        if (options?.proofCreated) {
+            this.proofReloadToken++;
+        }
+    }
+
     @task *refresh() {
         try {
             yield this.hostRouter.refresh();

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

@@ -271,7 +271,7 @@ export default class OperationsOrdersIndexController extends Controller {
             },
             {
                 label: this.intl.t('column.transaction'),
-                cellComponent: 'table/cell/base',
+                cellComponent: 'table/cell/currency',
                 valuePath: 'transaction_amount',
                 resizable: true,
                 hidden: true,
@@ -435,4 +435,8 @@ export default class OperationsOrdersIndexController extends Controller {
             this.isSearchVisible = false;
         }
     }
+
+    @action importOrders() {
+        return this.orderActions.importOrders({ onImportComplete: this.orderActions.refresh });
+    }
 }

package/addon/controllers/settings/payments/index.js

@@ -4,6 +4,7 @@ import { inject as service } from '@ember/service';
 import { isEmpty } from '@ember/utils';
 import { task } from 'ember-concurrency';
 import config from 'ember-get-config';
+import { action } from '@ember/object';
 
 export default class SettingsPaymentsIndexController extends Controller {
     @service fetch;
@@ -57,4 +58,8 @@ export default class SettingsPaymentsIndexController extends Controller {
             this.hasStripeConnectAccount = false;
         }
     }
+
+    @action refreshPayments() {
+        return this.lookupStripeConnectAccount.perform();
+    }
 }

package/addon/extension.js

@@ -117,6 +117,9 @@ export default {
         // Create registries
         this.createRegistries(registryService);
 
+        // // Register console home guidance
+        // this.registerHomeComponents(registryService);
+
         // Setup customer portal
         const isCustomerPortalInstalled = universe.extensionManager.isInstalled('@fleetbase/customer-portal-engine');
         if (isCustomerPortalInstalled) {
@@ -216,13 +219,23 @@ export default {
                 category: 'Analytics',
                 default: false,
             }),
+            new Widget({
+                id: 'fleet-ops-live-fleet-widget',
+                name: 'Live Fleet Map',
+                description: 'Real-time driver positions and active routes.',
+                icon: 'map-location-dot',
+                component: new ExtensionComponent('@fleetbase/fleetops-engine', 'widget/live-fleet'),
+                grid_options: { w: 8, h: 11, minW: 8, minH: 8 },
+                category: 'Maps',
+                default: true,
+            }),
             new Widget({
                 id: 'fleet-ops-revenue-trend-widget',
                 name: 'Revenue Trend',
                 description: 'Revenue over time with period comparison.',
                 icon: 'chart-line',
                 component: new ExtensionComponent('@fleetbase/fleetops-engine', 'widget/revenue-trend'),
-                grid_options: { w: 6, h: 6, minW: 5, minH: 5 },
+                grid_options: { w: 4, h: 11, minW: 4, minH: 8 },
                 category: 'Analytics',
                 default: true,
             }),
@@ -254,7 +267,7 @@ export default {
                 component: new ExtensionComponent('@fleetbase/fleetops-engine', 'widget/top-drivers'),
                 grid_options: { w: 6, h: 6, minW: 5, minH: 5 },
                 category: 'Analytics',
-                default: false,
+                default: true,
             }),
             new Widget({
                 id: 'fleet-ops-fuel-efficiency-widget',
@@ -266,6 +279,16 @@ export default {
                 category: 'Analytics',
                 default: false,
             }),
+            new Widget({
+                id: 'fleet-ops-fuel-providers-widget',
+                name: 'Fuel Integrations',
+                description: 'Provider spend, unmatched transactions, and sync health.',
+                icon: 'gas-pump',
+                component: new ExtensionComponent('@fleetbase/fleetops-engine', 'widget/fuel-providers'),
+                grid_options: { w: 4, h: 5, minW: 4, minH: 5 },
+                category: 'Analytics',
+                default: false,
+            }),
             new Widget({
                 id: 'fleet-ops-issues-insights-widget',
                 name: 'Issues Insights',
@@ -296,21 +319,15 @@ export default {
                 category: 'Analytics',
                 default: false,
             }),
-            new Widget({
-                id: 'fleet-ops-live-fleet-widget',
-                name: 'Live Fleet Map',
-                description: 'Real-time driver positions and active routes.',
-                icon: 'map-location-dot',
-                component: new ExtensionComponent('@fleetbase/fleetops-engine', 'widget/live-fleet'),
-                grid_options: { w: 12, h: 10, minW: 8, minH: 8 },
-                category: 'Maps',
-                default: true,
-            }),
         ];
 
         widgetService.registerWidgets('dashboard', widgets);
     },
 
+    registerHomeComponents(registryService) {
+        registryService.registerRenderableComponent('console:home:before-dashboard', new ExtensionComponent('@fleetbase/fleetops-engine', 'home/getting-started-guidance'));
+    },
+
     createRegistries(registryService) {
         registryService.createRegistries([
             'engine:fleet-ops',

package/addon/helpers/format-duration.js

@@ -1,38 +1 @@
-import { helper } from '@ember/component/helper';
-
-export function formatDurationValue(seconds) {
-    const value = Number(seconds);
-
-    if (!Number.isFinite(value)) {
-        return '0s';
-    }
-
-    const totalSeconds = Math.max(0, Math.ceil(value));
-    const days = Math.floor(totalSeconds / 86400);
-    const hours = Math.floor((totalSeconds % 86400) / 3600);
-    const minutes = Math.floor((totalSeconds % 3600) / 60);
-    const remainingSeconds = totalSeconds % 60;
-    const parts = [];
-
-    if (days) {
-        parts.push(`${days}d`);
-    }
-
-    if (hours) {
-        parts.push(`${hours}h`);
-    }
-
-    if (!days && minutes) {
-        parts.push(`${minutes}m`);
-    }
-
-    if (!days && !hours && parts.length < 2 && remainingSeconds) {
-        parts.push(`${remainingSeconds}s`);
-    }
-
-    return parts.length ? parts.join(' ') : '0s';
-}
-
-export default helper(function formatDuration([seconds]) {
-    return formatDurationValue(seconds);
-});
+export { default, formatDurationValue } from '@fleetbase/ember-ui/helpers/format-duration';

package/addon/initializers/load-leaflet-assets.js

@@ -1,15 +1,14 @@
-import loadLeafletPlugins from '@fleetbase/ember-ui/utils/load-leaflet-plugins';
+import { debug } from '@ember/debug';
+import ensureLeafletPluginsReady from '../utils/leaflet-plugin-loader';
 
 export function initialize() {
     let waitForLeaflet = setInterval(() => {
         let leafletLoaded = window.L !== undefined;
         if (leafletLoaded) {
-            loadLeafletPlugins({
-                scripts: ['leaflet.contextmenu.js', 'leaflet.draw-src.js'],
-                stylesheets: ['leaflet.contextmenu.css', 'leaflet.draw.css'],
-                globalIndicatorKey: 'fleetopsLeafletPluginsLoaded',
-            });
             clearInterval(waitForLeaflet);
+            ensureLeafletPluginsReady().catch((error) => {
+                debug(error.message);
+            });
         }
     }, 100);
 }