@akinon/next 1.52.0-rc.0 → 1.53.0

package/assets/styles/index.scss

@@ -1,53 +1,29 @@
 .checkout-payment-iframe-wrapper {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  border: none;
-  z-index: 1000;
-  background-color: white;
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	border: none;
+	z-index: 1000;
+	background-color: white;
 
-  iframe {
-    width: 100%;
-    height: 100%;
-    border: none;
-    background-color: white;
-  }
+	iframe {
+		width: 100%;
+		height: 100%;
+		border: none;
+		background-color: white;
+	}
 
-  .close-button {
-    position: fixed;
-    top: 16px;
-    right: 16px;
-    width: 32px;
-    height: 32px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 1001;
-  }
-}
-
-.checkout-payment-redirection-iframe-wrapper {
-  width: 100%;
-  position: relative;
-
-  iframe {
-    width: 100%;
-    height: 100%;
-    border: none;
-    background-color: white;
-  }
-
-  .close-button {
-    position: absolute;
-    top: 16px;
-    right: 16px;
-    width: 32px;
-    height: 32px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 1001;
-  }
-}
+	.close-button {
+		position: fixed;
+		top: 16px;
+		right: 16px;
+		width: 32px;
+		height: 32px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		z-index: 1001;
+	}
+}

package/bin/pz-prebuild.js

@@ -4,4 +4,3 @@ const runScript = require('./run-script');
 
 runScript('pz-install-theme.js');
 runScript('pz-pre-check-dist.js');
-runScript('pz-generate-translations.js');

package/bin/pz-predev.js

@@ -5,4 +5,3 @@ const runScript = require('./run-script');
 runScript('pz-install-extensions.js');
 runScript('pz-check-env.js');
 runScript('pz-install-theme.js');
-runScript('pz-generate-translations.js');

package/components/index.ts

@@ -19,4 +19,3 @@ export * from './trans';
 export * from './link';
 export * from './pagination';
 export * from './live-commerce';
-export * from './file-input';

package/components/input.tsx

@@ -1,30 +1,17 @@
 import clsx from 'clsx';
-import { forwardRef, FocusEvent, useState, Ref } from 'react';
+import { forwardRef, FocusEvent, useState } from 'react';
 import { Controller } from 'react-hook-form';
-
-// @ts-ignore
-import { PatternFormat, PatternFormatProps } from 'react-number-format';
+import NumberFormat, { NumberFormatProps } from 'react-number-format';
 import { InputProps } from '../types';
 import { twMerge } from 'tailwind-merge';
 
-const PatternFormatWithRef = forwardRef(
-  (props: PatternFormatProps, ref: Ref<HTMLInputElement>) => {
-    return <PatternFormat {...props} getInputRef={ref} />;
-  }
-);
-PatternFormatWithRef.displayName = 'PatternFormatWithRef';
-
 export const Input = forwardRef<
   HTMLInputElement,
   InputProps &
     Pick<
-      PatternFormatProps,
-      'mask' | 'allowEmptyFormatting' | 'onValueChange'
-    > & {
-      format?: string;
-      defaultValue?: string;
-      type?: string;
-    }
+      NumberFormatProps,
+      'format' | 'mask' | 'allowEmptyFormatting' | 'onValueChange'
+    >
 >((props, ref) => {
   const [focused, setFocused] = useState(false);
   const [hasValue, setHasValue] = useState(false);
@@ -50,7 +37,6 @@ export const Input = forwardRef<
     ),
     props.className
   );
-
   const inputProps: any = {
     id,
     ref,
@@ -93,14 +79,14 @@ export const Input = forwardRef<
             <Controller
               name={props.name ?? ''}
               control={props.control}
+              defaultValue={false}
               render={({ field }) => (
-                <PatternFormatWithRef
+                <NumberFormat
                   format={format}
                   mask={mask ?? ''}
                   {...rest}
                   {...field}
                   {...inputProps}
-                  type={props.type as 'text' | 'password' | 'tel'}
                 />
               )}
             />

package/components/link.tsx

@@ -10,32 +10,28 @@ type LinkProps = Omit<
   React.AnchorHTMLAttributes<HTMLAnchorElement>,
   keyof NextLinkProps
 > &
-  NextLinkProps & {
-    href: string;
-  };
+  NextLinkProps;
 
 export const Link = ({ children, href, ...rest }: LinkProps) => {
   const { locale, defaultLocaleValue, localeUrlStrategy } = useLocalization();
   const formattedHref = useMemo(() => {
-    if (!href) {
-      return '#';
+    if (typeof href !== 'string' || href.startsWith('http')) {
+      return href;
     }
 
-    if (typeof href === 'string' && !href.startsWith('http')) {
-      const pathnameWithoutLocale = href.replace(urlLocaleMatcherRegex, '');
-      const hrefWithLocale = `/${locale}${pathnameWithoutLocale}`;
+    const pathnameWithoutLocale = href.replace(urlLocaleMatcherRegex, '');
+    const hrefWithLocale = `/${locale}${pathnameWithoutLocale}`;
 
-      if (localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales) {
-        return hrefWithLocale;
-      } else if (
-        localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale &&
-        locale !== defaultLocaleValue
-      ) {
-        return hrefWithLocale;
-      }
+    if (localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales) {
+      return hrefWithLocale;
+    } else if (
+      localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale &&
+      locale !== defaultLocaleValue
+    ) {
+      return hrefWithLocale;
     }
 
-    return href;
+    return href || '#';
   }, [href, defaultLocaleValue, locale, localeUrlStrategy]);
 
   return (

package/components/price.tsx

@@ -1,14 +1,11 @@
 import { useMemo } from 'react';
-
-// @ts-ignore
-import { NumericFormat, NumericFormatProps } from 'react-number-format';
+import NumberFormat, { NumberFormatProps } from 'react-number-format';
 import { getCurrency } from '@akinon/next/utils';
 
 import { useLocalization } from '@akinon/next/hooks';
 import { PriceProps } from '../types';
-import Settings from 'settings';
 
-export const Price = (props: NumericFormatProps & PriceProps) => {
+export const Price = (props: NumberFormatProps & PriceProps) => {
   const {
     value,
     currencyCode,
@@ -30,10 +27,6 @@ export const Price = (props: NumericFormatProps & PriceProps) => {
   // TODO: This is very bad practice. It broke decimalScale.
   const _value = value?.toString().replace('.', ',');
 
-  const currentCurrencyDecimalScale = Settings.localization.currencies.find(
-    (currency) => currency.code === currencyCode_
-  ).decimalScale;
-
   const currency = useMemo(
     () =>
       getCurrency({
@@ -46,14 +39,14 @@ export const Price = (props: NumericFormatProps & PriceProps) => {
   );
 
   return (
-    <NumericFormat
+    <NumberFormat
       value={useNegative ? `-${useNegativeSpace}${_value}` : _value}
       {...{
         [useCurrencyAfterPrice ? 'suffix' : 'prefix']: currency
       }}
       displayType={displayType}
       thousandSeparator={thousandSeparator}
-      decimalScale={currentCurrencyDecimalScale ?? decimalScale}
+      decimalScale={decimalScale}
       decimalSeparator={decimalSeparator}
       fixedDecimalScale={fixedDecimalScale}
       {...rest}

package/components/pz-root.tsx

@@ -3,29 +3,17 @@ import ClientRoot from './client-root';
 import { cookies } from 'next/headers';
 import PzProviders from './pz-providers';
 import { WebVitals } from './web-vitals';
-import settings from 'settings';
 
-export default async function PzRoot({
+export default function PzRoot({
   translations,
-  children,
-  locale
+  children
 }: {
-  translations?: any;
+  translations: any;
   children: React.ReactNode;
-  locale?: string;
 }) {
   const nextCookies = cookies();
   const sessionid = nextCookies.get('osessionid')?.value;
 
-  if (!translations) {
-    const { getTranslations } =
-      settings.useOptimizedTranslations && locale
-        ? require('translations')
-        : require('../utils/server-translation');
-
-    translations = await getTranslations(locale);
-  }
-
   return (
     <PzProviders translations={translations}>
       <WebVitals />

package/components/selected-payment-option-view.tsx

@@ -6,21 +6,6 @@ import dynamic from 'next/dynamic';
 import { PaymentOptionViews } from 'views/checkout/steps/payment';
 import { useMemo } from 'react';
 
-const fallbackView = () => <div />;
-
-const paymentTypeToView = {
-  bkm_express: 'bkm',
-  credit_card: 'credit-card',
-  credit_payment: 'credit-payment',
-  funds_transfer: 'funds-transfer',
-  gpay: 'gpay',
-  loyalty_money: 'loyalty',
-  masterpass: 'credit-card',
-  pay_on_delivery: 'pay-on-delivery',
-  redirection: 'redirection'
-  // Add other mappings as needed
-};
-
 export default function SelectedPaymentOptionView() {
   const { payment_option } = useAppSelector(
     (state: RootState) => state.checkout.preOrder
@@ -29,7 +14,7 @@ export default function SelectedPaymentOptionView() {
   const Component = useMemo(
     () =>
       dynamic(
-        async () => {
+        () => {
           const customOption = PaymentOptionViews.find(
             (opt) => opt.slug === payment_option.slug
           );
@@ -44,19 +29,46 @@ export default function SelectedPaymentOptionView() {
             });
           }
 
-          const view = paymentTypeToView[payment_option.payment_type];
-          if (view) {
-            try {
-              const mod = await import(
-                `views/checkout/steps/payment/options/${view}`
+          let promise: any;
+
+          try {
+            if (payment_option.payment_type === 'credit_card') {
+              promise = import(
+                `views/checkout/steps/payment/options/credit-card`
+              );
+            } else if (payment_option.payment_type === 'funds_transfer') {
+              promise = import(
+                `views/checkout/steps/payment/options/funds-transfer`
+              );
+            } else if (payment_option.payment_type === 'redirection') {
+              promise = import(
+                `views/checkout/steps/payment/options/redirection`
+              );
+            } else if (payment_option.payment_type === 'pay_on_delivery') {
+              promise = import(
+                `views/checkout/steps/payment/options/pay-on-delivery`
+              );
+            } else if (payment_option.payment_type === 'loyalty_money') {
+              promise = import(`views/checkout/steps/payment/options/loyalty`);
+            } else if (payment_option.payment_type === 'masterpass') {
+              promise = import(
+                `views/checkout/steps/payment/options/credit-card`
               );
-              return mod.default || fallbackView;
-            } catch (error) {
-              return fallbackView;
             }
-          }
+            // else if (payment_option.payment_type === 'credit_payment') {
+            //   promise = import(`views/checkout/steps/payment/options/credit-payment`);
+            // }
+            // else if (payment_option.payment_type === 'gpay') {
+            //   promise = import(`views/checkout/steps/payment/options/gpay`);
+            // }
+            // else if (payment_option.payment_type === 'bkm_express') {
+            //   promise = import(`views/checkout/steps/payment/options/bkm`);
+            // }
+          } catch (error) {}
 
-          return fallbackView;
+          return promise
+            ? promise.then((mod) => mod.default).catch(() => () => null)
+            : new Promise<any>((resolve) => resolve(() => null));
         },
         { ssr: false }
       ),

package/data/client/account.ts

@@ -123,16 +123,15 @@ const accountApi = api.injectEndpoints({
       query: ({ page, status, limit }) =>
         buildClientRequestUrl(account.getQuotations(page, status, limit))
     }),
-    sendContact: builder.mutation<void, FormData>({
-      query: (body) => {
-        return {
-          url: buildClientRequestUrl(account.sendContact, {
-            useFormData: true
-          }),
-          method: 'POST',
-          body
-        };
-      }
+    sendContact: builder.mutation<void, ContactFormType>({
+      query: (body) => ({
+        url: buildClientRequestUrl(account.sendContact, {
+          contentType: 'application/json',
+          responseType: 'text'
+        }),
+        method: 'POST',
+        body
+      })
     }),
     cancelOrder: builder.mutation<void, AccountOrderCancellation>({
       query: ({ id, ...body }) => ({

package/data/client/address.ts

@@ -39,10 +39,7 @@ const addressApi = api.injectEndpoints({
       query: (city) =>
         buildClientRequestUrl(address.getRetailStoreTownships(city))
     }),
-    addAddress: builder.mutation<
-      Address,
-      Partial<Address> & { invalidateTag?: 'Addresses' | 'Checkout' }
-    >({
+    addAddress: builder.mutation<Address, Partial<Address>>({
       query: (body) => ({
         url: buildClientRequestUrl(address.base, {
           contentType: 'application/json'
@@ -53,16 +50,9 @@ const addressApi = api.injectEndpoints({
           type: body.is_corporate === 'true' ? 'corporate' : 'personal'
         }
       }),
-      invalidatesTags: (_, error, arg) => {
-        if (error) return [];
-        if (arg.invalidateTag) return [arg.invalidateTag];
-        return ['Addresses', 'Checkout'];
-      }
+      invalidatesTags: (_, error) => (error ? [] : ['Addresses', 'Checkout'])
     }),
-    editAddress: builder.mutation<
-      Address,
-      Partial<Address> & { invalidateTag?: 'Addresses' | 'Checkout' }
-    >({
+    editAddress: builder.mutation<Address, Partial<Address>>({
       query: ({ pk, ...body }) => ({
         url: buildClientRequestUrl(address.editAddress(pk), {
           contentType: 'application/json'
@@ -74,28 +64,14 @@ const addressApi = api.injectEndpoints({
           type: body.is_corporate === 'true' ? 'corporate' : 'personal'
         }
       }),
-      invalidatesTags: (_, error, arg) => {
-        if (error) return [];
-        if (arg.invalidateTag) return [arg.invalidateTag];
-        return ['Addresses', 'Checkout'];
-      }
+      invalidatesTags: (_, error) => (error ? [] : ['Addresses', 'Checkout']) // TODO: Invalidate one of these tags when necessary (e.g. Address page invalidates Addresses tag, Checkout page invalidates Checkout tag)
     }),
-    removeAddress: builder.mutation<
-      void,
-      number | { id: number; invalidateTag: 'Addresses' | 'Checkout' }
-    >({
-      query: (arg) => ({
-        url: buildClientRequestUrl(
-          address.removeAddress(typeof arg === 'number' ? arg : arg.id)
-        ),
+    removeAddress: builder.mutation<void, number>({
+      query: (id) => ({
+        url: buildClientRequestUrl(address.removeAddress(id)),
         method: 'DELETE'
       }),
-      invalidatesTags: (_, error, arg) => {
-        if (error) return [];
-        if (typeof arg === 'object' && arg.invalidateTag)
-          return [arg.invalidateTag];
-        return ['Addresses', 'Checkout'];
-      }
+      invalidatesTags: (_, error) => (error ? [] : ['Addresses', 'Checkout']) // TODO: Invalidate one of these tags when necessary (e.g. Address page invalidates Addresses tag, Checkout page invalidates Checkout tag)
     }),
     setDefaultAddress: builder.mutation<Address, Partial<Address>>({
       query: ({ pk, primary }) => ({

package/data/client/api.ts

@@ -67,7 +67,7 @@ export const api = createApi({
   baseQuery: customBaseQuery,
   tagTypes: [
     'Basket',
-    'MultiBasket',
+    'AllBaskets',
     'BasketB2b',
     'DraftsB2b',
     'Product',

package/data/client/b2b.ts

@@ -12,9 +12,7 @@ import {
   SaveBasketParams,
   UpdateProductParams,
   DeleteProductParams,
-  CreateQuotationParams,
-  BasketStatusResponse,
-  ExportBasketResponse
+  CreateQuotationParams
 } from '../../types';
 
 const b2bApi = api.injectEndpoints({
@@ -91,34 +89,6 @@ const b2bApi = api.injectEndpoints({
       }),
       invalidatesTags: ['BasketB2b', 'DraftsB2b']
     }),
-    exportBasket: build.mutation<ExportBasketResponse, string>({
-      query: (queryString) => {
-        return {
-          url: buildClientRequestUrl(b2b.basketExport(queryString)),
-          method: 'GET'
-        };
-      }
-    }),
-    getBasketStatus: build.mutation<BasketStatusResponse, string>({
-      query: (cacheKey) => {
-        return {
-          url: buildClientRequestUrl(b2b.statusBasket(cacheKey)),
-          method: 'GET'
-        };
-      }
-    }),
-    uploadFile: build.mutation<void, FormData>({
-      query: (body) => {
-        return {
-          url: buildClientRequestUrl(b2b.basketImport, {
-            useFormData: true
-          }),
-          method: 'POST',
-          body
-        };
-      },
-      invalidatesTags: ['BasketB2b']
-    })
   }),
   overrideExisting: true
 });
@@ -132,8 +102,5 @@ export const {
   useLoadBasketMutation,
   useUpdateProductMutation,
   useDeleteProductMutation,
-  useCreateQuotationMutation,
-  useGetBasketStatusMutation,
-  useExportBasketMutation,
-  useUploadFileMutation
+  useCreateQuotationMutation
 } = b2bApi;

package/data/client/basket.ts

@@ -28,7 +28,7 @@ export const basketApi = api.injectEndpoints({
       query: ({ namespace }) =>
         buildClientRequestUrl(basket.getBasketDetail(namespace)),
       transformResponse: (response: { basket: Basket }) => response.basket,
-      providesTags: ['MultiBasket']
+      providesTags: ['AllBaskets']
     }),
     getAllBaskets: build.query<Basket[], void>({
       query: () =>
@@ -36,7 +36,7 @@ export const basketApi = api.injectEndpoints({
           contentType: 'application/json'
         }),
       transformResponse: (response: { baskets: Basket[] }) => response.baskets,
-      providesTags: ['MultiBasket']
+      providesTags: ['AllBaskets']
     }),
     removeBasket: build.mutation<Basket, { pk: number }>({
       query: ({ pk }) => ({
@@ -46,7 +46,7 @@ export const basketApi = api.injectEndpoints({
         method: 'DELETE',
         body: { pk }
       }),
-      invalidatesTags: ['MultiBasket', 'Basket']
+      invalidatesTags: ['AllBaskets', 'Basket']
     }),
     selectMainBasket: build.mutation<Basket, { pk: number }>({
       query: ({ pk }) => ({
@@ -57,7 +57,7 @@ export const basketApi = api.injectEndpoints({
         body: { pk }
       }),
       transformResponse: (response: { baskets: Basket }) => response.baskets,
-      invalidatesTags: ['MultiBasket', 'Basket']
+      invalidatesTags: ['AllBaskets', 'Basket']
     }),
     updateQuantity: build.mutation<
       UpdateQuantityResponse,
@@ -69,8 +69,7 @@ export const basketApi = api.injectEndpoints({
         }),
         method: 'PUT',
         body
-      }),
-      invalidatesTags: ['MultiBasket', 'Basket']
+      })
     }),
     clearBasket: build.mutation<Basket, void>({
       query: (body) => ({

package/data/client/checkout.ts

@@ -1,11 +1,11 @@
 import {
   setBankAccounts,
-  setCardType,
   setInstallmentOptions,
   setPaymentStepBusy,
   setSelectedBankAccountPk,
   setSelectedCreditPaymentPk,
-  setShippingStepBusy
+  setShippingStepBusy,
+  setCardType
 } from '../../redux/reducers/checkout';
 import {
   CheckoutContext,
@@ -20,7 +20,6 @@ import { AppDispatch, AppStore, store } from 'redux/store';
 import settings from 'settings';
 import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';
 import {
-  setCvcRequired,
   setError,
   setOtpModalVisible
 } from '@akinon/pz-masterpass/src/redux/reducer';
@@ -114,8 +113,7 @@ const completeMasterpassPayment = async (
     ? await buildDirectPurchaseForm(commonFormValues, params)
     : await buildPurchaseForm({
         ...commonFormValues,
-        selectedCard,
-        cardCvc: params?.card_cvv
+        selectedCard
       });
 
   window.MFS?.[
@@ -153,10 +151,6 @@ const completeMasterpassPayment = async (
       return;
     }
 
-    if (['5013', '5182'].includes(response.responseCode)) {
-      dispatch(setCvcRequired(true));
-    }
-
     if (
       response.token &&
       (response.responseCode == '0000' || response.responseCode == '')
@@ -379,22 +373,6 @@ export const checkoutApi = api.injectEndpoints({
         dispatch(setShippingStepBusy(false));
       }
     }),
-    setDataSourceShippingOptions: build.mutation<CheckoutResponse, number[]>({
-      query: (pks) => ({
-        url: buildClientRequestUrl(checkout.setDataSourceShippingOption, {
-          useFormData: true
-        }),
-        method: 'POST',
-        body: {
-          data_source_shipping_options: JSON.stringify(pks)
-        }
-      }),
-      async onQueryStarted(arg, { dispatch, queryFulfilled }) {
-        dispatch(setShippingStepBusy(true));
-        await queryFulfilled;
-        dispatch(setShippingStepBusy(false));
-      }
-    }),
     setRetailStore: build.mutation<CheckoutResponse, SetRetailStoreParams>({
       query: ({ retailStorePk, billingAddressPk }) => ({
         url: buildClientRequestUrl(
@@ -695,25 +673,6 @@ export const checkoutApi = api.injectEndpoints({
           body
         };
       }
-    }),
-    setAttributeBasedShippingOptions: build.mutation<
-      CheckoutResponse,
-      Record<string, number>
-    >({
-      query: (options) => ({
-        url: buildClientRequestUrl(checkout.setAttributeBasedShippingOption, {
-          useFormData: true
-        }),
-        method: 'POST',
-        body: {
-          attribute_based_shipping_options: JSON.stringify(options)
-        }
-      }),
-      async onQueryStarted(arg, { dispatch, queryFulfilled }) {
-        dispatch(setShippingStepBusy(true));
-        await queryFulfilled;
-        dispatch(setShippingStepBusy(false));
-      }
     })
   }),
   overrideExisting: false
@@ -732,7 +691,6 @@ export const {
   useSetDeliveryOptionMutation,
   useSetAddressesMutation,
   useSetShippingOptionMutation,
-  useSetDataSourceShippingOptionsMutation,
   useSetPaymentOptionMutation,
   useSetBinNumberMutation,
   useSetInstallmentOptionMutation,
@@ -750,6 +708,5 @@ export const {
   useGetCheckoutLoyaltyBalanceQuery,
   usePayWithLoyaltyBalanceMutation,
   useSetOrderNoteMutation,
-  useSetDeliveryBagsMutation,
-  useSetAttributeBasedShippingOptionsMutation
+  useSetDeliveryBagsMutation
 } = checkoutApi;