@fleetbase/storefront-engine 0.2.4 → 0.2.5

package/README.md

@@ -15,10 +15,10 @@ This monorepo contains both the frontend and backend components of the Storefron
 
 ### Requirements
 
-- PHP 7.3.0 or above
-- Ember.js v3.24 or above
-- Ember CLI v3.24 or above
-- Node.js v14 or above
+* PHP 7.3.0 or above
+* Ember.js v4.8 or above
+* Ember CLI v4.8 or above
+* Node.js v18 or above
 
 ## Structure
 

package/addon/components/modals/import-products.hbs

@@ -3,7 +3,7 @@
         {{#if @options.isProcessing}}
             <div class="min-h-56 dropzone w-full rounded px-4 py-8 min-h text-gray-900 dark:text-white text-center flex flex-col items-center justify-center border-2 border-dashed border-gray-200 dark:border-indigo-500">
                 <div class="flex items-center justify-center py-5">
-                    <PageLoader class="text-sm dar:text-gray-100" @loadingMessage="Processing import..." />
+                    <Spinner class="text-sm dark:text-gray-100" @loadingMessage="Processing import..." />
                 </div>
             </div>
         {{else}}

package/addon/components/schedule-manager.hbs

@@ -2,9 +2,9 @@
     {{#each-in this.schedule as |day hours|}}
         <div class="content-panel {{@contentPanelClass}} shadow-sm">
             <div class="content-panel-header items-center {{@contentPanelHeaderClass}}">
-                <h4 class="font-semibold dark:text-gray-100">{{day}}</h4>
+                <h4 class="font-semibold text-sm dark:text-gray-100">{{day}}</h4>
                 <div>
-                    <Button @icon="calendar-week" @text="Add Hours" @onClick={{fn this.addHours @subject day}} class="{{@addHoursButtonClass}}" />
+                    <Button @icon="calendar-week" @text="Add Hours" @textClass="truncate text-xs" @size="sm" @onClick={{fn this.addHours @subject day}} class="{{@addHoursButtonClass}}" />
                 </div>
             </div>
             <div class="content-panel-body {{@contentPanelBodyClass}}">

package/addon/components/widget/customers.hbs

@@ -1,4 +1,4 @@
-<ContentPanel @title={{this.title}} @titleStatusRight={{this.customers.length}} @titleStatuRightClass="info-status-badge" @hideStatusDot={{true}} @open={{this.customers.length}} @pad={{false}} @wrapperClass={{@wrapperClass}} @onInsert={{this.getCustomers}}>
+<ContentPanel @title={{this.title}} @titleStatusRight={{this.customers.length}} @titleStatusRightClass="info-status-badge" @hideStatusDot={{true}} @open={{this.customers.length}} @pad={{false}} @wrapperClass={{@wrapperClass}} @onInsert={{this.getCustomers}}>
     {{#if this.isLoading}}
         <div class="px-3 py-2">
             <Spinner class="text-sky-400" />

package/addon/components/widget/customers.js

@@ -1,16 +1,19 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { action, computed } from '@ember/object';
+import { action } from '@ember/object';
+import setComponentArg from '@fleetbase/ember-core/utils/set-component-arg';
 
 export default class WidgetCustomersComponent extends Component {
     @service store;
     @service storefront;
     @tracked isLoading = true;
     @tracked customers = [];
+    @tracked title = 'Recent Customers';
 
-    @computed('args.title') get title() {
-        return this.args.title || 'Recent Customers';
+    constructor(owner, { title }) {
+        super(...arguments);
+        setComponentArg(this, 'title', title);
     }
 
     @action async getCustomers() {
@@ -28,7 +31,7 @@ export default class WidgetCustomersComponent extends Component {
         this.isLoading = true;
 
         return new Promise((resolve) => {
-            const storefront = this.storefront?.activeStore?.public_id;
+            const storefront = this.storefront.getActiveStore('public_id');
 
             if (!storefront) {
                 this.isLoading = false;

package/addon/components/widget/orders.js

@@ -17,6 +17,10 @@ export default class WidgetOrdersComponent extends Component {
         return this.args.title ?? 'Recent Orders';
     }
 
+    constructor() {
+        super(...arguments);
+    }
+
     @action async setupWidget() {
         later(
             this,

package/addon/controllers/base-controller.js

@@ -0,0 +1,31 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+export default class BaseController extends Controller {
+    /**
+     * Inject the `universe` service
+     *
+     * @var {Service}
+     */
+    @service universe;
+
+    /**
+     * Transitions to a specified route within the '@fleetbase/storefront-engine' engine.
+     *
+     * This action is a wrapper around the `transitionToEngineRoute` method of the `universe` service (or object),
+     * specifically targeting the '@fleetbase/storefront-engine'. It allows for easy transitioning to routes
+     * within this engine, abstracting away the need to repeatedly specify the engine name.
+     *
+     * @param {string} route - The route within the '@fleetbase/storefront-engine' to transition to.
+     * @param {...any} args - Additional arguments to pass to the transitionToEngineRoute method.
+     * @returns {Promise} A Promise that resolves with the result of the transitionToEngineRoute method.
+     *
+     * @example
+     * // To transition to the 'management.fleets.index.new' route within the '@fleetbase/storefront-engine'
+     * this.transitionToRoute('management.fleets.index.new');
+     */
+    @action transitionToRoute(route, ...args) {
+        return this.universe.transitionToEngineRoute('@fleetbase/storefront-engine', route, ...args);
+    }
+}

package/addon/controllers/networks/index/network.js

@@ -1,8 +1,8 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/storefront-engine/controllers/base-controller';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 
-export default class NetworksIndexNetworkController extends Controller {
+export default class NetworksIndexNetworkController extends BaseController {
     @service modalsManager;
 
     @action transitionBack({ closeOverlay }) {

package/addon/controllers/networks/index.js

@@ -1,4 +1,5 @@
-import Controller, { inject as controller } from '@ember/controller';
+import BaseController from '@fleetbase/storefront-engine/controllers/base-controller';
+import { inject as controller } from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -6,7 +7,7 @@ import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 
-export default class NetworksIndexController extends Controller {
+export default class NetworksIndexController extends BaseController {
     /**
      * Inject the `NetworksIndexNetworkStoresController` controller
      *

package/addon/controllers/products/index/category/new.js

@@ -1,4 +1,5 @@
-import Controller, { inject as controller } from '@ember/controller';
+import BaseController from '@fleetbase/storefront-engine/controllers/base-controller';
+import { inject as controller } from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 import { isArray } from '@ember/array';
 import { action } from '@ember/object';
@@ -6,7 +7,7 @@ import { alias } from '@ember/object/computed';
 import { underscore } from '@ember/string';
 import { inject as service } from '@ember/service';
 
-export default class ProductsIndexCategoryNewController extends Controller {
+export default class ProductsIndexCategoryNewController extends BaseController {
     @controller('products.index.category') productsIndexCategoryController;
     @service notifications;
     @service modalsManager;
@@ -89,6 +90,12 @@ export default class ProductsIndexCategoryNewController extends Controller {
     }
 
     @action queueFile(file) {
+        // since we have dropzone and upload button within dropzone validate the file state first
+        // as this method can be called twice from both functions
+        if (['queued', 'failed', 'timed_out', 'aborted'].indexOf(file.state) === -1) {
+            return;
+        }
+
         this.uploadQueue.pushObject(file);
         this.fetch.uploadFile.perform(
             file,

package/addon/controllers/products/index/category.js

@@ -1,4 +1,4 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/storefront-engine/controllers/base-controller';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
@@ -7,7 +7,7 @@ import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 
-export default class ProductsIndexCategoryController extends Controller {
+export default class ProductsIndexCategoryController extends BaseController {
     @service modalsManager;
     @service fetch;
     @service hostRouter;

package/addon/controllers/products/index/index.js

@@ -1,4 +1,4 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/storefront-engine/controllers/base-controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -6,7 +6,7 @@ import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 
-export default class ProductsIndexIndexController extends Controller {
+export default class ProductsIndexIndexController extends BaseController {
     /**
      * Inject the `filters` service
      *

package/addon/controllers/products/index.js

@@ -1,15 +1,14 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/storefront-engine/controllers/base-controller';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { alias } from '@ember/object/computed';
 import { dasherize } from '@ember/string';
 
-export default class ProductsIndexController extends Controller {
+export default class ProductsIndexController extends BaseController {
     @service store;
     @service modalsManager;
     @service currentUser;
-    @service modalsManager;
     @service notifications;
     @service fetch;
     @service hostRouter;

package/addon/models/network.js

@@ -15,7 +15,6 @@ export default class NetworkModel extends Model {
     @hasMany('store') stores;
     @hasMany('notification-channel') notification_channels;
     @hasMany('gateway') gateways;
-    @hasMany('store') stores;
     @belongsTo('file') logo;
     @belongsTo('file') backdrop;
 

package/addon/routes/customers/index.js

@@ -1,8 +1,11 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { action, set } from '@ember/object';
+import isNestedRouteTransition from '@fleetbase/ember-core/utils/is-nested-route-transition';
 
 export default class CustomersIndexRoute extends Route {
     @service store;
+    @service storefront;
 
     queryParams = {
         page: { refreshModel: true },
@@ -19,7 +22,14 @@ export default class CustomersIndexRoute extends Route {
         updated_at: { refreshModel: true },
     };
 
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
+    }
+
     model(params) {
-        return this.store.query('customer', params);
+        return this.store.query('customer', { ...params, storefront: this.storefront.getActiveStore('public_id') });
     }
 }

package/addon/routes/networks/index.js

@@ -1,5 +1,7 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { action, set } from '@ember/object';
+import isNestedRouteTransition from '@fleetbase/ember-core/utils/is-nested-route-transition';
 
 export default class NetworksIndexRoute extends Route {
     @service store;
@@ -13,6 +15,13 @@ export default class NetworksIndexRoute extends Route {
         updated_at: { refreshModel: true },
     };
 
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
+    }
+
     model(params) {
         return this.store.query('network', params);
     }

package/addon/routes/orders/index.js

@@ -1,8 +1,11 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { action, set } from '@ember/object';
+import isNestedRouteTransition from '@fleetbase/ember-core/utils/is-nested-route-transition';
 
 export default class OrdersIndexRoute extends Route {
     @service store;
+    @service storefront;
 
     queryParams = {
         page: { refreshModel: true },
@@ -23,7 +26,14 @@ export default class OrdersIndexRoute extends Route {
         before: { refreshModel: true },
     };
 
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
+    }
+
     model(params) {
-        return this.store.query('order', params);
+        return this.store.query('order', { ...params, storefront: this.storefront.getActiveStore('public_id') });
     }
 }

package/addon/routes/products/index.js

@@ -1,13 +1,19 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
+import { action, set } from '@ember/object';
+import isNestedRouteTransition from '@fleetbase/ember-core/utils/is-nested-route-transition';
 
 export default class ProductsIndexRoute extends Route {
     @service store;
     @service currentUser;
 
-    @action willTransition() {
+    @action willTransition(transition) {
         this.controller.category = null;
+
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
     }
 
     model(params = {}) {

package/addon/services/storefront.js

@@ -1,24 +1,86 @@
 import Service from '@ember/service';
 import Evented from '@ember/object/evented';
 import { inject as service } from '@ember/service';
+import { get } from '@ember/object';
 
+/**
+ * Service to manage storefront operations.
+ */
 export default class StorefrontService extends Service.extend(Evented) {
+    /**
+     * Ember service for data store.
+     * @type {Service}
+     */
     @service store;
+
+    /**
+     * Ember service for fetch operations.
+     * @type {Service}
+     */
     @service fetch;
+
+    /**
+     * Ember service for notifications.
+     * @type {Service}
+     */
     @service notifications;
+
+    /**
+     * Ember service for current user information.
+     * @type {Service}
+     */
     @service currentUser;
+
+    /**
+     * Ember service for managing modals.
+     * @type {Service}
+     */
     @service modalsManager;
+
+    /**
+     * Ember service for router operations.
+     * @type {Service}
+     */
     @service hostRouter;
 
+    /**
+     * Gets the active store.
+     * @returns {Object} The active store object.
+     */
     get activeStore() {
         return this.findActiveStore();
     }
 
+    /**
+     * Sets the active storefront.
+     * @param {Object} store - The store to set as active.
+     */
     setActiveStorefront(store) {
         this.currentUser.setOption('activeStorefront', store.id);
         this.trigger('storefront.changed', store);
     }
 
+    /**
+     * Gets the active store or a specific property of it.
+     * @param {string|null} property - The property to retrieve from the active store.
+     * @returns {Object|null} The active store or its specific property.
+     */
+    getActiveStore(property = null) {
+        if (this.activeStore) {
+            if (typeof property === 'string') {
+                return get(this.activeStore, property);
+            }
+
+            return this.activeStore;
+        }
+
+        return null;
+    }
+
+    /**
+     * Finds the active store based on the current user's settings.
+     * @returns {Object|null} The active store object or null if not found.
+     */
     findActiveStore() {
         const activeStoreId = this.currentUser.getOption('activeStorefront');
 
@@ -43,6 +105,11 @@ export default class StorefrontService extends Service.extend(Evented) {
         return activeStore;
     }
 
+    /**
+     * Alerts about an incoming order.
+     * @param {string} orderId - The ID of the incoming order.
+     * @param {Object} store - The store associated with the order.
+     */
     async alertIncomingOrder(orderId, store) {
         const order = await this.store.queryRecord('order', {
             public_id: orderId,
@@ -80,6 +147,9 @@ export default class StorefrontService extends Service.extend(Evented) {
         });
     }
 
+    /**
+     * Listens for incoming orders and handles them.
+     */
     async listenForIncomingOrders() {
         const store = this.findActiveStore();
 
@@ -109,6 +179,10 @@ export default class StorefrontService extends Service.extend(Evented) {
         this.hostRouter.on('routeWillChange', channel.close);
     }
 
+    /**
+     * Creates the first store with given options.
+     * @param {Object} [options={}] - Options for creating the first store.
+     */
     createFirstStore(options = {}) {
         const store = this.store.createRecord('store');
         const currency = this.currentUser.getWhoisProperty('currency.code');
@@ -151,6 +225,10 @@ export default class StorefrontService extends Service.extend(Evented) {
         });
     }
 
+    /**
+     * Creates a new storefront with given options.
+     * @param {Object} [options={}] - Options for creating the new storefront.
+     */
     createNewStorefront(options = {}) {
         const store = this.store.createRecord('store');
         const currency = this.currentUser.getWhoisProperty('currency.code');
@@ -191,6 +269,9 @@ export default class StorefrontService extends Service.extend(Evented) {
         });
     }
 
+    /**
+     * Plays an alert sound.
+     */
     playAlert() {
         // eslint-disable-next-line no-undef
         const alert = new Audio('/sounds/storefront_order_alert.mp3');

package/addon/templates/networks/index/network/stores.hbs

@@ -1,6 +1,6 @@
 <Layout::Section::Header @title="Stores" @searchQuery={{this.storeQuery}} @onSearch={{perform this.search}}>
-    <Button @type="primary" @icon="plus" @text="Add Stores" @onClick={{this.addStores}} @wrapperClass="mr-2" />
-    <Button @type="primary" @icon="envelope-open-text" @text="Invite Stores" @onClick={{this.invite}} />
+    <Button @type="primary" @icon="plus" @text="Add Stores" @textClass="truncate" @size="sm" @onClick={{this.addStores}} @wrapperClass="mr-2" />
+    <Button @type="primary" @icon="envelope-open-text" @textClass="truncate" @size="sm" @text="Invite Stores" @onClick={{this.invite}} />
 </Layout::Section::Header>
 
 <Layout::Section::Body>

package/addon/templates/networks/index/network.hbs

@@ -1,4 +1,4 @@
-<Overlay @position="right" @isResizable={{true}} @noBackdrop={{true}} @width="800px" @minResizeWidth={{700}} @fullHeight={{true}}>
+<Overlay @position="right" @isResizable={{true}} @noBackdrop={{true}} @width="570px" @minResizeWidth={{570}} @fullHeight={{true}}>
     <Overlay::Header @title="Manage Network" @onPressCancel={{this.transitionBack}} />
     <Overlay::Body class="p-0i" @increaseInnerBodyHeightBy="0" @wrapperClass="space-y-4 pt-4">
         <div class="flex flex-col">

package/addon/templates/products/index/category/new.hbs

@@ -1,4 +1,4 @@
-<Overlay @position="right" @noBackdrop={{true}} @width="700px" @fullHeight={{true}} @containerClass="border-l border-transparent dark:border-gray-700">
+<Overlay @position="right" @noBackdrop={{true}} @isResizable={{true}} @width="570px" @fullHeight={{true}} @containerClass="border-l border-transparent dark:border-gray-700">
     <Overlay::Header @title={{this.overlayTitle}} @titleClass="truncate" @titleWrapperClass="w-3/4" @headerLeftClass="w-70pc" @headerLeftInnerClass="w-full flex-1" @onPressCancel={{this.transitionBack}}>
         <Button @icon={{this.overlayActionButtonIcon}} @type="primary" @text={{this.overlayActionButtonTitle}} @onClick={{this.saveProduct}} @isLoading={{this.isSaving}} @isSubscriptionRequired={{true}} />
     </Overlay::Header>

package/addon/templates/products/index/category.hbs

@@ -1,6 +1,23 @@
-<Layout::Section::Header @title={{concat this.category.name " Products"}} @searchQuery={{this.query}} @onSearch={{perform this.search}}>
-    <Button @type="default" @text="Edit this category" @icon="edit" @onClick={{fn this.editCategory this.category}} @disabled={{not this.category}} @wrapperClass="mr-2" />
-    <Button @type="danger" @text="Delete this category" @icon="trash" @onClick={{this.deleteCategory}} @disabled={{not this.category}} />
+<Layout::Section::Header @title={{concat this.category.name " Products"}} @titleClass="truncate" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
+    {{!-- <Button @type="default" @text="Edit this category" @textClass="truncate" @icon="edit" @onClick={{fn this.editCategory this.category}} @disabled={{not this.category}} @wrapperClass="mr-2" />
+    <Button @type="danger" @text="Delete this category" @textClass="truncate" @icon="trash" @onClick={{this.deleteCategory}} @disabled={{not this.category}} /> --}}
+
+    {{#if this.category}}
+        <DropdownButton @icon="gear" @text="Category" @type="default" @size="sm" @contentClass="dropdown-menu" as |dd|>
+            <div class="next-dd-menu">
+                <div class="px-1">
+                    <a href="#" class="next-dd-item" {{on "click" (dropdown-fn dd this.editCategory this.category)}}>
+                        Edit this category...
+                    </a>
+                </div>
+                <div class="px-1">
+                    <a href="#" class="text-red-500 next-dd-item" {{on "click" (dropdown-fn dd this.deleteCategory)}}>
+                        Delete this category...
+                    </a>
+                </div>
+            </div>
+        </DropdownButton>
+    {{/if}}
 </Layout::Section::Header>
 
 <div class="h-screen overflow-y-scroll p-6">

package/app/controllers/base-controller.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/controllers/base-controller';

package/composer.json

@@ -23,7 +23,7 @@
     "require": {
         "php": "^7.4|^8.0",
         "fleetbase/core-api": "^1.3.2",
-        "fleetbase/fleetops-api": "^0.3.2",
+        "fleetbase/fleetops-api": "^0.3.5",
         "geocoder-php/google-maps-places-provider": "^1.4",
         "laravel-notification-channels/apn": "^3.8",
         "laravel-notification-channels/fcm": "^2.7",

package/config/environment.js

@@ -1,11 +1,12 @@
 /* eslint-env node */
 'use strict';
-const { name } = require('../package');
+const { name, fleetbase } = require('../package');
 
 module.exports = function (environment) {
     let ENV = {
         modulePrefix: name,
         environment,
+        mountedEngineRoutePrefix: getMountedEngineRoutePrefix(),
 
         defaultValues: {
             categoryImage: getenv('DEFAULT_CATEGORY_IMAGE', 'https://flb-assets.s3.ap-southeast-1.amazonaws.com/images/fallback-placeholder-1.png'),
@@ -16,6 +17,15 @@ module.exports = function (environment) {
     return ENV;
 };
 
+function getMountedEngineRoutePrefix() {
+    let mountedEngineRoutePrefix = 'storefront';
+    if (fleetbase && typeof fleetbase.route === 'string') {
+        mountedEngineRoutePrefix = fleetbase.route;
+    }
+
+    return `console.${mountedEngineRoutePrefix}.`;
+}
+
 function getenv(variable, defaultValue = null) {
     return process.env[variable] !== undefined ? process.env[variable] : defaultValue;
 }

package/index.js

@@ -2,6 +2,8 @@
 const { buildEngine } = require('ember-engines/lib/engine-addon');
 const { name } = require('./package');
 const Funnel = require('broccoli-funnel');
+const MergeTrees = require('broccoli-merge-trees');
+const path = require('path');
 
 module.exports = buildEngine({
     name,
@@ -23,4 +25,17 @@ module.exports = buildEngine({
     isDevelopingAddon() {
         return true;
     },
+
+    treeForPublic: function () {
+        const publicTree = this._super.treeForPublic.apply(this, arguments);
+
+        const addonTree = [
+            new Funnel(path.join(__dirname, 'assets'), {
+                destDir: '/',
+            }),
+        ];
+
+        // Merge the addon tree with the existing tree
+        return publicTree ? new MergeTrees([publicTree, ...addonTree], { overwrite: true }) : new MergeTrees([...addonTree], { overwrite: true });
+    },
 });

package/package.json

@@ -1,127 +1,134 @@
 {
-    "name": "@fleetbase/storefront-engine",
-    "version": "0.2.4",
-    "description": "Headless Commerce & Marketplace Extension for Fleetbase",
-    "fleetbase": {
-        "route": "storefront",
-        "dashboard": "storefront/int/v1/dashboard"
-    },
-    "keywords": [
-        "fleetbase-extension",
-        "fleetbase-storefront",
-        "fleetbase",
-        "e-commerce",
-        "headless-commerce",
-        "headless-marketplace",
-        "ember-engine",
-        "ember-addon"
-    ],
-    "repository": "https://github.com/fleetbase/storefront",
-    "license": "MIT",
-    "author": "Fleetbase Pte Ltd <hello@fleetbase.io>",
-    "directories": {
-        "app": "app",
-        "addon": "addon",
-        "tests": "tests"
-    },
-    "scripts": {
-        "build": "ember build --environment=production",
-        "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
-        "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
-        "lint:hbs": "ember-template-lint .",
-        "lint:hbs:fix": "ember-template-lint . --fix",
-        "lint:js": "eslint . --cache",
-        "lint:js:fix": "eslint . --fix",
-        "start": "ember serve",
-        "test": "npm-run-all lint test:*",
-        "test:ember": "ember test",
-        "test:ember-compatibility": "ember try:each",
-        "publish:npm": "npm config set registry https://registry.npmjs.org/ && npm publish",
-        "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
-    },
-    "dependencies": {
-        "@fleetbase/ember-core": "^0.1.7",
-        "@fleetbase/ember-ui": "^0.2.4",
-        "@fleetbase/fleetops-data": "^0.1.3",
-        "@fortawesome/ember-fontawesome": "^0.4.1",
-        "@fortawesome/fontawesome-svg-core": "^6.4.0",
-        "@fortawesome/free-solid-svg-icons": "^6.4.0",
-        "ember-cli-babel": "^7.26.11",
-        "ember-cli-es6-transform": "^1.0.0",
-        "ember-cli-htmlbars": "^6.1.0",
-        "ember-intl": "^6.0.0-beta.6",
-        "ember-tag-input": "^3.1.0",
-        "ember-wormhole": "^0.6.0"
-    },
-    "devDependencies": {
-        "@ember/optional-features": "^2.0.0",
-        "@ember/test-helpers": "^2.8.1",
-        "@embroider/test-setup": "^1.8.3",
-        "@glimmer/component": "^1.1.2",
-        "@glimmer/tracking": "^1.1.2",
-        "babel-eslint": "^10.1.0",
-        "broccoli-asset-rev": "^3.0.0",
-        "broccoli-funnel": "^3.0.8",
-        "ember-auto-import": "^2.4.2",
-        "ember-classic-decorator": "^3.0.0",
-        "ember-cli": "~4.6.0",
-        "ember-cli-dependency-checker": "^3.3.1",
-        "ember-cli-inject-live-reload": "^2.1.0",
-        "ember-cli-sri": "^2.1.1",
-        "ember-cli-terser": "^4.0.2",
-        "ember-concurrency": "^2.3.7",
-        "ember-concurrency-decorators": "^2.0.3",
-        "ember-data": "~4.6.0",
-        "ember-disable-prototype-extensions": "^1.1.3",
-        "ember-engines": "^0.8.23",
-        "ember-load-initializers": "^2.1.2",
-        "ember-math-helpers": "^2.18.2",
-        "ember-page-title": "^7.0.0",
-        "ember-qunit": "^5.1.5",
-        "ember-resolver": "^8.0.3",
-        "ember-responsive": "^5.0.0",
-        "ember-source": "~4.6.0",
-        "ember-source-channel-url": "^3.0.0",
-        "ember-template-lint": "^4.10.1",
-        "ember-try": "^2.0.0",
-        "eslint": "^7.32.0",
-        "eslint-config-prettier": "^8.5.0",
-        "eslint-plugin-ember": "^11.0.2",
-        "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-prettier": "^4.2.1",
-        "eslint-plugin-qunit": "^7.3.1",
-        "loader.js": "^4.7.0",
-        "npm-run-all": "^4.1.5",
-        "prettier": "^2.7.1",
-        "qunit": "^2.19.1",
-        "qunit-dom": "^2.0.0",
-        "webpack": "^5.74.0"
-    },
-    "peerDependencies": {
-        "ember-engines": "^0.8.23"
-    },
-    "engines": {
-        "node": "14.* || >= 16"
-    },
-    "ember": {
-        "edition": "octane"
-    },
-    "ember-addon": {
-        "configPath": "tests/dummy/config"
-    },
-    "prettier": {
-        "trailingComma": "es5",
-        "tabWidth": 4,
-        "semi": true,
-        "singleQuote": true,
-        "printWidth": 190,
-        "overrides": [
-            {
-                "files": "*.hbs",
-                "options": {
-                    "singleQuote": false
-                }
-            }
-        ]
-    }
+  "name": "@fleetbase/storefront-engine",
+  "version": "0.2.5",
+  "description": "Headless Commerce & Marketplace Extension for Fleetbase",
+  "fleetbase": {
+    "route": "storefront",
+    "dashboard": "storefront/int/v1/dashboard"
+  },
+  "keywords": [
+    "fleetbase-extension",
+    "fleetbase-storefront",
+    "fleetbase",
+    "e-commerce",
+    "headless-commerce",
+    "headless-marketplace",
+    "ember-engine",
+    "ember-addon"
+  ],
+  "repository": "https://github.com/fleetbase/storefront",
+  "license": "MIT",
+  "author": "Fleetbase Pte Ltd <hello@fleetbase.io>",
+  "directories": {
+    "app": "app",
+    "addon": "addon",
+    "tests": "tests"
+  },
+  "scripts": {
+    "build": "ember build --environment=production",
+    "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
+    "lint:css": "stylelint \"**/*.css\"",
+    "lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
+    "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
+    "lint:hbs": "ember-template-lint .",
+    "lint:hbs:fix": "ember-template-lint . --fix",
+    "lint:js": "eslint . --cache",
+    "lint:js:fix": "eslint . --fix",
+    "start": "ember serve",
+    "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
+    "test:ember": "ember test",
+    "test:ember-compatibility": "ember try:each",
+    "publish:npm": "npm config set registry https://registry.npmjs.org/ && npm publish",
+    "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
+  },
+  "dependencies": {
+    "@fleetbase/ember-core": "^0.1.9",
+    "@fleetbase/ember-ui": "^0.2.8",
+    "@fleetbase/fleetops-data": "^0.1.6",
+    "@babel/core": "^7.23.2",
+    "@fortawesome/ember-fontawesome": "^0.4.1",
+    "@fortawesome/fontawesome-svg-core": "^6.4.0",
+    "@fortawesome/free-solid-svg-icons": "^6.4.0",
+    "ember-cli-babel": "^8.2.0",
+    "ember-cli-htmlbars": "^6.3.0",
+    "ember-intl": "6.3.2",
+    "ember-tag-input": "^3.1.0",
+    "ember-wormhole": "^0.6.0"
+  },
+  "devDependencies": {
+    "@babel/eslint-parser": "^7.22.15",
+    "@babel/plugin-proposal-decorators": "^7.23.2",
+    "@ember/optional-features": "^2.0.0",
+    "@ember/test-helpers": "^3.2.0",
+    "@embroider/test-setup": "^3.0.2",
+    "@glimmer/component": "^1.1.2",
+    "@glimmer/tracking": "^1.1.2",
+    "broccoli-asset-rev": "^3.0.0",
+    "broccoli-funnel": "^3.0.8",
+    "broccoli-merge-trees": "^4.2.0",
+    "concurrently": "^8.2.2",
+    "ember-auto-import": "^2.6.3",
+    "ember-classic-decorator": "^3.0.0",
+    "ember-cli": "~5.4.1",
+    "ember-cli-clean-css": "^3.0.0",
+    "ember-cli-dependency-checker": "^3.3.2",
+    "ember-cli-inject-live-reload": "^2.1.0",
+    "ember-cli-sri": "^2.1.1",
+    "ember-cli-terser": "^4.0.2",
+    "ember-concurrency": "^3.1.1",
+    "ember-concurrency-decorators": "^2.0.3",
+    "ember-data": "^4.12.5",
+    "ember-engines": "^0.9.0",
+    "ember-load-initializers": "^2.1.2",
+    "ember-math-helpers": "^4.0.0",
+    "ember-page-title": "^8.0.0",
+    "ember-qunit": "^8.0.1",
+    "ember-resolver": "^11.0.1",
+    "ember-responsive": "^5.0.0",
+    "ember-source": "~5.4.0",
+    "ember-source-channel-url": "^3.0.0",
+    "ember-template-lint": "^5.11.2",
+    "ember-try": "^3.0.0",
+    "eslint": "^8.52.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-ember": "^11.11.1",
+    "eslint-plugin-n": "^16.2.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-qunit": "^8.0.1",
+    "loader.js": "^4.7.0",
+    "prettier": "^3.0.3",
+    "qunit": "^2.20.0",
+    "qunit-dom": "^2.0.0",
+    "stylelint": "^15.11.0",
+    "stylelint-config-standard": "^34.0.0",
+    "stylelint-prettier": "^4.0.2",
+    "webpack": "^5.89.0"
+  },
+  "peerDependencies": {
+    "ember-engines": "^0.9.0"
+  },
+  "engines": {
+    "node": ">= 18"
+  },
+  "ember": {
+    "edition": "octane"
+  },
+  "ember-addon": {
+    "configPath": "tests/dummy/config"
+  },
+  "prettier": {
+    "trailingComma": "es5",
+    "tabWidth": 4,
+    "semi": true,
+    "singleQuote": true,
+    "printWidth": 190,
+    "overrides": [
+      {
+        "files": "*.hbs",
+        "options": {
+          "singleQuote": false
+        }
+      }
+    ]
+  }
 }

package/server/src/Expansions/ContactFilterExpansion.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Fleetbase\Storefront\Expansions;
+
+use Fleetbase\Build\Expansion;
+
+class ContactFilterExpansion implements Expansion
+{
+    /**
+     * Get the target class to expand.
+     *
+     * @return string|Class
+     */
+    public static function target()
+    {
+        return \Fleetbase\FleetOps\Http\Filter\ContactFilter::class;
+    }
+
+    /**
+     * Filter contact's by their storefront order.
+     *
+     * @return \Closure
+     */
+    public function storefront()
+    {
+        return function (?string $storefront) {
+            /** @var \Fleetbase\FleetOps\Http\Filter\ContactFilter $this */
+            $this->builder->whereHas(
+                'customerOrders',
+                function ($query) use ($storefront) {
+                    $query->where('meta->storefront_id', $storefront);
+                }
+            );
+        };
+    }
+}

package/server/src/Expansions/OrderFilterExpansion.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Fleetbase\Storefront\Expansions;
+
+use Fleetbase\Build\Expansion;
+
+class OrderFilterExpansion implements Expansion
+{
+    /**
+     * Get the target class to expand.
+     *
+     * @return string|Class
+     */
+    public static function target()
+    {
+        return \Fleetbase\FleetOps\Http\Filter\OrderFilter::class;
+    }
+
+    /**
+     * Filter orders by the storefront id.
+     *
+     * @return \Closure
+     */
+    public function storefront()
+    {
+        return function (?string $storefront) {
+            /** @var \Fleetbase\FleetOps\Http\Filter\OrderFilter $this */
+            $this->builder->where('meta->storefront_id', $storefront);
+        };
+    }
+}

package/server/src/Expansions/VendorFilterExpansion.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Fleetbase\Storefront\Expansions;
+
+use Fleetbase\Build\Expansion;
+
+class VendorFilterExpansion implements Expansion
+{
+    /**
+     * Get the target class to expand.
+     *
+     * @return string|Class
+     */
+    public static function target()
+    {
+        return \Fleetbase\FleetOps\Http\Filter\VendorFilter::class;
+    }
+
+    /**
+     * Filter vendor's by their storefront order.
+     *
+     * @return \Closure
+     */
+    public function storefront()
+    {
+        return function (?string $storefront) {
+            /** @var \Fleetbase\FleetOps\Http\Filter\VendorFilter $this */
+            $this->builder->whereHas(
+                'customerOrders',
+                function ($query) use ($storefront) {
+                    $query->where('meta->storefront_id', $storefront);
+                }
+            );
+        };
+    }
+}

package/server/src/Http/Resources/Cart.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\Storefront\Http\Resources;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
 
 class Cart extends FleetbaseResource
 {
@@ -15,7 +16,14 @@ class Cart extends FleetbaseResource
     public function toArray($request)
     {
         return [
-            'id' => $this->public_id,
+            'id' => $this->when(Http::isInternalRequest(), $this->id,$this->public_id),
+            'uuid' => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id' => $this->when(Http::isInternalRequest(), $this->public_id),
+            'company_uuid' => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'user_uuid' => $this->when(Http::isInternalRequest(), $this->user_uuid),
+            'checkout_uuid' => $this->when(Http::isInternalRequest(), $this->checkout_uuid),
+            'checkout_uuid' => $this->when(Http::isInternalRequest(), $this->checkout_uuid),
+            'customer_id' => $this->customer_id,
             'currency' => $this->currency,
             'subtotal' => $this->subtotal,
             'total_items' => $this->total_items,

package/server/src/Http/Resources/Network.php

@@ -20,6 +20,10 @@ class Network extends FleetbaseResource
             'uuid' => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id' => $this->when(Http::isInternalRequest(), $this->public_id),
             'key' => $this->when(Http::isInternalRequest(), $this->key),
+            'company_uuid' => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'created_by_uuid' => $this->when(Http::isInternalRequest(), $this->created_by_uuid),
+            'logo_uuid' => $this->when(Http::isInternalRequest(), $this->logo_uuid),
+            'backdrop_uuid' => $this->when(Http::isInternalRequest(), $this->backdrop_uuid),
             'name' => $this->name,
             'description' => $this->description,
             'translations' => $this->translations ?? [],

package/server/src/Http/Resources/Product.php

@@ -21,6 +21,11 @@ class Product extends FleetbaseResource
             'id' => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'uuid' => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id' => $this->when(Http::isInternalRequest(), $this->public_id),
+            'company_uuid' => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'store_uuid' => $this->when(Http::isInternalRequest(), $this->store_uuid),
+            'category_uuid' => $this->when(Http::isInternalRequest(), $this->category_uuid),
+            'created_by_uuid' => $this->when(Http::isInternalRequest(), $this->created_by_uuid),
+            'primary_image_uuid' => $this->when(Http::isInternalRequest(), $this->primary_image_uuid),
             'name' => $this->name,
             'description' => $this->description,
             'sku' => $this->sku,

package/server/src/Http/Resources/Store.php

@@ -20,6 +20,10 @@ class Store extends FleetbaseResource
             'uuid' => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id' => $this->when(Http::isInternalRequest(), $this->public_id),
             'key' => $this->when(Http::isInternalRequest(), $this->key),
+            'company_uuid' => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'created_by_uuid' => $this->when(Http::isInternalRequest(), $this->created_by_uuid),
+            'logo_uuid' => $this->when(Http::isInternalRequest(), $this->logo_uuid),
+            'backdrop_uuid' => $this->when(Http::isInternalRequest(), $this->backdrop_uuid),
             'name' => $this->name,
             'description' => $this->description,
             'translations' => $this->translations ?? [],

package/server/src/Http/Resources/StoreLocation.php

@@ -3,7 +3,6 @@
 namespace Fleetbase\Storefront\Http\Resources;
 
 use Fleetbase\FleetOps\Http\Resources\v1\Place;
-use Fleetbase\FleetOps\Http\Resources\Internal\v1\Place as InternalPlace;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
 
@@ -24,7 +23,7 @@ class StoreLocation extends FleetbaseResource
             'store' => data_get($this, 'store.public_id'),
             'store_data' => $this->when($request->boolean('with_store'), new Store($this->store)),
             'name' => $this->name,
-            'place' =>  $this->when(Http::isInternalRequest(), new InternalPlace($this->place), new Place($this->place)),
+            'place' => $this->place ? new Place($this->place) : null,
             'hours' => StoreHour::collection($this->hours),
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,

package/tsconfig.declarations.json

@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "declarationDir": "declarations",
+    "emitDeclarationOnly": true,
+    "noEmit": false,
+    "rootDir": "."
+  },
+  "include": ["addon", "addon-test-support"]
+}