@sonic-equipment/ui 135.0.0 → 137.0.0

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

@@ -42,34 +42,44 @@ function AdyenPayment({ amount, cartId, countryCode, currencyCode, customerId, d
                 if (!state.details.redirectResult) {
                     return onError(new Error('No redirectResult'), null);
                 }
-                const result = await getAdyenPaymentDetails({
-                    redirectResult: state.details.redirectResult,
-                });
-                if (amount.toFixed(2).replaceAll(/[,.]/gi, '') !== adyenAmount)
-                    return onError(new Error('Invalid amount'), result);
-                if (customerId !== adyenCustomerId)
-                    return onError(new Error('Invalid customer'), result);
-                return handlePaymentResponse(result, onComplete, onError);
+                try {
+                    const result = await getAdyenPaymentDetails({
+                        redirectResult: state.details.redirectResult,
+                    });
+                    if (amount.toFixed(2).replaceAll(/[,.]/gi, '') !== adyenAmount)
+                        return onError(new Error('Invalid amount'), result);
+                    if (customerId !== adyenCustomerId)
+                        return onError(new Error('Invalid customer'), result);
+                    return handlePaymentResponse(result, onComplete, onError);
+                }
+                catch (error) {
+                    return onError(error, null);
+                }
             }),
             onSubmit: (async (state, _component) => {
-                dropinDivRef.current?.classList.add(styles.loading);
-                if (state.data.paymentMethod.type === 'paybybank') {
-                    state.data.countryCode = countryCode;
-                }
-                const result = await postAdyenPayment({
-                    currencyCode,
-                    data: state.data,
-                    orderAmount,
-                    returnUrl,
-                    webOrderNumber: adyenSession.webOrderNumber,
-                });
-                if (result.action) {
-                    if (result.action.type === 'redirect') {
-                        return handleRedirectPaymentAction(result);
+                try {
+                    dropinDivRef.current?.classList.add(styles.loading);
+                    if (state.data.paymentMethod.type === 'paybybank') {
+                        state.data.countryCode = countryCode;
                     }
-                    return onError(new Error('Invalid payment response'), result);
+                    const result = await postAdyenPayment({
+                        currencyCode,
+                        data: state.data,
+                        orderAmount,
+                        returnUrl,
+                        webOrderNumber: adyenSession.webOrderNumber,
+                    });
+                    if (result.action) {
+                        if (result.action.type === 'redirect') {
+                            return handleRedirectPaymentAction(result);
+                        }
+                        return onError(new Error('Invalid payment response'), result);
+                    }
+                    return handlePaymentResponse(result, onComplete, onError);
+                }
+                catch (error) {
+                    return onError(error, null);
                 }
-                return handlePaymentResponse(result, onComplete, onError);
             }),
             session: {
                 ...adyenSession,
@@ -117,10 +127,12 @@ function getAndRemoveAdyenQueryParams() {
         return {};
     const params = qs.parse(window.location.search || '');
     const { amount, customerId, redirectResult } = params;
-    delete params['redirectResult'];
-    delete params['amount'];
-    delete params['customerId'];
-    history?.pushState({}, '', `${window.location.pathname}${qs.stringify(params) ? `?${qs.stringify(params)}` : ''}`);
+    if (redirectResult) {
+        delete params['redirectResult'];
+        delete params['amount'];
+        delete params['customerId'];
+        history?.pushState({}, '', `${window.location.pathname}${qs.stringify(params) ? `?${qs.stringify(params)}` : ''}`);
+    }
     return { amount, customerId, redirectResult };
 }
 async function handlePaymentResponse(result, onSubmit, onError) {

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

@@ -12,7 +12,9 @@ import { TextField } from '../../../../forms/text-field/text-field.js';
 import { InfoIconTooltip } from '../../../../info-icon-tooltip/info-icon-tooltip.js';
 import { FormattedMessage } from '../../../../intl/formatted-message.js';
 import { useFormattedMessage } from '../../../../intl/use-formatted-message.js';
+import { logger } from '../../../../logging/logger.js';
 import { usePatchSession } from '../../../../shared/api/storefront/hooks/authentication/use-patch-session.js';
+import { useInvalidateCurrentCart } from '../../../../shared/api/storefront/hooks/cart/use-invalidate-current-cart.js';
 import { usePatchCart } from '../../../../shared/api/storefront/hooks/cart/use-patch-cart.js';
 import { usePlaceOrder } from '../../../../shared/api/storefront/hooks/cart/use-place-order.js';
 import { useInvalidateAdyen } from '../../../../shared/api/storefront/hooks/payment/use-invalidate-adyen.js';
@@ -31,6 +33,7 @@ function Payment({ atp, cart: _cart, form, onError: _onError, onPaymentComplete,
     const { isLoading: isPatchingSession } = usePatchSession();
     const { isLoading: isPlacingCart, mutate: placeOrder } = usePlaceOrder();
     const { sendPurchaseEventFromPaymentPage } = useAlgoliaInsights();
+    const invalidateCurrentCart = useInvalidateCurrentCart();
     const dropinRef = useRef(null);
     const [paymentError, setPaymentError] = useState();
     const [apiError, setAPIError] = useState();
@@ -151,7 +154,7 @@ function Payment({ atp, cart: _cart, form, onError: _onError, onPaymentComplete,
         if (isAdyenPayment) {
             /* Adyen Payment */
             if (!dropinRef.current) {
-                console.warn('Adyen Dropin not ready');
+                logger.warn('Adyen Dropin not ready');
                 return;
             }
             dropinRef.current.showValidation();
@@ -168,20 +171,26 @@ function Payment({ atp, cart: _cart, form, onError: _onError, onPaymentComplete,
                 requestedDeliveryDate: formData.get('deliveryDate')?.toString(),
             };
             try {
-                cartRef.current = await patchCart({
-                    cart: updatedCart,
-                });
-            }
-            catch (error) {
-                console.error(error);
-                setAPIError(error);
-            }
-            try {
-                dropinRef.current.submit();
+                try {
+                    cartRef.current = await patchCart({
+                        cart: updatedCart,
+                    });
+                }
+                catch (error) {
+                    setAPIError(error);
+                    throw error;
+                }
+                try {
+                    dropinRef.current.submit();
+                }
+                catch (error) {
+                    setPaymentError(error);
+                    throw error;
+                }
             }
             catch (error) {
-                console.error(error);
-                setPaymentError(error);
+                logger.error(error);
+                invalidateCurrentCart();
             }
         }
         else {
@@ -196,8 +205,9 @@ function Payment({ atp, cart: _cart, form, onError: _onError, onPaymentComplete,
                 return onPaymentComplete({ cartId: cart.trackId });
             }
             catch (error) {
-                console.error(error);
+                logger.error(error);
                 setPaymentError(error);
+                invalidateCurrentCart();
             }
         }
     }
@@ -224,7 +234,7 @@ function Payment({ atp, cart: _cart, form, onError: _onError, onPaymentComplete,
             return onPaymentComplete({ cartId: cart.trackId });
         }
         catch (error) {
-            console.error(error);
+            logger.error(error);
             setAPIError(error);
         }
     }, [onPaymentComplete, onPlaceOrderCompleted, placeOrder]);
@@ -232,7 +242,7 @@ function Payment({ atp, cart: _cart, form, onError: _onError, onPaymentComplete,
         invalidateAdyen();
         // invalidateCurrentCart()
         setPaymentError(error);
-        console.error(error);
+        logger.error(error);
         _onError?.(error, result);
     }, [_onError, invalidateAdyen]);
     return (jsxs(Form, { className: styles['payment-form'], "data-test-selector": "paymentForm", id: form, onSubmit: e => {

package/dist/pages/checkout/shipping-page/components/edit-address.d.ts

@@ -1,4 +1,4 @@
-import { CountryModel } from '../../../../shared/api/storefront/model/storefront.model';
+import { BillToModel, CountryModel } from '../../../../shared/api/storefront/model/storefront.model';
 export declare const EDIT_ADDRESS_FORM_ID = "billToForm";
 interface Address {
     address1: string;
@@ -8,12 +8,14 @@ interface Address {
     city: string;
     companyName: string;
     country: CountryModel;
+    email: string;
     firstName: string;
     lastName: string;
     phone: string;
     postalCode: string;
 }
-export declare function EditAddresses({ countries, isLoading, isPickup, onSubmit, }: {
+export declare function EditAddresses({ billTo, countries, isLoading, isPickup, onSubmit, }: {
+    billTo: BillToModel | undefined | null;
     countries: CountryModel[];
     isLoading: boolean;
     isPickup: boolean;

package/dist/pages/checkout/shipping-page/components/edit-address.js

@@ -15,10 +15,10 @@ import { SonicAddress } from './sonic-address.js';
 import styles from './edit-address.module.css.js';
 
 const EDIT_ADDRESS_FORM_ID = 'billToForm';
-function EditAddresses({ countries, isLoading, isPickup, onSubmit, }) {
+function EditAddresses({ billTo, countries, isLoading, isPickup, onSubmit, }) {
     const t = useFormattedMessage();
-    const [companyName, setCompanyName] = useState('');
-    const [lastName, setLastName] = useState('');
+    const [companyName, setCompanyName] = useState(billTo?.companyName || '');
+    const [lastName, setLastName] = useState(billTo?.lastName || '');
     const { data: cart } = useFetchCurrentCart();
     return (jsxs(Fragment, { children: [jsx(CheckoutPageSection, { title: jsx(FormattedMessage, { id: "Billing address" }), children: jsx(CheckoutPageSectionContent, { children: jsxs(Form, { className: styles.form, "data-test-selector": "billToAddressForm", id: EDIT_ADDRESS_FORM_ID, onSubmit: e => {
                             e.preventDefault();
@@ -36,6 +36,7 @@ function EditAddresses({ countries, isLoading, isPickup, onSubmit, }) {
                                     city: formData.get('address1')?.toString() || '',
                                     companyName: formData.get('companyName')?.toString() || '',
                                     country,
+                                    email: formData.get('email')?.toString() || '',
                                     firstName: formData.get('firstName')?.toString() || '',
                                     lastName: formData.get('address1')?.toString() || '',
                                     phone: formData.get('phone')?.toString() || '',
@@ -43,7 +44,7 @@ function EditAddresses({ countries, isLoading, isPickup, onSubmit, }) {
                                 },
                                 notes: formData.get('notes')?.toString() || '',
                             });
-                        }, children: [jsx(TextField, { isDisabled: isLoading, label: t('First name'), name: "firstName", showLabel: true }), jsx(TextField, { isDisabled: isLoading, isRequired: !companyName, label: t('Last name'), minLength: 3, name: "lastName", onChange: setLastName, showLabel: true, value: lastName }, `lastname-${Boolean(companyName)}`), jsx(TextField, { isDisabled: isLoading, label: t('Company name'), name: "companyName", onChange: setCompanyName, showLabel: true, value: companyName }), jsx(TextField, { isDisabled: isLoading, label: t('Attention'), name: "attention", showLabel: true }), jsx("div", { className: styles['span-2'], children: jsx(TextField, { isRequired: true, isDisabled: isLoading, label: `${t('Address')} 1`, maxLength: 30, minLength: 3, name: "address1", showLabel: true }) }), jsx("div", { className: styles['span-2'], children: jsx(TextField, { isDisabled: isLoading, label: `${t('Address')} 2`, maxLength: 30, minLength: 3, name: "address2", showLabel: true }) }), jsx("div", { className: styles['span-2'], children: jsx(TextField, { isDisabled: isLoading, label: `${t('Address')} 3`, maxLength: 30, minLength: 3, name: "address3", showLabel: true }) }), jsx(TextField, { isRequired: true, isDisabled: isLoading, label: t('Postal Code'), maxLength: 10, minLength: 4, name: "postalCode", showLabel: true }), jsx(TextField, { isRequired: true, isDisabled: isLoading, label: t('City'), maxLength: 30, minLength: 3, name: "city", showLabel: true }), jsx("div", { className: styles['span-2'], children: jsx(CountrySelect, { isRequired: true, countries: countries, "data-test-selector": "countrySelect", isDisabled: isLoading, name: "countrySelect" }) }), jsx("div", { className: styles['span-2'], children: jsx(TextField, { isRequired: true, isDisabled: isLoading, label: t('Phone'), name: "phone", showLabel: true, validate: value => {
+                        }, children: [jsx(TextField, { defaultValue: billTo?.firstName, isDisabled: isLoading, label: t('First name'), name: "firstName", showLabel: true }), jsx(TextField, { isDisabled: isLoading, isRequired: !companyName, label: t('Last name'), minLength: 3, name: "lastName", onChange: setLastName, showLabel: true, value: lastName }, `lastname-${Boolean(companyName)}`), jsx(TextField, { defaultValue: billTo?.companyName, isDisabled: isLoading, label: t('Company name'), name: "companyName", onChange: setCompanyName, showLabel: true, value: companyName }), jsx(TextField, { defaultValue: billTo?.attention, isDisabled: isLoading, label: t('Attention'), name: "attention", showLabel: true }), jsx("div", { className: styles['span-2'], children: jsx(TextField, { isRequired: true, defaultValue: billTo?.address1, isDisabled: isLoading, label: `${t('Address')} 1`, maxLength: 30, minLength: 3, name: "address1", showLabel: true }) }), jsx("div", { className: styles['span-2'], children: jsx(TextField, { defaultValue: billTo?.address2, isDisabled: isLoading, label: `${t('Address')} 2`, maxLength: 30, minLength: 3, name: "address2", showLabel: true }) }), jsx("div", { className: styles['span-2'], children: jsx(TextField, { defaultValue: billTo?.address3, isDisabled: isLoading, label: `${t('Address')} 3`, maxLength: 30, minLength: 3, name: "address3", showLabel: true }) }), jsx(TextField, { isRequired: true, defaultValue: billTo?.postalCode, isDisabled: isLoading, label: t('Postal Code'), maxLength: 10, minLength: 4, name: "postalCode", showLabel: true }), jsx(TextField, { isRequired: true, defaultValue: billTo?.city, isDisabled: isLoading, label: t('City'), maxLength: 30, minLength: 3, name: "city", showLabel: true }), jsx("div", { className: styles['span-2'], children: jsx(CountrySelect, { isRequired: true, countries: countries, "data-test-selector": "countrySelect", defaultSelectedCountry: countries.find(country => country.id === billTo?.country?.id), isDisabled: isLoading, name: "countrySelect" }) }), jsx("div", { className: styles['span-2'], children: jsx(TextField, { isRequired: true, defaultValue: billTo?.phone, isDisabled: isLoading, label: t('Phone'), name: "phone", showLabel: true, validate: value => {
                                         if (!value)
                                             return value;
                                         return (validatePhone(value) ||
@@ -53,7 +54,7 @@ function EditAddresses({ countries, isLoading, isPickup, onSubmit, }) {
                                             return value;
                                         return (validateEmail(value) ||
                                             t('Please enter a valid e-mail address'));
-                                    } }) }), jsx("div", { className: styles['span-2'], children: jsx(TextField, { isDisabled: isLoading, isMultiline: true, label: t('Add order notes'), name: "notes", rows: 3, showLabel: true }) })] }) }) }), jsx(CheckoutPageSection, { title: jsx(FormattedMessage, { id: isPickup ? 'Pickup address' : 'Shipping address' }), children: jsx(CheckoutPageSectionContent, { children: jsx(Fragment, { children: isPickup ? (jsx(SonicAddress, {})) : (jsxs("div", { className: styles['use-invoice-checkbox'], children: [jsx(Checkbox, { "data-test-selector": "checkboxUseBillingAddress", isDisabled: true, isSelected: true, children: jsx(FormattedMessage, { id: "Use billing address" }) }), jsx(InfoIconTooltip, { variant: "stroke", children: t('Changing your address is currently not possible. Please contact customer support to change your address.') })] })) }) }) })] }));
+                                    } }) }), jsx("div", { className: styles['span-2'], children: jsx(TextField, { defaultValue: cart?.notes, isDisabled: isLoading, isMultiline: true, label: t('Add order notes'), name: "notes", rows: 3, showLabel: true }) })] }) }) }), jsx(CheckoutPageSection, { title: jsx(FormattedMessage, { id: isPickup ? 'Pickup address' : 'Shipping address' }), children: jsx(CheckoutPageSectionContent, { children: jsx(Fragment, { children: isPickup ? (jsx(SonicAddress, {})) : (jsxs("div", { className: styles['use-invoice-checkbox'], children: [jsx(Checkbox, { "data-test-selector": "checkboxUseBillingAddress", isDisabled: true, isSelected: true, children: jsx(FormattedMessage, { id: "Use billing address" }) }), jsx(InfoIconTooltip, { variant: "stroke", children: t('Changing your address is currently not possible. Please contact customer support to change your address.') })] })) }) }) })] }));
 }
 
 export { EDIT_ADDRESS_FORM_ID, EditAddresses };

package/dist/pages/checkout/shipping-page/hooks/use-patch-shipping-details.d.ts

@@ -1,4 +1,4 @@
-import { BillToModel, CartModel } from '../../../../shared/api/storefront/model/storefront.model';
+import { BillToModel, CartModel, SessionModel } from '../../../../shared/api/storefront/model/storefront.model';
 export declare function usePatchShippingDetails(): {
     error: unknown;
     isError: boolean;
@@ -8,5 +8,9 @@ export declare function usePatchShippingDetails(): {
         billTo?: BillToModel;
         cart: CartModel;
         notes: string | undefined;
-    }) => Promise<void>;
+    }) => Promise<{
+        patchedBillTo: BillToModel | undefined;
+        patchedCart: CartModel;
+        patchedSession: SessionModel | undefined;
+    }>;
 };

package/dist/pages/checkout/shipping-page/hooks/use-patch-shipping-details.js

@@ -1,19 +1,38 @@
 import { useAwaitableMutation } from '../../../../shared/api/shared/hooks/use-awaitable-mutation.js';
+import { patchSession } from '../../../../shared/api/storefront/services/authentication-service.js';
 import { patchCart } from '../../../../shared/api/storefront/services/cart-service.js';
 import { patchBillToAddress } from '../../../../shared/api/storefront/services/customer-service.js';
 
 function usePatchShippingDetails() {
     return useAwaitableMutation({
         mutationFn: async ({ billTo, cart, notes, }) => {
-            await Promise.all([
-                billTo && patchBillToAddress({ billTo }),
-                patchCart({ cart: { ...cart, notes } }),
-            ].filter(Boolean));
+            const patchedBillTo = billTo
+                ? await patchBillToAddress({ billTo })
+                : undefined;
+            const patchedSession = patchedBillTo
+                ? await patchSession({
+                    session: {
+                        billTo: { id: patchedBillTo.id },
+                        customerWasUpdated: true,
+                        shipTo: { id: cart.shipTo?.id || patchedBillTo.id },
+                    },
+                })
+                : undefined;
+            const patchedCart = await patchCart({
+                cart: { ...cart, billTo: patchedBillTo, notes },
+            });
+            return { patchedBillTo, patchedCart, patchedSession };
         },
-        onSuccess: ({ queryClient }) => {
-            queryClient.removeQueries({ queryKey: ['customer'] });
-            queryClient.removeQueries({ queryKey: ['carts'] });
-            queryClient.removeQueries({ queryKey: ['session'] });
+        onSuccess: ({ data: { patchedBillTo, patchedCart, patchedSession }, queryClient, }) => {
+            if (patchedBillTo)
+                queryClient.setQueryData(['customer', 'bill-to-addresses'], patchedBillTo);
+            if (patchedSession) {
+                queryClient.setQueryData(['session'], patchedSession);
+            }
+            else if (patchedBillTo) {
+                queryClient.removeQueries({ queryKey: ['session'] });
+            }
+            queryClient.setQueryData(['carts', patchedCart.id], patchedCart);
         },
     });
 }

package/dist/pages/checkout/shipping-page/shipping-page-content.d.ts

@@ -5,10 +5,11 @@ export interface ShippingPageContentProps {
     editAddress: ReactNode;
     errorPatchBillingAddress?: unknown;
     fulfillmentMethods: string[] | undefined;
+    isGuest: boolean;
     isLoadingFulfillmentMethods: boolean;
     isPatching: boolean;
     isPatchingSession: boolean;
     onChangeFulfillmentMethod: (value: string) => void;
     readOnlyAddress: ReactNode;
 }
-export declare function ShippingPageContent({ cart, editAddress, errorPatchBillingAddress, fulfillmentMethods, isLoadingFulfillmentMethods, isPatching, isPatchingSession, onChangeFulfillmentMethod, readOnlyAddress, }: ShippingPageContentProps): import("react/jsx-runtime").JSX.Element;
+export declare function ShippingPageContent({ cart, editAddress, errorPatchBillingAddress, fulfillmentMethods, isGuest, isLoadingFulfillmentMethods, isPatching, isPatchingSession, onChangeFulfillmentMethod, readOnlyAddress, }: ShippingPageContentProps): import("react/jsx-runtime").JSX.Element;

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

@@ -14,7 +14,7 @@ import { CheckoutPageSectionContent } from '../layouts/checkout-page-layout/comp
 import { EDIT_ADDRESS_FORM_ID } from './components/edit-address.js';
 import styles from './shipping-page.module.css.js';
 
-function ShippingPageContent({ cart, editAddress, errorPatchBillingAddress, fulfillmentMethods, isLoadingFulfillmentMethods, isPatching, isPatchingSession, onChangeFulfillmentMethod, readOnlyAddress, }) {
+function ShippingPageContent({ cart, editAddress, errorPatchBillingAddress, fulfillmentMethods, isGuest, isLoadingFulfillmentMethods, isPatching, isPatchingSession, onChangeFulfillmentMethod, readOnlyAddress, }) {
     const t = useFormattedMessage();
     const fulfillmentMethodOptions = fulfillmentMethods?.reduce((acc, method) => ({
         ...acc,
@@ -34,7 +34,7 @@ function ShippingPageContent({ cart, editAddress, errorPatchBillingAddress, fulf
                 primary: (jsx(Button, { withArrow: true, "data-test-selector": "checkoutShippingCartTotalContinueButton", form: EDIT_ADDRESS_FORM_ID, isDisabled: isPatching, isLoading: isPatching || isPatchingSession ? (jsx(FormattedMessage, { id: "Updating address" })) : undefined, type: "submit", children: jsx(FormattedMessage, { id: "Continue shopping" }) })),
             }, mobileSummary: jsx(CartTotalsSummary, { totalAmount: cart.orderGrandTotalDisplay }), overview: jsx(CartTotals, { fulfillmentMethod: fulfillmentMethods && fulfillmentMethods.length === 1
                     ? cart.fulfillmentMethod
-                    : undefined, shippingCost: cart.shippingAndHandlingDisplay, subtotal: cart.orderSubTotalDisplay, tax: cart.totalTaxDisplay, total: cart.orderGrandTotalDisplay, vatPercentage: cart.cartLines?.[0]?.pricing?.vatRate }), children: [jsxs(Fragment, { children: [fulfillmentMethods && fulfillmentMethods.length > 1 && (jsx(CheckoutPageSection, { hasBorder: true, title: t('Fulfillment method'), children: jsx(CheckoutPageSectionContent, { children: jsx("div", { className: styles['fulfillment-select-wrapper'], children: jsx(Select, { isRequired: true, showLabel: true, "data-test-selector": "fulfillmentMethodSelect", defaultSelectedOption: cart.fulfillmentMethod, isLoading: isLoadingFulfillmentMethods, label: t('Fulfillment method'), name: "fulfillmentMethod", onChange: onChangeFulfillmentMethod, options: fulfillmentMethodOptions || {}, variant: "solid" }) }) }) })), hasBillToAddress ? readOnlyAddress : editAddress] }), Boolean(errorPatchBillingAddress) && (jsx("div", { className: styles['error-message'], children: jsx(FormattedMessage, { id: "An unexpected error occured" }) }))] }) }));
+                    : undefined, shippingCost: cart.shippingAndHandlingDisplay, subtotal: cart.orderSubTotalDisplay, tax: cart.totalTaxDisplay, total: cart.orderGrandTotalDisplay, vatPercentage: cart.cartLines?.[0]?.pricing?.vatRate }), children: [jsxs(Fragment, { children: [fulfillmentMethods && fulfillmentMethods.length > 1 && (jsx(CheckoutPageSection, { hasBorder: true, title: t('Fulfillment method'), children: jsx(CheckoutPageSectionContent, { children: jsx("div", { className: styles['fulfillment-select-wrapper'], children: jsx(Select, { isRequired: true, showLabel: true, "data-test-selector": "fulfillmentMethodSelect", defaultSelectedOption: cart.fulfillmentMethod, isLoading: isLoadingFulfillmentMethods, label: t('Fulfillment method'), name: "fulfillmentMethod", onChange: onChangeFulfillmentMethod, options: fulfillmentMethodOptions || {}, variant: "solid" }) }) }) })), hasBillToAddress && !isGuest ? readOnlyAddress : editAddress] }), Boolean(errorPatchBillingAddress) && (jsx("div", { className: styles['error-message'], children: jsx(FormattedMessage, { id: "An unexpected error occured" }) }))] }) }));
 }
 
 export { ShippingPageContent };

package/dist/pages/checkout/shipping-page/shipping-page.js

@@ -1,7 +1,6 @@
 import { jsx } from 'react/jsx-runtime';
 import { useRef, useEffect } from 'react';
 import { useFetchSession } from '../../../shared/api/storefront/hooks/authentication/use-fetch-session.js';
-import { useIsAuthenticated } from '../../../shared/api/storefront/hooks/authentication/use-is-authenticated.js';
 import { usePatchSession } from '../../../shared/api/storefront/hooks/authentication/use-patch-session.js';
 import { useFetchCurrentCart } from '../../../shared/api/storefront/hooks/cart/use-fetch-current-cart.js';
 import { useFetchFulfillmentMethodsForCurrentCart } from '../../../shared/api/storefront/hooks/customer/use-fetch-fulfillment-methods-for-current-cart.js';
@@ -18,17 +17,17 @@ import { usePatchShippingDetails } from './hooks/use-patch-shipping-details.js';
 import { ShippingPageContent } from './shipping-page-content.js';
 
 function ShippingPage() {
-    const isAuthenticated = useIsAuthenticated();
     const { createEcommerceEvent, dataLayer } = useDataLayer();
     const gaEventPushed = useRef(false);
     const { data: cart, error: errorFetchCart, isLoading: isLoadingCart, refetch: refetchCart, } = useFetchCurrentCart();
+    const { data: session } = useFetchSession();
     const { data: countries, isLoading: isLoadingCountries } = useFetchCountries({
-        enabled: hasNo(cart?.billTo?.address1),
+        enabled: hasNo(cart?.billTo?.address1) || Boolean(session?.isGuest),
     });
-    const { data: session } = useFetchSession();
     const { data: fulfillmentMethods, isLoading: isLoadingFulfillmentMethods } = useFetchFulfillmentMethodsForCurrentCart();
     const { isLoading: isPatchingSession, mutate: patchSession } = usePatchSession();
     const { error: errorPatchBillingAddress, isError, isLoading: isPatching, isSuccess, mutate: patchShippingDetails, } = usePatchShippingDetails();
+    const isAuthenticated = session?.isAuthenticated;
     const isLoading = isLoadingCart || isLoadingCountries || isLoadingFulfillmentMethods;
     const { isNavigating, navigate } = useNavigate();
     const isPickup = cart?.fulfillmentMethod === 'PickUp';
@@ -75,13 +74,14 @@ function ShippingPage() {
     if (isLoading || isNavigating || isError || isSuccess)
         return jsx(LoadingPage, {});
     if (!isAuthenticated ||
+        hasNo(session) ||
         hasNo(cart) ||
         hasNo(cart.cartLines) ||
         cart.cartLines.length === 0 ||
         hasNo(cart.billTo) ||
         (hasNo(cart.billTo.address1) && hasNo(countries)))
         return null;
-    return (jsx(ShippingPageContent, { cart: cart, editAddress: jsx(EditAddresses, { countries: countries || [], isLoading: isPatching, isPickup: isPickup, onSubmit: async ({ address, notes }) => {
+    return (jsx(ShippingPageContent, { cart: cart, editAddress: jsx(EditAddresses, { billTo: cart.billTo, countries: countries || [], isLoading: isPatching, isPickup: isPickup, onSubmit: async ({ address, notes }) => {
                 if (!cart.billTo)
                     return;
                 await patchShippingDetails({
@@ -93,7 +93,7 @@ function ShippingPage() {
                     cart,
                     event: { event: 'add_shipping_info' },
                 }));
-            } }), errorPatchBillingAddress: errorPatchBillingAddress, fulfillmentMethods: fulfillmentMethods, isLoadingFulfillmentMethods: isLoadingFulfillmentMethods, isPatching: isPatching, isPatchingSession: isPatchingSession, onChangeFulfillmentMethod: async (value) => {
+            } }), errorPatchBillingAddress: errorPatchBillingAddress, fulfillmentMethods: fulfillmentMethods, isGuest: session.isGuest, isLoadingFulfillmentMethods: isLoadingFulfillmentMethods, isPatching: isPatching, isPatchingSession: isPatchingSession, onChangeFulfillmentMethod: async (value) => {
             await patchSession({
                 session: {
                     ...session,

package/dist/pages/product/search-result-page/search-results-page.js

@@ -37,7 +37,7 @@ function SearchResultsPageContent({ keyword }) {
     const { hits, isLoading } = useAlgoliaHits();
     const hasHits = hits.length > 0;
     const t = useFormattedMessage();
-    return (jsxs(Fragment, { children: [isLoading !== false && !hasHits && jsx(LoadingPage, {}), isLoading === false && !hasHits && (jsx(NoResults, { content: jsxs("p", { children: [jsx(FormattedMessage, { id: "You could try checking the spelling of your search query" }), jsx("br", {}), jsx(FormattedMessage, { id: "Try another search" }), jsx("br", {}), jsx(FormattedMessage, { id: "Are you looking for information about our service? Please visit our customer support page" })] }), title: t("Unfortnately, We found no articles for your search '{0}'", {
+    return (jsxs(Fragment, { children: [isLoading !== false && !hasHits && jsx(LoadingPage, {}), isLoading === false && !hasHits && (jsx(NoResults, { content: jsxs(Fragment, { children: [jsx(FormattedMessage, { id: "You could try checking the spelling of your search query" }), jsx("br", {}), jsx(FormattedMessage, { id: "Try another search" }), jsx("br", {}), jsx(FormattedMessage, { id: "Are you looking for information about our service? Please visit our customer support page" })] }), title: t("Unfortnately, We found no articles for your search '{0}'", {
                     replacementValues: { 0: keyword },
                 }) })), jsxs("div", { style: {
                     display: hasHits ? undefined : 'none',

package/dist/shared/api/shared/hooks/use-awaitable-mutation.d.ts

@@ -1,29 +1,30 @@
 import { QueryClient } from '@tanstack/react-query';
-export type InferPromiseResult<T> = T extends (...args: any) => Promise<infer TResult> ? TResult : never;
-interface UseAwaitableMutationArgs<T extends (...args: any) => Promise<TResult>, TResult = InferPromiseResult<T>> {
+export type OnError<T extends (...args: any) => Promise<unknown>> = (args: {
+    args: Parameters<T>;
+    error: unknown;
+    queryClient: QueryClient;
+}) => void;
+export type OnSuccess<T extends (...args: any) => Promise<TResult>, TResult = Awaited<ReturnType<T>>> = (args: {
+    args: Parameters<T>;
+    data: TResult;
+    queryClient: QueryClient;
+}) => void;
+export type OnComplete<T extends (...args: any) => Promise<TResult>, TResult = Awaited<ReturnType<T>>> = (args: {
+    args: Parameters<T>;
+    data: TResult | undefined;
+    error: unknown | undefined;
+    queryClient: QueryClient;
+}) => void;
+export interface UseAwaitableMutationArgs<T extends (...args: any) => Promise<TResult>, TResult = Awaited<ReturnType<T>>> {
     mutationFn: T;
-    onComplete?: (args: {
-        args: Parameters<T>;
-        data: TResult | undefined;
-        error: unknown | undefined;
-        queryClient: QueryClient;
-    }) => void;
-    onError?: (args: {
-        args: Parameters<T>;
-        error: unknown;
-        queryClient: QueryClient;
-    }) => void;
-    onSuccess?: (args: {
-        args: Parameters<T>;
-        data: TResult;
-        queryClient: QueryClient;
-    }) => void;
+    onComplete?: OnComplete<T, TResult>;
+    onError?: OnError<T>;
+    onSuccess?: OnSuccess<T, TResult>;
 }
-export declare function useAwaitableMutation<T extends (...args: any) => Promise<TResult>, TResult = InferPromiseResult<T>>({ mutationFn, onComplete, onError, onSuccess, }: UseAwaitableMutationArgs<T, TResult>): {
+export declare function useAwaitableMutation<T extends (...args: any) => Promise<TResult>, TResult = Awaited<ReturnType<T>>>({ mutationFn, onComplete, onError, onSuccess, }: UseAwaitableMutationArgs<T, TResult>): {
     error: unknown;
     isError: boolean;
     isLoading: boolean;
     isSuccess: boolean;
     mutate: (...args: Parameters<T>) => Promise<TResult>;
 };
-export {};

package/dist/shared/api/storefront/hooks/cart/use-patch-cart.d.ts

@@ -1,6 +1,4 @@
-export declare function usePatchCart({ skipInvalidation, }?: {
-    skipInvalidation?: boolean;
-}): {
+export declare function usePatchCart(): {
     error: unknown;
     isError: boolean;
     isLoading: boolean;

package/dist/shared/api/storefront/hooks/cart/use-patch-cart.js

@@ -2,15 +2,13 @@ import { useCallback } from 'react';
 import { useAwaitableMutation } from '../../../shared/hooks/use-awaitable-mutation.js';
 import { patchCart } from '../../services/cart-service.js';
 
-function usePatchCart({ skipInvalidation = false, } = {}) {
+function usePatchCart() {
     const onError = useCallback(({ args: [{ cart }], queryClient }) => {
         queryClient.invalidateQueries({ queryKey: ['carts', cart.id] });
     }, []);
-    const onSuccess = useCallback(({ args: [{ cart }], queryClient }) => {
-        if (skipInvalidation)
-            return;
-        queryClient.removeQueries({ queryKey: ['carts', cart.id] });
-    }, [skipInvalidation]);
+    const onSuccess = useCallback(({ args: [{ cart }], data, queryClient }) => {
+        queryClient.setQueryData(['carts', cart.id], data);
+    }, []);
     return useAwaitableMutation({
         mutationFn: patchCart,
         onError,

package/dist/shared/api/storefront/hooks/cart/use-place-order.d.ts

@@ -6,5 +6,5 @@ export declare const usePlaceOrder: () => {
     mutate: (args_0: {
         cart: import("../../model/storefront.model").CartModel;
         isPending?: boolean;
-    }) => Promise<any>;
+    }) => Promise<import("../../model/storefront.model").CartModel>;
 };

package/dist/shared/api/storefront/hooks/cart/use-place-order.js

@@ -3,15 +3,16 @@ import { useAwaitableMutation } from '../../../shared/hooks/use-awaitable-mutati
 import { placeOrder } from '../../services/cart-service.js';
 
 const usePlaceOrder = () => {
-    const onComplete = useCallback(({ args: [{ cart }], queryClient }) => {
-        queryClient.removeQueries({ queryKey: ['carts', cart.id] });
+    const onSuccess = useCallback(({ data: cart, queryClient }) => {
+        queryClient.invalidateQueries({ queryKey: ['carts', 'current'] });
+        queryClient.setQueryData(['carts', cart.id], cart);
     }, []);
-    const onSuccess = useCallback(({ data: updatedCart, queryClient }) => {
-        queryClient.removeQueries({ queryKey: ['carts', updatedCart.id] });
+    const onError = useCallback(({ queryClient }) => {
+        queryClient.invalidateQueries({ queryKey: ['carts'] });
     }, []);
     return useAwaitableMutation({
         mutationFn: placeOrder,
-        onComplete,
+        onError,
         onSuccess,
     });
 };

package/dist/shared/api/storefront/services/cart-service.js

@@ -37,16 +37,16 @@ async function patchCartLineById({ cartLine, cartLineId, }) {
     });
 }
 async function patchCart({ cart, }) {
-    await request({
+    const { body } = await request({
         body: cart,
         credentials: 'include',
         headers: {
             'Content-Type': 'application/json',
         },
         method: 'PATCH',
-        url: `${config.SHOP_API_URL}/api/v1/carts/current`,
+        url: `${config.BFF_API_URL}/api/v1/carts/current`,
     });
-    return await fetchCart(cart);
+    return body;
 }
 async function deleteCurrentCart() {
     const { body } = await request({
@@ -103,16 +103,16 @@ async function placeOrder({ cart, isPending, }) {
         : isPending
             ? 'PendingPaymentValidation'
             : 'Submitted';
-    await request({
+    const { body } = await request({
         body: { ...cart, status: newStatus },
         credentials: 'include',
         headers: {
             'Content-Type': 'application/json',
         },
         method: 'PATCH',
-        url: `${config.SHOP_API_URL}/api/v1/carts/current`,
+        url: `${config.BFF_API_URL}/api/v1/carts/current`,
     });
-    return await fetchCart(cart);
+    return body;
 }
 async function saveCartForLater({ cart }) {
     // USER NEEDS TO BE LOGGED IN
@@ -123,7 +123,7 @@ async function saveCartForLater({ cart }) {
             'Content-Type': 'application/json',
         },
         method: 'PATCH',
-        url: `${config.SHOP_API_URL}/api/v1/carts/current`,
+        url: `${config.BFF_API_URL}/api/v1/carts/current`,
     });
     return body;
 }

package/dist/shared/ga/data-layer.js

@@ -1,8 +1,9 @@
+import { logger } from '../../logging/logger.js';
+
 const _dataLayer = [];
 _dataLayer.push = (function (_push) {
     return (...items) => {
-        // eslint-disable-next-line no-console
-        console.log('dataLayer.push', items.length === 1 ? items[0] : items);
+        logger.info('dataLayer.push', items.length === 1 ? items[0] : items);
         return _push(...items);
     };
 })(_dataLayer.push.bind(_dataLayer));

package/dist/shared/model/image.d.ts

@@ -1,4 +1,4 @@
-interface DPRSrcSet {
+export interface DPRSrcSet {
     1: string;
     2: string;
     3: string;
@@ -24,4 +24,3 @@ export interface ResponsiveImageType {
     sm: DPRSrcSet;
 }
 export declare function isResponsiveImage(image: ImageType | ResponsiveImageType | undefined): image is ResponsiveImageType;
-export {};

package/dist/shared/providers/global-state-provider.js

@@ -73,11 +73,9 @@ function useGlobalState(key, initialState) {
             state.removeEventListener('stateChanged', updateState);
         };
     }, [state]);
-    function updateGlobalState(valueOrFn) {
-        state.value =
-            valueOrFn instanceof Function ? valueOrFn(state.value) : valueOrFn;
-    }
-    return [rerenderState, useCallback(updateGlobalState, [updateGlobalState])];
+    const setGlobalState = useCallback((valueOrFn) => (state.value =
+        valueOrFn instanceof Function ? valueOrFn(state.value) : valueOrFn), [state]);
+    return [rerenderState, setGlobalState];
 }
 
 export { GlobalStateProvider, GlobalStateProviderContext, useGlobalState };

package/dist/shared/utils/debug.d.ts

@@ -0,0 +1,2 @@
+export declare function trackPropertyChange(name: string, value: unknown): void;
+export declare function trackPropertyChange(obj: Record<string, unknown>): void;