Merge pull request #15 from fleetbase/dev-v0.3.1

v0.3.1
fleetbase · Feb 21, 2024 · c356f46 · c356f46
2 parents b5776ac + e997c21
commit c356f46
Show file tree

Hide file tree

Showing 21 changed files with 508 additions and 558 deletions.
diff --git a/addon/controllers/networks/index/network/index.js b/addon/controllers/networks/index/network/index.js
@@ -89,7 +89,7 @@ export default class NetworksIndexNetworkIndexController extends Controller {
         this.model
             .save()
             .then(() => {
-                this.notifications.success(this.intl.t('storefront.controllers.networks.index.change-network-saved'));
+                this.notifications.success(this.intl.t('storefront.networks.index.network.index.change-network-saved'));
             })
             .catch((error) => {
                 this.notifications.serverError(error);

diff --git a/addon/controllers/products/index/category/new.js b/addon/controllers/products/index/category/new.js
@@ -140,10 +140,10 @@ export default class ProductsIndexCategoryNewController extends BaseController {
 
     @action makePrimaryFile(file) {
         if (file.isNotImage) {
-            return this.notifications.warning(this.intl.t('storefront.products.index.category.new.warning-only-select-an-image-file-to-be-primary'));
+            return this.notifications.warning(this.intl.t('storefront.products.index.new.warning-only-select-an-image-file-to-be-primary'));
         }
 
-        this.notifications.success(this.intl.t('storefront.products.index.category.new.made-the-primary-success-image', { fileName: file.original_filename }));
+        this.notifications.success(this.intl.t('storefront.products.index.new.made-the-primary-success-image', { fileName: file.original_filename }));
         this.product.primary_image_uuid = file.id;
         this.product.primary_image_url = file.url;
         this.product.primary_image = file;

diff --git a/addon/templates/networks/index/network/index.hbs b/addon/templates/networks/index/network/index.hbs
@@ -183,7 +183,10 @@
                             }}</span>
                     </Toggle>
                     {{#if @model.options.require_pod}}
-                        <InputGroup @wrapperClass="mb-0 mt-2" @name={{t "storefront.networks.index.network.index.general-network-settings-form.config-switches.proof-of-delivery-method"}}>
+                        <InputGroup
+                            @wrapperClass="mb-0 mt-2"
+                            @name={{t "storefront.networks.index.network.index.general-network-settings-form.config-switches.proof-of-delivery-method-label"}}
+                        >
                             <Select
                                 @options={{this.podMethods}}
                                 @optionValue="value"

diff --git a/addon/templates/settings/gateways.hbs b/addon/templates/settings/gateways.hbs
@@ -15,7 +15,7 @@
                 </div>
             </div>
 
-            {{#each this.gateways as |gateway|}}
+            {{#each this.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 @name={{t "storefront.settings.gateways.gateway-code"}} @value={{gateway.code}} @disabled={{true}} @helpText={{t "storefront.settings.gateways.gateway-code-help-text"}} />

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,8 +22,8 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.3",
-        "fleetbase/fleetops-api": "^0.4.9",
+        "fleetbase/core-api": "^1.4.7",
+        "fleetbase/fleetops-api": "^0.4.13",
         "geocoder-php/google-maps-places-provider": "^1.4",
         "laravel-notification-channels/apn": "^5.0",
         "laravel-notification-channels/fcm": "^4.1",

diff --git a/extension.json b/extension.json
@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/storefront",
     "license": "MIT",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/storefront-engine",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",
@@ -44,8 +44,8 @@
     },
     "dependencies": {
         "@fleetbase/ember-core": "^0.2.4",
-        "@fleetbase/ember-ui": "^0.2.10",
-        "@fleetbase/fleetops-data": "^0.1.8",
+        "@fleetbase/ember-ui": "^0.2.11",
+        "@fleetbase/fleetops-data": "^0.1.9",
         "@babel/core": "^7.23.2",
         "@fortawesome/ember-fontawesome": "^0.4.1",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",