@sonic-equipment/ui 258.0.1 → 258.0.3

package/dist/index.js

@@ -237,7 +237,7 @@ export { CheckoutPageSectionHeader } from './pages/checkout/layouts/checkout-pag
 export { CheckoutPageSectionLink } from './pages/checkout/layouts/checkout-page-layout/components/checkout-page-section-link.js';
 export { OrderConfirmationPage } from './pages/checkout/order-confirmation-page/order-confirmation-page.js';
 export { OrderConfirmationPageContent } from './pages/checkout/order-confirmation-page/order-confirmation-page-content.js';
-export { AdyenPayment, getAdyenQueryParams } from './pages/checkout/payment-page/components/adyen-payment.js';
+export { AdyenPayment, getAdyenQueryParams, removeAdyenQueryParamsFromUrl } from './pages/checkout/payment-page/components/adyen-payment.js';
 export { Payment } from './pages/checkout/payment-page/components/payment.js';
 export { useGetAdyenRedirectResult } from './pages/checkout/payment-page/hooks/use-get-adyen-redirect-result.js';
 export { useHasReturnedFromAdyen } from './pages/checkout/payment-page/hooks/use-has-returned-from-adyen.js';

package/dist/pages/checkout/payment-page/components/adyen-payment.d.ts

@@ -27,4 +27,5 @@ export declare function getAdyenQueryParams(): {
     customerId: string | undefined;
     redirectResult: string | undefined;
 };
+export declare function removeAdyenQueryParamsFromUrl(): void;
 export {};

package/dist/pages/checkout/payment-page/components/adyen-payment.js

@@ -105,6 +105,8 @@ function AdyenPayment({ amount, cartId, countryCode, currencyCode, customerId, d
             const dropIn = checkout.create('dropin');
             if (redirectResult) {
                 checkout.submitDetails({ details: { redirectResult } });
+                removeAdyenQueryParamsFromUrl();
+                queryStringParams.current = {};
             }
             if (dropinRef.current)
                 dropinRef.current.unmount();
@@ -176,6 +178,20 @@ async function handlePaymentResponse(result, onSubmit, onError) {
         onError(error, result);
     }
 }
+function removeAdyenQueryParamsFromUrl() {
+    if (typeof window === 'undefined')
+        return;
+    try {
+        const url = new URL(window.location.href);
+        url.searchParams.delete('amount');
+        url.searchParams.delete('customerId');
+        url.searchParams.delete('redirectResult');
+        window.history.replaceState(null, '', url.toString());
+    }
+    catch (error) {
+        logger.error(error);
+    }
+}
 function handleRedirectPaymentAction(adyenPaymentResult) {
     if (typeof window === 'undefined' || typeof document === 'undefined')
         return;
@@ -198,4 +214,4 @@ function handleRedirectPaymentAction(adyenPaymentResult) {
     }
 }
 
-export { AdyenPayment, getAdyenQueryParams };
+export { AdyenPayment, getAdyenQueryParams, removeAdyenQueryParamsFromUrl };

package/dist/pages/checkout/payment-page/components/payment.js

@@ -22,23 +22,9 @@ import { useDataLayer } from '../../../../shared/ga/use-data-layer.js';
 import { getCurrencyCodeBySymbol } from '../../../../shared/model/currency.js';
 import { isProductionEnvironment } from '../../../../shared/utils/environment.js';
 import { BillingAndInvoiceInformation } from '../../components/billing-and-invoice-information.js';
-import { AdyenPayment } from './adyen-payment.js';
+import { removeAdyenQueryParamsFromUrl, AdyenPayment } from './adyen-payment.js';
 import styles from './payment.module.css.js';
 
-function removeAdyenQueryParamsFromUrl() {
-    if (typeof window === 'undefined')
-        return;
-    try {
-        const url = new URL(window.location.href);
-        url.searchParams.delete('amount');
-        url.searchParams.delete('customerId');
-        url.searchParams.delete('redirectResult');
-        window.history.replaceState(null, '', url.toString());
-    }
-    catch (error) {
-        logger.error(error);
-    }
-}
 function Payment({ atp, cart: _cart, form, isProcessing, onError: _onError, onPaymentComplete, onProcessing, }) {
     const { createEcommerceEvent, dataLayer } = useDataLayer();
     const { mutate: patchCart } = usePatchCart();
@@ -167,6 +153,7 @@ function Payment({ atp, cart: _cart, form, isProcessing, onError: _onError, onPa
             catch (error) {
                 logger.error(error);
                 invalidateCurrentCart();
+                onProcessing(false);
             }
             finally {
                 onProcessing(false);
@@ -189,6 +176,7 @@ function Payment({ atp, cart: _cart, form, isProcessing, onError: _onError, onPa
                 logger.error(error);
                 setPaymentError(error);
                 invalidateCurrentCart();
+                onProcessing(false);
             }
             finally {
                 onProcessing(false);
@@ -221,6 +209,7 @@ function Payment({ atp, cart: _cart, form, isProcessing, onError: _onError, onPa
         }
         catch (error) {
             logger.error(error);
+            onProcessing(false);
             setAPIError(error);
         }
         finally {
@@ -229,10 +218,10 @@ function Payment({ atp, cart: _cart, form, isProcessing, onError: _onError, onPa
         }
     }, [onPaymentComplete, onPlaceOrderCompleted, onProcessing, placeOrder]);
     const onError = useCallback((error, result) => {
-        onProcessing(false);
         invalidateAdyen();
         setPaymentError(error);
         logger.error(error);
+        onProcessing(false);
         _onError?.(error, result);
     }, [_onError, invalidateAdyen, onProcessing]);
     return (jsxs(Form, { className: styles['payment-form'], "data-test-selector": "paymentForm", id: form, onSubmit: e => {

package/dist/pages/checkout/payment-page/payment-page-content.js

@@ -31,7 +31,7 @@ function PaymentPageContent({ atp, cart, formId, hasAtp, isProcessing, onPayment
         ], "data-test-selector": "paymentPage", title: t('Review and payment'), children: jsxs(CheckoutPageLayout, { actions: {
                 primary: (jsx(Button, { withArrow: true, "data-test-selector": "checkoutReviewAndSubmit_placeOrder", form: formId, isDisabled: isProcessing, isLoading: isProcessing ? jsx(FormattedMessage, { id: "Processing" }) : false, type: "submit", children: cart.paymentMethod?.name === 'PBI' ? (jsx(FormattedMessage, { id: "Finalize order" })) : (jsx(FormattedMessage, { id: "Finalize payment" })) })),
             }, mobileSummary: jsx(CartTotalsSummary, { currencyCode: currencyCode, totalAmount: cart.orderGrandTotal }), overview: jsx(CartTotals, { currencyCode: currencyCode, deliveryDate: hasAtp ? undefined : cart.requestedDeliveryDate, fulfillmentMethod: cart.fulfillmentMethod, isPayByInvoice: (cart.paymentOptions?.paymentMethods?.length || 1) <= 1 &&
-                    cart.paymentMethod?.name === 'PBI', shippingCost: cart.shippingAndHandling, subtotal: cart.orderSubTotal, tax: cart.totalTax, total: cart.orderGrandTotal, vatPercentage: cart.cartLines?.[0]?.pricing?.vatRate || 0 }), children: [jsx(CheckoutPageSection, { hasBorder: false, title: jsx(FormattedMessage, { id: "Payment" }), children: jsx(CheckoutPageSectionContent, { children: jsx(Payment, { atp: atp, cart: cart, form: formId, isProcessing: isProcessing, onPaymentComplete: onPaymentComplete, onProcessing: setIsProcessing }) }) }), jsx(CheckoutPageSection, { hasBorder: false, title: jsx(FormattedMessage, { id: "Order" }), children: jsx(CheckoutPageSectionContent, { stretch: true, children: jsx(OrderLineList, { children: cart.cartLines?.map(cartLine => (jsx(OrderLineCard, { deliveryDate: cartLine.atp?.date ?? null, href: cartLine.productUri, image: {
+                    cart.paymentMethod?.name === 'PBI', shippingCost: cart.shippingAndHandling, subtotal: cart.orderSubTotal, tax: cart.totalTax, total: cart.orderGrandTotal, vatPercentage: cart.cartLines?.[0]?.pricing?.vatRate || 0 }), children: [jsx(CheckoutPageSection, { hasBorder: false, title: jsx(FormattedMessage, { id: "Payment" }), children: jsx(CheckoutPageSectionContent, { children: jsx(Payment, { atp: atp, cart: cart, form: formId, isProcessing: isProcessing, onError: () => setIsProcessing(false), onPaymentComplete: onPaymentComplete, onProcessing: setIsProcessing }) }) }), jsx(CheckoutPageSection, { hasBorder: false, title: jsx(FormattedMessage, { id: "Order" }), children: jsx(CheckoutPageSectionContent, { stretch: true, children: jsx(OrderLineList, { children: cart.cartLines?.map(cartLine => (jsx(OrderLineCard, { deliveryDate: cartLine.atp?.date ?? null, href: cartLine.productUri, image: {
                                     fit: 'contain',
                                     image: {
                                         '1': cartLine.smallImagePath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonic-equipment/ui",
-  "version": "258.0.1",
+  "version": "258.0.3",
   "type": "module",
   "license": "MIT",
   "engines": {