npm - @fleetbase/fleetops-engine - Versions diffs - 0.4.22 → 0.4.24 - Mend

@fleetbase/fleetops-engine 0.4.22 → 0.4.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (44) hide show

package/addon/components/admin/navigator-app.hbs CHANGED Viewed

@@ -5,80 +5,4 @@
             <InputInfo>{{t "fleet-ops.component.admin.navigator-app.message" htmlSafe=true companyName=@app.name}}</InputInfo>
         </Attach::Tooltip>
     </InputGroup>
-</ContentPanel>
-<ContentPanel @title={{t "fleet-ops.component.admin.navigator-app.settings"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
-    <InputGroup>
-        <div class="flex items-center">
-            <Toggle @isToggled={{this.isEntityFieldsEditable}} @onToggle={{this.enableEditableEntityFields}} />
-            <div class="ml-2">{{t "fleet-ops.component.admin.navigator-app.select-input"}}</div>
-        </div>
-    </InputGroup>
-    {{#if this.isEntityFieldsEditable}}
-        <OrderConfigManager @onConfigChanged={{this.onConfigChanged}} as |Action Context|>
-            <div class="mt-2">
-                <InputGroup @name="Select order config" @helpText="Apply entity editing settings for an order config.">
-                    <DropdownButton
-                        class="order-config-select-button mr-2"
-                        @disabled={{not Context.configs}}
-                        @text={{if Context.currentConfig.name Context.currentConfig.name (t "fleet-ops.component.order-config-manager.select-order-config")}}
-                        @textClass="text-sm mr-2"
-                        @buttonClass="flex-row-reverse w-44 justify-between"
-                        @icon="caret-down"
-                        @iconClass="mr-0i"
-                        @size="sm"
-                        @iconPrefix="fas"
-                        @triggerClass="hidden md:flex"
-                        as |dd|
-                    >
-                        <div class="next-dd-menu mt-1 mx-0" aria-labelledby="user-menu">
-                            <div class="p-1">
-                                {{#each Context.configs as |orderConfig|}}
-                                    <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd Context.selectConfig orderConfig)}}>
-                                        <div class="flex-1 flex flex-row items-center">
-                                            <div class="w-6">
-                                                <FaIcon @icon="cogs" />
-                                            </div>
-                                            <span>{{orderConfig.name}}</span>
-                                        </div>
-                                        <div>
-                                            {{#if (eq Context.currentConfig.id orderConfig.id)}}
-                                                <FaIcon @icon="check" class="text-green-500" />
-                                            {{/if}}
-                                        </div>
-                                    </a>
-                                {{/each}}
-                            </div>
-                        </div>
-                    </DropdownButton>
-                </InputGroup>
-            </div>
-        </OrderConfigManager>
-        {{#if this.selectedOrderConfig}}
-            <div class="bg-gray-400 border-gray-600 rounded-lg px-4 py-2 dark:bg-gray-700 dark:border-gray-800">
-                {{#let (get (get this.entityEditingSettings this.selectedOrderConfig.id) "editable_entity_fields") as |editableEntityFields|}}
-                    {{#each this.entityFields as |entityField|}}
-                        <div class="mt-1">
-                            <Checkbox
-                                @value={{includes entityField editableEntityFields}}
-                                @label={{smart-humanize entityField}}
-                                @onToggle={{fn this.toggleFieldEditable entityField}}
-                                @helpText={{t "fleet-ops.component.admin.visibility-controls.checkbox-text"}}
-                            />
-                        </div>
-                    {{/each}}
-                {{/let}}
-            </div>
-            <div class="mt-3 flex items-center">
-                <Button
-                    @type="primary"
-                    @size="lg"
-                    @icon="save"
-                    @text={{t "fleet-ops.common.save-changes"}}
-                    @onClick={{perform this.saveEntityEditingSettings}}
-                    @isLoading={{not this.saveEntityEditingSettings.isIdle}}
-                />
-            </div>
-        {{/if}}
-    {{/if}}
 </ContentPanel>

package/addon/components/admin/navigator-app.js CHANGED Viewed

@@ -1,62 +1,15 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { isArray } from '@ember/array';
 import { task } from 'ember-concurrency-decorators';
 export default class NavigatorAppControlsComponent extends Component {
     @service fetch;
-    @tracked isLoading = false;
     @tracked url;
-    @tracked selectedOrderConfig;
-    @tracked entityFields = ['name', 'description', 'sku', 'height', 'width', 'length', 'weight', 'declared_value', 'sale_price'];
-    @tracked entityEditingSettings = {};
-    @tracked isEntityFieldsEditable = false;
     constructor() {
         super(...arguments);
         this.getAppLinkUrl.perform();
-        this.getEntityEditableSettings.perform();
-    }
-    @action enableEditableEntityFields(isEntityFieldsEditable) {
-        this.isEntityFieldsEditable = isEntityFieldsEditable;
-    }
-    @action onConfigChanged(orderConfig) {
-        this.selectedOrderConfig = orderConfig;
-    }
-    @action toggleFieldEditable(fieldName, isEditable) {
-        const editableFields = this.entityEditingSettings[this.selectedOrderConfig.id]?.editable_entity_fields;
-        if (isArray(editableFields)) {
-            if (isEditable) {
-                editableFields.pushObject(fieldName);
-            } else {
-                editableFields.removeObject(fieldName);
-            }
-        } else {
-            this.entityEditingSettings = {
-                ...this.entityEditingSettings,
-                [this.selectedOrderConfig.id]: {
-                    editable_entity_fields: [],
-                },
-            };
-            return this.toggleFieldEditable(...arguments);
-        }
-        this.updateEditableEntityFieldsForOrderConfig(editableFields);
-    }
-    updateEditableEntityFieldsForOrderConfig(editableFields = [], orderConfig = null) {
-        orderConfig = orderConfig === null ? this.selectedOrderConfig : orderConfig;
-        this.entityEditingSettings = {
-            ...this.entityEditingSettings,
-            [orderConfig.id]: {
-                editable_entity_fields: editableFields,
-            },
-        };
     }
     @task *getAppLinkUrl() {
@@ -66,15 +19,4 @@ export default class NavigatorAppControlsComponent extends Component {
             this.url = linkUrl;
         }
     }
-    @task *getEntityEditableSettings() {
-        const { entityEditingSettings, isEntityFieldsEditable } = yield this.fetch.get('fleet-ops/settings/entity-editing-settings');
-        this.entityEditingSettings = entityEditingSettings;
-        this.isEntityFieldsEditable = isEntityFieldsEditable;
-    }
-    @task *saveEntityEditingSettings() {
-        const { entityEditingSettings, isEntityFieldsEditable } = this;
-        yield this.fetch.post('fleet-ops/settings/entity-editing-settings', { entityEditingSettings, isEntityFieldsEditable });
-    }
 }

package/addon/components/driver-onboard-settings.hbs ADDED Viewed

@@ -0,0 +1,29 @@
+<ContentPanel @title={{t "fleet-ops.component.driver-onboard-settings.driver-onboard-settings"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800 mb-4">
+    {{#if this.driverOnboardSettingsLoaded}}
+        <InputGroup>
+            <div class="flex items-center">
+                <Toggle @isToggled={{this.driverOnboardSettings.enableDriverOnboardFromApp}} @onToggle={{this.enableDriverOnboard}} @label={{t "fleet-ops.component.driver-onboard-settings.enable-driver-onboard-from-app"}} @helpText={{t "fleet-ops.component.driver-onboard-settings.enable-driver-onboard-from-app-help-text"}} />
+            </div>
+        </InputGroup>
+        {{#if this.driverOnboardSettings.enableDriverOnboardFromApp}}
+            <InputGroup @name={{t "fleet-ops.component.driver-onboard-settings.select-onboard-method"}} @helpText={{t "fleet-ops.component.driver-onboard-settings.select-onboard-method-help-text"}}>
+                <Select class="w-full flex-1" @value={{this.driverOnboardSettings.driverOnboardAppMethod}} @options={{this.driverOnboardMethods}} @placeholder={{t "fleet-ops.component.driver-onboard-settings.select-onboard-method"}} @onSelect={{this.selectDriverOnboardMethod}} />
+            </InputGroup>
+            <InputGroup>
+                <div class="flex items-center">
+                    <Toggle @isToggled={{this.driverOnboardSettings.driverMustProvideOnboardDocuments}} @onToggle={{this.enableDriverOnboardDocuments}} @label={{t "fleet-ops.component.driver-onboard-settings.require-driver-to-upload-onboard-documents"}} @helpText={{t "fleet-ops.component.driver-onboard-settings.require-driver-to-upload-onboard-documents-help-text"}} />
+                </div>
+            </InputGroup>
+            {{#if this.driverOnboardSettings.driverMustProvideOnboardDocuments}}
+                <InputGroup>
+                    <ArrayInput @data={{this.driverOnboardSettings.requiredOnboardDocuments}} @placeholder={{t "fleet-ops.component.driver-onboard-settings.enter-document-name"}} @onDataChanged={{this.onOnboardDocumentsChanged}} @addButtonText={{t "fleet-ops.component.driver-onboard-settings.add-onboard-document"}}>
+                        <InputLabel @labelText={{t "fleet-ops.component.driver-onboard-settings.required-onboard-documents"}} @helpText={{t "fleet-ops.component.driver-onboard-settings.required-onboard-documents-help-text"}} />
+                    </ArrayInput>
+                </InputGroup>
+            {{/if}}
+        {{/if}}
+        <div class="mt-3 flex items-center mb-4">
+            <Button @type="primary" @size="lg" @icon="save" @text={{t "fleet-ops.common.save-changes"}} @onClick={{perform this.saveDriverOnboardSettings}} @isLoading={{not this.saveDriverOnboardSettings.isIdle}} />
+        </div>
+    {{/if}}
+</ContentPanel>

package/addon/components/driver-onboard-settings.js ADDED Viewed

@@ -0,0 +1,75 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { task } from 'ember-concurrency-decorators';
+export default class DriverOnboardSettingsComponent extends Component {
+    @service fetch;
+    @service currentUser;
+    @tracked companyId;
+    @tracked driverOnboardSettingsLoaded = false;
+    @tracked driverOnboardSettings = {};
+    @tracked driverOnboardMethods = ['invite', 'button'];
+    constructor() {
+        super(...arguments);
+        this.companyId = this.currentUser.companyId;
+        this.getDriverOnboardSettings.perform();
+    }
+    @action enableDriverOnboard(enableDriverOnboardFromApp) {
+        this.updateDriverOnboardSettings({ enableDriverOnboardFromApp });
+    }
+    @action enableDriverOnboardDocuments(driverMustProvideOnboardDocuments) {
+        this.updateDriverOnboardSettings({ driverMustProvideOnboardDocuments });
+    }
+    @action selectDriverOnboardMethod(driverOnboardAppMethod) {
+        this.updateDriverOnboardSettings({ driverOnboardAppMethod });
+    }
+    @action onOnboardDocumentsChanged(requiredOnboardDocuments) {
+        requiredOnboardDocuments = requiredOnboardDocuments.filter((documentName) => typeof documentName === 'string');
+        this.updateDriverOnboardSettings({ requiredOnboardDocuments });
+    }
+    @task *saveDriverOnboardSettings() {
+        const { driverOnboardSettings } = this;
+        const driverOnboardSettingsResponse = yield this.fetch.post('fleet-ops/settings/driver-onboard-settings', { driverOnboardSettings });
+        if (driverOnboardSettings?.enableDriverOnboardFromApp == false) this.driverOnboardSettings = driverOnboardSettingsResponse?.driverOnboardSettings;
+    }
+    @task *getDriverOnboardSettings() {
+        const companyId = this.currentUser.companyId;
+        const { driverOnboardSettings } = yield this.fetch.get(`fleet-ops/settings/driver-onboard-settings/${companyId}`);
+        this.driverOnboardSettings = driverOnboardSettings;
+        if (this.companyDoesntHaveDriverOnboardSettings()) {
+            this.updateDriverOnboardSettings({
+                enableDriverOnboardFromApp: false,
+                driverOnboardAppMethod: 'invite',
+                driverMustProvideOnboardDocuments: false,
+                requiredOnboardDocuments: [],
+            });
+        }
+        this.driverOnboardSettingsLoaded = true;
+    }
+    companyDoesntHaveDriverOnboardSettings() {
+        const companyId = this.driverOnboardSettings.companyId;
+        return companyId === undefined;
+    }
+    updateDriverOnboardSettings(props = {}) {
+        const companyId = this.currentUser.companyId;
+        const driverOnboardSettings = this.driverOnboardSettings ?? {};
+        this.driverOnboardSettings = {
+            companyId: companyId,
+            ...driverOnboardSettings,
+            ...props,
+        };
+    }
+}

package/addon/components/entity-field-editing-settings.hbs ADDED Viewed

@@ -0,0 +1,79 @@
+<ContentPanel @title={{t "fleet-ops.component.entity-field-editing-settings.entitiy-field-editing-settings"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800 mb-4">
+    <OrderConfigManager @onConfigChanged={{this.onConfigChanged}} as |Action Context|>
+        <div>
+            <InputGroup
+                @name={{t "fleet-ops.component.entity-field-editing-settings.select-order-config"}}
+                @helpText={{t "fleet-ops.component.entity-field-editing-settings.select-order-config-help-text"}}
+            >
+                <DropdownButton
+                    class="order-config-select-button mr-2"
+                    @disabled={{not Context.configs}}
+                    @text={{if Context.currentConfig.name Context.currentConfig.name (t "fleet-ops.component.entity-field-editing-settings.select-order-config")}}
+                    @textClass="text-sm mr-2"
+                    @buttonClass="flex-row-reverse w-44 justify-between"
+                    @icon="caret-down"
+                    @iconClass="mr-0i"
+                    @size="sm"
+                    @iconPrefix="fas"
+                    @triggerClass="hidden md:flex"
+                    as |dd|
+                >
+                    <div class="next-dd-menu mt-1 mx-0" aria-labelledby="user-menu">
+                        <div class="p-1">
+                            {{#each Context.configs as |orderConfig|}}
+                                <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd Context.selectConfig orderConfig)}}>
+                                    <div class="flex-1 flex flex-row items-center">
+                                        <div class="w-6">
+                                            <FaIcon @icon="cogs" />
+                                        </div>
+                                        <span>{{orderConfig.name}}</span>
+                                    </div>
+                                    <div>
+                                        {{#if (eq Context.currentConfig.id orderConfig.id)}}
+                                            <FaIcon @icon="check" class="text-green-500" />
+                                        {{/if}}
+                                    </div>
+                                </a>
+                            {{/each}}
+                        </div>
+                    </div>
+                </DropdownButton>
+            </InputGroup>
+        </div>
+    </OrderConfigManager>
+    {{#if this.selectedOrderConfig}}
+        {{#let (get this.entityEditingSettings this.selectedOrderConfig.id) as |orderConfigEntityEditingSettings|}}
+            <InputGroup>
+                <div class="flex items-center">
+                    <Toggle
+                        @isToggled={{orderConfigEntityEditingSettings.is_editable}}
+                        @onToggle={{this.enableEditableEntityFields}}
+                        @label={{t "fleet-ops.component.entity-field-editing-settings.enable-driver-to-edit-entity-fields"}}
+                        @helpText={{t "fleet-ops.component.entity-field-editing-settings.enable-driver-to-edit-entity-fields-help-text"}}
+                    />
+                </div>
+            </InputGroup>
+            {{#if orderConfigEntityEditingSettings.is_editable}}
+                <div class="bg-gray-400 border-gray-600 rounded-lg px-4 py-2 dark:bg-gray-700 dark:border-gray-800">
+                    {{#let (get (get this.entityEditingSettings this.selectedOrderConfig.id) "editable_entity_fields") as |editableEntityFields|}}
+                        {{#each this.entityFields as |entityField|}}
+                            <div class="mt-1">
+                                <Checkbox @value={{includes entityField editableEntityFields}} @label={{smart-humanize entityField}} @onToggle={{fn this.toggleFieldEditable entityField}} />
+                            </div>
+                        {{/each}}
+                    {{/let}}
+                </div>
+            {{/if}}
+            <div class="mt-4 flex items-center">
+                <Button
+                    @type="primary"
+                    @size="lg"
+                    @icon="save"
+                    @text={{t "fleet-ops.common.save-changes"}}
+                    @onClick={{perform this.saveEntityEditingSettings}}
+                    @isLoading={{not this.saveEntityEditingSettings.isIdle}}
+                />
+            </div>
+        {{/let}}
+    {{/if}}
+</ContentPanel>

package/addon/components/entity-field-editing-settings.js ADDED Viewed

@@ -0,0 +1,106 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { isArray } from '@ember/array';
+import { isNone } from '@ember/utils';
+import { task } from 'ember-concurrency-decorators';
+export default class EntityFieldEditingSettingsComponent extends Component {
+    @service notifications;
+    @service fetch;
+    @tracked selectedOrderConfig;
+    @tracked entityFields = ['name', 'description', 'sku', 'height', 'width', 'length', 'weight', 'declared_value', 'sale_price'];
+    @tracked entityEditingSettings = {};
+    @tracked settingsLoaded = false;
+    constructor() {
+        super(...arguments);
+        this.getEntityEditableSettings.perform();
+    }
+    @action onConfigChanged(orderConfig) {
+        if (!isNone(this.selectedOrderConfig) && this.orderConfigDoesntHaveSettings(orderConfig)) {
+            this.createSettingsForOrderConfig(orderConfig);
+        }
+        this.selectedOrderConfig = orderConfig;
+    }
+    @action enableEditableEntityFields(isEditable) {
+        const orderConfig = this.selectedOrderConfig;
+        if (orderConfig) {
+            if (this.orderConfigDoesntHaveSettings(orderConfig)) {
+                this.createSettingsForOrderConfig(orderConfig, isEditable);
+            } else {
+                const orderConfigSettings = this.entityEditingSettings[orderConfig.id] ?? {};
+                this.entityEditingSettings = {
+                    ...this.entityEditingSettings,
+                    [orderConfig.id]: {
+                        ...orderConfigSettings,
+                        is_editable: isEditable,
+                    },
+                };
+            }
+        }
+    }
+    @action toggleFieldEditable(fieldName, isEditable) {
+        const editableFields = this.entityEditingSettings[this.selectedOrderConfig.id]?.editable_entity_fields;
+        if (isArray(editableFields)) {
+            if (isEditable) {
+                editableFields.pushObject(fieldName);
+            } else {
+                editableFields.removeObject(fieldName);
+            }
+        } else {
+            this.entityEditingSettings = {
+                ...this.entityEditingSettings,
+                [this.selectedOrderConfig.id]: {
+                    ...this.entityEditingSettings[this.selectedOrderConfig.id],
+                    editable_entity_fields: [],
+                },
+            };
+            return this.toggleFieldEditable(...arguments);
+        }
+        this.updateEditableEntityFieldsForOrderConfig(editableFields);
+    }
+    @task *getEntityEditableSettings() {
+        const { entityEditingSettings } = yield this.fetch.get('fleet-ops/settings/entity-editing-settings');
+        this.entityEditingSettings = entityEditingSettings;
+        this.settingsLoaded = true;
+    }
+    @task *saveEntityEditingSettings() {
+        const { entityEditingSettings } = this;
+        yield this.fetch.post('fleet-ops/settings/entity-editing-settings', { entityEditingSettings });
+    }
+    orderConfigDoesntHaveSettings(orderConfig) {
+        return isNone(this.entityEditingSettings[orderConfig.id]);
+    }
+    createSettingsForOrderConfig(orderConfig, isEditable = false) {
+        if (this.orderConfigDoesntHaveSettings(orderConfig)) {
+            this.entityEditingSettings = {
+                ...this.entityEditingSettings,
+                [orderConfig.id]: {
+                    editable_entity_fields: [],
+                    is_editable: isEditable,
+                },
+            };
+        }
+    }
+    updateEditableEntityFieldsForOrderConfig(editableFields = [], orderConfig = null) {
+        orderConfig = orderConfig === null ? this.selectedOrderConfig : orderConfig;
+        this.entityEditingSettings = {
+            ...this.entityEditingSettings,
+            [orderConfig.id]: {
+                ...this.entityEditingSettings[orderConfig.id],
+                editable_entity_fields: editableFields,
+            },
+        };
+    }
+}

package/addon/components/layout/fleet-ops-sidebar/driver-listing.hbs CHANGED Viewed

@@ -1,4 +1,4 @@
-<Layout::Sidebar::Panel @open={{true}} @title={{@title}} @titleIcon={{@icon}} @hideCaret={{true}} @toggleOnCaretOnly={{true}} @onClickPanelTitle={{this.transitionToRoute}} @wrapperClass="next-driver-listing">
+<Layout::Sidebar::Panel @open={{true}} @title={{@title}} @titleIcon={{@icon}} @hideCaret={{true}} @toggleOnCaretOnly={{true}} @onClickPanelTitle={{this.transitionToRoute}} @wrapperClass="next-driver-listing" @dropdownButton={{this.displayPanelDropdown}} @dropdownButtonActions={{this.panelDropdownButtonActions}} @dropdownButtonRenderInPlace={{false}} @dropdownHorizontalPosition="left" @dropdownButtonMenuLabel={{t "fleet-ops.component.layout.fleet-ops-sidebar.drivers"}}>
     {{#each this.drivers as |driver|}}
         <Layout::Sidebar::Item @icon="circle" @iconSize="2xs" @iconClass={{if driver.online "text-green-500" "text-yellow-200"}} @onClick={{fn this.onDriverClicked driver}} class="driver-nav-item" @dropdownButton={{true}} @dropdownButtonActions={{this.dropdownButtonActions}} @dropdownContext={{driver}} @dropdownButtonIcon={{@itemDropdownButtonIcon}} @dropdownButtonIconPrefix={{@itemDropdownButtonIconPrefix}} @dropdownButtonText={{@itemDropdownButtonText}} @dropdownButtonCalculatePosition={{@itemDropdownButtonCalculatePosition}} @dropdownButtonRenderInPlace={{false}} @dropdownButtonMenuLabel={{driver.name}} @dropdownButtonWrapperClass={{@itemDropdownButtonWrapperClass}} @dropdownButtonTriggerClass={{@itemDropdownButtonTriggerClass}} @dropdownHorizontalPosition="left" @registerDropdownButtonAPI={{@itemRegisterDropdownButtonAPI}} @rightSideComponent={{@itemRightSideComponent}} @rightSideComponentContext={{@itemRightSideComponentContext}} @rightSideStatus={{@itemRightSideStatus}} @rightSideStatusText={{@itemRightSideStatusText}} @hideRightSideStatusDot={{@itemHideRightSideStatusDot}} @rightSideStatusClass={{@itemRightSideStatusClass}} @disableRightSideStatusHumanize={{@itemDisableRightSideStatusHumanize}}>{{driver.name}}</Layout::Sidebar::Item>
     {{/each}}

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

@@ -18,6 +18,18 @@ export default class LayoutFleetOpsSidebarDriverListingComponent extends Compone
         this.fetchDrivers.perform();
     }
+    displayPanelDropdown = true;
+    panelDropdownButtonActions = [
+        {
+            label: 'Create new driver...',
+            onClick: () => {
+                const driver = this.store.createRecord('driver');
+                this.contextPanel.focus(driver);
+            },
+        },
+    ];
     dropdownButtonActions = [
         {
             label: 'View driver details...',

package/addon/components/layout/fleet-ops-sidebar.hbs CHANGED Viewed

@@ -9,7 +9,7 @@
     {{/if}}
 {{/each}}
 {{#each this.menuPanels as |menuPanel|}}
-    <Layout::Sidebar::Panel @open={{menuPanel.open}} @title={{menuPanel.title}}>
+    <Layout::Sidebar::Panel @open={{menuPanel.open}} @title={{menuPanel.title}} @titleIcon={{menuPanel.icon}} @hideCaret={{menuPanel.hideCaret}} @toggleOnCaretOnly={{menuPanel.toggleOnCaretOnly}} @onClickPanelTitle={{menuPanel.onClickPanelTitle}} @wrapperClass={{menuPanel.wrapperClass}} @dropdownButton={{menuPanel.dropdownButton}} @dropdownButtonActions={{menuPanel.dropdownButtonActions}} @dropdownButtonRenderInPlace={{menuPanel.dropdownButtonRenderInPlace}} @dropdownHorizontalPosition={{menuPanel.dropdownHorizontalPosition}} @dropdownButtonMenuLabel={{menuPanel.dropdownButtonMenuLabel}}>
         {{#each menuPanel.items as |menuItem|}}
             {{#if menuItem.renderComponentInPlace}}
                 {{component menuItem.component menuItem=menuItem title=menuItem.title onClick=menuItem.onClick route=(concat this.routePrefix menuItem.route) icon=menuItem.icon rightSideComponent=menuItem.rightSideComponent rightSideComponentContext=menuItem.rightSideComponentContext rightSideStatus=menuItem.rightSideStatus rightSideStatusText=menuItem.rightSideStatusText hideRightSideStatusDot=menuItem.hideRightSideStatusDot rightSideStatusClass=menuItem.rightSideStatusClass disableRightSideStatusHumanize=menuItem.disableRightSideStatusHumanize dropdownButton=menuItem.dropdownButton dropdownButtonActions=menuItem.dropdownButtonActions dropdownButtonIcon=menuItem.dropdownButtonIcon dropdownButtonIconPrefix=menuItem.dropdownButtonIconPrefix dropdownButtonText=menuItem.dropdownButtonText dropdownButtonCalculatePosition=menuItem.dropdownButtonCalculatePosition dropdownButtonRenderInPlace=menuItem.dropdownButtonRenderInPlace dropdownButtonMenuLabel=menuItem.dropdownButtonMenuLabel dropdownButtonWrapperClass=menuItem.dropdownButtonWrapperClass dropdownButtonTriggerClass=menuItem.dropdownButtonTriggerClass registerDropdownButtonAPI=menuItem.registerDropdownButtonAPI}}
@@ -20,12 +20,11 @@
     </Layout::Sidebar::Panel>
 {{/each}}
 {{#each this.universeMenuPanels as |menuPanel|}}
-    <Layout::Sidebar::Panel @open={{menuPanel.open}} @title={{menuPanel.title}}>
+    <Layout::Sidebar::Panel @open={{menuPanel.open}} @title={{menuPanel.title}} @titleIcon={{menuPanel.icon}} @hideCaret={{menuPanel.hideCaret}} @toggleOnCaretOnly={{menuPanel.toggleOnCaretOnly}} @onClickPanelTitle={{menuPanel.onClickPanelTitle}} @wrapperClass={{menuPanel.wrapperClass}} @dropdownButton={{menuPanel.dropdownButton}} @dropdownButtonActions={{menuPanel.dropdownButtonActions}} @dropdownButtonRenderInPlace={{menuPanel.dropdownButtonRenderInPlace}} @dropdownHorizontalPosition={{menuPanel.dropdownHorizontalPosition}} @dropdownButtonMenuLabel={{menuPanel.dropdownButtonMenuLabel}}>
         {{#each menuPanel.items as |menuItem|}}
             <Layout::Sidebar::Item @onClick={{fn this.universe.transitionMenuItem (concat this.routePrefix "virtual") menuItem}} @menuItem={{menuItem}} @icon={{menuItem.icon}} @rightSideComponent={{menuItem.rightSideComponent}} @rightSideComponentContext={{menuItem.rightSideComponentContext}} @rightSideStatus={{menuItem.rightSideStatus}} @rightSideStatusText={{menuItem.rightSideStatusText}} @hideRightSideStatusDot={{menuItem.hideRightSideStatusDot}} @rightSideStatusClass={{menuItem.rightSideStatusClass}} @disableRightSideStatusHumanize={{menuItem.disableRightSideStatusHumanize}} @dropdownButton={{menuItem.dropdownButton}} @dropdownButtonActions={{menuItem.dropdownButtonActions}} @dropdownButtonIcon={{menuItem.dropdownButtonIcon}} @dropdownButtonIconPrefix={{menuItem.dropdownButtonIconPrefix}} @dropdownButtonText={{menuItem.dropdownButtonText}} @dropdownButtonCalculatePosition={{menuItem.dropdownButtonCalculatePosition}} @dropdownButtonRenderInPlace={{menuItem.dropdownButtonRenderInPlace}} @dropdownButtonMenuLabel={{menuItem.dropdownButtonMenuLabel}} @dropdownButtonWrapperClass={{menuItem.dropdownButtonWrapperClass}} @dropdownButtonTriggerClass={{menuItem.dropdownButtonTriggerClass}} @registerDropdownButtonAPI={{menuItem.registerDropdownButtonAPI}}>{{menuItem.title}}</Layout::Sidebar::Item>
         {{/each}}
     </Layout::Sidebar::Panel>
 {{/each}}
-{{!-- <Layout::Sidebar::Item @onClick={{this.onClickSettings}} @icon="cogs">{{t "fleet-ops.component.layout.fleet-ops-sidebar.settings"}}</Layout::Sidebar::Item> --}}
 {{yield}}
 <Spacer @height="10px" />

package/addon/components/layout/fleet-ops-sidebar.js CHANGED Viewed

@@ -66,6 +66,8 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
             { title: this.intl.t('fleet-ops.component.layout.fleet-ops-sidebar.issues'), icon: 'triangle-exclamation', route: 'management.issues' },
         ];
+        const settingsItems = [{ title: this.intl.t('fleet-ops.component.layout.fleet-ops-sidebar.navigator-app'), icon: 'location-arrow', route: 'settings.navigator-app' }];
         const createPanel = (title, routePrefix, items = []) => ({
             title,
             open: true,
@@ -81,6 +83,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
         this.menuPanels = [
             createPanel(this.intl.t('fleet-ops.component.layout.fleet-ops-sidebar.operations'), 'operations', operationsItems),
             createPanel(this.intl.t('fleet-ops.component.layout.fleet-ops-sidebar.resources'), 'management', resourcesItems),
+            createPanel(this.intl.t('fleet-ops.component.layout.fleet-ops-sidebar.settings'), 'settings', settingsItems),
         ].filter((panel) => {
             const isVisible = panel.visible && panel.items.length > 0;
             return isVisible;

package/addon/routes/settings/navigator-app.js ADDED Viewed

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

package/addon/routes/settings.js ADDED Viewed

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

package/addon/routes.js CHANGED Viewed

@@ -1,6 +1,9 @@
 import buildRoutes from 'ember-engines/routes';
 export default buildRoutes(function () {
+    this.route('settings', function () {
+        this.route('navigator-app');
+    });
     this.route('virtual', { path: '/:slug/:view' });
     this.route('operations', { path: '/' }, function () {
         this.route('dispatch');

package/addon/styles/fleetops-engine.css CHANGED Viewed

@@ -61,6 +61,30 @@ body[data-theme='dark'] .scheduler-left-sidebar {
     padding-left: 3.5rem;
 }
+/** content panel dropdown button */
+.next-sidebar .next-sidebar-panel-container.next-driver-listing > .next-sidebar-panel > .next-content-panel > .next-content-panel-header.next-sidebar-panel-toggle {
+    padding-right: 0.25rem;
+}
+.next-sidebar
+    .next-sidebar-panel-container.next-driver-listing
+    > .next-sidebar-panel
+    > .next-content-panel
+    > .next-content-panel-header.next-sidebar-panel-toggle
+    .ember-basic-dropdown
+    button,
+.next-sidebar
+    .next-sidebar-panel-container.next-driver-listing
+    > .next-sidebar-panel
+    > .next-content-panel
+    > .next-content-panel-header.next-sidebar-panel-toggle
+    .ember-basic-dropdown-trigger
+    button {
+    padding: 0.15rem 0.625rem;
+    font-size: 10px;
+    line-height: 0.5;
+}
 .multi-drop-select-container .fleetbase-model-select.fleetbase-power-select.ember-model-select > .ember-model-select__loading {
     background: none;
     border: none;

package/addon/templates/settings/navigator-app.hbs ADDED Viewed

@@ -0,0 +1,11 @@
+<Layout::Section::Header @title={{t "fleet-ops.settings.navigator-app.navigator-app-settings"}} />
+<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">
+            <EntityFieldEditingSettings />
+            <DriverOnboardSettings />
+        </div>
+    </div>
+    <Spacer @height="600px" />
+</Layout::Section::Body>

package/addon/templates/settings.hbs ADDED Viewed

	@@ -0,0 +1 @@
1	+ {{outlet}}

package/app/components/driver-onboard-settings.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export { default } from '@fleetbase/fleetops-engine/components/driver-onboard-settings';

package/app/components/entity-field-editing-settings.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export { default } from '@fleetbase/fleetops-engine/components/entity-field-editing-settings';

package/app/routes/settings/navigator-app.js ADDED Viewed

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

package/app/routes/settings.js ADDED Viewed

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

package/app/templates/settings/navigator-app.js ADDED Viewed

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

package/app/templates/settings.js ADDED Viewed

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

package/composer.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.4.22",
+    "version": "0.4.24",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.14",
+        "fleetbase/core-api": "^1.4.16",
         "barryvdh/laravel-dompdf": "^2.0",
         "brick/geo": "0.7.2",
         "cknow/laravel-money": "^7.1",

package/extension.json CHANGED Viewed

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

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.4.22",
+    "version": "0.4.24",
     "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.8",
-        "@fleetbase/ember-ui": "^0.2.11",
+        "@fleetbase/ember-ui": "^0.2.12",
         "@fleetbase/fleetops-data": "^0.1.14",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@fortawesome/ember-fontawesome": "^0.4.1",

package/server/src/Console/Commands/FixInvalidPolymorphicRelationTypeNamespaces.php CHANGED Viewed

@@ -36,7 +36,7 @@ class FixInvalidPolymorphicRelationTypeNamespaces extends Command
             ['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) {

package/server/src/Http/Controllers/Api/v1/DriverController.php CHANGED Viewed

@@ -44,6 +44,9 @@ class DriverController extends Controller
         // get request input
         $input = $request->except(['name', 'password', 'email', 'phone', 'location', 'altitude', 'heading', 'speed', 'meta']);
+        // Add default status
+        $input['status'] = 'active';
         // get user details for driver
         $userDetails                 = $request->only(['name', 'password', 'email', 'phone', 'timezone']);
@@ -500,7 +503,7 @@ class DriverController extends Controller
             return response()->apiError($e->getMessage());
         }
-        // $driver->update(['auth_token' => $token->plainTextToken]);
+        $driver->update(['auth_token' => $token->plainTextToken]);
         $driver->token = $token->plainTextToken;
         return new DriverResource($driver);
@@ -597,7 +600,8 @@ class DriverController extends Controller
         }
         // Assign user to company and update their session
-        $user->assignCompany($company);
+        $user->update(['company_uuid' => $company->uuid]);
         Auth::setSession($user);
         return new Organization($company);
@@ -772,4 +776,4 @@ class DriverController extends Controller
         return $phone;
     }
-}
+}

package/server/src/Http/Controllers/Api/v1/NavigatorController.php ADDED Viewed

@@ -0,0 +1,35 @@
+<?php
+namespace Fleetbase\FleetOps\Http\Controllers\Api\v1;
+use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Models\Setting;
+class NavigatorController extends Controller
+{
+    /**
+     * Retrieve the driver onboard settings.
+     *
+     * This method retrieves the driver onboard settings for the current company session. If no company session
+     * is found in the request, an error response is returned. The method retrieves the company ID from the session,
+     * then fetches the saved driver onboard settings. If settings for the current company are found, they are returned,
+     * otherwise, default settings are provided.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    /**
+     * Retrieve driver onboard settings.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function getDriverOnboardSettings($companyId)
+    {
+        $driverOnboardSettings  = Setting::where('key', 'fleet-ops.driver-onboard-settings.' . $companyId)->value('value');
+        if (!$driverOnboardSettings) {
+            $driverOnboardSettings = [];
+        }
+        return response()->json(['driverOnboardSettings' => $driverOnboardSettings]);
+    }
+}

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

@@ -434,6 +434,7 @@ class OrderController extends Controller
     public function query(Request $request)
     {
         $results = Order::queryWithRequest($request, function (&$query, $request) {
+            $query->where('company_uuid', session('company'));
             if ($request->has('payload')) {
                 $query->whereHas('payload', function ($q) use ($request) {
                     $q->where('public_id', $request->input('payload'));
@@ -495,9 +496,9 @@ class OrderController extends Controller
                 });
             }
-            if ($request->has('on')) {
-                $on = Carbon::fromString($request->input('on'));
+            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);
@@ -1401,14 +1402,10 @@ class OrderController extends Controller
         // Get entity editing settings
         $savedEntityEditingSettings = Setting::where('key', 'fleet-ops.entity-editing-settings')->value('value');
         if ($orderConfigId && $savedEntityEditingSettings) {
-            $resolvedEntityEditingSettings = data_get($savedEntityEditingSettings, $orderConfigId, []);
-            if ($resolvedEntityEditingSettings) {
-                $entityEditingSettings = data_get($resolvedEntityEditingSettings, 'editable_entity_fields', []);
-            }
+            $entityEditingSettings = data_get($savedEntityEditingSettings, $orderConfigId, []);
         }
         return response()->json($entityEditingSettings);
     }
-}
+}

package/server/src/Http/Controllers/Api/v1/OrganizationController.php CHANGED Viewed

@@ -5,6 +5,8 @@ namespace Fleetbase\FleetOps\Http\Controllers\Api\v1;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Http\Resources\Organization;
 use Fleetbase\Models\Company;
+use Fleetbase\Models\Setting;
+use Illuminate\Http\Request;
 class OrganizationController extends Controller
 {
@@ -13,15 +15,31 @@ class OrganizationController extends Controller
      *
      * @return Organization
      */
-    public function listOrganizations()
+    public function listOrganizations(Request $request)
     {
-        $companies = Company::whereHas('users')->take(10)->get()->map(function ($company) {
+        $limit                    = $request->input('limit', 10);
+        $withDriverOnboardEnabled = $request->boolean('with_driver_onboard');
+        $companies = Company::whereHas('users')->get()->map(function ($company) {
             return [
-                'name' => $company->name,
-                'id'   => $company->public_id,
+                'name'   => $company->name,
+                'uuid'   => $company->uuid,
             ];
         });
-        return response()->json($companies);
+        if ($withDriverOnboardEnabled) {
+            $driverOnboardSettings  = Setting::where('key', 'fleet-ops.driver-onboard-settings')->value('value');
+            $companies = $companies->filter(function ($company) use ($driverOnboardSettings) {
+                return $driverOnboardSettings && isset($driverOnboardSettings[$company['uuid']]) && data_get($driverOnboardSettings[$company['uuid']], 'enableDriverOnboardFromApp') === true;
+            });
+        }
+        // limit
+        $companies = $companies->take($limit);
+        $companiesArray = $companies->values()->toArray();
+        return response()->json($companiesArray);
     }
 }

package/server/src/Http/Controllers/FleetOpsController.php CHANGED Viewed

@@ -11,10 +11,4 @@ class FleetOpsController extends FleetbaseController
      * The package namespace used to resolve from.
      */
     public string $namespace = '\\Fleetbase\\FleetOps';
-    public function test()
-    {
-        $order = Order::where('public_id', '')->first();
-        dd($order->config()->getNextActivity());
-    }
 }

package/server/src/Http/Controllers/Internal/v1/NavigatorController.php CHANGED Viewed

@@ -6,6 +6,7 @@ use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Http\Resources\Organization;
 use Fleetbase\Models\ApiCredential;
 use Fleetbase\Models\Company;
+use Fleetbase\Models\Setting;
 use Fleetbase\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
@@ -76,4 +77,11 @@ class NavigatorController extends Controller
         return new Organization($organization);
     }
+    public function getDriverOnboardSettings()
+    {
+        $onBoardSettings  = Setting::where('key', 'fleet-ops.driver-onboard')->value('value');
+        return response()->json($onBoardSettings);
+    }
 }

package/server/src/Http/Controllers/Internal/v1/SettingController.php CHANGED Viewed

@@ -48,23 +48,69 @@ class SettingController extends Controller
         return response()->json(['visibilitySettings' => $visibilitySettings]);
     }
+    /**
+     * Save entity editing settings.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function saveEntityEditingSettings(Request $request)
     {
         $entityEditingSettings  = $request->input('entityEditingSettings', []);
-        $isEntityFieldsEditable = $request->boolean('isEntityFieldsEditable');
         // Save entity editing settings
         Setting::configure('fleet-ops.entity-editing-settings', $entityEditingSettings);
-        Setting::configure('fleet-ops.entity-fields-editable', $isEntityFieldsEditable);
-        return response()->json(['entityEditingSettings' => $entityEditingSettings, 'isEntityFieldsEditable' => $isEntityFieldsEditable]);
+        return response()->json(['entityEditingSettings' => $entityEditingSettings]);
     }
+    /**
+     * Retrieve entity editing settings.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function getEntityEditingSettings()
     {
         $entityEditingSettings  = Setting::where('key', 'fleet-ops.entity-editing-settings')->value('value');
-        $isEntityFieldsEditable = Setting::where('key', 'fleet-ops.entity-fields-editable')->value('value');
+        if (!$entityEditingSettings) {
+            $entityEditingSettings = [];
+        }
+        return response()->json(['entityEditingSettings' => $entityEditingSettings]);
+    }
+    /**
+     * Retrieve driver onboard settings.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function getDriverOnboardSettings($companyId)
+    {
+        $driverOnboardSettings  = Setting::where('key', 'fleet-ops.driver-onboard-settings.' . $companyId)->value('value');
+        if (!$driverOnboardSettings) {
+            $driverOnboardSettings = [];
+        }
+        return response()->json(['driverOnboardSettings' => $driverOnboardSettings]);
+    }
+    /**
+     * Save driver onboard settings.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function savedDriverOnboardSettings(Request $request)
+    {
+        $driverOnboardSettings = $request->input('driverOnboardSettings', []);
+        if ($driverOnboardSettings['enableDriverOnboardFromApp'] == false) {
+            $driverOnboardSettings['driverMustProvideOnboardDoucments'] = false;
+            $driverOnboardSettings['requiredOnboardDocuments']          = [];
+            $driverOnboardSettings['driverOnboardAppMethod']            = '';
+            $driverOnboardSettings['enableDriverOnboardFromApp']        = false;
+        }
+        Setting::configure('fleet-ops.driver-onboard-settings.' . $driverOnboardSettings['companyId'], $driverOnboardSettings);
-        return response()->json(['entityEditingSettings' => $entityEditingSettings, 'isEntityFieldsEditable' => $isEntityFieldsEditable]);
+        return response()->json(['driverOnboardSettings' => $driverOnboardSettings]);
     }
 }

package/server/src/Http/Filter/OrderFilter.php CHANGED Viewed

@@ -38,7 +38,7 @@ class OrderFilter extends Filter
     public function queryForPublic()
     {
-        $this->builder->where('company_uuid', $this->session->get('company'))->whereHas('trackingNumber')->whereHas('payload');
+        $this->builder->where('company_uuid', $this->session->get('company'));
     }
     public function unassigned(bool $unassigned)

package/server/src/Http/Requests/CreateContactRequest.php CHANGED Viewed

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

package/server/src/Http/Requests/CreateDriverRequest.php CHANGED Viewed

@@ -15,7 +15,7 @@ class CreateDriverRequest extends FleetbaseRequest
      */
     public function authorize()
     {
-        return request()->is('navigator/v1/*') || request()->session()->has('api_credential');
+        return request()->is('navigator/v1/*') || request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
     /**

package/server/src/Http/Requests/CreateEntityRequest.php CHANGED Viewed

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

package/server/src/Http/Requests/CreateIssueRequest.php CHANGED Viewed

@@ -6,6 +6,21 @@ use Fleetbase\Http\Requests\FleetbaseRequest;
 class CreateIssueRequest extends FleetbaseRequest
 {
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');;
+    }
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
     public function rules()
     {
         return [

package/server/src/Http/Requests/CreatePlaceRequest.php CHANGED Viewed

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

package/server/src/Http/Requests/CreateVehicleRequest.php CHANGED Viewed

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

package/server/src/Http/Resources/v1/Driver.php CHANGED Viewed

@@ -53,7 +53,7 @@ class Driver extends FleetbaseResource
             'city'                          => data_get($this, 'city', Utils::getCapitalCityFromCountryCode($this->country)),
             'online'                        => data_get($this, 'online', false),
             'status'                        => $this->status,
-            'token'                         => data_get($this, 'token'),
+            'token'                         => $this->auth_token,
             'meta'                          => $this->meta,
             'updated_at'                    => $this->updated_at,
             'created_at'                    => $this->created_at,

package/server/src/Support/Utils.php CHANGED Viewed

@@ -851,8 +851,8 @@ class Utils extends FleetbaseUtils
      * Calculates driving distance and time between two points using Vincenty's formula.
      * Returns distance in meters and time in seconds.
      *
-     * @param \Fleetbase\FleetOps\Models\Place|\Fleetbase\LaravelMysqlSpatial\Types\Point|array $origin
-     * @param \Fleetbase\FleetOps\Models\Place|\Fleetbase\LaravelMysqlSpatial\Types\Point|array $destination
+     * @param \Fleetbase\FleetOps\Models\Place|Point|array $origin
+     * @param \Fleetbase\FleetOps\Models\Place|Point|array $destination
      */
     public static function calculateDrivingDistanceAndTime($origin, $destination): DistanceMatrix
     {
@@ -870,8 +870,8 @@ class Utils extends FleetbaseUtils
      * Calculates driving distance and time between two points using Vincenty's formula.
      * Returns distance in meters and time in seconds.
      *
-     * @param \Fleetbase\FleetOps\Models\Place|\Fleetbase\LaravelMysqlSpatial\Types\Point|array $origin
-     * @param \Fleetbase\FleetOps\Models\Place|\Fleetbase\LaravelMysqlSpatial\Types\Point|array $destination
+     * @param \Fleetbase\FleetOps\Models\Place|Point|array $origin
+     * @param \Fleetbase\FleetOps\Models\Place|Point|array $destination
      */
     public static function getPreliminaryDistanceMatrix($origin, $destination): DistanceMatrix
     {

package/server/src/routes.php CHANGED Viewed

@@ -179,6 +179,11 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                 $router->group(['prefix' => 'labels'], function () use ($router) {
                     $router->get('{id}', 'LabelController@getLabel');
                 });
+                // navigator routes
+                $router->group(['prefix' => 'onboard'], function () use ($router) {
+                    $router->get('driver-onboard-settings/{companyId}', 'NavigatorController@getDriverOnboardSettings');
+                });
             });
         /*
@@ -435,6 +440,8 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                                         $router->post('visibility', 'SettingController@saveVisibilitySettings');
                                         $router->get('entity-editing-settings', 'SettingController@getEntityEditingSettings');
                                         $router->post('entity-editing-settings', 'SettingController@saveEntityEditingSettings');
+                                        $router->post('driver-onboard-settings', 'SettingController@savedDriverOnboardSettings');
+                                        $router->get('driver-onboard-settings/{companyId}', 'SettingController@getDriverOnboardSettings');
                                     }
                                 );
                                 $router->group(

package/translations/en-us.yaml CHANGED Viewed

@@ -94,7 +94,6 @@ fleet-ops:
     total: Total
     back: Back
     done: Done
   component:
     activity-logic-builder:
       activity-logic: Activity Logic
@@ -238,7 +237,11 @@ fleet-ops:
         message: Use this URL to link the official Navigator app to this {companyName} instance. Opening this URL on a mobile device will open the Navigator app and update it's configuration and branding.
         settings: Entity Settings
         select-input: Allow driver to update entity details
+        driver-settings: Driver Settings
+        description: Enable driver on-board
+        upload-document: Require driver to upload documents
+        upload-body: Add documents
+        document: Document
       visibility-controls:
         title: Visibility Controls
         message: Visibility controls allow you to disable sections of Fleet-Ops. Toggle the checkbox to enable or disable sections to hide in Fleet-ops.
@@ -249,6 +252,25 @@ fleet-ops:
         vehicles : Vehicles
         drivers : Drivers
         places : Places
+    entity-field-editing-settings:
+      entitiy-field-editing-settings: Entity Field Editing Settings
+      entity-field-editing-settings-help-text: These settings determine which fields of an entity are editable by a driver via Navigator App
+      select-order-config: Select Order Config
+      select-order-config-help-text: Select an order config which these settings will apply to
+      enable-driver-to-edit-entity-fields: Allow driver to edit entity details
+      enable-driver-to-edit-entity-fields-help-text: Enabling this toggle grants the driver permission to modify specific entity fields chosen below.
+    driver-onboard-settings:
+      driver-onboard-settings: Driver Onboard Settings
+      enable-driver-onboard-from-app: Enable driver onboard from Navigator App
+      enable-driver-onboard-from-app-help-text: Enabling this setting allows drivers to independently onboard (create their own account) via the Navigator App.
+      select-onboard-method: Select driver onboard method
+      select-onboard-method-help-text: This setting determines how drivers are permitted to create their accounts through the Navigator App. Choose 'Invite' if drivers need to receive an email invitation to create their account. Select 'Button' if you wish to enable a button within the app that allows anyone to create a driver account.
+      require-driver-to-upload-onboard-documents: Require driver to upload onboard documents
+      require-driver-to-upload-onboard-documents-help-text: This setting enforces documents that a driver must provide before their account can be created.
+      required-onboard-documents: Required onboard documents
+      required-onboard-documents-help-text: Input all the onboard documents required for a driver to provide below using the "Add onboard document" button.
+      enter-document-name: Enter document name
+      add-onboard-document: Add onboard document
     cell:
       driver-name:
         not-assigned: No driver assigned
@@ -265,6 +287,7 @@ fleet-ops:
         loading-vehicle: Loading fleet vehicles...
     layout:
       fleet-ops-sidebar:
+        navigator-app: Navigator App
         resources: Resources
         operations: Operations
         dashboard: Dashboard
@@ -1511,4 +1534,6 @@ fleet-ops:
           zone-label: Zone
           zone-help-text: Restrict this service to order request originating from a specific zone.
           zone-placeholder: Restrict to zone
+  settings:
+    navigator-app:
+      navigator-app-settings: Navigator App Settings