@fleetbase/storefront-engine 0.2.4 → 0.2.6

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>
@@ -117,7 +117,7 @@
         </ContentPanel>
 
         <ContentPanel @title="Add-Ons" @open={{this.product.addon_categories.length}} @pad={{false}} @panelBodyWrapperClass="px-0 py-4" @panelBodyClass="bg-white dark:bg-gray-800">
-            <div class="px-4 py-3">
+            <div class="px-4">
                 <div class="flex items-center justify-end mb-3">
                     <Button @text="Select Addon Categories" @icon="plus" @iconPrefix="fas" @onClick={{this.selectAddonCategory}} />
                 </div>
@@ -139,7 +139,7 @@
                                 {{#each addonCategory.category.addons as |addon|}}
                                     <div class="grid grid-cols-10 gap-1 px-3 py-2 rounded-md border border-gray-200 dark:border-gray-900 dark:text-gray-100 dark:bg-gray-800 bg-gray-200">
                                         <div class="flex items-center">
-                                            <Checkbox @value={{not-in-array addon.id addonCategory.excluded_addons}} @onToggle={{fn this.excludeAddon index addon}} />
+                                            <Checkbox @value={{not (in-array addon.id addonCategory.excluded_addons)}} @onToggle={{fn this.excludeAddon index addon}} />
                                         </div>
                                         <div class="col-span-3 flex items-center">
                                             {{addon.name}}

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

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.2.4",
+    "version": "0.2.6",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,8 +22,8 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "fleetbase/core-api": "^1.3.2",
-        "fleetbase/fleetops-api": "^0.3.2",
+        "fleetbase/core-api": "^1.3.6",
+        "fleetbase/fleetops-api": "^0.3.8",
         "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/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.2.4",
+    "version": "0.2.6",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/storefront",
     "license": "MIT",

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.6",
+  "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/Auth/Schemas/Storefront.php

@@ -6,90 +6,82 @@ class Storefront
 {
     /**
      * The permission schema Name.
-     *
-     * @var string
      */
     public string $name = 'storefront';
 
     /**
      * The permission schema Polict Name.
-     *
-     * @var string
      */
     public string $policyName = 'Storefront';
 
     /**
      * Guards these permissions should apply to.
-     *
-     * @var array
      */
     public array $guards = ['web', 'api'];
 
     /**
      * The permission schema resources.
-     *
-     * @var array
      */
     public array $resources = [
         [
-            'name' => 'order',
-            'actions' => ['accept', 'mark-as-ready', 'mark-as-completed', 'reject']
+            'name'    => 'order',
+            'actions' => ['accept', 'mark-as-ready', 'mark-as-completed', 'reject'],
         ],
         [
-            'name' => 'product',
-            'actions' => ['import']
+            'name'    => 'product',
+            'actions' => ['import'],
         ],
         [
-            'name' => 'product-addon',
-            'actions' => []
+            'name'    => 'product-addon',
+            'actions' => [],
         ],
         [
-            'name' => 'product-addon-category',
-            'actions' => []
+            'name'    => 'product-addon-category',
+            'actions' => [],
         ],
         [
-            'name' => 'product-hour',
-            'actions' => []
+            'name'    => 'product-hour',
+            'actions' => [],
         ],
         [
-            'name' => 'product-store-location',
-            'actions' => []
+            'name'    => 'product-store-location',
+            'actions' => [],
         ],
         [
-            'name' => 'product-variant',
-            'actions' => []
+            'name'    => 'product-variant',
+            'actions' => [],
         ],
         [
-            'name' => 'product-variant-option',
-            'actions' => []
+            'name'    => 'product-variant-option',
+            'actions' => [],
         ],
         [
-            'name' => 'gateway',
-            'actions' => []
+            'name'    => 'gateway',
+            'actions' => [],
         ],
         [
-            'name' => 'notification-channel',
-            'actions' => []
+            'name'    => 'notification-channel',
+            'actions' => [],
         ],
         [
-            'name' => 'network',
-            'actions' => []
+            'name'    => 'network',
+            'actions' => [],
         ],
         [
-            'name' => 'network-store',
-            'actions' => []
+            'name'    => 'network-store',
+            'actions' => [],
         ],
         [
-            'name' => 'store',
-            'actions' => []
+            'name'    => 'store',
+            'actions' => [],
         ],
         [
-            'name' => 'store-location',
-            'actions' => []
+            'name'    => 'store-location',
+            'actions' => [],
         ],
         [
-            'name' => 'store-hour',
-            'actions' => []
-        ]
+            'name'    => 'store-hour',
+            'actions' => [],
+        ],
     ];
 }

package/server/src/Console/Commands/NotifyStorefrontOrderNearby.php

@@ -33,17 +33,17 @@ class NotifyStorefrontOrderNearby extends Command
         // Get storefront orders that are enroute
         $orders = $this->getActiveStorefrontOrders();
 
-        // Notify and update 
+        // Notify and update
         $this->alert('Found (' . $orders->count() . ') Storefront Orders which are Enroute.');
 
         // Iterate each order
         $orders->each(
             function ($order) {
-                $origin = $order->payload->getPickupOrFirstWaypoint();
+                $origin      = $order->payload->getPickupOrFirstWaypoint();
                 $destination = $order->payload->getDropoffOrLastWaypoint();
-                $matrix = Utils::getDrivingDistanceAndTime($origin, $destination);
-                $distance = $matrix->distance;
-                $time = $matrix->time;
+                $matrix      = Utils::getDrivingDistanceAndTime($origin, $destination);
+                $distance    = $matrix->distance;
+                $time        = $matrix->time;
 
                 if (!$distance || !$time) {
                     return;
@@ -63,21 +63,19 @@ class NotifyStorefrontOrderNearby extends Command
 
     /**
      * Fetches active storefront orders based on certain criteria.
-     *
-     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function getActiveStorefrontOrders(): \Illuminate\Database\Eloquent\Collection
     {
         return Order::where(
             [
-                'status' => 'driver_enroute',
-                'type' => 'storefront',
-                'dispatched' => true
+                'status'     => 'driver_enroute',
+                'type'       => 'storefront',
+                'dispatched' => true,
             ]
         )->with(
             [
                 'payload',
-                'customer'
+                'customer',
             ]
         )
             ->withoutGlobalScopes()

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);
+                }
+            );
+        };
+    }
+}