@akinon/next 2.0.0-beta.2 → 2.0.0-beta.20

package/plugins.d.ts

@@ -13,6 +13,7 @@ declare module '@akinon/pz-masterpass/src/redux/reducer' {
   export const setError: any;
   export const setOtpModalVisible: any;
   export const setCvcRequired: any;
+  export const resetMasterpassState: any;
 }
 
 declare module '@akinon/pz-otp' {
@@ -30,9 +31,23 @@ declare module '@akinon/pz-saved-card' {
   export const SavedCardOption: any;
 }
 
-declare module '@akinon/pz-iyzico-saved-card' {
-  export const iyzicoSavedCardReducer: any;
-  export const iyzicoSavedCardMiddleware: any;
+declare module '@akinon/pz-apple-pay' {}
+
+declare module '@akinon/pz-cybersource-uc/src/redux/middleware' {
+  export default middleware as any;
 }
 
-declare module '@akinon/pz-apple-pay' {}
+declare module '@akinon/pz-cybersource-uc/src/redux/reducer' {
+  export default reducer as any;
+}
+
+declare module '@akinon/pz-cybersource-uc' {
+  export const CyberSourceUcPaymentOption: any;
+}
+
+declare module '@akinon/pz-flow-payment' {}
+
+declare module '@akinon/pz-masterpass-rest' {
+  export const MasterpassRestOption: React.FC;
+  export const masterpassRestReducer: any;
+}

package/plugins.js

@@ -14,5 +14,14 @@ module.exports = [
   'pz-multi-basket',
   'pz-saved-card',
   'pz-tabby-extension',
-  'pz-apple-pay'
+  'pz-apple-pay',
+  'pz-tamara-extension',
+  'pz-cybersource-uc',
+  'pz-hepsipay',
+  'pz-flow-payment',
+  'pz-virtual-try-on',
+  'pz-masterpass-rest',
+  'pz-similar-products',
+  'pz-haso',
+  'pz-google-pay'
 ];

package/redux/actions.ts

@@ -0,0 +1,47 @@
+// Re-export all action creators from slice modules
+export * from './reducers/root';
+export * from './reducers/header';
+export * from './reducers/checkout';
+export * from './reducers/config';
+
+// Import RTK Query APIs
+import { basketApi } from '../data/client/basket';
+import { productApi } from '../data/client/product';
+import { miscApi } from '../data/client/misc';
+import { checkoutApi } from '../data/client/checkout';
+import { wishlistApi } from '../data/client/wishlist';
+
+// Create RTK Query action creators
+export const rtkApiActionCreators = {
+  // RTK Query API endpoints
+  ...Object.fromEntries(
+    Object.entries(basketApi.endpoints).map(([key, endpoint]) => [
+      `api_basket_${key}`,
+      endpoint.initiate
+    ])
+  ),
+  ...Object.fromEntries(
+    Object.entries(productApi.endpoints).map(([key, endpoint]) => [
+      `api_product_${key}`,
+      endpoint.initiate
+    ])
+  ),
+  ...Object.fromEntries(
+    Object.entries(miscApi.endpoints).map(([key, endpoint]) => [
+      `api_misc_${key}`,
+      endpoint.initiate
+    ])
+  ),
+  ...Object.fromEntries(
+    Object.entries(checkoutApi.endpoints).map(([key, endpoint]) => [
+      `api_checkout_${key}`,
+      endpoint.initiate
+    ])
+  ),
+  ...Object.fromEntries(
+    Object.entries(wishlistApi.endpoints).map(([key, endpoint]) => [
+      `api_wishlist_${key}`,
+      endpoint.initiate
+    ])
+  )
+} as any;

package/redux/middlewares/checkout.ts

@@ -14,14 +14,15 @@ import {
   setHasGiftBox,
   setInstallmentOptions,
   setLoyaltyBalance,
+  setLoyaltyBalances,
   setPaymentChoices,
   setPaymentOptions,
-  setPreOrder,
   setRetailStores,
   setShippingOptions,
-  setShippingStepCompleted,
   setHepsipayAvailability,
-  setWalletPaymentData
+  setWalletPaymentData,
+  setPayOnDeliveryOtpModalActive,
+  setUnavailablePaymentOptions
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
@@ -37,6 +38,7 @@ interface CheckoutResult {
     errors?: Record<string, string[]>;
     pre_order?: PreOrder;
     context_list?: CheckoutContext[];
+    redirect_url?: string;
   };
 }
 
@@ -47,10 +49,14 @@ interface MiddlewareParams {
 
 export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const errors = result?.payload?.errors;
 
-    if (errors) {
+    if (
+      !!errors &&
+      ((typeof errors === 'object' && Object.keys(errors).length > 0) ||
+        (Array.isArray(errors) && errors.length > 0))
+    ) {
       dispatch(setErrors(errors));
     }
 
@@ -58,142 +64,29 @@ export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
   };
 };
 
-export const preOrderMiddleware: Middleware = ({
-  getState,
-  dispatch
-}: MiddlewareParams) => {
+export const redirectUrlMiddleware: Middleware = () => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
-    const preOrder = result?.payload?.pre_order;
+    const result = next(action) as CheckoutResult;
+    const redirectUrl = result?.payload?.redirect_url;
 
-    if (
-      !preOrder ||
-      action?.meta?.arg?.endpointName === 'guestLogin' ||
-      action?.meta?.arg?.endpointName === 'getCheckoutLoyaltyBalance'
-    ) {
-      return result;
-    }
+    if (redirectUrl) {
+      const currentLocale = getCookie('pz-locale');
 
-    const {
-      deliveryOptions,
-      addressList: addresses,
-      shippingOptions,
-      dataSourceShippingOptions,
-      paymentOptions,
-      installmentOptions,
-      attributeBasedShippingOptions
-    } = getState().checkout;
-    const { endpoints: apiEndpoints } = checkoutApi;
+      let url = redirectUrl;
 
-    if (preOrder.is_redirected) {
-      const contextList = result?.payload?.context_list;
+      if (currentLocale && !redirectUrl.includes('/orders/redirection')) {
+        const { defaultLocaleValue, localeUrlStrategy } = settings.localization;
 
-      if (
-        contextList.find(
-          (ctx) => ctx.page_name === 'RedirectionPaymentSelectedPage'
-        )
-      ) {
-        dispatch(
-          apiEndpoints.setPaymentOption.initiate(preOrder.payment_option?.pk)
-        );
-        return;
+        url =
+          currentLocale === defaultLocaleValue &&
+          localeUrlStrategy !== LocaleUrlStrategy.ShowAllLocales
+            ? redirectUrl
+            : `/${currentLocale}${redirectUrl}`;
       }
-    }
-
-    dispatch(setPreOrder(preOrder));
-
-    if (!preOrder.delivery_option && deliveryOptions.length > 0) {
-      dispatch(
-        apiEndpoints.setDeliveryOption.initiate(
-          deliveryOptions.find((opt) => opt.delivery_option_type === 'customer')
-            ?.pk
-        )
-      );
-    }
-
-    if (
-      (!preOrder.shipping_address || !preOrder.billing_address) &&
-      addresses.length > 0 &&
-      (!preOrder.delivery_option ||
-        preOrder.delivery_option.delivery_option_type === 'customer')
-    ) {
-      dispatch(
-        apiEndpoints.setAddresses.initiate({
-          shippingAddressPk: addresses[0].pk,
-          billingAddressPk: addresses[0].pk
-        })
-      );
-    }
-
-    if (
-      shippingOptions.length > 0 &&
-      (!preOrder.shipping_option ||
-        !shippingOptions.find((opt) => opt.pk === preOrder.shipping_option?.pk))
-    ) {
-      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.attribute_based_shipping_options[0].pk
-        ])
-      );
 
-      dispatch(
-        apiEndpoints.setAttributeBasedShippingOptions.initiate(
-          initialSelectedOptions
-        )
-      );
-    }
-
-    if (!preOrder.payment_option && paymentOptions.length > 0) {
-      dispatch(apiEndpoints.setPaymentOption.initiate(paymentOptions[0].pk));
+      window.location.href = url;
     }
 
-    if (
-      !preOrder.installment &&
-      preOrder.payment_option?.payment_type !== 'saved_card' &&
-      installmentOptions.length > 0
-    ) {
-      dispatch(
-        apiEndpoints.setInstallmentOption.initiate(installmentOptions[0].pk)
-      );
-    }
-
-    dispatch(
-      setShippingStepCompleted(
-        [
-          preOrder.delivery_option?.delivery_option_type === 'retail_store'
-            ? true
-            : preOrder.shipping_address?.pk,
-          preOrder.billing_address?.pk,
-          preOrder.shipping_option?.pk,
-          addresses.length > 0
-        ].every(Boolean)
-      )
-    );
-
     return result;
   };
 };
@@ -203,13 +96,14 @@ export const contextListMiddleware: Middleware = ({
   getState
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const { isMobileApp } = getState().root;
-    const result: CheckoutResult = next(action);
+    const { isMobileApp, userPhoneNumber } = getState().root;
+    const result = next(action) as CheckoutResult;
+    const preOrder = result?.payload?.pre_order;
 
     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;
+        const isIframe = context.page_context.is_iframe ?? false;
 
         if (redirectUrl) {
           const currentLocale = getCookie('pz-locale');
@@ -288,6 +182,14 @@ export const contextListMiddleware: Middleware = ({
           dispatch(setPaymentOptions(context.page_context.payment_options));
         }
 
+        if (context.page_context.unavailable_options) {
+          dispatch(
+            setUnavailablePaymentOptions(
+              context.page_context.unavailable_options
+            )
+          );
+        }
+
         if (context.page_context.credit_payment_options) {
           dispatch(
             setCreditPaymentOptions(context.page_context.credit_payment_options)
@@ -311,7 +213,10 @@ export const contextListMiddleware: Middleware = ({
             dispatch(setCardType(context.page_context.card_type));
           }
 
-          if (context.page_context.installments) {
+          if (
+            context.page_context.installments &&
+            preOrder?.payment_option?.payment_type !== 'masterpass_rest'
+          ) {
             dispatch(setInstallmentOptions(context.page_context.installments));
           }
         }
@@ -320,9 +225,29 @@ export const contextListMiddleware: Middleware = ({
           dispatch(setLoyaltyBalance(context.page_context.balance));
         }
 
+        if (context.page_context.balances) {
+          dispatch(setLoyaltyBalances(context.page_context.balances));
+        }
+
+        if (context.page_context.accounts) {
+          dispatch(setLoyaltyBalances(context.page_context.accounts));
+        }
+
         if (context.page_context.retail_stores) {
           dispatch(setRetailStores(context.page_context.retail_stores));
         }
+
+        if (context.page_name === 'SendSmsPage' && !preOrder?.phone_number) {
+          dispatch(
+            checkoutApi.endpoints.sendSms.initiate({
+              phone_number: userPhoneNumber ?? preOrder?.user_phone_number
+            })
+          );
+        }
+
+        if (context.page_name === 'VerifySmsPage') {
+          dispatch(setPayOnDeliveryOtpModalActive(true));
+        }
       });
     }
 
@@ -335,7 +260,7 @@ export const hepsiPayMiddleware: Middleware = ({
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const { payload } = result;
     const preOrder = payload?.pre_order;
     const contextList = payload?.context_list;
@@ -389,7 +314,7 @@ export const walletPaymentMiddleware: Middleware = ({
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const { payload } = result;
     const preOrder = payload?.pre_order;
     const contextList = payload?.context_list;

package/redux/middlewares/index.ts

@@ -3,8 +3,10 @@
 import { signOut } from 'next-auth/react';
 import { ROUTES } from 'routes';
 import type { Middleware } from '@reduxjs/toolkit';
+import type { MiddlewareAction } from '../../types';
 import {
   errorMiddleware,
+  redirectUrlMiddleware,
   contextListMiddleware,
   hepsiPayMiddleware,
   walletPaymentMiddleware
@@ -17,17 +19,17 @@ import logger from '@akinon/next/utils/log';
 
 // Plugin middlewares
 import { savedCardMiddleware } from '@akinon/pz-saved-card';
+import cyberSourceUcMiddleware from '@akinon/pz-cybersource-uc/src/redux/middleware';
 
-export const rtkQueryResponseHandler: Middleware =
-  ({ dispatch }) =>
-  (next) =>
-  (action) => {
-    return next(action);
-  };
+export const rtkQueryResponseHandler: Middleware = () => (next) => (action) => {
+  return next(action);
+};
 
 export const rtkQueryErrorHandler: Middleware =
   () => (next) => async (action) => {
-    if (action?.payload?.status === 401) {
+    const act = action as MiddlewareAction;
+
+    if (act?.payload?.status === 401) {
       await signOut({
         callbackUrl: `${ROUTES.AUTH}?callbackUrl=${window.location.pathname}`
       });
@@ -36,9 +38,9 @@ export const rtkQueryErrorHandler: Middleware =
       return;
     }
 
-    if (action?.payload?.status === 404) {
+    if (act?.payload?.status === 404) {
       logger.warn(
-        `404 - Not Found. Endpoint: ${action.meta.arg.endpointName}, url: ${action.meta.baseQueryMeta.request.url}`
+        `404 - Not Found. Endpoint: ${act.meta.arg.endpointName}, url: ${act.meta.baseQueryMeta.request.url}`
       );
     }
 
@@ -50,11 +52,13 @@ const middlewares = [
   rtkQueryResponseHandler,
   rtkQueryErrorHandler,
   errorMiddleware,
+  redirectUrlMiddleware,
   ...preOrderMiddlewares,
   contextListMiddleware,
   hepsiPayMiddleware,
   walletPaymentMiddleware,
-  savedCardMiddleware
+  savedCardMiddleware,
+  cyberSourceUcMiddleware
 ];
 
 // Filter out any non-function middleware to ensure all middlewares are valid and executable

package/redux/middlewares/pre-order/address.ts

@@ -1,14 +1,13 @@
 import { Middleware } from '@reduxjs/toolkit';
 import { CheckoutResult, MiddlewareParams } from '../../../types';
 import { checkoutApi } from '../../../data/client/checkout';
-import { setPreOrder } from '../../../redux/reducers/checkout';
 
 export const setAddressMiddleware: Middleware = ({
   getState,
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const preOrder = result?.payload?.pre_order;
 
     if (!preOrder) {
@@ -38,8 +37,14 @@ export const setAddressMiddleware: Middleware = ({
           billingAddressPk: firstAddressPk
         })
       );
+
+      return null;
     }
 
     return result;
   };
 };
+
+Object.defineProperty(setAddressMiddleware, 'name', {
+  value: 'setAddressMiddleware'
+});

package/redux/middlewares/pre-order/attribute-based-shipping-option.ts

@@ -7,7 +7,7 @@ export const attributeBasedShippingOptionMiddleware: Middleware = ({
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const preOrder = result?.payload?.pre_order;
 
     if (!preOrder) {
@@ -33,8 +33,14 @@ export const attributeBasedShippingOptionMiddleware: Middleware = ({
           initialSelectedOptions
         )
       );
+
+      return null;
     }
 
     return result;
   };
 };
+
+Object.defineProperty(attributeBasedShippingOptionMiddleware, 'name', {
+  value: 'attributeBasedShippingOptionMiddleware'
+});

package/redux/middlewares/pre-order/data-source-shipping-option.ts

@@ -7,7 +7,7 @@ export const dataSourceShippingOptionMiddleware: Middleware = ({
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const preOrder = result?.payload?.pre_order;
 
     if (!preOrder) {
@@ -29,9 +29,15 @@ export const dataSourceShippingOptionMiddleware: Middleware = ({
         dispatch(
           apiEndpoints.setDataSourceShippingOptions.initiate(selectedPks)
         );
+
+        return null;
       }
     }
 
     return result;
   };
 };
+
+Object.defineProperty(dataSourceShippingOptionMiddleware, 'name', {
+  value: 'dataSourceShippingOptionMiddleware'
+});

package/redux/middlewares/pre-order/delivery-option.ts

@@ -7,7 +7,7 @@ export const deliveryOptionMiddleware: Middleware = ({
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const preOrder = result?.payload?.pre_order;
 
     if (!preOrder) {
@@ -26,9 +26,15 @@ export const deliveryOptionMiddleware: Middleware = ({
         dispatch(
           apiEndpoints.setDeliveryOption.initiate(customerDeliveryOption)
         );
+
+        return null;
       }
     }
 
     return result;
   };
 };
+
+Object.defineProperty(deliveryOptionMiddleware, 'name', {
+  value: 'deliveryOptionMiddleware'
+});

package/redux/middlewares/pre-order/index.ts

@@ -8,18 +8,24 @@ import { dataSourceShippingOptionMiddleware } from './data-source-shipping-optio
 import { attributeBasedShippingOptionMiddleware } from './attribute-based-shipping-option';
 import { paymentOptionMiddleware } from './payment-option';
 import { installmentOptionMiddleware } from './installment-option';
+import { paymentOptionResetMiddleware } from './payment-option-reset';
 import { shippingStepMiddleware } from './shipping-step';
 
+// ⚠️ WARNING: Redux Toolkit applies middlewares in reverse order (from last to first).
+// This list is written **in reverse execution order** to ensure they run in the correct sequence.
+// If you add a new middleware, make sure to insert it **in reverse order** based on execution priority.
+
 export const preOrderMiddlewares = [
-  preOrderValidationMiddleware,
-  redirectionMiddleware,
-  setPreOrderMiddleware,
-  deliveryOptionMiddleware,
-  setAddressMiddleware,
-  shippingOptionMiddleware,
-  dataSourceShippingOptionMiddleware,
-  attributeBasedShippingOptionMiddleware,
-  paymentOptionMiddleware,
+  shippingStepMiddleware,
   installmentOptionMiddleware,
-  shippingStepMiddleware
+  paymentOptionResetMiddleware,
+  paymentOptionMiddleware,
+  attributeBasedShippingOptionMiddleware,
+  dataSourceShippingOptionMiddleware,
+  shippingOptionMiddleware,
+  setAddressMiddleware,
+  deliveryOptionMiddleware,
+  setPreOrderMiddleware,
+  redirectionMiddleware,
+  preOrderValidationMiddleware
 ];

package/redux/middlewares/pre-order/installment-option.ts

@@ -7,7 +7,7 @@ export const installmentOptionMiddleware: Middleware = ({
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const preOrder = result?.payload?.pre_order;
 
     if (!preOrder) {
@@ -20,6 +20,7 @@ export const installmentOptionMiddleware: Middleware = ({
     if (
       !preOrder?.installment &&
       preOrder?.payment_option?.payment_type !== 'saved_card' &&
+      preOrder?.payment_option?.payment_type !== 'masterpass_rest' &&
       installmentOptions.length > 0
     ) {
       const firstInstallmentOptionPk = installmentOptions[0]?.pk;
@@ -28,9 +29,15 @@ export const installmentOptionMiddleware: Middleware = ({
         dispatch(
           apiEndpoints.setInstallmentOption.initiate(firstInstallmentOptionPk)
         );
+
+        return null;
       }
     }
 
     return result;
   };
 };
+
+Object.defineProperty(installmentOptionMiddleware, 'name', {
+  value: 'installmentOptionMiddleware'
+});

package/redux/middlewares/pre-order/payment-option-reset.ts

@@ -0,0 +1,37 @@
+import { Middleware } from '@reduxjs/toolkit';
+import { CheckoutResult, MiddlewareAction, MiddlewareParams } from '../../../types';
+import {
+  setBankAccounts,
+  setCardType,
+  setInstallmentOptions,
+  setSelectedBankAccountPk
+} from '../../reducers/checkout';
+import { resetMasterpassState } from '@akinon/pz-masterpass/src/redux/reducer';
+
+export const paymentOptionResetMiddleware: Middleware = ({
+  dispatch
+}: MiddlewareParams) => {
+  return (next) => (action) => {
+    const result = next(action) as CheckoutResult;
+    const act = action as MiddlewareAction;
+
+    if (
+      act.type === 'api/executeMutation/fulfilled' &&
+      act.meta?.arg?.endpointName === 'setPaymentOption'
+    ) {
+      dispatch(setInstallmentOptions([]));
+      dispatch(setBankAccounts([]));
+      dispatch(setSelectedBankAccountPk(null));
+      dispatch(setCardType(null));
+      if(resetMasterpassState){
+        dispatch(resetMasterpassState());
+      }
+    }
+
+    return result;
+  };
+};
+
+Object.defineProperty(paymentOptionResetMiddleware, 'name', {
+  value: 'paymentOptionResetMiddleware'
+});

package/redux/middlewares/pre-order/payment-option.ts

@@ -7,7 +7,7 @@ export const paymentOptionMiddleware: Middleware = ({
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const preOrder = result?.payload?.pre_order;
 
     if (!preOrder) {
@@ -21,8 +21,14 @@ export const paymentOptionMiddleware: Middleware = ({
       const firstPaymentOptionPk = paymentOptions[0]?.pk;
 
       dispatch(apiEndpoints.setPaymentOption.initiate(firstPaymentOptionPk));
+
+      return null;
     }
 
     return result;
   };
 };
+
+Object.defineProperty(paymentOptionMiddleware, 'name', {
+  value: 'paymentOptionMiddleware'
+});