@fleetbase/storefront-engine 0.2.5 → 0.2.7

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

@@ -17,6 +17,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
     @service fetch;
     @service loader;
     @service crud;
+    @service hostRouter;
     @alias('storefront.activeStore') activeStore;
     @tracked product = this.store.createRecord('product', { store_uuid: this.activeStore.id, currency: this.activeStore.currency, tags: [], meta_array: [] });
     @tracked uploadQueue = [];
@@ -58,15 +59,13 @@ export default class ProductsIndexCategoryNewController extends BaseController {
         this.product
             .serializeMeta()
             .save()
-            .then((product) => {
+            .then(() => {
                 this.loader.removeLoader(loader);
                 this.isSaving = false;
                 this.notifications.success('New product created successfully!');
 
                 return this.transitionToRoute('products.index.category').then(() => {
-                    console.log(this.productsIndexCategoryController);
-                    console.log(this.productsIndexCategoryController.products);
-                    this.productsIndexCategoryController?.products?.pushObject(product);
+                    return this.hostRouter.refresh();
                 });
             })
             .catch((error) => {
@@ -81,8 +80,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
             this.product.tags = [];
         }
 
-        this.product.tags?.pushObject(tag);
-        console.log('this.product.tags', this.product.tags);
+        this.product.tags.pushObject(tag);
     }
 
     @action removeTag(index) {
@@ -191,7 +189,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
                         });
                     });
 
-                    product.addon_categories = productAddonCategories;
+                    product.addon_categories.pushObjects(productAddonCategories);
                 },
             });
         });
@@ -265,8 +263,6 @@ export default class ProductsIndexCategoryNewController extends BaseController {
         } else {
             productAddonCategory.excluded_addons.pushObject(id);
         }
-
-        console.log(productAddonCategory);
     }
 
     @action addMetaField() {

package/addon/models/product-addon-category.js

@@ -1,5 +1,6 @@
 import Model, { attr, belongsTo } from '@ember-data/model';
 import { format, formatDistanceToNow } from 'date-fns';
+import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
 
 export default class ProductAddonCategoryModel extends Model {
     /** @ids */
@@ -19,7 +20,15 @@ export default class ProductAddonCategoryModel extends Model {
 
     /** @methods */
     toJSON() {
-        return this.serialize();
+        return {
+            uuid: this.id,
+            category_uuid: this.category_uuid,
+            product_uuid: this.product_uuid,
+            name: this.name,
+            excluded_addons: getWithDefault(this, 'excluded_addons', []),
+            updated_at: this.updated_at,
+            created_at: this.created_at,
+        };
     }
 
     /** @computed */

package/addon/models/product-variant.js

@@ -4,8 +4,6 @@ import { format, formatDistanceToNow } from 'date-fns';
 export default class ProductVariantModel extends Model {
     /** @ids */
     @attr('string') product_uuid;
-    @attr('string') created_by_uuid;
-    @attr('string') company_uuid;
 
     /** @relationships */
     @hasMany('product-variant-option') options;

package/addon/models/product.js

@@ -20,7 +20,7 @@ export default class ProductModel extends Model {
     @belongsTo('file') primary_image;
     @hasMany('file') files;
     @hasMany('product-variant', { async: false }) variants;
-    @hasMany('product-addon-category') addon_categories;
+    @hasMany('product-addon-category', { async: false }) addon_categories;
     @hasMany('product-hour') hours;
 
     /** @attributes */
@@ -56,7 +56,40 @@ export default class ProductModel extends Model {
 
     /** @methods */
     toJSON() {
-        return this.serialize();
+        return {
+            uuid: this.id,
+            created_by_uuid: this.created_by_uuid,
+            company_uuid: this.company_uuid,
+            store_uuid: this.store_uuid,
+            category_uuid: this.category_uuid,
+            primary_image_uuid: this.primary_image_uuid,
+            public_id: this.public_id,
+            name: this.name,
+            category: this.category,
+            primary_image: this.primary_image,
+            files: this.files,
+            variants: this.variants,
+            addon_categories: this.addon_categories,
+            hours: this.hours,
+            description: this.description,
+            primary_image_url: this.primary_image_url,
+            sku: this.sku,
+            currency: this.currency,
+            price: this.price,
+            sale_price: this.sale_price,
+            tags: this.tags,
+            youtube_urls: this.youtube_urls,
+            translations: this.translations,
+            is_on_sale: this.is_on_sale,
+            is_recommended: this.is_recommended,
+            is_service: this.is_service,
+            is_available: this.is_available,
+            is_bookable: this.is_bookable,
+            status: this.status,
+            slug: this.slug,
+            created_at: this.created_at,
+            updated_at: this.updated_at,
+        };
     }
 
     /** @computed */

package/addon/serializers/product.js

@@ -1,5 +1,6 @@
 import ApplicationSerializer from '@fleetbase/ember-core/serializers/application';
 import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
+import { isArray } from '@ember/array';
 
 export default class ProductSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) {
     /**
@@ -17,4 +18,19 @@ export default class ProductSerializer extends ApplicationSerializer.extend(Embe
             category: { embedded: 'always' },
         };
     }
+
+    serializeHasMany(snapshot, json, relationship) {
+        let key = relationship.key;
+
+        if (key === 'addon_categories') {
+            const addonCategories = snapshot.record.get('addon_categories');
+
+            if (isArray(addonCategories)) {
+                json.addon_categories = addonCategories;
+            }
+            return;
+        }
+
+        return super.serializeHasMany(...arguments);
+    }
 }

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

@@ -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/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.2.4",
+    "version": "0.2.7",
     "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.5",
+        "fleetbase/core-api": "^1.3.10",
+        "fleetbase/fleetops-api": "^0.4.0",
         "geocoder-php/google-maps-places-provider": "^1.4",
         "laravel-notification-channels/apn": "^3.8",
         "laravel-notification-channels/fcm": "^2.7",

package/extension.json

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

package/package.json

@@ -1,134 +1,134 @@
 {
-  "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
-        }
-      }
-    ]
-  }
+    "name": "@fleetbase/storefront-engine",
+    "version": "0.2.7",
+    "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.2.0",
+        "@fleetbase/ember-ui": "^0.2.9",
+        "@fleetbase/fleetops-data": "^0.1.7",
+        "@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()