@akinon/next 1.59.0-rc.4 → 1.59.0

package/plugins.d.ts

@@ -21,10 +21,4 @@ declare module '@akinon/pz-otp' {
 
 declare module '@akinon/pz-otp/src/redux/reducer' {
   export const showPopup: any;
-  export const hidePopup: any;
-}
-
-declare module '@akinon/pz-saved-card' {
-  export const savedCardReducer: any;
-  export const SavedCardOption: any;
 }

package/plugins.js

@@ -12,6 +12,5 @@ module.exports = [
   'pz-b2b',
   'pz-akifast',
   'pz-multi-basket',
-  'pz-tabby-extension',
-  'pz-saved-card'
+  'pz-tabby-extension'
 ];

package/redux/middlewares/checkout.ts

@@ -3,12 +3,9 @@
 import { Middleware } from '@reduxjs/toolkit';
 import {
   setAddressList,
-  setAttributeBasedShippingOptions,
   setBankAccounts,
   setCanGuestPurchase,
   setCardType,
-  setCreditPaymentOptions,
-  setDataSourceShippingOptions,
   setDeliveryOptions,
   setErrors,
   setHasGiftBox,
@@ -19,16 +16,16 @@ import {
   setPreOrder,
   setRetailStores,
   setShippingOptions,
-  setShippingStepCompleted
+  setShippingStepCompleted,
+  setCreditPaymentOptions
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
 import { CheckoutContext, PreOrder } from '../../types';
-import { getCookie } from '../../utils';
+import { getCookie, setCookie } from '../../utils';
 import settings from 'settings';
 import { LocaleUrlStrategy } from '../../localization';
 import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';
-import { showRedirectionIframe } from '../../utils/redirection-iframe';
 
 interface CheckoutResult {
   payload: {
@@ -76,10 +73,8 @@ export const preOrderMiddleware: Middleware = ({
       deliveryOptions,
       addressList: addresses,
       shippingOptions,
-      dataSourceShippingOptions,
       paymentOptions,
-      installmentOptions,
-      attributeBasedShippingOptions
+      installmentOptions
     } = getState().checkout;
     const { endpoints: apiEndpoints } = checkoutApi;
 
@@ -112,8 +107,7 @@ export const preOrderMiddleware: Middleware = ({
     if (
       (!preOrder.shipping_address || !preOrder.billing_address) &&
       addresses.length > 0 &&
-      (!preOrder.delivery_option ||
-        preOrder.delivery_option.delivery_option_type === 'customer')
+      preOrder.delivery_option?.delivery_option_type === 'customer'
     ) {
       dispatch(
         apiEndpoints.setAddresses.initiate({
@@ -131,49 +125,11 @@ export const preOrderMiddleware: Middleware = ({
       dispatch(apiEndpoints.setShippingOption.initiate(shippingOptions[0].pk));
     }
 
-    if (
-      dataSourceShippingOptions.length > 0 &&
-      !preOrder.data_source_shipping_options
-    ) {
-      const selectedDataSourceShippingOptionsPks =
-        dataSourceShippingOptions.map(
-          (opt) => opt.data_source_shipping_options[0].pk
-        );
-
-      dispatch(
-        apiEndpoints.setDataSourceShippingOptions.initiate(
-          selectedDataSourceShippingOptionsPks
-        )
-      );
-    }
-
-    if (
-      Object.keys(attributeBasedShippingOptions).length > 0 &&
-      !preOrder.attribute_based_shipping_options
-    ) {
-      const initialSelectedOptions: Record<string, number> = Object.fromEntries(
-        Object.entries(attributeBasedShippingOptions).map(([key, options]) => [
-          key,
-          options[0].pk
-        ])
-      );
-
-      dispatch(
-        apiEndpoints.setAttributeBasedShippingOptions.initiate(
-          initialSelectedOptions
-        )
-      );
-    }
-
     if (!preOrder.payment_option && paymentOptions.length > 0) {
       dispatch(apiEndpoints.setPaymentOption.initiate(paymentOptions[0].pk));
     }
 
-    if (
-      !preOrder.installment &&
-      preOrder.payment_option.payment_type !== 'saved_card' &&
-      installmentOptions.length > 0
-    ) {
+    if (!preOrder.installment && installmentOptions.length > 0) {
       dispatch(
         apiEndpoints.setInstallmentOption.initiate(installmentOptions[0].pk)
       );
@@ -207,7 +163,6 @@ export const contextListMiddleware: Middleware = ({
     if (result?.payload?.context_list) {
       result.payload.context_list.forEach((context) => {
         const redirectUrl = context.page_context.redirect_url;
-        const isIframe = context.page_context.is_frame ?? false;
 
         if (redirectUrl) {
           const currentLocale = getCookie('pz-locale');
@@ -226,19 +181,16 @@ export const contextListMiddleware: Middleware = ({
           }
 
           const urlObj = new URL(url, window.location.origin);
-          const isMobileDevice =
-            isMobileApp ||
-            /iPad|iPhone|iPod|Android/i.test(navigator.userAgent);
-          const isIframePaymentOptionExcluded =
-            !settings.checkout?.iframeExcludedPaymentOptions?.includes(
-              result.payload?.pre_order?.payment_option?.slug
-            );
           urlObj.searchParams.set('t', new Date().getTime().toString());
 
-          if (isMobileDevice && !isIframePaymentOptionExcluded) {
+          if (
+            (isMobileApp ||
+              /iPad|iPhone|iPod|Android/i.test(navigator.userAgent)) &&
+            !settings.checkout?.iframeExcludedPaymentOptions?.includes(
+              result.payload?.pre_order?.payment_option?.slug
+            )
+          ) {
             showMobile3dIframe(urlObj.toString());
-          } else if (isIframe && !isIframePaymentOptionExcluded) {
-            showRedirectionIframe(urlObj.toString());
           } else {
             window.location.href = urlObj.toString();
           }
@@ -268,28 +220,12 @@ export const contextListMiddleware: Middleware = ({
           dispatch(setShippingOptions(context.page_context.shipping_options));
         }
 
-        if (context.page_context.data_sources) {
-          dispatch(
-            setDataSourceShippingOptions(context.page_context.data_sources)
-          );
-        }
-
-        if (context.page_context.attribute_based_shipping_options) {
-          dispatch(
-            setAttributeBasedShippingOptions(
-              context.page_context.attribute_based_shipping_options
-            )
-          );
-        }
-
         if (context.page_context.payment_options) {
           dispatch(setPaymentOptions(context.page_context.payment_options));
         }
 
         if (context.page_context.credit_payment_options) {
-          dispatch(
-            setCreditPaymentOptions(context.page_context.credit_payment_options)
-          );
+          dispatch(setCreditPaymentOptions(context.page_context.credit_payment_options));
         }
 
         if (context.page_context.payment_choices) {

package/redux/reducers/checkout.ts

@@ -14,9 +14,7 @@ import {
   CheckoutCreditPaymentOption,
   PreOrder,
   RetailStore,
-  ShippingOption,
-  DataSource,
-  AttributeBasedShippingOption
+  ShippingOption
 } from '../../types';
 
 export interface CheckoutState {
@@ -38,7 +36,6 @@ export interface CheckoutState {
   addressList: Address[];
   deliveryOptions: DeliveryOption[];
   shippingOptions: ShippingOption[];
-  dataSourceShippingOptions: DataSource[];
   paymentOptions: PaymentOption[];
   creditPaymentOptions: CheckoutCreditPaymentOption[];
   selectedCreditPaymentPk: number;
@@ -49,8 +46,6 @@ export interface CheckoutState {
   selectedBankAccountPk: number;
   loyaltyBalance?: string;
   retailStores: RetailStore[];
-  attributeBasedShippingOptions: AttributeBasedShippingOption[];
-  selectedShippingOptions: Record<string, number>;
 }
 
 const initialState: CheckoutState = {
@@ -72,7 +67,6 @@ const initialState: CheckoutState = {
   addressList: [],
   deliveryOptions: [],
   shippingOptions: [],
-  dataSourceShippingOptions: [],
   paymentOptions: [],
   creditPaymentOptions: [],
   selectedCreditPaymentPk: null,
@@ -81,9 +75,7 @@ const initialState: CheckoutState = {
   installmentOptions: [],
   bankAccounts: [],
   selectedBankAccountPk: null,
-  retailStores: [],
-  attributeBasedShippingOptions: [],
-  selectedShippingOptions: {}
+  retailStores: []
 };
 
 const checkoutSlice = createSlice({
@@ -129,9 +121,6 @@ const checkoutSlice = createSlice({
     setShippingOptions(state, { payload }) {
       state.shippingOptions = payload;
     },
-    setDataSourceShippingOptions(state, { payload }) {
-      state.dataSourceShippingOptions = payload;
-    },
     setPaymentOptions(state, { payload }) {
       state.paymentOptions = payload;
     },
@@ -161,12 +150,6 @@ const checkoutSlice = createSlice({
     },
     setRetailStores(state, { payload }) {
       state.retailStores = payload;
-    },
-    setAttributeBasedShippingOptions(state, { payload }) {
-      state.attributeBasedShippingOptions = payload;
-    },
-    setSelectedShippingOptions: (state, { payload }) => {
-      state.selectedShippingOptions = payload;
     }
   }
 });
@@ -185,7 +168,6 @@ export const {
   setAddressList,
   setDeliveryOptions,
   setShippingOptions,
-  setDataSourceShippingOptions,
   setPaymentOptions,
   setCreditPaymentOptions,
   setSelectedCreditPaymentPk,
@@ -195,9 +177,7 @@ export const {
   setBankAccounts,
   setSelectedBankAccountPk,
   setLoyaltyBalance,
-  setRetailStores,
-  setAttributeBasedShippingOptions,
-  setSelectedShippingOptions
+  setRetailStores
 } = checkoutSlice.actions;
 
 export default checkoutSlice.reducer;

package/redux/reducers/index.ts

@@ -7,7 +7,6 @@ import { api } from '../../data/client/api';
 // Plugin reducers
 import { masterpassReducer } from '@akinon/pz-masterpass';
 import { otpReducer } from '@akinon/pz-otp';
-import { savedCardReducer } from '@akinon/pz-saved-card';
 
 const reducers = {
   [api.reducerPath]: api.reducer,
@@ -16,8 +15,7 @@ const reducers = {
   config: configReducer,
   header: headerReducer,
   masterpass: masterpassReducer,
-  otp: otpReducer,
-  savedCard: savedCardReducer
+  otp: otpReducer
 };
 
 export default reducers;

package/types/commerce/address.ts

@@ -17,7 +17,7 @@ export type AddressFormType = {
   line: string;
   postcode: string;
   company_name?: string;
-  tax_no?: string;
+  tax_no?: number;
   tax_office?: string;
   e_bill_taxpayer?: boolean;
   country_code?: string;

package/types/commerce/b2b.ts

@@ -72,7 +72,7 @@ export type BasketItemType = {
   divisions: BasketItemDivision[];
   product: ProductB2b;
   product_remote_id: number;
-};
+}
 
 export type BasketParams = {
   division: string;
@@ -91,7 +91,7 @@ export type CreateQuotationParams = {
 export type UpdateProductParams = {
   product_remote_id: number;
   division: number;
-  quantity: number;
+  quantity: number
 };
 
 export type DeleteProductParams = {
@@ -115,13 +115,3 @@ export type DraftResponse = {
   total_amount: number;
   total_quantity: number;
 };
-
-export type BasketStatusResponse = {
-  is_ready: boolean;
-  status: string;
-  url: string;
-};
-
-export type ExportBasketResponse = {
-  cache_key: string;
-};

package/types/commerce/checkout.ts

@@ -34,23 +34,6 @@ export interface ShippingOption {
   slug: string;
 }
 
-export interface DataSource {
-  pk: number;
-  name: string;
-  data_source_shipping_options: DataSourceShippingOption[];
-}
-
-export interface DataSourceShippingOption {
-  pk: number;
-  shipping_amount: string;
-  shipping_option_name: string;
-  shipping_option_logo: string | null;
-  data_source: {
-    pk: number;
-    title: string | null;
-  };
-}
-
 export interface CheckoutAddressType {
   label: string;
   text: string;
@@ -96,8 +79,6 @@ export interface PreOrder {
   retail_store?: RetailStore;
   gift_box?: GiftBox;
   credit_payment_option?: CheckoutCreditPaymentOption;
-  data_source_shipping_options: any;
-  attribute_based_shipping_options?: AttributeBasedShippingOption[];
   bags?: Product[];
   bags_fee?: string;
   extra_field?: ExtraField;
@@ -142,7 +123,6 @@ export interface CheckoutContext {
     redirect_url?: string;
     context_data?: any;
     balance?: string;
-    attribute_based_shipping_options?: AttributeBasedShippingOption[];
     [key: string]: any;
   };
 }
@@ -168,13 +148,3 @@ export interface BankAccount {
   pk: number;
   sort_order: number;
 }
-
-export interface AttributeBasedShippingOption {
-  pk: number;
-  shipping_amount: string | null;
-  shipping_option_name: string | null;
-  shipping_option_logo: string | null;
-  attribute_value: string | null;
-  attribute_key: string;
-  [key: string]: any;
-}

package/types/commerce/order.ts

@@ -114,7 +114,6 @@ export interface Order {
     pk: number;
     name: string;
     slug: string;
-    logo: string;
     [key: string]: any;
   };
 }

package/types/index.ts

@@ -68,17 +68,9 @@ export interface Currency {
    * @see https://en.wikipedia.org/wiki/ISO_4217
    */
   code: string;
-  /**
-   * Number of decimal places to display.
-   *
-   * @example
-   * decimalScale: 3
-   */
-  decimalScale?: number;
 }
 
 export interface Settings {
-  usePrettyUrlRoute?: boolean;
   commerceUrl: string;
   redis: {
     defaultExpirationTime: number;
@@ -191,7 +183,6 @@ export interface Settings {
     masterpassJsUrl?: string;
   };
   customNotFoundEnabled: boolean;
-  useOptimizedTranslations?: boolean;
   plugins?: Record<string, Record<string, any>>;
   includedProxyHeaders?: string[];
 }
@@ -225,7 +216,7 @@ export type ImageOptions = CDNOptions & {
 export type Translations = { [key: string]: object };
 
 export interface PageProps<T = any> {
-  params: T & { locale: string; currency: string };
+  params: T;
   searchParams: URLSearchParams;
 }
 
@@ -234,11 +225,7 @@ export interface LayoutProps<T = any> extends PageProps<T> {
 }
 
 export interface RootLayoutProps<
-  T = {
-    commerce: string;
-    locale: string;
-    currency: string;
-  }
+  T = { commerce: string; locale: string; currency: string }
 > extends LayoutProps<T> {
   translations: Translations;
   locale: Locale & {
@@ -264,8 +251,6 @@ export interface ButtonProps
   appearance?: 'filled' | 'outlined' | 'ghost';
 }
 
-export type FileInputProps = React.HTMLProps<HTMLInputElement>;
-
 export interface PriceProps {
   currencyCode?: string;
   useCurrencySymbol?: boolean;

package/utils/app-fetch.ts

@@ -1,26 +1,18 @@
 import Settings from 'settings';
+import { ServerVariables } from './server-variables';
 import logger from '../utils/log';
 import { headers, cookies } from 'next/headers';
-import { ServerVariables } from './server-variables';
 
 export enum FetchResponseType {
   JSON = 'json',
   TEXT = 'text'
 }
 
-const appFetch = async <T>({
-  url,
-  locale,
-  currency,
-  init = {},
+const appFetch = async <T>(
+  url: RequestInfo,
+  init: RequestInit = {},
   responseType = FetchResponseType.JSON
-}: {
-  url: RequestInfo;
-  locale: string;
-  currency: string;
-  init?: RequestInit;
-  responseType?: FetchResponseType;
-}): Promise<T> => {
+): Promise<T> => {
   let response: T;
   let status: number;
   let ip = '';
@@ -32,7 +24,7 @@ const appFetch = async <T>({
 
     const commerceUrl = Settings.commerceUrl;
     const currentLocale = Settings.localization.locales.find(
-      (l) => l.value === locale
+      (locale) => locale.value === ServerVariables.locale
     );
 
     if (commerceUrl === 'default') {
@@ -46,13 +38,13 @@ const appFetch = async <T>({
       ...(init.headers ?? {}),
       ...(ServerVariables.globalHeaders ?? {}),
       'Accept-Language': currentLocale.apiValue,
-      'x-currency': currency,
+      'x-currency': ServerVariables.currency,
       'x-forwarded-for': ip,
       cookie: nextCookies.toString()
     };
 
     init.next = {
-      revalidate: Settings.usePrettyUrlRoute ? 0 : 60
+      revalidate: 60
     };
 
     logger.debug(`FETCH START ${url}`, { requestURL, init, ip });

package/utils/generate-commerce-search-params.ts

@@ -1,8 +1,6 @@
 import logger from './log';
 
-export const generateCommerceSearchParams = (
-  searchParams?: URLSearchParams
-) => {
+export const generateCommerceSearchParams = (searchParams?: URLSearchParams) => {
   if (!searchParams) {
     return null;
   }

package/utils/index.ts

@@ -63,33 +63,18 @@ export function getTranslateFn(path: string, translations: any) {
 
 export function buildClientRequestUrl(
   path: string,
-  options?: ClientRequestOptions & { cache?: boolean }
+  options?: ClientRequestOptions
 ) {
   let url = `/api/client${path}`;
 
-  let hasQuery = url.includes('?');
-
   if (options) {
-    const { cache, ...otherOptions } = options;
-
-    if (Object.keys(otherOptions).length > 0) {
-      if (hasQuery) {
-        url += '&';
-      } else {
-        url += '?';
-        hasQuery = true;
-      }
-      url += `options=${encodeURIComponent(JSON.stringify(otherOptions))}`;
+    if (url.includes('?')) {
+      url += '&';
+    } else {
+      url += '?';
     }
 
-    if (cache === false) {
-      if (hasQuery) {
-        url += '&';
-      } else {
-        url += '?';
-      }
-      url += `t=${Date.now()}`;
-    }
+    url += `options=${encodeURIComponent(JSON.stringify(options))}`;
   }
 
   return url;
@@ -117,12 +102,6 @@ export function buildCDNUrl(url: string, config?: CDNOptions) {
     ''
   );
 
-  const noOptionFileExtension = url?.split('.').pop()?.toLowerCase() ?? '';
-
-  if (noOptionFileExtension === 'svg' || noOptionFileExtension === 'gif') {
-    return url;
-  }
-
   let options = '';
 
   if (config) {

package/utils/server-translation.ts

@@ -8,6 +8,7 @@ import logger from './log';
 
 export const translations: Translations = {};
 
+// TODO: Read translations from cache
 export async function getTranslations(locale_: string) {
   try {
     const locale = settings.localization.locales.find(
@@ -54,14 +55,3 @@ export async function getTranslations(locale_: string) {
 export function t(path: string) {
   return getTranslateFn(path, translations);
 }
-
-export async function t_(path: string, locale?: string) {
-  let translations_ = translations;
-
-  if (settings.useOptimizedTranslations && locale) {
-    const { getTranslations } = require('translations');
-    translations_ = await getTranslations(locale);
-  }
-
-  return getTranslateFn(path, translations_);
-}

package/with-pz-config.js

@@ -8,7 +8,6 @@ const defaultConfig = {
   transpilePackages: ['@akinon/next', ...pzPlugins.map((p) => `@akinon/${p}`)],
   skipTrailingSlashRedirect: true,
   poweredByHeader: false,
-  cacheMaxMemorySize: 0,
   env: {
     NEXT_PUBLIC_SENTRY_DSN: process.env.SENTRY_DSN
   },
@@ -57,8 +56,7 @@ const defaultConfig = {
       ...pzPlugins.reduce((acc, plugin) => {
         acc[`@akinon/${plugin}`] = false;
         return acc;
-      }, {}),
-      translations: false
+      }, {})
     };
     return config;
   },
@@ -67,12 +65,7 @@ const defaultConfig = {
   }
 };
 
-const withPzConfig = (
-  myNextConfig = {},
-  options = {
-    useCacheHandler: false
-  }
-) => {
+const withPzConfig = (myNextConfig = {}) => {
   let extendedConfig = deepMerge({}, defaultConfig, myNextConfig);
 
   const originalPzHeadersFunction = defaultConfig.headers;
@@ -98,10 +91,6 @@ const withPzConfig = (
     return [...pzRewrites, ...myRewrites];
   };
 
-  if (options.useCacheHandler && process.env.CACHE_HOST) {
-    extendedConfig.cacheHandler = require.resolve('./lib/cache-handler.mjs');
-  }
-
   return extendedConfig;
 };
 

package/assets/styles/index.css

@@ -1,49 +0,0 @@
-.checkout-payment-iframe-wrapper {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  border: none;
-  z-index: 1000;
-  background-color: white;
-}
-.checkout-payment-iframe-wrapper iframe {
-  width: 100%;
-  height: 100%;
-  border: none;
-  background-color: white;
-}
-.checkout-payment-iframe-wrapper .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;
-}
-.checkout-payment-redirection-iframe-wrapper iframe {
-  width: 100%;
-  height: 100%;
-  border: none;
-  background-color: white;
-}
-.checkout-payment-redirection-iframe-wrapper .close-button {
-  position: absolute;
-  top: 16px;
-  right: 16px;
-  width: 32px;
-  height: 32px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 1001;
-}/*# sourceMappingURL=index.css.map */

package/assets/styles/index.css.map

@@ -1 +0,0 @@
-{"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"}