@akinon/next 1.52.0 → 1.53.0-rc.0

package/assets/styles/index.css.map

@@ -0,0 +1 @@
+{"version":3,"sources":["index.scss","index.css"],"names":[],"mappings":"AAAA;EACE,eAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,YAAA;EACA,YAAA;EACA,aAAA;EACA,uBAAA;ACCF;ADCE;EACE,WAAA;EACA,YAAA;EACA,YAAA;EACA,uBAAA;ACCJ;ADEE;EACE,eAAA;EACA,SAAA;EACA,WAAA;EACA,WAAA;EACA,YAAA;EACA,aAAA;EACA,mBAAA;EACA,uBAAA;EACA,aAAA;ACAJ;;ADIA;EACE,WAAA;EACA,kBAAA;ACDF;ADGE;EACE,WAAA;EACA,YAAA;EACA,YAAA;EACA,uBAAA;ACDJ;ADIE;EACE,kBAAA;EACA,SAAA;EACA,WAAA;EACA,WAAA;EACA,YAAA;EACA,aAAA;EACA,mBAAA;EACA,uBAAA;EACA,aAAA;ACFJ","file":"index.css"}

package/assets/styles/index.scss

@@ -1,29 +1,53 @@
 .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;
-	}
-}
+  .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;
+  }
+}

package/bin/pz-generate-translations.js

@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+const localesPath = path.resolve(`public/locales/`);
+
+async function generateTranslationIndex(locale_) {
+  let translations = {};
+
+  try {
+    const localeDirPath = path.resolve(`public/locales/${locale_}`);
+    const fileNames = fs.readdirSync(localeDirPath);
+
+    for await (const fileName of fileNames) {
+      if (fileName === 'index.json') {
+        continue;
+      }
+
+      const data = fs.readFileSync(
+        path.join(localeDirPath, `/${fileName}`),
+        'utf-8'
+      );
+
+      translations[fileName.substring(0, fileName.lastIndexOf('.'))] =
+        JSON.parse(data);
+    }
+
+    fs.writeFileSync(
+      path.resolve(`public/locales/${locale_}/index.json`),
+      JSON.stringify(translations)
+    );
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+const localePaths = fs.readdirSync(localesPath);
+
+localePaths.forEach((localePath) => {
+  generateTranslationIndex(localePath);
+});

package/bin/pz-prebuild.js

@@ -4,3 +4,4 @@ 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,3 +5,4 @@ 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/file-input.tsx

@@ -0,0 +1,8 @@
+import { forwardRef } from 'react';
+import { FileInputProps } from '../types/index';
+
+export const FileInput = forwardRef<HTMLInputElement, FileInputProps>(
+  function fileInput(props, ref) {
+    return <input type="file" {...props} ref={ref} />;
+  }
+);

package/components/index.ts

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

package/components/input.tsx

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

package/components/link.tsx

@@ -10,28 +10,32 @@ type LinkProps = Omit<
   React.AnchorHTMLAttributes<HTMLAnchorElement>,
   keyof NextLinkProps
 > &
-  NextLinkProps;
+  NextLinkProps & {
+    href: string;
+  };
 
 export const Link = ({ children, href, ...rest }: LinkProps) => {
   const { locale, defaultLocaleValue, localeUrlStrategy } = useLocalization();
   const formattedHref = useMemo(() => {
-    if (typeof href !== 'string' || href.startsWith('http')) {
-      return href;
+    if (!href) {
+      return '#';
     }
 
-    const pathnameWithoutLocale = href.replace(urlLocaleMatcherRegex, '');
-    const hrefWithLocale = `/${locale}${pathnameWithoutLocale}`;
+    if (typeof href === 'string' && !href.startsWith('http')) {
+      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,11 +1,14 @@
 import { useMemo } from 'react';
-import NumberFormat, { NumberFormatProps } from 'react-number-format';
+
+// @ts-ignore
+import { NumericFormat, NumericFormatProps } 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: NumberFormatProps & PriceProps) => {
+export const Price = (props: NumericFormatProps & PriceProps) => {
   const {
     value,
     currencyCode,
@@ -27,6 +30,10 @@ export const Price = (props: NumberFormatProps & 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({
@@ -39,14 +46,14 @@ export const Price = (props: NumberFormatProps & PriceProps) => {
   );
 
   return (
-    <NumberFormat
+    <NumericFormat
       value={useNegative ? `-${useNegativeSpace}${_value}` : _value}
       {...{
         [useCurrencyAfterPrice ? 'suffix' : 'prefix']: currency
       }}
       displayType={displayType}
       thousandSeparator={thousandSeparator}
-      decimalScale={decimalScale}
+      decimalScale={currentCurrencyDecimalScale ?? decimalScale}
       decimalSeparator={decimalSeparator}
       fixedDecimalScale={fixedDecimalScale}
       {...rest}

package/components/pz-root.tsx

@@ -3,17 +3,29 @@ 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 function PzRoot({
+export default async function PzRoot({
   translations,
-  children
+  children,
+  locale
 }: {
-  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,6 +6,21 @@ 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
@@ -14,7 +29,7 @@ export default function SelectedPaymentOptionView() {
   const Component = useMemo(
     () =>
       dynamic(
-        () => {
+        async () => {
           const customOption = PaymentOptionViews.find(
             (opt) => opt.slug === payment_option.slug
           );
@@ -29,46 +44,19 @@ export default function SelectedPaymentOptionView() {
             });
           }
 
-          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`
+          const view = paymentTypeToView[payment_option.payment_type];
+          if (view) {
+            try {
+              const mod = await import(
+                `views/checkout/steps/payment/options/${view}`
               );
+              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 promise
-            ? promise.then((mod) => mod.default).catch(() => () => null)
-            : new Promise<any>((resolve) => resolve(() => null));
+          return fallbackView;
         },
         { ssr: false }
       ),

package/data/client/account.ts

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

package/data/client/address.ts

@@ -39,7 +39,10 @@ const addressApi = api.injectEndpoints({
       query: (city) =>
         buildClientRequestUrl(address.getRetailStoreTownships(city))
     }),
-    addAddress: builder.mutation<Address, Partial<Address>>({
+    addAddress: builder.mutation<
+      Address,
+      Partial<Address> & { invalidateTag?: 'Addresses' | 'Checkout' }
+    >({
       query: (body) => ({
         url: buildClientRequestUrl(address.base, {
           contentType: 'application/json'
@@ -50,9 +53,16 @@ const addressApi = api.injectEndpoints({
           type: body.is_corporate === 'true' ? 'corporate' : 'personal'
         }
       }),
-      invalidatesTags: (_, error) => (error ? [] : ['Addresses', 'Checkout'])
+      invalidatesTags: (_, error, arg) => {
+        if (error) return [];
+        if (arg.invalidateTag) return [arg.invalidateTag];
+        return ['Addresses', 'Checkout'];
+      }
     }),
-    editAddress: builder.mutation<Address, Partial<Address>>({
+    editAddress: builder.mutation<
+      Address,
+      Partial<Address> & { invalidateTag?: 'Addresses' | 'Checkout' }
+    >({
       query: ({ pk, ...body }) => ({
         url: buildClientRequestUrl(address.editAddress(pk), {
           contentType: 'application/json'
@@ -64,14 +74,28 @@ const addressApi = api.injectEndpoints({
           type: body.is_corporate === 'true' ? 'corporate' : 'personal'
         }
       }),
-      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)
+      invalidatesTags: (_, error, arg) => {
+        if (error) return [];
+        if (arg.invalidateTag) return [arg.invalidateTag];
+        return ['Addresses', 'Checkout'];
+      }
     }),
-    removeAddress: builder.mutation<void, number>({
-      query: (id) => ({
-        url: buildClientRequestUrl(address.removeAddress(id)),
+    removeAddress: builder.mutation<
+      void,
+      number | { id: number; invalidateTag: 'Addresses' | 'Checkout' }
+    >({
+      query: (arg) => ({
+        url: buildClientRequestUrl(
+          address.removeAddress(typeof arg === 'number' ? arg : arg.id)
+        ),
         method: 'DELETE'
       }),
-      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)
+      invalidatesTags: (_, error, arg) => {
+        if (error) return [];
+        if (typeof arg === 'object' && arg.invalidateTag)
+          return [arg.invalidateTag];
+        return ['Addresses', 'Checkout'];
+      }
     }),
     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',
-    'AllBaskets',
+    'MultiBasket',
     'BasketB2b',
     'DraftsB2b',
     'Product',

package/data/client/b2b.ts

@@ -12,7 +12,9 @@ import {
   SaveBasketParams,
   UpdateProductParams,
   DeleteProductParams,
-  CreateQuotationParams
+  CreateQuotationParams,
+  BasketStatusResponse,
+  ExportBasketResponse
 } from '../../types';
 
 const b2bApi = api.injectEndpoints({
@@ -89,6 +91,34 @@ 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
 });
@@ -102,5 +132,8 @@ export const {
   useLoadBasketMutation,
   useUpdateProductMutation,
   useDeleteProductMutation,
-  useCreateQuotationMutation
+  useCreateQuotationMutation,
+  useGetBasketStatusMutation,
+  useExportBasketMutation,
+  useUploadFileMutation
 } = 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: ['AllBaskets']
+      providesTags: ['MultiBasket']
     }),
     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: ['AllBaskets']
+      providesTags: ['MultiBasket']
     }),
     removeBasket: build.mutation<Basket, { pk: number }>({
       query: ({ pk }) => ({
@@ -46,7 +46,7 @@ export const basketApi = api.injectEndpoints({
         method: 'DELETE',
         body: { pk }
       }),
-      invalidatesTags: ['AllBaskets', 'Basket']
+      invalidatesTags: ['MultiBasket', '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: ['AllBaskets', 'Basket']
+      invalidatesTags: ['MultiBasket', 'Basket']
     }),
     updateQuantity: build.mutation<
       UpdateQuantityResponse,
@@ -69,7 +69,8 @@ export const basketApi = api.injectEndpoints({
         }),
         method: 'PUT',
         body
-      })
+      }),
+      invalidatesTags: ['MultiBasket', 'Basket']
     }),
     clearBasket: build.mutation<Basket, void>({
       query: (body) => ({