@fleetbase/storefront-engine 0.3.17 → 0.3.18

package/addon/components/modals/manage-addons.js

@@ -117,8 +117,12 @@ export default class ModalsManageAddonsComponent extends Component {
             owner_uuid: this.activeStore.id,
         });
 
-        yield category.save();
-        this.categories.pushObject(category);
+        try {
+            yield category.save();
+            this.categories.pushObject(category);
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
     }
 
     /**

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

@@ -21,11 +21,12 @@ export default class ProductsIndexCategoryNewController extends BaseController {
     @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 product = this.store.createRecord('product', { store_uuid: this.activeStore.id, currency: this.activeStore.currency, tags: [], meta_array: [], status: 'published' });
     @tracked uploadQueue = [];
     @tracked uploadedFiles = [];
     @tracked primaryFile = null;
     @tracked isSaving = false;
+    @tracked statusOptions = ['published', 'draft'];
     abilityPermission = 'storefront create product';
 
     /** overlay options */

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

@@ -7,32 +7,9 @@ import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 
 export default class ProductsIndexIndexController extends BaseController {
-    /**
-     * Inject the `filters` service
-     *
-     * @var {Service}
-     */
     @service filters;
-
-    /**
-     * Inject the `intl` service
-     *
-     * @var {Service}
-     */
     @service intl;
-
-    /**
-     * Inject the `currentUser` service
-     *
-     * @var {Service}
-     */
     @service currentUser;
-
-    /**
-     * Inject the `currentUser` service
-     *
-     * @var {Service}
-     */
     @service modalsManager;
 
     /**

package/addon/controllers/settings/gateways.js

@@ -8,6 +8,7 @@ import getGatewaySchemas from '../../utils/get-gateway-schemas';
 export default class SettingsGatewaysController extends Controller {
     @service notifications;
     @service intl;
+    @service hostRouter;
     @service modalsManager;
     @service store;
     @service crud;
@@ -33,7 +34,7 @@ export default class SettingsGatewaysController extends Controller {
                     return;
                 }
 
-                this.gateways.pushObject(gateway);
+                this.hostRouter.refresh();
             },
         });
     }
@@ -70,25 +71,20 @@ export default class SettingsGatewaysController extends Controller {
 
                 set(gateway.config, key, value);
             },
-            confirm: (modal, done) => {
+            confirm: async (modal, done) => {
                 modal.startLoading();
 
-                gateway
-                    .save()
-                    .then((gateway) => {
-                        if (typeof options.successNotification === 'function') {
-                            this.notifications.success(options.successNotification(gateway));
-                        } else {
-                            this.notifications.success(options.successNotification || `${gateway.name} details updated.`);
-                        }
-
-                        done();
-                    })
-                    .catch((error) => {
-                        // gateway.rollbackAttributes();
-                        modal.stopLoading();
-                        this.notifications.serverError(error);
-                    });
+                try {
+                    await gateway.save();
+                    if (typeof options.successNotification === 'function') {
+                        this.notifications.success(options.successNotification(gateway));
+                    } else {
+                        this.notifications.success(options.successNotification || `${gateway.name} details updated.`);
+                    }
+                } catch (error) {
+                    modal.stopLoading();
+                    this.notifications.serverError(error);
+                }
             },
             ...options,
         });

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

@@ -12,6 +12,8 @@ export default class ProductAddonCategoryModel extends Model {
 
     /** @attributes */
     @attr('string') name;
+    @attr('number') max_selectable;
+    @attr('boolean') is_required;
     @attr('raw') excluded_addons;
 
     /** @dates */
@@ -25,6 +27,7 @@ export default class ProductAddonCategoryModel extends Model {
             category_uuid: this.category_uuid,
             product_uuid: this.product_uuid,
             name: this.name,
+            max_selectable: this.max_selectable,
             excluded_addons: getWithDefault(this, 'excluded_addons', []),
             updated_at: this.updated_at,
             created_at: this.created_at,

package/addon/styles/storefront-engine.css

@@ -4,3 +4,10 @@
 .ui-combo-box .selected-list a.combo-box-option.selected:hover {
     background-color: #76a9fa !important;
 }
+
+/** hotfix tag input */
+.emberTagInput.form-input {
+    flex-wrap: wrap !important;
+    gap: 0.35rem !important;
+    height: auto !important;
+}

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

@@ -23,6 +23,9 @@
             <InputGroup @name="Product Description" @helpText="Enter a description of your product">
                 <Textarea @value={{this.product.description}} class="form-input w-full" placeholder="Enter a description of your product...." disabled={{unauthorized}} rows={{4}} />
             </InputGroup>
+            <InputGroup @name="Product Status">
+                <Select class="w-full" @value={{this.product.status}} @placeholder="Select product status" @options={{this.statusOptions}} @onSelect={{fn (mut this.product.status)}} @humanize={{true}} />
+            </InputGroup>
             <InputGroup @name="Product Tags">
                 <TagInput
                     class="form-input"
@@ -261,7 +264,7 @@
                                                 {{addon.description}}
                                             </div>
                                             <div class="col-span-2">
-                                                {{format-currency addon.price}}
+                                                {{format-currency addon.price this.product.currency}}
                                             </div>
                                         </div>
                                     {{/each}}

package/addon/templates/settings/gateways.hbs

@@ -15,7 +15,7 @@
                 </div>
             </div>
 
-            {{#each this.model as |gateway|}}
+            {{#each @model as |gateway|}}
                 <ContentPanel @title={{gateway.name}} @open={{true}} @pad={{true}}>
                     <InputGroup @name={{t "storefront.settings.gateways.gateway-name"}} @value={{gateway.name}} @helpText={{t "storefront.settings.gateways.helpText"}} />
                     <InputGroup

package/addon/templates/settings/index.hbs

@@ -293,14 +293,14 @@
                 <div class="input-group">
                     <Toggle @isToggled={{@model.options.tips_enabled}} @onToggle={{fn (mut @model.options.tips_enabled)}}>
                         <FaIcon @icon="cash-register" class="text-gray-600 dark:text-gray-400 mx-2" /><span class="dark:text-gray-100 text-sm">{{t
-                                "storefront.settings.index.enable-tip"
+                                "storefront.settings.index.enable-tips"
                             }}</span>
                     </Toggle>
                 </div>
                 <div class="input-group">
                     <Toggle @isToggled={{@model.options.delivery_tips_enabled}} @onToggle={{fn (mut @model.options.delivery_tips_enabled)}}>
                         <FaIcon @icon="face-smile" class="text-gray-600 dark:text-gray-400 mx-2" /><span class="dark:text-gray-100 text-sm">{{t
-                                "storefront.settings.index.enable-integrated-vendors"
+                                "storefront.settings.index.enable-delivery-tips"
                             }}</span>
                     </Toggle>
                 </div>

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.3.17",
+    "version": "0.3.18",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.3.17",
+    "version": "0.3.18",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/storefront",
     "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/storefront-engine",
-    "version": "0.3.17",
+    "version": "0.3.18",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",

package/server/src/Http/Controllers/ProductController.php

@@ -41,6 +41,8 @@ class ProductController extends StorefrontController
                 $variants        = $request->array('product.variants');
                 $files           = $request->array('product.files');
 
+                // dd($addonCategories);
+
                 // save addon categories
                 $product->setAddonCategories($addonCategories);