@akinon/next 1.43.0-rc.6 → 1.43.0

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(
@@ -694,7 +672,6 @@ export const {
   useSetDeliveryOptionMutation,
   useSetAddressesMutation,
   useSetShippingOptionMutation,
-  useSetDataSourceShippingOptionsMutation,
   useSetPaymentOptionMutation,
   useSetBinNumberMutation,
   useSetInstallmentOptionMutation,

package/data/server/category.ts

@@ -8,7 +8,7 @@ import logger from '../../utils/log';
 
 function getCategoryDataHandler(
   pk: number,
-  searchParams?: { [key: string]: string | string[] | undefined },
+  searchParams?: URLSearchParams,
   headers?: Record<string, string>
 ) {
   return async function () {
@@ -78,7 +78,7 @@ export const getCategoryData = ({
   headers
 }: {
   pk: number;
-  searchParams?: { [key: string]: string | string[] | undefined };
+  searchParams?: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(

package/data/server/list.ts

@@ -7,7 +7,7 @@ import { parse } from 'lossless-json';
 import logger from '../../utils/log';
 
 const getListDataHandler = (
-  searchParams: { [key: string]: string | string[] | undefined },
+  searchParams: URLSearchParams,
   headers?: Record<string, string>
 ) => {
   return async function () {
@@ -54,7 +54,7 @@ export const getListData = async ({
   searchParams,
   headers
 }: {
-  searchParams: { [key: string]: string | string[] | undefined };
+  searchParams: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(

package/data/server/product.ts

@@ -1,12 +1,15 @@
 import { Cache, CacheKey } from '../../lib/cache';
 import { product } from '../urls';
-import { ProductCategoryResult, ProductResult } from '../../types';
+import {
+  BreadcrumbResultType,
+  ProductCategoryResult,
+  ProductResult
+} from '../../types';
 import appFetch from '../../utils/app-fetch';
-import logger from '../../utils/log';
 
 type GetProduct = {
   pk: number;
-  searchParams?: { [key: string]: string | string[] | undefined };
+  searchParams?: URLSearchParams;
   groupProduct?: boolean;
 };
 
@@ -47,17 +50,9 @@ const getProductDataHandler = ({
       }
     );
 
-    const menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
-
-    if (!menuItemModel) {
-      logger.warn('menuItemModel is undefined, skipping breadcrumbData fetch', {
-        handler: 'getProductDataHandler',
-        pk
-      });
-      return { data, breadcrumbData: undefined };
-    }
-
-    const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
+    const breadcrumbUrl = product.breadcrumbUrl(
+      productCategoryData.results[0].menuitemmodel
+    );
 
     const breadcrumbData = await appFetch<any>(breadcrumbUrl, {
       headers: {
@@ -79,7 +74,10 @@ export const getProductData = async ({
   groupProduct
 }: GetProduct) => {
   return Cache.wrap(
-    CacheKey[groupProduct ? 'GroupProduct' : 'Product'](pk, searchParams ?? {}),
+    CacheKey[groupProduct ? 'GroupProduct' : 'Product'](
+      pk,
+      searchParams ?? new URLSearchParams()
+    ),
     getProductDataHandler({ pk, searchParams, groupProduct }),
     {
       expire: 300

package/data/server/special-page.ts

@@ -7,7 +7,7 @@ import header from '../../redux/reducers/header';
 
 const getSpecialPageDataHandler = (
   pk: number,
-  searchParams: { [key: string]: string | string[] | undefined },
+  searchParams: URLSearchParams,
   headers?: Record<string, string>
 ) => {
   return async function () {
@@ -34,7 +34,7 @@ export const getSpecialPageData = async ({
   headers
 }: {
   pk: number;
-  searchParams: { [key: string]: string | string[] | undefined };
+  searchParams: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(

package/data/urls.ts

@@ -83,8 +83,6 @@ export const checkout = {
   setDeliveryOption: '/orders/checkout/?page=DeliveryOptionSelectionPage',
   setAddresses: '/orders/checkout/?page=AddressSelectionPage',
   setShippingOption: '/orders/checkout/?page=ShippingOptionSelectionPage',
-  setDataSourceShippingOption:
-    '/orders/checkout/?page=DataSourceShippingOptionSelectionPage',
   setPaymentOption: '/orders/checkout/?page=PaymentOptionSelectionPage',
   setBinNumber: '/orders/checkout/?page=BinNumberPage',
   setMasterpassBinNumber: '/orders/checkout/?page=MasterpassBinNumberPage',

package/hocs/server/with-segment-defaults.tsx

@@ -2,7 +2,7 @@ import settings from 'settings';
 import { LayoutProps, PageProps, RootLayoutProps } from '../../types';
 import { redirect } from 'next/navigation';
 import { ServerVariables } from '../../utils/server-variables';
-import { getCachedTranslations } from '../../utils/server-translation';
+import { getTranslations } from '../../utils/server-translation';
 import { ROUTES } from 'routes';
 import logger from '../../utils/log';
 
@@ -50,7 +50,7 @@ const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
     return redirect(ROUTES.HOME);
   }
 
-  const translations = await getCachedTranslations(params.locale);
+  const translations = await getTranslations(params.locale);
   componentProps.translations = translations;
 
   const locale = settings.localization.locales.find(

package/hooks/index.ts

@@ -8,5 +8,4 @@ export * from './use-media-query';
 export * from './use-on-click-outside';
 export * from './use-mobile-iframe-handler';
 export * from './use-payment-options';
-export * from './use-pagination';
-export * from './use-message-listener';
+export * from './use-pagination';

package/hooks/use-payment-options.ts

@@ -18,8 +18,7 @@ export const usePaymentOptions = () => {
     pay_on_delivery: 'pz-pay-on-delivery',
     bkm_express: 'pz-bkm',
     credit_payment: 'pz-credit-payment',
-    masterpass: 'pz-masterpass',
-    gpay: 'pz-gpay'
+    masterpass: 'pz-masterpass'
   };
 
   const isInitialTypeIncluded = (type: string) => initialTypes.has(type);

package/lib/cache.ts

@@ -20,16 +20,13 @@ const hashCacheKey = (object?: Record<string, string>) => {
   return `_${encodeURIComponent(cacheKey)}`;
 };
 export const CacheKey = {
-  List: (
-    searchParams: { [key: string]: string | string[] | undefined },
-    headers?: Record<string, string>
-  ) =>
+  List: (searchParams: URLSearchParams, headers?: Record<string, string>) =>
     `list_${encodeURIComponent(JSON.stringify(searchParams))}${hashCacheKey(
       headers
     )}`,
   Category: (
     pk: number,
-    searchParams?: { [key: string]: string | string[] | undefined },
+    searchParams?: URLSearchParams,
     headers?: Record<string, string>
   ) =>
     `category_${pk}_${encodeURIComponent(
@@ -38,20 +35,15 @@ export const CacheKey = {
   CategorySlug: (slug: string) => `category_${slug}`,
   SpecialPage: (
     pk: number,
-    searchParams: { [key: string]: string | string[] | undefined },
+    searchParams: URLSearchParams,
     headers?: Record<string, string>
   ) =>
     `special_page_${pk}_${encodeURIComponent(
       JSON.stringify(searchParams)
     )}${hashCacheKey(headers)}`,
-  Product: (
-    pk: number,
-    searchParams: { [key: string]: string | string[] | undefined }
-  ) => `product_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
-  GroupProduct: (
-    pk: number,
-    searchParams: { [key: string]: string | string[] | undefined }
-  ) =>
+  Product: (pk: number, searchParams: URLSearchParams) =>
+    `product_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
+  GroupProduct: (pk: number, searchParams: URLSearchParams) =>
     `group_product_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
   FlatPage: (pk: number) => `flat_page_${pk}`,
   LandingPage: (pk: number) => `landing_page_${pk}`,
@@ -166,10 +158,6 @@ export class Cache {
     handler: () => Promise<T>,
     options?: CacheOptions
   ): Promise<T> {
-    if (Settings.usePrettyUrlRoute) {
-      return await handler();
-    }
-
     const requiredVariables = [
       process.env.CACHE_HOST,
       process.env.CACHE_PORT,

package/middlewares/default.ts

@@ -84,44 +84,14 @@ const withPzDefault =
       req.nextUrl.pathname.includes('/orders/hooks/') ||
       req.nextUrl.pathname.includes('/orders/checkout-with-token/')
     ) {
-      const segment = url.searchParams.get('segment');
-      const currency = url.searchParams.get('currency')?.toLowerCase();
-
-      const headers = {};
-
-      if (segment) {
-        headers['X-Segment-Id'] = segment;
-      }
-
-      if (currency) {
-        headers['x-currency'] = currency;
-      }
-
-      const response = NextResponse.rewrite(
+      return NextResponse.rewrite(
         new URL(
           `${Settings.commerceUrl}${req.nextUrl.pathname.replace(
             urlLocaleMatcherRegex,
             ''
           )}`
-        ),
-        {
-          headers
-        }
+        )
       );
-
-      if (segment) {
-        response.cookies.set('pz-segment', segment);
-      }
-
-      if (currency) {
-        response.cookies.set('pz-currency', currency, {
-          sameSite: 'none',
-          secure: true,
-          expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 7) // 7 days
-        });
-      }
-
-      return response;
     }
 
     if (req.nextUrl.pathname.startsWith('/orders/redirection/')) {
@@ -233,15 +203,6 @@ const withPzDefault =
                               );
                             }
 
-                            if (
-                              Settings.usePrettyUrlRoute &&
-                              url.searchParams.toString().length > 0
-                            ) {
-                              url.pathname =
-                                url.pathname +
-                                `searchparams|${url.searchParams.toString()}`;
-                            }
-
                             Settings.rewrites.forEach((rewrite) => {
                               url.pathname = url.pathname.replace(
                                 rewrite.source,

package/middlewares/pretty-url.ts

@@ -56,10 +56,6 @@ const resolvePrettyUrl = async (pathname: string, ip: string | null) => {
 const withPrettyUrl =
   (middleware: NextMiddleware) =>
   async (req: PzNextRequest, event: NextFetchEvent) => {
-    if (Settings.usePrettyUrlRoute) {
-      return middleware(req, event);
-    }
-
     const url = req.nextUrl.clone();
     const matchedLanguagePrefix = url.pathname.match(
       urlLocaleMatcherRegex

package/middlewares/url-redirection.ts

@@ -11,10 +11,6 @@ import { ROUTES } from 'routes';
 const withUrlRedirection =
   (middleware: NextMiddleware) =>
   async (req: PzNextRequest, event: NextFetchEvent) => {
-    if (settings.usePrettyUrlRoute) {
-      return middleware(req, event);
-    }
-
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
     const pathnameWithoutLocale = url.pathname.replace(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.43.0-rc.6",
+  "version": "1.43.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -20,22 +20,21 @@
     "@opentelemetry/sdk-trace-node": "1.19.0",
     "@opentelemetry/semantic-conventions": "1.19.0",
     "@reduxjs/toolkit": "1.9.7",
-    "@neshca/cache-handler": "1.5.1",
     "cross-spawn": "7.0.3",
     "generic-pool": "3.9.0",
     "react-redux": "8.1.3",
     "react-string-replace": "1.1.1",
-    "redis": "4.6.13",
-    "semver": "7.6.2",
+    "redis": "4.5.1",
+    "semver": "7.5.4",
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.43.0-rc.6",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
+    "@akinon/eslint-plugin-projectzero": "1.43.0",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/plugins.d.ts

@@ -12,7 +12,6 @@ declare module '@akinon/pz-masterpass/src/utils' {
 declare module '@akinon/pz-masterpass/src/redux/reducer' {
   export const setError: any;
   export const setOtpModalVisible: any;
-  export const setCvcRequired: any;
 }
 
 declare module '@akinon/pz-otp' {

package/redux/middlewares/checkout.ts

@@ -16,7 +16,6 @@ import {
   setPreOrder,
   setRetailStores,
   setShippingOptions,
-  setDataSourceShippingOptions,
   setShippingStepCompleted,
   setCreditPaymentOptions
 } from '../../redux/reducers/checkout';
@@ -27,11 +26,10 @@ 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: {
-    errors?: Record<string, string[]>;
+    errors?: any;
     pre_order?: PreOrder;
     context_list?: CheckoutContext[];
   };
@@ -75,7 +73,6 @@ export const preOrderMiddleware: Middleware = ({
       deliveryOptions,
       addressList: addresses,
       shippingOptions,
-      dataSourceShippingOptions,
       paymentOptions,
       installmentOptions
     } = getState().checkout;
@@ -128,22 +125,6 @@ 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 (!preOrder.payment_option && paymentOptions.length > 0) {
       dispatch(apiEndpoints.setPaymentOption.initiate(paymentOptions[0].pk));
     }
@@ -182,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');
@@ -201,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();
           }
@@ -243,20 +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.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,12 +14,12 @@ import {
   CheckoutCreditPaymentOption,
   PreOrder,
   RetailStore,
-  ShippingOption,
-  DataSource
+  ShippingOption
 } from '../../types';
 
 export interface CheckoutState {
-  errors: Record<string, string[]>;
+  // TODO: Add types
+  errors: any;
   hasGiftBox: boolean;
   canGuestPurchase: boolean;
   steps: {
@@ -37,7 +37,6 @@ export interface CheckoutState {
   addressList: Address[];
   deliveryOptions: DeliveryOption[];
   shippingOptions: ShippingOption[];
-  dataSourceShippingOptions: DataSource[];
   paymentOptions: PaymentOption[];
   creditPaymentOptions: CheckoutCreditPaymentOption[];
   selectedCreditPaymentPk: number;
@@ -69,7 +68,6 @@ const initialState: CheckoutState = {
   addressList: [],
   deliveryOptions: [],
   shippingOptions: [],
-  dataSourceShippingOptions: [],
   paymentOptions: [],
   creditPaymentOptions: [],
   selectedCreditPaymentPk: null,
@@ -124,9 +122,6 @@ const checkoutSlice = createSlice({
     setShippingOptions(state, { payload }) {
       state.shippingOptions = payload;
     },
-    setDataSourceShippingOptions(state, { payload }) {
-      state.dataSourceShippingOptions = payload;
-    },
     setPaymentOptions(state, { payload }) {
       state.paymentOptions = payload;
     },
@@ -174,7 +169,6 @@ export const {
   setAddressList,
   setDeliveryOptions,
   setShippingOptions,
-  setDataSourceShippingOptions,
   setPaymentOptions,
   setCreditPaymentOptions,
   setSelectedCreditPaymentPk,

package/redux/reducers/config.ts

@@ -6,8 +6,6 @@ import { Config } from '../../types';
 const initialState: Config = {
   user_phone_regex: '^(05)\\d{9}$',
   user_phone_format: '05999999999',
-  user_post_code_regex: '^\\d{5}$',
-  user_post_code_format: '99999',
   country: {
     pk: 1,
     name: 'Türkiye',

package/types/commerce/account.ts

@@ -61,5 +61,4 @@ export type ContactFormType = {
   order?: string;
   country_code?: string;
   order_needed?: boolean;
-  file?: FileList
 };

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/checkout.ts

@@ -33,23 +33,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;
@@ -95,7 +78,6 @@ export interface PreOrder {
   retail_store?: RetailStore;
   gift_box?: GiftBox;
   credit_payment_option?: CheckoutCreditPaymentOption;
-  data_source_shipping_options: any;
 }
 
 export interface GuestLoginFormParams {

package/types/commerce/misc.ts

@@ -2,8 +2,6 @@ import { District } from './address';
 export interface Config {
   user_phone_regex: string;
   user_phone_format: string;
-  user_post_code_regex: string;
-  user_post_code_format: string;
   country: {
     pk: number;
     name: string;

package/types/commerce/order.ts

@@ -52,10 +52,6 @@ export interface OrderItem {
   quantity: string;
   unit_price: string;
   total_amount: string;
-  attributes: {
-    gift_note: string;
-    [key: string]: any;
-  };
 }
 
 export interface Order {
@@ -109,14 +105,6 @@ export interface Order {
   shipping_option: number;
   tracking_number: string;
   tracking_url: string;
-  [key: string]: any;
-  bank: {
-    pk: number;
-    name: string;
-    slug: string;
-    logo: string;
-    [key: string]: any;
-  };
 }
 
 export interface Quotations {