Merge branch 'develop' into main

vuestorefront-community · Nov 8, 2022 · 5b6317b · 5b6317b
2 parents 3009291 + 51e0722
commit 5b6317b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/prestashop-api",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": false,
   "sideEffects": false,
   "server": "server/index.js",

diff --git a/packages/composables/package.json b/packages/composables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/prestashop",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": false,
   "sideEffects": false,
   "main": "lib/index.cjs.js",
@@ -16,7 +16,7 @@
     "update:update": "ncu -u"
   },
   "dependencies": {
-    "@vue-storefront/prestashop-api": "1.1.0",
+    "@vue-storefront/prestashop-api": "1.1.1",
     "@vue-storefront/core": "~2.5.4"
   },
   "devDependencies": {

diff --git a/packages/theme/middleware/checkout.js b/packages/theme/middleware/checkout.js
@@ -8,14 +8,18 @@ export default async ({ app, $vsf }) => {
   const psCookieKey = $vsf.$prestashop.config.app.$cookies.get(vsfCookieKey);
   const psCookieValue = $vsf.$prestashop.config.app.$cookies.get(vsfCookieValue);
 
+  const lang = $vsf.$prestashop.config.app.i18n.locales && $vsf.$prestashop.config.app.i18n.locales.length > 1 ? '/' + $vsf.$prestashop.config.app.$cookies.get('vsf-locale') : '';
+  const currency = $vsf.$prestashop.config.app.$cookies.get('vsf-currency');
+
   switch (currentPath) {
     case 'payment':
-      const customer = await $vsf.$prestashop.api.loadCustomer({key: psCookieKey, value: psCookieValue});
+      const customer = await $vsf.$prestashop.api.loadCustomer({key: psCookieKey, value: psCookieValue, lang: lang, currency: currency});
+
       if (customer.code === 410) {
         app.context.redirect('/checkout/user-account');
       }
 
-      const { data } = await $vsf.$prestashop.api.getPaymentMethods({ psCookieKey, psCookieValue });
+      const { data } = await $vsf.$prestashop.api.getPaymentMethods({ psCookieKey, psCookieValue, lang: lang, currency: currency});
 
       if (data.code === 200) {
         if (Object.keys(data.psdata).length === 0) {
@@ -26,7 +30,7 @@ export default async ({ app, $vsf }) => {
       }
       break;
     case 'shipping':
-      const result = await $vsf.$prestashop.api.loadCustomer({key: psCookieKey, value: psCookieValue});
+      const result = await $vsf.$prestashop.api.loadCustomer({key: psCookieKey, value: psCookieValue, lang: lang, currency: currency});
       if (result.code === 410) {
         app.context.redirect('/checkout/user-account');
       }

diff --git a/packages/theme/package.json b/packages/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/prestashop-theme",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "scripts": {
     "build": "nuxt build -m",
@@ -24,7 +24,7 @@
     "@vue-storefront/middleware": "~2.5.4",
     "@vue-storefront/nuxt": "~2.5.4",
     "@vue-storefront/nuxt-theme": "~2.5.4",
-    "@vue-storefront/prestashop": "1.1.0",
+    "@vue-storefront/prestashop": "1.1.1",
     "cookie-universal-nuxt": "^2.1.5",
     "core-js": "^3.19.0",
     "nuxt": "^2.15.8",