@akinon/next 1.100.0-rc.71 → 1.100.0

package/data/server/product.ts

@@ -35,84 +35,57 @@ const getProductDataHandler = ({
           .join('&');
     }
 
-    let data: ProductResult;
-
-    try {
-      data = await appFetch<ProductResult>({
-        url,
-        locale,
-        currency,
-        init: {
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-            ...(headers ?? {})
-          }
+    const data = await appFetch<ProductResult>({
+      url,
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
-      });
-    } catch (error) {
-      logger.error('Failed to fetch product data', {
-        handler: 'getProductDataHandler',
-        pk,
-        error: error.message,
-        url
-      });
-      return null;
-    }
+      }
+    });
 
     const categoryUrl = product.categoryUrl(data.product.pk);
 
-    let productCategoryData: ProductCategoryResult;
-    let breadcrumbData: { menu?: unknown } = {};
-
-    try {
-      productCategoryData = await appFetch<ProductCategoryResult>({
-        url: categoryUrl,
-        locale,
-        currency,
-        init: {
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json'
-          }
+    const productCategoryData = await appFetch<ProductCategoryResult>({
+      url: categoryUrl,
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
         }
-      });
-
-      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 menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
 
-      breadcrumbData = await appFetch<{ menu?: unknown }>({
-        url: breadcrumbUrl,
-        locale,
-        currency,
-        init: {
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json'
-          }
-        }
-      });
-    } catch (error) {
-      logger.warn('Failed to fetch breadcrumb data', {
+    if (!menuItemModel) {
+      logger.warn('menuItemModel is undefined, skipping breadcrumbData fetch', {
         handler: 'getProductDataHandler',
-        pk,
-        error: error.message
+        pk
       });
-      // Continue without breadcrumb data
+      return { data, breadcrumbData: undefined };
     }
 
+    const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
+
+    const breadcrumbData = await appFetch<any>({
+      url: breadcrumbUrl,
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
+        }
+      }
+    });
+
     return {
       data,
       breadcrumbData: breadcrumbData?.menu

package/data/server/special-page.ts

@@ -15,24 +15,20 @@ const getSpecialPageDataHandler = (
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    try {
-      const data: GetCategoryResponse = await appFetch({
-        url: `${category.getSpecialPageByPk(pk)}${params}`,
-        locale,
-        currency,
-        init: {
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-            ...(headers ?? {})
-          }
+    const data: GetCategoryResponse = await appFetch({
+      url: `${category.getSpecialPageByPk(pk)}${params}`,
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
-      });
+      }
+    });
 
-      return data;
-    } catch (error) {
-      return null;
-    }
+    return data;
   };
 };
 

package/data/urls.ts

@@ -183,11 +183,7 @@ export const product = {
   breadcrumbUrl: (menuitemmodel: string) =>
     `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
   bundleProduct: (productPk: string, queryString: string) =>
-    `/bundle-product/${productPk}/?${queryString}`,
-  similarProducts: (params?: string) =>
-    `/similar-products${params ? `?${params}` : ''}`,
-  similarProductsList: (params?: string) =>
-    `/similar-product-list${params ? `?${params}` : ''}`
+    `/bundle-product/${productPk}/?${queryString}`
 };
 
 export const wishlist = {
@@ -251,7 +247,7 @@ export const widgets = {
 };
 
 export const form = {
-  getForm: (pk: number) => `/forms/${pk}/generate`
+  getForm: (pk: number) => `/forms/${pk}/generate/`
 };
 
 const URLS = {

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

@@ -72,13 +72,10 @@ const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
 const checkRedisVariables = () => {
   const requiredVariableValues = [
     process.env.CACHE_HOST,
-    process.env.CACHE_PORT
+    process.env.CACHE_PORT,
+    process.env.CACHE_SECRET
   ];
 
-  if (!settings.usePrettyUrlRoute) {
-    requiredVariableValues.push(process.env.CACHE_SECRET);
-  }
-
   if (
     !requiredVariableValues.every((v) => v) &&
     process.env.NODE_ENV === 'production'

package/hooks/use-localization.ts

@@ -4,6 +4,7 @@ import { LocalizationContext } from '../localization/provider';
 import { useContext } from 'react';
 import { setCookie, urlLocaleMatcherRegex } from '../utils';
 import { LocaleUrlStrategy } from '../localization';
+import { useRouter } from 'next/navigation';
 
 export const useLocalization = () => {
   const {
@@ -17,6 +18,8 @@ export const useLocalization = () => {
     localeUrlStrategy
   } = useContext(LocalizationContext);
 
+  const router = useRouter();
+
   /**
    * Sets the locale in the URL.
    * @param locale Locale value defined in the settings.
@@ -27,8 +30,6 @@ export const useLocalization = () => {
 
     let targetUrl;
 
-    setCookie('pz-locale', locale);
-
     if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
       const hostParts = hostname.split('.');
       const subDomain = hostParts[0];

package/middlewares/complete-gpay.ts

@@ -148,8 +148,7 @@ const withCompleteGpay =
       logger.info('Redirecting to order success page', {
         middleware: 'complete-gpay',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/complete-masterpass.ts

@@ -149,8 +149,7 @@ const withCompleteMasterpass =
       logger.info('Redirecting to order success page', {
         middleware: 'complete-masterpass',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/default.ts

@@ -302,6 +302,19 @@ const withPzDefault =
                                     )}`;
                                 }
 
+                                if (
+                                  !req.middlewareParams.found &&
+                                  Settings.customNotFoundEnabled
+                                ) {
+                                  const pathname = url.pathname
+                                    .replace(/\/+$/, '')
+                                    .split('/');
+                                  url.pathname = url.pathname.replace(
+                                    pathname.pop(),
+                                    'pz-not-found'
+                                  );
+                                }
+
                                 Settings.rewrites.forEach((rewrite) => {
                                   url.pathname = url.pathname.replace(
                                     rewrite.source,
@@ -339,24 +352,6 @@ const withPzDefault =
                                   middlewareResult = NextResponse.rewrite(url);
                                 }
 
-                                if (
-                                  !req.middlewareParams.found &&
-                                  Settings.customNotFoundEnabled
-                                ) {
-                                  const pathSegments = url.pathname
-                                    .replace(/\/+$/, '')
-                                    .split('/');
-                                  if (pathSegments.length >= 3) {
-                                    url.pathname = `/${pathSegments[1]}/${pathSegments[2]}/pz-not-found`;
-                                  } else {
-                                    url.pathname = '/pz-not-found';
-                                  }
-
-                                  middlewareResult = NextResponse.rewrite(url, {
-                                    status: 404
-                                  });
-                                }
-
                                 const { localeUrlStrategy } =
                                   Settings.localization;
 
@@ -406,38 +401,6 @@ const withPzDefault =
                                   }
                                 );
 
-                                if (
-                                  !url.pathname.startsWith(
-                                    `/${currency}/orders`
-                                  )
-                                ) {
-                                  const currentCookieLocale =
-                                    req.cookies.get('pz-locale')?.value;
-
-                                  const urlHasExplicitLocale =
-                                    url.pathname.match(urlLocaleMatcherRegex);
-                                  const shouldUpdateCookie =
-                                    !currentCookieLocale ||
-                                    urlHasExplicitLocale;
-
-                                  if (shouldUpdateCookie) {
-                                    middlewareResult.cookies.set(
-                                      'pz-locale',
-                                      locale?.length > 0
-                                        ? locale
-                                        : defaultLocaleValue,
-                                      {
-                                        domain: rootHostname,
-                                        sameSite: 'none',
-                                        secure: true,
-                                        expires: new Date(
-                                          Date.now() + 1000 * 60 * 60 * 24 * 7
-                                        ) // 7 days
-                                      }
-                                    );
-                                  }
-                                }
-
                                 if (
                                   req.cookies.get('pz-locale') &&
                                   req.cookies.get('pz-locale').value !== locale

package/middlewares/locale.ts

@@ -23,15 +23,7 @@ const getMatchedLocale = (pathname: string, req: PzNextRequest) => {
       );
 
       if (subDomainLocaleMatched && subDomainLocaleMatched[0]) {
-        const subdomainLocale = subDomainLocaleMatched[0].slice(1);
-
-        const isValidSubdomainLocale = settings.localization.locales.find(
-          (l) => l.value === subdomainLocale
-        );
-
-        if (isValidSubdomainLocale) {
-          matchedLocale = subdomainLocale;
-        }
+        matchedLocale = subDomainLocaleMatched[0].slice(1);
       }
     }
   }

package/middlewares/redirection-payment.ts

@@ -149,8 +149,7 @@ const withRedirectionPayment =
       logger.info('Redirecting to order success page', {
         middleware: 'redirection-payment',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/saved-card-redirection.ts

@@ -149,8 +149,7 @@ const withSavedCardRedirection =
       logger.info('Redirecting to order success page', {
         middleware: 'saved-card-redirection',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/three-d-redirection.ts

@@ -4,6 +4,7 @@ import { Buffer } from 'buffer';
 import logger from '../utils/log';
 import { getUrlPathWithLocale } from '../utils/localization';
 import { PzNextRequest } from '.';
+import { ServerVariables } from '../utils/server-variables';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -148,8 +149,7 @@ const withThreeDRedirection =
       logger.info('Redirecting to order success page', {
         middleware: 'three-d-redirection',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/url-redirection.ts

@@ -4,7 +4,6 @@ import { PzNextRequest } from '.';
 import logger from '../utils/log';
 import { urlLocaleMatcherRegex } from '../utils';
 import { getUrlPathWithLocale } from '../utils/localization';
-import { shouldIgnoreRedirect } from '../utils/redirect-ignore';
 import { ROUTES } from 'routes';
 
 // This middleware is used to handle url redirections set in Omnitron
@@ -61,13 +60,20 @@ const withUrlRedirection =
 
         const setCookies = request.headers.getSetCookie();
 
-        if (
-          shouldIgnoreRedirect(
-            url.pathname,
-            req.middlewareParams.rewrites.locale
-          )
-        ) {
-          return middleware(req, event);
+        if (settings.commerceRedirectionIgnoreList) {
+          const shouldIgnoreRedirect =
+            settings.commerceRedirectionIgnoreList.some((ignorePath) =>
+              redirectUrl.pathname.startsWith(
+                getUrlPathWithLocale(
+                  ignorePath,
+                  req.middlewareParams.rewrites.locale
+                )
+              )
+            );
+
+          if (shouldIgnoreRedirect) {
+            return middleware(req, event);
+          }
         }
 
         const response = NextResponse.redirect(redirectUrl.toString(), {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.100.0-rc.71",
+  "version": "1.100.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -35,7 +35,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.100.0-rc.71",
+    "@akinon/eslint-plugin-projectzero": "1.100.0",
     "@babel/core": "7.26.10",
     "@babel/preset-env": "7.26.9",
     "@babel/preset-typescript": "7.27.0",

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,14 +31,11 @@ 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-flow-payment' {}
-
-declare module '@akinon/pz-similar-products' {
-  export const SimilarProductsModal: any;
-  export const SimilarProductsFilterSidebar: any;
-  export const SimilarProductsResultsGrid: any;
-  export const SimilarProductsPlugin: any;
-  export const SimilarProductsButtonPlugin: any;
-}

package/plugins.js

@@ -16,7 +16,5 @@ module.exports = [
   'pz-tabby-extension',
   'pz-apple-pay',
   'pz-tamara-extension',
-  'pz-hepsipay',
-  'pz-flow-payment',
-  'pz-similar-products'
+  'pz-flow-payment'
 ];

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

@@ -51,11 +51,7 @@ export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
     const result: CheckoutResult = next(action);
     const errors = result?.payload?.errors;
 
-    if (
-      !!errors &&
-      ((typeof errors === 'object' && Object.keys(errors).length > 0) ||
-        (Array.isArray(errors) && errors.length > 0))
-    ) {
+    if (errors) {
       dispatch(setErrors(errors));
     }
 

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

@@ -8,15 +8,17 @@ 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.  
+// 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 = [
   shippingStepMiddleware,
   installmentOptionMiddleware,
+  paymentOptionResetMiddleware,
   paymentOptionMiddleware,
   attributeBasedShippingOptionMiddleware,
   dataSourceShippingOptionMiddleware,

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

@@ -0,0 +1,34 @@
+import { Middleware } from '@reduxjs/toolkit';
+import { CheckoutResult, 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: CheckoutResult = next(action);
+
+    if (
+      action.type === 'api/executeMutation/fulfilled' &&
+      action.meta?.arg?.endpointName === 'setPaymentOption'
+    ) {
+      dispatch(setInstallmentOptions([]));
+      dispatch(setBankAccounts([]));
+      dispatch(setSelectedBankAccountPk(null));
+      dispatch(setCardType(null));
+      dispatch(resetMasterpassState());
+    }
+
+    return result;
+  };
+};
+
+Object.defineProperty(paymentOptionResetMiddleware, 'name', {
+  value: 'paymentOptionResetMiddleware'
+});

package/types/commerce/order.ts

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