@sonic-equipment/ui 253.0.0 → 255.0.0

package/dist/config.js

@@ -70,11 +70,11 @@ const configPerEnvironment = {
     production: () => ({
         ALGOLIA_API_KEY: 'e31a3a53449eceb4d0f9273b9bcd9759',
         ALGOLIA_APP_ID: '14CUFCVMAD',
-        ALGOLIA_HOST: 'shop.sonic-equipment.com',
-        BFF_API_URL: 'https://shop.sonic-equipment.com/api/v1/bff',
+        ALGOLIA_HOST: 'shopapi.sonic-equipment.com',
+        BFF_API_URL: 'https://shopapi.sonic-equipment.com/api/v1/bff',
         COOKIE_DOMAIN: '.sonic-equipment.com',
         HOME_PAGE_URL: 'https://sonic-equipment.com/',
-        SHOP_API_URL: 'https://shop.sonic-equipment.com',
+        SHOP_API_URL: 'https://shopapi.sonic-equipment.com',
         SHOP_URL: 'https://shop.sonic-equipment.com',
     }),
     sandbox: () => ({

package/dist/index.js

@@ -390,7 +390,7 @@ export { ExistingAccountError, createAccount, createGuestAccount, fetchCurrentAc
 export { AccountLockedOutError, InvalidEmailPasswordCombinationError, InvalidGrantError, InvalidPasswordError, NonUniquePasswordError, UnableToChangePasswordError, UserNotFoundError, createSession, fetchSession, patchSession, recoverPassword, signIn, signOut } from './shared/api/storefront/services/authentication-service.js';
 export { addBulkProductsToCurrentCart, addProductToCurrentCart, convertToMinorUnits, deleteCartLineById, deleteCurrentCart, fetchCart, fetchCurrentCart, fetchCurrentCartLines, fetchCurrentCartProductAtp, fetchCurrentCartPromotions, fetchCurrentCheckoutAtp, getAdyenPaymentDetails, patchCartLineById, postAdyenPayment } from './shared/api/storefront/services/cart-service.js';
 export { fetchCategories } from './shared/api/storefront/services/category-service.js';
-export { fetchBillToAddress, fetchBillToAddresses, fetchCurrentBillToAddress, fetchCurrentShipToAddress, fetchFulfillmentMethods, fetchPagedShipToAddresses, fetchShipToAddress, fetchShipToAddresses, patchBillToAddress, patchShipToAddress, postShipToAddress } from './shared/api/storefront/services/customer-service.js';
+export { fetchBillToAddress, fetchBillToAddresses, fetchCurrentBillToAddress, fetchCurrentShipToAddress, fetchFulfillmentMethods, fetchPagedShipToAddresses, fetchShipByBillTo, fetchShipToAddress, fetchShipToAddresses, patchBillToAddress, patchShipToAddress, postShipToAddress } from './shared/api/storefront/services/customer-service.js';
 export { validateVATNumber } from './shared/api/storefront/services/finance-service.js';
 export { fetchOrderById, fetchOrders } from './shared/api/storefront/services/order-service.js';
 export { createAdyenSession, fetchAdyenConfig } from './shared/api/storefront/services/payment-service.js';

package/dist/media/image/image.js

@@ -27,9 +27,9 @@ function Image({ className, 'data-test-selector': dataTestSelector, fallbackSrc
 }
 function createSrcSet(image) {
     return ([
-        image[1] && `${image[1]} 1x`,
-        image[2] && `${image[2]} 2x`,
-        image[3] && `${image[3]} 3x`,
+        image[1] && `${encodeURI(image[1])} 1x`,
+        image[2] && `${encodeURI(image[2])} 2x`,
+        image[3] && `${encodeURI(image[3])} 3x`,
     ]
         .filter(Boolean)
         .join(', ') || undefined);
@@ -57,7 +57,7 @@ function PictureComponent({ className, fallbackSrc, fit = 'cover', hasError, ima
         return (jsx("picture", { className: clsx(styles.picture, className), children: jsx("img", { alt: "Missing", className: clsx(styles.image, styles[fit], styles['has-error']), src: fallbackSrc, ...rest }) }));
     return (jsxs("picture", { className: clsx(styles.picture, className), children: [image.sm && (jsx("source", { media: "(max-width: 768px)", srcSet: createSrcSet(image.sm) })), image.md && (jsx("source", { media: "(max-width: 1439px)", srcSet: createSrcSet(image.md) })), image.lg && (jsx("source", { media: "(min-width: 1440px)", srcSet: createSrcSet(image.lg) })), jsx("img", { alt: image.altText, className: clsx(styles.image, styles[fit], {
                     [styles['has-error']]: hasError,
-                }), src: hasError ? fallbackSrc : getPrimarySrc(image), ...rest })] }));
+                }), src: encodeURI((hasError ? fallbackSrc : getPrimarySrc(image)) || ''), ...rest })] }));
 }
 
 export { Image };

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

@@ -1 +1,3 @@
-export declare function PaymentPage(): import("react/jsx-runtime").JSX.Element | null;
+export declare function PaymentPage({ hasReturnedFromAdyen, }: {
+    hasReturnedFromAdyen?: boolean;
+}): import("react/jsx-runtime").JSX.Element | null;

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

@@ -9,13 +9,11 @@ import { usePaths } from '../../../shared/routing/use-paths.js';
 import { hasNo } from '../../../shared/utils/types.js';
 import { ErrorPage } from '../../error-page/error-page.js';
 import { LoadingPage } from '../../loading-page/loading-page.js';
-import { useHasReturnedFromAdyen } from './hooks/use-has-returned-from-adyen.js';
 import { PaymentPageContent } from './payment-page-content.js';
 
 const PAYMENT_FORM_ID = 'paymentForm';
-function PaymentPage() {
+function PaymentPage({ hasReturnedFromAdyen, }) {
     const paths = usePaths();
-    const hasReturnedFromAdyen = useHasReturnedFromAdyen();
     const isAuthenticated = useIsAuthenticated();
     const { data: cart, error, isLoading: isLoadingCart, } = useFetchCurrentCartWithAtp({
         forceRecalculation: !hasReturnedFromAdyen,

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

@@ -24,11 +24,14 @@ function ReadOnlyAddresses({ billTo, isLoading, isPickup, notes, onSubmit, shipT
     const href = `${pathname}${search}`;
     const billToId = billTo?.id;
     const shipToId = shipTo?.id;
+    const isShipToABillToAddress = billToId && shipToId && billToId === shipToId;
     const editBillToAddressUrl = environment.includes('next')
         ? `${paths.ACCOUNT_EDIT_BILL_TO_ADDRESS}/${billToId}?returnUrl=${encodeURIComponent(href)}`
         : paths.ACCOUNT_ADDRESSES;
     const editShipToAddressUrl = environment.includes('next')
-        ? `${paths.ACCOUNT_EDIT_BILL_TO_ADDRESS}/${billToId}${paths.ACCOUNT_EDIT_SHIP_TO_ADDRESS}/${shipToId}?returnUrl=${encodeURIComponent(href)}`
+        ? isShipToABillToAddress
+            ? `${paths.ACCOUNT_EDIT_BILL_TO_ADDRESS}/${billToId}${paths.ACCOUNT_EDIT_SHIP_TO_ADDRESS}/new?returnUrl=${encodeURIComponent(href)}&makeDefault=true`
+            : `${paths.ACCOUNT_EDIT_BILL_TO_ADDRESS}/${billToId}${paths.ACCOUNT_EDIT_SHIP_TO_ADDRESS}/${shipToId}?returnUrl=${encodeURIComponent(href)}`
         : paths.ACCOUNT_ADDRESSES;
     return (jsxs(Form, { id: EDIT_ADDRESS_FORM_ID, onSubmit: e => {
             e.preventDefault();

package/dist/pages/my-sonic/actions/change-customer/connected-change-customer-dialog.js

@@ -4,6 +4,7 @@ import { useState, useEffect } from 'react';
 import { useFetchCurrentAccount } from '../../../../shared/api/storefront/hooks/account/use-fetch-current-account.js';
 import { usePatchSession } from '../../../../shared/api/storefront/hooks/authentication/use-patch-session.js';
 import { useFetchBillToAddresses } from '../../../../shared/api/storefront/hooks/customer/use-fetch-bill-to-addresses.js';
+import { fetchShipByBillTo } from '../../../../shared/api/storefront/services/customer-service.js';
 import { ChangeCustomerDialog } from './change-customer-dialog.js';
 
 function ConnectedChangeCustomerDialog({ allowSetDefault = false, isOpen, onClose, onCustomerSelected, }) {
@@ -17,6 +18,12 @@ function ConnectedChangeCustomerDialog({ allowSetDefault = false, isOpen, onClos
     useEffect(() => reset(), [isOpen, reset]);
     return (jsx(ChangeCustomerDialog, { allowSetDefault: allowSetDefault, data: data, defaultCustomerId: account?.defaultCustomerId || undefined, error: error, filter: filter, hasErrorSubmitting: Boolean(errorMutation), isLoading: isLoading || isFetching, isOpen: isOpen, isUpdating: isMutating, onClose: onClose, onCustomerSelected: async (id, setAsDefault) => {
             id = `${id}`;
+            const shipToAddress = await fetchShipByBillTo({ billToId: id });
+            const defaultShipTo = shipToAddress.shipTos?.find(shipTo => shipTo.isDefault);
+            const firstShipToWithId = shipToAddress.shipTos?.find(shipTo => shipTo.id !== '');
+            const shipToId = defaultShipTo
+                ? defaultShipTo.id
+                : (firstShipToWithId?.id ?? id);
             try {
                 await mutate({
                     session: {
@@ -28,8 +35,8 @@ function ConnectedChangeCustomerDialog({ allowSetDefault = false, isOpen, onClos
                         customerWasUpdated: false,
                         fulfillmentMethod: 'Ship',
                         pickUpWarehouse: null,
-                        shipTo: { id },
-                        shipToId: id,
+                        shipTo: { id: shipToId },
+                        shipToId,
                     },
                 });
                 onCustomerSelected(id, setAsDefault);

package/dist/pages/my-sonic/actions/create-ship-to-address/connected-create-ship-to-address-form.d.ts

@@ -1,4 +1,5 @@
-export declare function ConnectedCreateShipToAddressForm({ billToId, returnUrl, }: {
+export declare function ConnectedCreateShipToAddressForm({ billToId, makeDefault, returnUrl, }: {
     billToId: string;
+    makeDefault?: boolean;
     returnUrl?: string;
 }): import("react/jsx-runtime").JSX.Element;

package/dist/pages/my-sonic/actions/create-ship-to-address/connected-create-ship-to-address-form.js

@@ -18,7 +18,7 @@ import { LoadingPage } from '../../../loading-page/loading-page.js';
 import formStyles from '../../../../forms/partials/address-form/address-form.module.css.js';
 import styles from './create-ship-to-address.module.css.js';
 
-function ConnectedCreateShipToAddressForm({ billToId, returnUrl, }) {
+function ConnectedCreateShipToAddressForm({ billToId, makeDefault, returnUrl, }) {
     const paths = usePaths();
     const { navigate } = useNavigate();
     const { countries, currentCountry, error: errorCountries, isFetching: isLoadingCountries, } = useCountries();
@@ -83,7 +83,7 @@ function ConnectedCreateShipToAddressForm({ billToId, returnUrl, }) {
                 });
             }
             return navigate(`${paths.ACCOUNT_EDIT_BILL_TO_ADDRESS}/${billToId}${paths.ACCOUNT_EDIT_SHIP_TO_ADDRESS}/${createdShipToAddress.id}?returnUrl=${encodeURIComponent(returnUrl || '')}`);
-        }, children: [jsx(AddressForm, { address: undefined, countries: countries, currentCountry: currentCountry, isLoading: isPatching }), jsx(Checkbox, { isDisabled: isPatching, name: "setAsDefault", value: "TRUE", children: jsx(FormattedMessage, { id: "Make this the default ship to address" }) }), Boolean(errorShipToAddress) && (jsx("div", { className: styles.info, children: jsx(Message, { type: "danger", children: jsx(FormattedMessage, { id: "An unexpected error occured" }) }) })), isSuccess && !isPatching && (jsx("div", { className: styles.info, children: jsx(Message, { type: "info", children: jsx(FormattedMessage, { id: "Saved" }) }) })), jsxs("div", { className: styles.actions, children: [returnUrl && (jsx(Button, { color: "secondary", isDisabled: isPatching, onClick: () => navigate(returnUrl), variant: "outline", children: jsx(FormattedMessage, { id: "Back" }) })), jsx(Button, { isLoading: isPatching ? jsx(FormattedMessage, { id: "Saving" }) : undefined, type: "submit", children: jsx(FormattedMessage, { id: "Save" }) })] })] }));
+        }, children: [jsx(AddressForm, { address: undefined, countries: countries, currentCountry: currentCountry, isLoading: isPatching }), jsx(Checkbox, { defaultSelected: makeDefault, isDisabled: isPatching, name: "setAsDefault", value: "TRUE", children: jsx(FormattedMessage, { id: "Make this the default ship to address" }) }), Boolean(errorShipToAddress) && (jsx("div", { className: styles.info, children: jsx(Message, { type: "danger", children: jsx(FormattedMessage, { id: "An unexpected error occured" }) }) })), isSuccess && !isPatching && (jsx("div", { className: styles.info, children: jsx(Message, { type: "info", children: jsx(FormattedMessage, { id: "Saved" }) }) })), jsxs("div", { className: styles.actions, children: [returnUrl && (jsx(Button, { color: "secondary", isDisabled: isPatching, onClick: () => navigate(returnUrl), variant: "outline", children: jsx(FormattedMessage, { id: "Back" }) })), jsx(Button, { isLoading: isPatching ? jsx(FormattedMessage, { id: "Saving" }) : undefined, type: "submit", children: jsx(FormattedMessage, { id: "Save" }) })] })] }));
 }
 
 export { ConnectedCreateShipToAddressForm };

package/dist/pages/my-sonic/pages/create-ship-to-address-details-page/create-ship-to-address-details-page.d.ts

@@ -1,5 +1,6 @@
-export declare function CreateShipToAddressDetailsPage({ billToId, returnUrl, }: {
+export declare function CreateShipToAddressDetailsPage({ billToId, makeDefault, returnUrl, }: {
     billToId: string;
+    makeDefault?: boolean;
     returnUrl?: string;
 }): import("react/jsx-runtime").JSX.Element;
 export declare function CreateShipToAddressDetailsPageBreadcrumb({ billToId, }: {

package/dist/pages/my-sonic/pages/create-ship-to-address-details-page/create-ship-to-address-details-page.js

@@ -7,10 +7,10 @@ import { ConnectedCreateShipToAddressForm } from '../../actions/create-ship-to-a
 import { MySonicLayoutBreadcrumb } from '../../layouts/my-sonic-layout/my-sonic-layout-breadcrumb.js';
 import { MySonicLayoutPage } from '../../layouts/my-sonic-layout/my-sonic-layout-page.js';
 
-function CreateShipToAddressDetailsPage({ billToId, returnUrl, }) {
+function CreateShipToAddressDetailsPage({ billToId, makeDefault, returnUrl, }) {
     const t = useFormattedMessage();
     const paths = usePaths();
-    return (jsx(MySonicLayoutPage, { title: t('Shipping address'), children: jsx(ConnectedCreateShipToAddressForm, { billToId: billToId, returnUrl: returnUrl || paths.ACCOUNT }) }));
+    return (jsx(MySonicLayoutPage, { title: t('Shipping address'), children: jsx(ConnectedCreateShipToAddressForm, { billToId: billToId, makeDefault: makeDefault, returnUrl: returnUrl || paths.ACCOUNT }) }));
 }
 function CreateShipToAddressDetailsPageBreadcrumb({ billToId, }) {
     const t = useFormattedMessage();

package/dist/shared/api/storefront/services/customer-service.d.ts

@@ -14,6 +14,9 @@ export declare function fetchShipToAddress({ billToId, includeValidation, shipTo
     includeValidation?: boolean;
     shipToId: string;
 }): Promise<ShipToModel>;
+export declare function fetchShipByBillTo({ billToId }: {
+    billToId: string;
+}): Promise<ShipToCollectionModel>;
 export interface FetchBillToAddressesParams {
     filter?: string;
     pageSize?: number;

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

@@ -25,6 +25,13 @@ async function fetchShipToAddress({ billToId, includeValidation = false, shipToI
     });
     return body;
 }
+async function fetchShipByBillTo({ billToId }) {
+    const { body } = await request({
+        credentials: 'include',
+        url: `${config.SHOP_API_URL}/api/v1/billtos/${billToId}/shiptos`,
+    });
+    return body;
+}
 async function fetchBillToAddresses({ filter, pageSize = 20, } = {}) {
     const { body } = await request({
         credentials: 'include',
@@ -102,4 +109,4 @@ async function fetchFulfillmentMethods({ customerId, }) {
     return updatedBillTo;
 }
 
-export { fetchBillToAddress, fetchBillToAddresses, fetchCurrentBillToAddress, fetchCurrentShipToAddress, fetchFulfillmentMethods, fetchPagedShipToAddresses, fetchShipToAddress, fetchShipToAddresses, patchBillToAddress, patchShipToAddress, postShipToAddress };
+export { fetchBillToAddress, fetchBillToAddresses, fetchCurrentBillToAddress, fetchCurrentShipToAddress, fetchFulfillmentMethods, fetchPagedShipToAddresses, fetchShipByBillTo, fetchShipToAddress, fetchShipToAddresses, patchBillToAddress, patchShipToAddress, postShipToAddress };

package/package.json

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