From 983f16f1aaf326931ca21c6d2cd13c7940f02ed4 Mon Sep 17 00:00:00 2001 From: Matteo Alessani Date: Fri, 14 Mar 2025 16:44:02 +0100 Subject: [PATCH 1/2] fix: refine buttons and use checkout url when using express payments --- package.json | 6 ++-- packages/cart/package.json | 4 +-- .../cart/src/assets/locales/it/common.json | 4 +-- .../components/Cart/Totals/ButtonCheckout.tsx | 34 +++++++++---------- pnpm-lock.yaml | 10 +++--- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index e5fb5080..f89f6a42 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,9 @@ "node": ">=18", "pnpm": ">=7" }, - "workspaces": ["packages/*"], + "workspaces": [ + "packages/*" + ], "devDependencies": { "@biomejs/biome": "^1.9.4", "husky": "^9.1.7", @@ -36,4 +38,4 @@ "lint-staged": "^15.4.3", "npm-check-updates": "^17.1.15" } -} +} \ No newline at end of file diff --git a/packages/cart/package.json b/packages/cart/package.json index a0632897..02663963 100644 --- a/packages/cart/package.json +++ b/packages/cart/package.json @@ -39,7 +39,7 @@ "dependencies": { "@commercelayer/js-auth": "^6.7.1", "@commercelayer/organization-config": "^2.2.0", - "@commercelayer/react-components": "4.20.0", + "@commercelayer/react-components": "v4.20.1", "@commercelayer/sdk": "6.34.0", "@playwright/test": "^1.50.1", "@tailwindcss/forms": "^0.5.10", @@ -77,4 +77,4 @@ "engines": { "node": ">=18" } -} +} \ No newline at end of file diff --git a/packages/cart/src/assets/locales/it/common.json b/packages/cart/src/assets/locales/it/common.json index e0c1aff5..2812a1c7 100644 --- a/packages/cart/src/assets/locales/it/common.json +++ b/packages/cart/src/assets/locales/it/common.json @@ -15,7 +15,7 @@ "shippingAmount": "Spedizione", "paymentMethodAmount": "Metodo di pagamento", "total": "Totale", - "gotToCheckoutCta": "Checkout", + "gotToCheckoutCta": "Procedi con l'ordine", "returnUrlLabel": "Continua ad acquistare", "quantityNotAvailable": "La quantità selezionata non è disponibile", "retryableErrorCode": "Problemi di connessione", @@ -52,4 +52,4 @@ "coupon_code": "Non corrisponde ad un coupon attivo" } } -} +} \ No newline at end of file diff --git a/packages/cart/src/components/Cart/Totals/ButtonCheckout.tsx b/packages/cart/src/components/Cart/Totals/ButtonCheckout.tsx index 48b29b22..d1727977 100644 --- a/packages/cart/src/components/Cart/Totals/ButtonCheckout.tsx +++ b/packages/cart/src/components/Cart/Totals/ButtonCheckout.tsx @@ -19,22 +19,6 @@ export const ButtonCheckout: FC = () => { return ( <> -
- - } - hide={({ payment_source_type }) => { - // only show stripe payments - return payment_source_type === "stripe_payments" - }} - > - } /> - - -
- { data-test-id="button-checkout" aria-disabled="false" className={ - "button-base bg-primary text-contrast block rounded-md py-3 px-3 !text-xs md:!text-base" + "button-base bg-primary text-contrast block rounded-md py-3 px-3 text-base" } label={label} target={isEmbedded() ? "_top" : undefined} @@ -66,6 +50,22 @@ export const ButtonCheckout: FC = () => { ) } + +
+ + } + hide={({ payment_source_type }) => { + // only show stripe payments + return payment_source_type === "stripe_payments" + }} + > + } /> + + +
) } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 373f99f2..52261d77 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -33,8 +33,8 @@ importers: specifier: ^2.2.0 version: 2.2.0 '@commercelayer/react-components': - specifier: 4.20.0 - version: 4.20.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.34.9)(typescript@5.8.2) + specifier: v4.20.1 + version: 4.20.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.34.9)(typescript@5.8.2) '@commercelayer/sdk': specifier: 6.34.0 version: 6.34.0 @@ -320,8 +320,8 @@ packages: resolution: {integrity: sha512-v7vfLru0WiqocrPWfldmqhbG6VKYQcdu480SUCU4wTnDcXLVnlKfgaadkNnv+tVVZXh0qke8/uwrkNoi3VY/Bw==} engines: {node: '>=18', pnpm: '>=7'} - '@commercelayer/react-components@4.20.0': - resolution: {integrity: sha512-urZU0DexPVoAZwKVUsU2lG1MYWfkrx4luH3dHmK1EeOxEFKesraiJAZSX2N9D7fs8iX1hJfjcvEEvU2aOdyR2w==} + '@commercelayer/react-components@4.20.1': + resolution: {integrity: sha512-sMrvMwL+aI3oCAoggkISl1GFmAAriyw6o6oeFFsFfQ2HPTSjuaHz72l9D8GtKK/ViI9SxhOf3vpKJZhGyg4MdA==} peerDependencies: react: '>=18.0.0' @@ -3887,7 +3887,7 @@ snapshots: dependencies: merge-anything: 5.1.7 - '@commercelayer/react-components@4.20.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.34.9)(typescript@5.8.2)': + '@commercelayer/react-components@4.20.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.34.9)(typescript@5.8.2)': dependencies: '@adyen/adyen-web': 6.9.0 '@commercelayer/organization-config': 2.2.0 From 921a1d281e76e040e02a61f4102b03d95912ee69 Mon Sep 17 00:00:00 2001 From: Matteo Alessani Date: Fri, 14 Mar 2025 18:13:37 +0100 Subject: [PATCH 2/2] v4.1.3 --- lerna.json | 2 +- packages/cart/package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lerna.json b/lerna.json index 425f9e93..24073f2e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "4.1.2", + "version": "4.1.3", "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useNx": false, "npmClient": "pnpm", diff --git a/packages/cart/package.json b/packages/cart/package.json index 02663963..303b7f37 100644 --- a/packages/cart/package.json +++ b/packages/cart/package.json @@ -1,6 +1,6 @@ { "name": "mfe-cart", - "version": "4.1.2", + "version": "4.1.3", "private": true, "author": { "name": "Giuseppe Ciotola", @@ -77,4 +77,4 @@ "engines": { "node": ">=18" } -} \ No newline at end of file +}