From 8713784cb859aeeeb18e7cc49318fb5680f223c7 Mon Sep 17 00:00:00 2001 From: Alessandro Casazza Date: Mon, 8 Jul 2024 20:00:31 +0200 Subject: [PATCH 1/5] Fix customer payments provided by Adyen --- .../src/components/payment_source/AdyenPayment.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/react-components/src/components/payment_source/AdyenPayment.tsx b/packages/react-components/src/components/payment_source/AdyenPayment.tsx index b2e29b6e..ed549685 100644 --- a/packages/react-components/src/components/payment_source/AdyenPayment.tsx +++ b/packages/react-components/src/components/payment_source/AdyenPayment.tsx @@ -369,13 +369,15 @@ export function AdyenPayment({ paymentMethodsResponse, showPayButton: false, paymentMethodsConfiguration: { - showStoredPaymentMethods: true, + // @ts-expect-error no type + showStoredPaymentMethods: paymentSource?.payment_methods?.storedPaymentMethods?.lenght > 0 ?? false, paypal: { showPayButton: true, style: styles?.paypal }, card: { - enableStoreDetails: true, + // @ts-expect-error no type + enableStoreDetails: paymentSource?.payment_methods?.storedPaymentMethods?.lenght > 0 ?? false, styles: styles?.card, holderNameRequired: false } From ede2af890eefbe1aa97f47db8b49bb68c8e48876 Mon Sep 17 00:00:00 2001 From: Alessandro Casazza Date: Mon, 8 Jul 2024 20:06:23 +0200 Subject: [PATCH 2/5] v4.14.3-beta.0 --- lerna.json | 4 ++-- packages/react-components/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lerna.json b/lerna.json index f9128b02..e7df3d80 100644 --- a/lerna.json +++ b/lerna.json @@ -2,10 +2,10 @@ "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useNx": false, "npmClient": "pnpm", - "version": "4.14.2", + "version": "4.14.3-beta.0", "command": { "version": { "preid": "beta" } } -} \ No newline at end of file +} diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 3b20d57e..9f3c6d5e 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@commercelayer/react-components", - "version": "4.14.2", + "version": "4.14.3-beta.0", "description": "The Official Commerce Layer React Components", "main": "lib/cjs/index.js", "module": "lib/esm/index.js", From 407857b560926721c57e075b399dd433f5178961 Mon Sep 17 00:00:00 2001 From: Alessandro Casazza Date: Tue, 9 Jul 2024 16:38:53 +0200 Subject: [PATCH 3/5] Fix payment localization --- .../src/components/payment_source/AdyenPayment.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-components/src/components/payment_source/AdyenPayment.tsx b/packages/react-components/src/components/payment_source/AdyenPayment.tsx index ed549685..590b147c 100644 --- a/packages/react-components/src/components/payment_source/AdyenPayment.tsx +++ b/packages/react-components/src/components/payment_source/AdyenPayment.tsx @@ -356,9 +356,9 @@ export function AdyenPayment({ 'Payment methods are not available. Please, check your Adyen configuration.' ) } - + console.log('order?.country_code', order?.country_code) const options = { - locale, + locale: order?.country_code != null ? `${order?.country_code?.toLowerCase()}_${order?.country_code}` : locale, environment, clientKey, amount: { @@ -370,14 +370,14 @@ export function AdyenPayment({ showPayButton: false, paymentMethodsConfiguration: { // @ts-expect-error no type - showStoredPaymentMethods: paymentSource?.payment_methods?.storedPaymentMethods?.lenght > 0 ?? false, + showStoredPaymentMethods: paymentSource?.payment_methods?.storedPaymentMethods != null ?? false, paypal: { showPayButton: true, style: styles?.paypal }, card: { // @ts-expect-error no type - enableStoreDetails: paymentSource?.payment_methods?.storedPaymentMethods?.lenght > 0 ?? false, + enableStoreDetails: paymentSource?.payment_methods?.storedPaymentMethods != null ?? false, styles: styles?.card, holderNameRequired: false } From bba89ef7144361f187839f39ceb0f68ee85c6386 Mon Sep 17 00:00:00 2001 From: Alessandro Casazza Date: Tue, 9 Jul 2024 16:39:55 +0200 Subject: [PATCH 4/5] v4.14.3-beta.1 --- lerna.json | 2 +- packages/react-components/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index e7df3d80..a664b4e9 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useNx": false, "npmClient": "pnpm", - "version": "4.14.3-beta.0", + "version": "4.14.3-beta.1", "command": { "version": { "preid": "beta" diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 9f3c6d5e..8a6f6aeb 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@commercelayer/react-components", - "version": "4.14.3-beta.0", + "version": "4.14.3-beta.1", "description": "The Official Commerce Layer React Components", "main": "lib/cjs/index.js", "module": "lib/esm/index.js", From 92bc8f17d33cdb062255bb273b5ea1c12dbe77a1 Mon Sep 17 00:00:00 2001 From: Alessandro Casazza Date: Wed, 10 Jul 2024 15:42:53 +0200 Subject: [PATCH 5/5] Fix payment localization --- .../src/components/payment_source/AdyenPayment.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/react-components/src/components/payment_source/AdyenPayment.tsx b/packages/react-components/src/components/payment_source/AdyenPayment.tsx index 590b147c..0ea6aeaf 100644 --- a/packages/react-components/src/components/payment_source/AdyenPayment.tsx +++ b/packages/react-components/src/components/payment_source/AdyenPayment.tsx @@ -356,9 +356,8 @@ export function AdyenPayment({ 'Payment methods are not available. Please, check your Adyen configuration.' ) } - console.log('order?.country_code', order?.country_code) const options = { - locale: order?.country_code != null ? `${order?.country_code?.toLowerCase()}_${order?.country_code}` : locale, + locale: order?.language_code ?? locale, environment, clientKey, amount: {