@akinon/next 2.0.0-beta.7 → 2.0.0-beta.9

package/.eslintrc.js

@@ -24,6 +24,18 @@ module.exports = {
       parserOptions: {
         sourceType: 'script'
       }
+    },
+    {
+      env: {
+        node: true
+      },
+      files: ['redux/middlewares/pre-order/index.ts'],
+      rules: {
+        '@akinon/projectzero/check-pre-order-middleware-order': 'error'
+      },
+      parserOptions: {
+        sourceType: 'script'
+      }
     }
   ],
   parser: '@typescript-eslint/parser',

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @akinon/next
 
+## 2.0.0-beta.9
+
+### Minor Changes
+
+- 0fe7711: ZERO-3387: Upgrade nextjs, eslint-config-next
+
+## 2.0.0-beta.8
+
+### Minor Changes
+
+- 071d0f5: ZERO-3352: Resolve Single item size exceeds maxSize error and upgrade dependencies
+
 ## 2.0.0-beta.7
 
 ## 2.0.0-beta.6

package/api/auth.ts

@@ -99,6 +99,21 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
             userIp
           });
 
+          const checkCurrentUser = await getCurrentUser(
+            req.cookies['osessionid'] ?? '',
+            req.cookies['pz-currency'] ?? ''
+          );
+
+          if (checkCurrentUser?.pk) {
+            const sessionCookie = headers
+              .get('cookie')
+              ?.match(/osessionid=\w+/)?.[0]
+              .replace(/osessionid=/, '');
+            if (sessionCookie) {
+              headers.set('cookie', sessionCookie);
+            }
+          }
+
           const apiRequest = await fetch(
             `${Settings.commerceUrl}${user[credentials.formType]}`,
             {

package/bin/run-prebuild-tests.js

@@ -0,0 +1,46 @@
+const path = require('path')
+const fs = require('fs')
+
+function runPrebuildTests() {
+  const workspaceRoot = process.cwd()
+  const configPath = path.join(workspaceRoot, 'config/prebuild-tests.json')
+
+  try {
+    const config = JSON.parse(fs.readFileSync(configPath, 'utf8'))
+
+    if (config.tests && Array.isArray(config.tests)) {
+      for (const testScript of config.tests) {
+        console.log(`🧪 Running test script: ${testScript}`)
+        const result = require('child_process').spawnSync('yarn', [testScript], {
+          stdio: 'inherit',
+          shell: true
+        })
+
+        if (result.status !== 0) {
+          console.error(`❌ Test script '${testScript}' failed`)
+          process.exit(1)
+        }
+      }
+      console.log('✅ All prebuild tests passed successfully!')
+    }
+  } catch (error) {
+    if (error.code === 'ENOENT') {
+      console.log('🧪 Running default test: test:middleware')
+      const result = require('child_process').spawnSync('yarn', ['test:middleware'], {
+        stdio: 'inherit',
+        shell: true
+      })
+
+      if (result.status !== 0) {
+        console.error('❌ Middleware test failed')
+        process.exit(1)
+      }
+      console.log('✅ Default test passed successfully!')
+    } else {
+      console.error('❌ Error reading test configuration:', error)
+      process.exit(1)
+    }
+  }
+}
+
+module.exports = runPrebuildTests

package/components/client-root.tsx

@@ -1,6 +1,9 @@
 'use client';
 
 import { useMobileIframeHandler } from '../hooks';
+import * as Sentry from '@sentry/nextjs';
+import { initSentry } from '../sentry';
+import { useEffect } from 'react';
 
 export default function ClientRoot({
   children,
@@ -11,6 +14,23 @@ export default function ClientRoot({
 }) {
   const { preventPageRender } = useMobileIframeHandler({ sessionId });
 
+  const initializeSentry = async () => {
+    const response = await fetch('/api/sentry', { next: { revalidate: 0 } });
+    const data = await response.json();
+
+    const options = {
+      dsn: data.dsn
+    };
+
+    initSentry('Client', options);
+  };
+
+  useEffect(() => {
+    if (!Sentry.isInitialized()) {
+      initializeSentry();
+    }
+  }, []);
+
   if (preventPageRender) {
     return null;
   }

package/data/client/api.ts

@@ -68,6 +68,7 @@ export const api = createApi({
   tagTypes: [
     'Basket',
     'MultiBasket',
+    'MiniBasket',
     'BasketB2b',
     'DraftsB2b',
     'Product',

package/data/client/basket.ts

@@ -24,6 +24,26 @@ export const basketApi = api.injectEndpoints({
       transformResponse: (response: { basket: Basket }) => response.basket,
       providesTags: ['Basket']
     }),
+    getMiniBasket: build.query<
+      { pk: number | null; total_quantity: number },
+      void
+    >({
+      query: () =>
+        buildClientRequestUrl(basket.getMiniBasket, {
+          contentType: 'application/json'
+        }),
+      providesTags: ['MiniBasket']
+    }),
+    getMiniBasketDetail: build.query<
+      { pk: number | null; total_quantity: number },
+      { namespace: string }
+    >({
+      query: ({ namespace }) =>
+        buildClientRequestUrl(basket.getMiniBasketDetail(namespace), {
+          contentType: 'application/json'
+        }),
+      providesTags: ['MiniBasket']
+    }),
     getBasketDetail: build.query<Basket, { namespace: string }>({
       query: ({ namespace }) =>
         buildClientRequestUrl(basket.getBasketDetail(namespace)),
@@ -46,7 +66,7 @@ export const basketApi = api.injectEndpoints({
         method: 'DELETE',
         body: { pk }
       }),
-      invalidatesTags: ['MultiBasket', 'Basket']
+      invalidatesTags: ['MultiBasket', 'Basket', 'MiniBasket']
     }),
     selectMainBasket: build.mutation<Basket, { pk: number }>({
       query: ({ pk }) => ({
@@ -57,7 +77,7 @@ export const basketApi = api.injectEndpoints({
         body: { pk }
       }),
       transformResponse: (response: { baskets: Basket }) => response.baskets,
-      invalidatesTags: ['MultiBasket', 'Basket']
+      invalidatesTags: ['MultiBasket', 'Basket', 'MiniBasket']
     }),
     selectNameSpaceMainBasket: build.mutation<Basket, { namespace: string }>({
       query: ({ namespace }) => ({
@@ -71,7 +91,7 @@ export const basketApi = api.injectEndpoints({
         body: { namespace }
       }),
       transformResponse: (response: { baskets: Basket }) => response.baskets,
-      invalidatesTags: ['MultiBasket', 'Basket']
+      invalidatesTags: ['MultiBasket', 'Basket', 'MiniBasket']
     }),
     updateQuantity: build.mutation<
       UpdateQuantityResponse,
@@ -84,7 +104,7 @@ export const basketApi = api.injectEndpoints({
         method: 'PUT',
         body
       }),
-      invalidatesTags: ['MultiBasket', 'Basket']
+      invalidatesTags: ['MultiBasket', 'Basket', 'MiniBasket']
     }),
     clearBasket: build.mutation<Basket, void>({
       query: (body) => ({
@@ -95,7 +115,7 @@ export const basketApi = api.injectEndpoints({
         body
       }),
       transformResponse: (response: { basket: Basket }) => response.basket,
-      invalidatesTags: ['Basket']
+      invalidatesTags: ['Basket', 'MiniBasket', 'MiniBasket']
     }),
     applyVoucherCode: build.mutation<Basket, { voucher_code: string }>({
       query: (body) => ({
@@ -125,6 +145,8 @@ export const basketApi = api.injectEndpoints({
 
 export const {
   useGetBasketQuery,
+  useGetMiniBasketQuery,
+  useGetMiniBasketDetailQuery,
   useLazyGetBasketDetailQuery,
   useGetAllBasketsQuery,
   useRemoveBasketMutation,

package/data/client/checkout.ts

@@ -13,7 +13,9 @@ import {
   ExtraField,
   GuestLoginFormParams,
   Order,
-  PreOrder
+  PreOrder,
+  SendSmsType,
+  VerifySmsType
 } from '../../types';
 import { buildClientRequestUrl } from '../../utils';
 import { api } from './api';
@@ -847,6 +849,24 @@ export const checkoutApi = api.injectEndpoints({
           selected_loyalty_amount: amount
         }
       })
+    }),
+    sendSms: build.mutation<CheckoutResponse, SendSmsType>({
+      query: (body) => ({
+        url: buildClientRequestUrl(checkout.sendSmsPage, {
+          useFormData: true
+        }),
+        method: 'POST',
+        body
+      })
+    }),
+    verifySms: build.mutation<CheckoutResponse, VerifySmsType>({
+      query: (body) => ({
+        url: buildClientRequestUrl(checkout.verifySmsPage, {
+          useFormData: true
+        }),
+        method: 'POST',
+        body
+      })
     })
   }),
   overrideExisting: false
@@ -892,5 +912,7 @@ export const {
   useSetWalletSelectionPageMutation,
   useSetWalletPaymentPageMutation,
   useSetWalletCompletePageMutation,
+  useSendSmsMutation,
+  useVerifySmsMutation,
   useResetCheckoutStateQuery
 } = checkoutApi;

package/data/client/misc.ts

@@ -92,6 +92,29 @@ export const miscApi = api.injectEndpoints({
       transformResponse: (response: { menu: MenuItemType[] }) => {
         return response.menu;
       }
+    }),
+    getBukalemunImageUrl: builder.query<
+      any,
+      { current_chapter: string; sku: string; selected_attributes: any }
+    >({
+      query: ({ current_chapter, sku, selected_attributes }) => {
+        const data = {
+          ...selected_attributes,
+          current_chapter,
+          sku
+        };
+
+        const params = new URLSearchParams(data);
+
+        return {
+          url: buildClientRequestUrl(
+            misc.bukalemunImageUrl(params.toString()),
+            {
+              responseType: 'json'
+            }
+          )
+        };
+      }
     })
   }),
   overrideExisting: true
@@ -102,5 +125,6 @@ export const {
   useEmailSubscriptionMutation,
   useSetLanguageMutation,
   useGetWidgetQuery,
-  useGetMenuQuery
+  useGetMenuQuery,
+  useGetBukalemunImageUrlQuery
 } = miscApi;

package/data/client/product.ts

@@ -69,12 +69,28 @@ export const productApi = api.injectEndpoints({
         }),
         method: 'POST',
         body
-      })
+      }),
+      invalidatesTags: ['MiniBasket']
     }),
     getInstallments: build.query<any, any>({
       query: (productPk) => ({
         url: buildClientRequestUrl(product.installments(productPk))
       })
+    }),
+    getBundleProductData: build.query<
+      any,
+      { productPk: string; queryString: string }
+    >({
+      query: ({ productPk, queryString }) => {
+        return {
+          url: buildClientRequestUrl(
+            product.bundleProduct(productPk, queryString),
+            {
+              responseType: 'json'
+            }
+          )
+        };
+      }
     })
   }),
   overrideExisting: true
@@ -85,5 +101,6 @@ export const {
   useGetProductByPkQuery,
   useGetRetailStoreStockMutation,
   useGetInstallmentsQuery,
-  useGetProductByParamsQuery
+  useGetProductByParamsQuery,
+  useGetBundleProductDataQuery
 } = productApi;

package/data/urls.ts

@@ -74,7 +74,10 @@ export const address = {
 
 export const basket = {
   getBasket: '/baskets/basket/',
+  getMiniBasket: '/baskets/basket/mini/',
   getBasketDetail: (namespace: string) => `/baskets/basket/${namespace}/`,
+  getMiniBasketDetail: (namespace: string) =>
+    `/baskets/basket/${namespace}/mini/`,
   getAllBaskets: '/baskets/basket-list/',
   removeBasket: (pk: number) => `/baskets/basket-list/${pk}/`,
   selectMainBasket: (pk: number) => `/baskets/basket-list/id/${pk}/main/`,
@@ -137,7 +140,9 @@ export const checkout = {
     '/orders/checkout/?page=AttributeBasedShippingOptionSelectionPage',
   deliveryBagsPage: '/orders/checkout/?page=DeliveryBagsPage',
   setOrderSelectionPage: '/orders/checkout/?page=OrderSelectionPage',
-  loyaltyCardPage: '/orders/checkout/?page=LoyaltyCardPage'
+  loyaltyCardPage: '/orders/checkout/?page=LoyaltyCardPage',
+  sendSmsPage: '/orders/checkout/?page=SendSmsPage',
+  verifySmsPage: '/orders/checkout/?page=VerifySmsPage'
 };
 
 export const flatpage = {
@@ -160,7 +165,8 @@ export const misc = {
       parent ? `&parent=${parent}` : ''
     }`,
   cmsSeo: (slug: string | string[]) => `/cms/seo/?url=${slug ? slug : '/'}`,
-  setCurrency: '/users/activate-currency/'
+  setCurrency: '/users/activate-currency/',
+  bukalemunImageUrl: (params: string) => `/bukalemun/?${params}`
 };
 
 export const product = {
@@ -174,7 +180,9 @@ export const product = {
   slug: (slug: string) => `/${slug}/`,
   categoryUrl: (pk: number) => `/products/${pk}/category_nodes/?limit=1`,
   breadcrumbUrl: (menuitemmodel: string) =>
-    `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`
+    `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
+  bundleProduct: (productPk: string, queryString: string) =>
+    `/bundle-product/${productPk}/?${queryString}`
 };
 
 export const wishlist = {

package/hooks/index.ts

@@ -10,3 +10,4 @@ export * from './use-mobile-iframe-handler';
 export * from './use-payment-options';
 export * from './use-pagination';
 export * from './use-message-listener';
+export * from './use-sentry-uncaught-errors';

package/hooks/use-router.ts

@@ -27,8 +27,11 @@ export const useRouter = () => {
     );
 
     url.pathname = `${
-      locale === defaultLocale?.value &&
-      localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale
+      localeUrlStrategy === LocaleUrlStrategy.Subdomain ||
+      (locale === defaultLocale?.value &&
+        [LocaleUrlStrategy.HideDefaultLocale].includes(
+          localeUrlStrategy as LocaleUrlStrategy
+        ))
         ? ''
         : `/${locale}`
     }${pathnameWithoutLocale}`;

package/hooks/use-sentry-uncaught-errors.ts

@@ -0,0 +1,24 @@
+import { useEffect } from 'react';
+import * as Sentry from '@sentry/nextjs';
+import { ClientLogType } from '@akinon/next/sentry';
+
+export const useSentryUncaughtErrors = (error: Error & { digest?: string }) => {
+  useEffect(() => {
+    Sentry.withScope(function (scope) {
+      scope.setLevel('fatal');
+      scope.setTags({
+        APP_TYPE: 'ProjectZeroNext',
+        TYPE: 'Client',
+        LOG_TYPE: ClientLogType.UNCAUGHT_ERROR_PAGE
+      });
+      scope.setExtra('error', error);
+
+      const error_ = new Error('FATAL: Uncaught client error');
+      error_.name = 'UNCAUGHT_ERROR_PAGE';
+
+      Sentry.captureException(error_, {
+        fingerprint: ['UNCAUGHT_ERROR_PAGE', error.digest]
+      });
+    });
+  }, [error]);
+};

package/instrumentation/index.ts

@@ -1,5 +1,15 @@
+import { initSentry } from '../sentry';
+import * as Sentry from '@sentry/nextjs';
+
 export async function register() {
   if (process.env.NEXT_RUNTIME === 'nodejs') {
     await import('./node');
+    initSentry('Server');
+  }
+
+  if (process.env.NEXT_RUNTIME === 'edge') {
+    initSentry('Edge');
   }
 }
+
+export const onRequestError = Sentry.captureRequestError;

package/lib/cache.ts

@@ -156,10 +156,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,
@@ -178,6 +174,10 @@ export class Cache {
     const _options = Object.assign(defaultOptions, options);
     const formattedKey = Cache.formatKey(key, locale);
 
+    if (Settings.usePrettyUrlRoute) {
+      _options.expire = 120;
+    }
+
     logger.debug('Cache wrap', { key, formattedKey, _options });
 
     if (_options.cache) {

package/localization/index.ts

@@ -1,5 +1,6 @@
 export enum LocaleUrlStrategy {
   HideAllLocales = 'hide-all-locales',
   HideDefaultLocale = 'hide-default-locale',
-  ShowAllLocales = 'show-all-locales'
+  ShowAllLocales = 'show-all-locales',
+  Subdomain = 'subdomain'
 }

package/middlewares/default.ts

@@ -95,7 +95,9 @@ const withPzDefault =
 
     if (
       req.nextUrl.pathname.includes('/orders/hooks/') ||
-      req.nextUrl.pathname.includes('/orders/checkout-with-token/')
+      req.nextUrl.pathname.includes('/orders/checkout-with-token/') ||
+      req.nextUrl.pathname.includes('/hooks/cash_register/complete/') ||
+      req.nextUrl.pathname.includes('/hooks/cash_register/pre_order/')
     ) {
       const queryString = searchParams.toString();
       const currency = searchParams.get('currency')?.toLowerCase();
@@ -285,7 +287,9 @@ const withPzDefault =
                                 url.pathname =
                                   url.pathname +
                                   (/\/$/.test(url.pathname) ? '' : '/') +
-                                  `searchparams|${url.searchParams.toString()}`;
+                                  `searchparams|${encodeURIComponent(
+                                    url.searchParams.toString()
+                                  )}`;
                               }
 
                               Settings.rewrites.forEach((rewrite) => {

package/middlewares/locale.ts

@@ -4,17 +4,32 @@ import { PzNextRequest } from '.';
 import { LocaleUrlStrategy } from '../localization';
 import { urlLocaleMatcherRegex } from '../utils';
 import logger from '../utils/log';
+import { getUrlPathWithLocale } from '../utils/localization';
 
-const getMatchedLocale = (pathname: string) => {
+const getMatchedLocale = (pathname: string, req: PzNextRequest) => {
   let matchedLocale = pathname.match(urlLocaleMatcherRegex)?.[0] ?? '';
   matchedLocale = matchedLocale.replace('/', '');
 
+  const { localeUrlStrategy, defaultLocaleValue } = settings.localization;
+
+  if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
+    const host = req.headers.get('x-forwarded-host');
+
+    if (host) {
+      const subDomain = host.split('.')[0] || '';
+      const subDomainLocaleMatched = `/${subDomain}`.match(
+        urlLocaleMatcherRegex
+      );
+
+      if (subDomainLocaleMatched && subDomainLocaleMatched[0]) {
+        matchedLocale = subDomainLocaleMatched[0].slice(1);
+      }
+    }
+  }
+
   if (!matchedLocale.length) {
-    if (
-      settings.localization.localeUrlStrategy !==
-      LocaleUrlStrategy.ShowAllLocales
-    ) {
-      matchedLocale = settings.localization.defaultLocaleValue;
+    if (localeUrlStrategy !== LocaleUrlStrategy.ShowAllLocales) {
+      matchedLocale = defaultLocaleValue;
     }
   }
 
@@ -28,7 +43,7 @@ const withLocale =
 
     try {
       const url = req.nextUrl.clone();
-      const matchedLocale = getMatchedLocale(url.pathname);
+      const matchedLocale = getMatchedLocale(url.pathname, req);
       let { localeUrlStrategy, defaultLocaleValue, redirectToDefaultLocale } =
         settings.localization;
 
@@ -50,8 +65,15 @@ const withLocale =
         redirectToDefaultLocale &&
         req.method === 'GET'
       ) {
-        url.pathname = `/${defaultLocaleValue}${url.pathname}`;
-        return NextResponse.redirect(url);
+        // Redirect to existing or default locale
+
+        url.pathname = getUrlPathWithLocale(
+          url.pathname,
+          req.cookies.get('pz-locale')?.value
+        );
+
+        // Use 303 for POST requests
+        return NextResponse.redirect(url, 303);
       }
 
       req.middlewareParams.rewrites.locale = matchedLocale;
@@ -61,7 +83,6 @@ const withLocale =
         ip
       });
     }
-
     return middleware(req, event);
   };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0-beta.9",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -21,6 +21,7 @@
     "@opentelemetry/semantic-conventions": "1.19.0",
     "@reduxjs/toolkit": "1.9.7",
     "@neshca/cache-handler": "1.5.1",
+    "@sentry/nextjs": "9.5.0",
     "cross-spawn": "7.0.3",
     "generic-pool": "3.9.0",
     "react-redux": "8.1.3",
@@ -30,13 +31,13 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "2.0.0-beta.7",
+    "@akinon/eslint-plugin-projectzero": "2.0.0-beta.9",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "8.18.2",
     "@typescript-eslint/parser": "8.18.2",
     "eslint": "9.17.0",
-    "eslint-config-next": "15.1.2",
+    "eslint-config-next": "15.3.2",
     "eslint-config-prettier": "9.1.0"
   }
 }

package/redux/middlewares/checkout.ts

@@ -16,12 +16,11 @@ import {
   setLoyaltyBalance,
   setPaymentChoices,
   setPaymentOptions,
-  setPreOrder,
   setRetailStores,
   setShippingOptions,
-  setShippingStepCompleted,
   setHepsipayAvailability,
-  setWalletPaymentData
+  setWalletPaymentData,
+  setPayOnDeliveryOtpModalActive
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
@@ -58,153 +57,14 @@ export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
   };
 };
 
-export const preOrderMiddleware: Middleware = ({
-  getState,
-  dispatch
-}: MiddlewareParams) => {
-  return (next) => (action) => {
-    const result: CheckoutResult = next(action);
-    const preOrder = result?.payload?.pre_order;
-
-    if (
-      !preOrder ||
-      action?.meta?.arg?.endpointName === 'guestLogin' ||
-      action?.meta?.arg?.endpointName === 'getCheckoutLoyaltyBalance'
-    ) {
-      return result;
-    }
-
-    const {
-      deliveryOptions,
-      addressList: addresses,
-      shippingOptions,
-      dataSourceShippingOptions,
-      paymentOptions,
-      installmentOptions,
-      attributeBasedShippingOptions
-    } = getState().checkout;
-    const { endpoints: apiEndpoints } = checkoutApi;
-
-    if (preOrder.is_redirected) {
-      const contextList = result?.payload?.context_list;
-
-      if (
-        contextList.find(
-          (ctx) => ctx.page_name === 'RedirectionPaymentSelectedPage'
-        )
-      ) {
-        dispatch(
-          apiEndpoints.setPaymentOption.initiate(preOrder.payment_option?.pk)
-        );
-        return;
-      }
-    }
-
-    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));
-    }
-
-    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;
-  };
-};
-
 export const contextListMiddleware: Middleware = ({
   dispatch,
   getState
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const { isMobileApp } = getState().root;
+    const { isMobileApp, userPhoneNumber } = getState().root;
     const result: CheckoutResult = next(action);
+    const preOrder = result?.payload?.pre_order;
 
     if (result?.payload?.context_list) {
       result.payload.context_list.forEach((context) => {
@@ -323,6 +183,18 @@ export const contextListMiddleware: Middleware = ({
         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));
+        }
       });
     }
 

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

@@ -37,6 +37,8 @@ export const setAddressMiddleware: Middleware = ({
           billingAddressPk: firstAddressPk
         })
       );
+
+      return null;
     }
 
     return result;

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

@@ -33,6 +33,8 @@ export const attributeBasedShippingOptionMiddleware: Middleware = ({
           initialSelectedOptions
         )
       );
+
+      return null;
     }
 
     return result;

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

@@ -29,6 +29,8 @@ export const dataSourceShippingOptionMiddleware: Middleware = ({
         dispatch(
           apiEndpoints.setDataSourceShippingOptions.initiate(selectedPks)
         );
+
+        return null;
       }
     }
 

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

@@ -26,6 +26,8 @@ export const deliveryOptionMiddleware: Middleware = ({
         dispatch(
           apiEndpoints.setDeliveryOption.initiate(customerDeliveryOption)
         );
+
+        return null;
       }
     }
 

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

@@ -10,16 +10,20 @@ import { paymentOptionMiddleware } from './payment-option';
 import { installmentOptionMiddleware } from './installment-option';
 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
+  paymentOptionMiddleware,
+  attributeBasedShippingOptionMiddleware,
+  dataSourceShippingOptionMiddleware,
+  shippingOptionMiddleware,
+  setAddressMiddleware,
+  deliveryOptionMiddleware,
+  setPreOrderMiddleware,
+  redirectionMiddleware,
+  preOrderValidationMiddleware
 ];

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

@@ -28,6 +28,8 @@ export const installmentOptionMiddleware: Middleware = ({
         dispatch(
           apiEndpoints.setInstallmentOption.initiate(firstInstallmentOptionPk)
         );
+
+        return null;
       }
     }
 

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

@@ -21,6 +21,8 @@ export const paymentOptionMiddleware: Middleware = ({
       const firstPaymentOptionPk = paymentOptions[0]?.pk;
 
       dispatch(apiEndpoints.setPaymentOption.initiate(firstPaymentOptionPk));
+
+      return null;
     }
 
     return result;

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

@@ -26,6 +26,8 @@ export const redirectionMiddleware: Middleware = ({
             preOrder.payment_option?.pk
           )
         );
+
+        return null;
       }
     }
 

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

@@ -30,6 +30,8 @@ export const shippingOptionMiddleware: Middleware = ({
         dispatch(
           apiEndpoints.setShippingOption.initiate(defaultShippingOption)
         );
+
+        return null;
       }
     }
 

package/redux/reducers/checkout.ts

@@ -70,6 +70,7 @@ export interface CheckoutState {
     };
     supportedMethods: string;
   };
+  payOnDeliveryOtpModalActive: boolean;
 }
 
 const initialState: CheckoutState = {
@@ -103,7 +104,8 @@ const initialState: CheckoutState = {
   retailStores: [],
   attributeBasedShippingOptions: [],
   selectedShippingOptions: {},
-  hepsipayAvailability: false
+  hepsipayAvailability: false,
+  payOnDeliveryOtpModalActive: false
 };
 
 const checkoutSlice = createSlice({
@@ -193,6 +195,9 @@ const checkoutSlice = createSlice({
     },
     setWalletPaymentData(state, { payload }) {
       state.walletPaymentData = payload;
+    },
+    setPayOnDeliveryOtpModalActive(state, { payload }) {
+      state.payOnDeliveryOtpModalActive = payload;
     }
   }
 });
@@ -225,7 +230,8 @@ export const {
   setAttributeBasedShippingOptions,
   setSelectedShippingOptions,
   setHepsipayAvailability,
-  setWalletPaymentData
+  setWalletPaymentData,
+  setPayOnDeliveryOtpModalActive
 } = checkoutSlice.actions;
 
 export default checkoutSlice.reducer;

package/redux/reducers/root.ts

@@ -14,7 +14,8 @@ const initialState = {
     open: false,
     title: null,
     content: null
-  }
+  },
+  userPhoneNumber: null
 };
 
 const rootSlice = createSlice({
@@ -45,6 +46,9 @@ const rootSlice = createSlice({
       state.rootModal.open = false;
       state.rootModal.title = null;
       state.rootModal.content = null;
+    },
+    setUserPhoneNumber(state, { payload }) {
+      state.userPhoneNumber = payload;
     }
   }
 });
@@ -55,7 +59,8 @@ export const {
   toggleMiniBasket,
   setHighlightedItem,
   openRootModal,
-  closeRootModal
+  closeRootModal,
+  setUserPhoneNumber
 } = rootSlice.actions;
 
 export default rootSlice.reducer;

package/sentry/index.ts

@@ -1,29 +1,48 @@
 import * as Sentry from '@sentry/nextjs';
 
-const SENTRY_DSN: string =
+const SENTRY_DSN: string | undefined =
   process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;
 
+export enum ClientLogType {
+  UNCAUGHT_ERROR_PAGE = 'UNCAUGHT_ERROR_PAGE',
+  CHECKOUT = 'CHECKOUT'
+}
+
+const ALLOWED_CLIENT_LOG_TYPES: ClientLogType[] = [
+  ClientLogType.UNCAUGHT_ERROR_PAGE,
+  ClientLogType.CHECKOUT
+];
+
 export const initSentry = (
   type: 'Server' | 'Client' | 'Edge',
   options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {}
 ) => {
   // TODO: Handle options with ESLint rules
 
-  // TODO: Remove Zero Project DSN
+  Sentry.init({
+    dsn:
+      options.dsn ||
+      SENTRY_DSN ||
+      'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
+    initialScope: {
+      tags: {
+        APP_TYPE: 'ProjectZeroNext',
+        TYPE: type
+      }
+    },
+    tracesSampleRate: 0,
+    integrations: [],
+    beforeSend: (event, hint) => {
+      if (
+        type === 'Client' &&
+        !ALLOWED_CLIENT_LOG_TYPES.includes(
+          event.tags?.LOG_TYPE as ClientLogType
+        )
+      ) {
+        return null;
+      }
 
-  if (type === 'Server' || type === 'Edge') {
-    Sentry.init({
-      dsn:
-        SENTRY_DSN ||
-        'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
-      initialScope: {
-        tags: {
-          APP_TYPE: 'ProjectZeroNext',
-          TYPE: type
-        }
-      },
-      tracesSampleRate: 1.0,
-      integrations: []
-    });
-  }
+      return event;
+    }
+  });
 };

package/types/commerce/checkout.ts

@@ -108,6 +108,7 @@ export interface PreOrder {
   context_extras?: ExtraField;
   token?: string;
   agreement_confirmed?: boolean;
+  phone_number?: string;
 }
 
 export type ExtraField = Record<string, any>;
@@ -200,3 +201,11 @@ export interface MiddlewareParams {
   getState: () => RootState;
   dispatch: TypedDispatch;
 }
+
+export type SendSmsType = {
+  phone_number: string;
+};
+
+export type VerifySmsType = {
+  verify_code: string;
+};

package/utils/index.ts

@@ -1,6 +1,6 @@
 import settings from 'settings';
 import { LocaleUrlStrategy } from '../localization';
-import { CDNOptions, ClientRequestOptions } from '../types';
+import { CDNOptions, ClientRequestOptions, Locale } from '../types';
 
 export * from './get-currency';
 export * from './menu-generator';
@@ -152,14 +152,17 @@ export function buildCDNUrl(url: string, config?: CDNOptions) {
   return `${rootWithoutOptions}${options}${fileExtension}`;
 }
 
+const { locales, localeUrlStrategy, defaultLocaleValue } =
+  settings.localization;
+
+const isLocaleExcluded = (locale: Locale) =>
+  ![LocaleUrlStrategy.ShowAllLocales, LocaleUrlStrategy.Subdomain].includes(
+    localeUrlStrategy
+  ) && locale.value !== defaultLocaleValue;
+
 export const urlLocaleMatcherRegex = new RegExp(
-  `^/(${settings.localization.locales
-    .filter((l) =>
-      settings.localization.localeUrlStrategy !==
-      LocaleUrlStrategy.ShowAllLocales
-        ? l.value !== settings.localization.defaultLocaleValue
-        : l
-    )
+  `^/(${locales
+    .filter((l) => !isLocaleExcluded(l))
     .map((l) => l.value)
     .join('|')})(?=/|$)`
 );

package/utils/localization.ts

@@ -11,6 +11,10 @@ export const getUrlPathWithLocale = (
     currentLocale = defaultLocaleValue;
   }
 
+  if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
+    return pathname;
+  }
+
   if (localeUrlStrategy === LocaleUrlStrategy.HideAllLocales) {
     return pathname;
   }

package/views/error-page.tsx

@@ -0,0 +1,93 @@
+import { useEffect, useState } from 'react';
+import { useLocalization } from '../hooks';
+import { Button, Link } from '../components';
+import { ROUTES } from 'routes';
+
+export default function PzErrorPage({
+  error,
+  reset
+}: {
+  error: Error & { digest?: string; isServerError?: boolean };
+  reset: () => void;
+}) {
+  const [isServerError, setIsServerError] = useState(false);
+
+  useEffect(() => {
+    if ('isServerError' in error) {
+      setIsServerError(true);
+      return;
+    }
+
+    setIsServerError(!!error.digest);
+  }, [error]);
+
+  return isServerError ? (
+    <ServerErrorUI />
+  ) : (
+    <ClientErrorUI error={error} reset={reset} />
+  );
+}
+
+function ClientErrorUI({
+  error,
+  reset
+}: {
+  error: Error & { digest?: string };
+  reset: () => void;
+}) {
+  const { t } = useLocalization();
+
+  const errorMessage = error?.message || 'Unknown error';
+
+  return (
+    <section className="text-center px-6 py-6 my-14 md:px-0 md:m-14">
+      <div className="text-4xl font-bold md:text-6xl text-red-500">500</div>
+      <h1 className="text-lg md:text-xl mt-4">
+        {t('common.client_error.title')}
+      </h1>
+      <p className="text-lg md:text-xl mt-2">
+        {t('common.client_error.description')}
+      </p>
+
+      <div className="mt-4 mx-auto max-w-lg">
+        <p className="text-xs text-gray-600 font-mono bg-gray-100 p-3 rounded overflow-auto text-left">
+          <span className="font-semibold">Error:</span> {errorMessage}
+        </p>
+      </div>
+
+      <div className="mt-6 flex flex-col gap-4 items-center justify-center">
+        <Link href={ROUTES.HOME} className="text-lg underline">
+          {t('common.client_error.link_text')}
+        </Link>
+        <Button onClick={reset} className="text-lg">
+          {t('common.try_again')}
+        </Button>
+      </div>
+    </section>
+  );
+}
+
+function ServerErrorUI() {
+  const { t } = useLocalization();
+
+  const reloadPage = () => {
+    window.location.reload();
+  };
+
+  return (
+    <section className="text-center px-6 my-14 md:px-0 md:m-14">
+      <div className="text-7xl font-bold md:text-8xl">500</div>
+      <h1 className="text-lg md:text-xl"> {t('common.page_500.title')} </h1>
+      <p className="text-lg md:text-xl"> {t('common.page_500.description')} </p>
+
+      <div className="mt-6 flex flex-col gap-4 items-center justify-center">
+        <Link href={ROUTES.HOME} className="text-lg underline">
+          {t('common.page_500.link_text')}
+        </Link>
+        <Button onClick={reloadPage} className="text-lg">
+          {t('common.try_again')}
+        </Button>
+      </div>
+    </section>
+  );
+}

package/with-pz-config.js

@@ -45,7 +45,8 @@ const defaultConfig = {
           },
           {
             key: 'Content-Security-Policy',
-            value: "frame-ancestors 'self' https://*.akifast.com akifast.com"
+            value:
+              "frame-ancestors 'self' https://*.akifast.com akifast.com https://*.akinoncloud.com akinoncloud.com"
           }
         ]
       }
@@ -64,7 +65,7 @@ const defaultConfig = {
   },
   sentry: {
     hideSourceMaps: true
-  }
+  } // TODO: This section will be reviewed again in the Sentry 8 update.
 };
 
 const withPzConfig = (