@akinon/next 1.119.0 → 1.120.0-rc.0

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @akinon/next
 
+## 1.120.0-rc.0
+
+### Minor Changes
+
+- 31b4a266: ZERO-4102: Add support for post-checkout redirect in middleware
+- d2c0e759: ZERO-3684: Handle cross-origin iframe access in iframeURLChange function
+- aef81c5d: ZERO-4034: Refactor checkout API to use dynamic store imports for improved performance
+- b55acb76: ZERO-2577: Fix pagination bug and update usePagination hook and ensure pagination controls rendering correctly
+- 8a7fd0f4: ZERO-4065: Add '[segment]' to skipSegments in route generation
+- 36143125: ZERO-3987: Add barcode scanner functionality with modal and button
+- 0754c835: ZERO-4063: Add support for optional Redis password in cache handlers
+- f7e0f646: ZERO-4032: Add bfcache-headers middleware, integrate it into the default chain, and introduce a new environment variable for control.
+- 94a86fcc: ZERO-4065: Expand skipSegments array to include additional segments for route generation
+- 143be2b9: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
+- cd68a97a: ZERO-4126: Enhance error handling in appFetch and related data handlers to throw notFound on 404 and 422 errors
+- 9f8cd3bc: ZERO-3449: AI Search Active Filters & Crop Style changes have been implemented
+- 49c82e1a: ZERO-4047: Remove Sentry configuration from default Next.js config
+- a9f5cdb1: ZERO-4102: Fix post-checkout condition to additionally check for empty search parameters.
+- d99a6a7d: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
+- d7e5178b: ZERO-3985: Add query string handling for orders redirection in middleware
+- 591e345e: ZERO-3855: Enhance credit card payment handling in checkout middlewares
+- 01ee41f1: ZERO-4102: Implement a post-checkout flow by dynamically determining checkout paths and managing a pz-post-checkout-flow cookie.
+- 4de5303c: ZERO-2504: add cookie filter to api client request
+- b59fdd1c: ZERO-4009: Add password reset token validation
+- 95b139dc: ZERO-3795: Remove duplicate entry for SavedCard in PluginComponents map
+- c6c5c1cd: ZERO-4128: Use cookies API for pz-pos-error to ensure delivery on 303 redirects
+- 3909d322: Edit the duplicate Plugin.SimilarProducts in the plugin-module.
+
 ## 1.119.0
 
 ## 1.118.0

package/api/barcode-search.ts

@@ -0,0 +1,59 @@
+import { NextRequest, NextResponse } from 'next/server';
+import Settings from 'settings';
+
+export async function GET(request: NextRequest) {
+  try {
+    const { searchParams } = new URL(request.url);
+    const barcode = searchParams.get('search_text');
+
+    if (!barcode) {
+      return NextResponse.json(
+        { error: 'Missing search_text parameter (barcode)' },
+        { status: 400 }
+      );
+    }
+
+    if (Settings.commerceUrl === 'default') {
+      return NextResponse.json(
+        { error: 'Commerce URL is not configured' },
+        { status: 500 }
+      );
+    }
+
+    const queryParams = new URLSearchParams();
+    queryParams.append('search_text', barcode);
+
+    searchParams.forEach((value, key) => {
+      if (key !== 'search_text') {
+        queryParams.append(key, value);
+      }
+    });
+
+    const apiUrl = `${Settings.commerceUrl}/list/?${queryParams.toString()}`;
+
+    const headers: Record<string, string> = {
+      Accept: 'application/json',
+      'Content-Type': 'application/json'
+    };
+
+    const response = await fetch(apiUrl, {
+      method: 'GET',
+      headers
+    });
+
+    if (!response.ok) {
+      return NextResponse.json(
+        { error: `API request failed with status: ${response.status}` },
+        { status: response.status }
+      );
+    }
+
+    const data = await response.json();
+    return NextResponse.json(data);
+  } catch (error) {
+    return NextResponse.json(
+      { error: (error as Error).message },
+      { status: 500 }
+    );
+  }
+}

package/bin/pz-generate-routes.js

@@ -25,7 +25,16 @@ const generateRoutes = () => {
   const routes = [];
   const excludedDirs = ['api', 'pz-not-found'];
 
-  const skipSegments = ['[commerce]', '[locale]', '[currency]'];
+  const skipSegments = [
+    '[commerce]',
+    '[locale]',
+    '[currency]',
+    '[session]',
+    '[segment]',
+    '[url]',
+    '[theme]',
+    '[member_type]'
+  ];
   const skipCatchAllRoutes = ['[...prettyurl]', '[...not_found]'];
 
   const walkDirectory = (dir, basePath = '') => {

package/components/plugin-module.tsx

@@ -55,6 +55,7 @@ export enum Component {
   SavedCard = 'SavedCardOption',
   VirtualTryOnPlugin = 'VirtualTryOnPlugin',
   BasketVirtualTryOn = 'BasketVirtualTryOn',
+  BarcodeScannerPlugin = 'BarcodeScannerPlugin',
   IyzicoSavedCard = 'IyzicoSavedCardOption',
   Hepsipay = 'Hepsipay',
   FlowPayment = 'FlowPayment',
@@ -113,11 +114,10 @@ const PluginComponents = new Map([
     ]
   ],
   [Plugin.SavedCard, [Component.SavedCard, Component.IyzicoSavedCard]],
-  [Plugin.SavedCard, [Component.SavedCard]],
   [Plugin.FlowPayment, [Component.FlowPayment]],
   [
     Plugin.VirtualTryOn,
-    [Component.VirtualTryOnPlugin, Component.BasketVirtualTryOn]
+    [Component.VirtualTryOnPlugin, Component.BasketVirtualTryOn, Component.BarcodeScannerPlugin]
   ],
   [Plugin.Hepsipay, [Component.Hepsipay]],
   [Plugin.MasterpassRest, [Component.MasterpassRest]],

package/data/client/account.ts

@@ -77,6 +77,10 @@ interface LoyaltyTransactions {
   }[];
 }
 
+interface PasswordResetValidateResponse {
+  validlink: boolean;
+}
+
 const accountApi = api.injectEndpoints({
   endpoints: (builder) => ({
     updatePassword: builder.mutation<void, AccountChangePasswordFormType>({
@@ -221,6 +225,12 @@ const accountApi = api.injectEndpoints({
     }),
     getLoyaltyTransactions: builder.query<LoyaltyTransactions, void>({
       query: () => buildClientRequestUrl(account.loyaltyTransactions)
+    }),
+    getValidatePasswordResetToken: builder.query<
+      PasswordResetValidateResponse,
+      string
+    >({
+      query: (slug) => buildClientRequestUrl(account.passwordReset(slug))
     })
   }),
   overrideExisting: true
@@ -247,5 +257,6 @@ export const {
   usePasswordResetMutation,
   useAnonymizeMutation,
   useGetLoyaltyBalanceQuery,
-  useGetLoyaltyTransactionsQuery
+  useGetLoyaltyTransactionsQuery,
+  useGetValidatePasswordResetTokenQuery
 } = accountApi;

package/data/client/checkout.ts

@@ -17,10 +17,10 @@ import {
   SendSmsType,
   VerifySmsType
 } from '../../types';
-import { buildClientRequestUrl } from '../../utils';
+import { buildClientRequestUrl, getCookie } from '../../utils';
 import { api } from './api';
 import { checkout } from '../urls';
-import { AppDispatch, AppStore, store } from 'redux/store';
+import type { AppDispatch, AppStore } from 'redux/store';
 import settings from 'settings';
 import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';
 import {
@@ -33,6 +33,11 @@ import {
   buildPurchaseForm
 } from '@akinon/pz-masterpass/src/utils';
 
+const getStore = async (): Promise<AppStore> => {
+  const { store } = await import('redux/store');
+  return store;
+};
+
 interface CheckoutResponse {
   pre_order?: PreOrder;
   errors: {
@@ -82,6 +87,18 @@ export interface PayOnDeliveryParams {
   paymentType: string;
 }
 
+const buildCheckoutRequestUrl = (
+  path: string,
+  options?: Parameters<typeof buildClientRequestUrl>[1]
+) => {
+  const effectivePath =
+    getCookie('pz-post-checkout-flow') === 'true' &&
+    /^\/orders\/checkout(\/|\?|$)/.test(path)
+      ? path.replace('/orders/checkout', '/orders/post-checkout')
+      : path;
+  return buildClientRequestUrl(effectivePath, options);
+};
+
 const completeMasterpassPayment = async (
   params: CompleteCreditCardParams,
   dispatch: AppDispatch,
@@ -181,41 +198,41 @@ export const checkoutApi = api.injectEndpoints({
   endpoints: (build) => ({
     fetchCheckout: build.query<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.fetchCheckout, {})
+        url: buildCheckoutRequestUrl(checkout.fetchCheckout, {})
       }),
       providesTags: ['Checkout']
     }),
     resetCheckoutState: build.query<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.guestLogin, {})
+        url: buildCheckoutRequestUrl(checkout.guestLogin, {})
       })
     }),
     fetchCheckoutResult: build.query<{ order: Order }, string>({
       query: (token: string) =>
-        buildClientRequestUrl(checkout.fetchCheckoutResult(token))
+        buildCheckoutRequestUrl(checkout.fetchCheckoutResult(token))
     }),
     get3dRedirectForm: build.query<{ result: string }, void>({
       query: () =>
-        buildClientRequestUrl(checkout.get3dRedirectForm, {
+        buildCheckoutRequestUrl(checkout.get3dRedirectForm, {
           responseType: 'text'
         })
     }),
     getContract: build.query<GetContractResponse, string>({
       query: (slug: string) =>
-        buildClientRequestUrl(checkout.getContract(slug), {
+        buildCheckoutRequestUrl(checkout.getContract(slug), {
           responseType: 'text'
         })
     }),
     getCoupons: build.query<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.couponSelectionPage)
+        url: buildCheckoutRequestUrl(checkout.couponSelectionPage)
       })
     }),
 
     setCoupon: build.mutation<CheckoutResponse, { pk: number; action: string }>(
       {
         query: ({ pk, action }) => ({
-          url: buildClientRequestUrl(checkout.couponSelectionPage, {
+          url: buildCheckoutRequestUrl(checkout.couponSelectionPage, {
             useFormData: true
           }),
           method: 'POST',
@@ -231,25 +248,32 @@ export const checkoutApi = api.injectEndpoints({
       CheckoutResponse,
       CompleteCreditCardParams
     >({
-      query: ({
-        card_holder,
-        card_cvv,
-        card_number,
-        card_month,
-        card_year,
-        use_three_d = true,
-        save = undefined
-      }) => {
+      async queryFn(
+        {
+          card_holder,
+          card_cvv,
+          card_number,
+          card_month,
+          card_year,
+          use_three_d = true,
+          save = undefined
+        },
+        _queryApi,
+        _extraOptions,
+        baseQuery
+      ) {
+        const reduxStore = await getStore();
         const paymentOption =
-          store.getState().checkout?.preOrder?.payment_option;
+          reduxStore.getState().checkout?.preOrder?.payment_option;
 
         if (paymentOption?.payment_type === 'masterpass') {
-          return {
-            url: buildClientRequestUrl(checkout.getMasterpassOrderNo, {
+          const result = await baseQuery({
+            url: buildCheckoutRequestUrl(checkout.getMasterpassOrderNo, {
               useFormData: true
             }),
             method: 'POST'
-          };
+          });
+          return result as { data: CheckoutResponse } | { error: any };
         }
 
         const body: Record<string, string> = {
@@ -266,18 +290,19 @@ export const checkoutApi = api.injectEndpoints({
           body.save = save ? '1' : '0';
         }
 
-        return {
-          url: buildClientRequestUrl(checkout.completeCreditCardPayment, {
+        const result = await baseQuery({
+          url: buildCheckoutRequestUrl(checkout.completeCreditCardPayment, {
             useFormData: true
           }),
           method: 'POST',
           body
-        };
+        });
+        return result as { data: CheckoutResponse } | { error: any };
       },
       async onQueryStarted(args, { dispatch, queryFulfilled }) {
         dispatch(setPaymentStepBusy(true));
         const { data } = await queryFulfilled;
-        const reduxStore = (await import('redux/store')).store;
+        const reduxStore = await getStore();
         const completePaymentContext = data?.context_list?.find(
           (context) => context?.page_name === 'MasterpassCompletePage'
         );
@@ -302,7 +327,7 @@ export const checkoutApi = api.injectEndpoints({
       }
     >({
       query: ({ token }) => ({
-        url: buildClientRequestUrl(checkout.completeMasterpassPayment, {
+        url: buildCheckoutRequestUrl(checkout.completeMasterpassPayment, {
           useFormData: true
         }),
         method: 'POST',
@@ -319,7 +344,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     completeFundsTransfer: build.mutation<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.completeFundsTransfer, {
+        url: buildCheckoutRequestUrl(checkout.completeFundsTransfer, {
           useFormData: true
         }),
         method: 'POST',
@@ -336,7 +361,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     guestLogin: build.mutation<CheckoutResponse, GuestLoginFormParams>({
       query: ({ user_email, phone_number }) => ({
-        url: buildClientRequestUrl(checkout.guestLogin, {
+        url: buildCheckoutRequestUrl(checkout.guestLogin, {
           useFormData: true
         }),
         method: 'POST',
@@ -349,7 +374,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setDeliveryOption: build.mutation<CheckoutResponse, number>({
       query: (pk: number) => ({
-        url: buildClientRequestUrl(checkout.setDeliveryOption, {
+        url: buildCheckoutRequestUrl(checkout.setDeliveryOption, {
           useFormData: true
         }),
         method: 'POST',
@@ -365,7 +390,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setAddresses: build.mutation<CheckoutResponse, SetAddressesParams>({
       query: ({ shippingAddressPk, billingAddressPk }) => ({
-        url: buildClientRequestUrl(checkout.setAddresses, {
+        url: buildCheckoutRequestUrl(checkout.setAddresses, {
           useFormData: true
         }),
         method: 'POST',
@@ -382,7 +407,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setShippingOption: build.mutation<CheckoutResponse, number>({
       query: (pk: number) => ({
-        url: buildClientRequestUrl(checkout.setShippingOption, {
+        url: buildCheckoutRequestUrl(checkout.setShippingOption, {
           useFormData: true
         }),
         method: 'POST',
@@ -398,7 +423,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setDataSourceShippingOptions: build.mutation<CheckoutResponse, number[]>({
       query: (pks) => ({
-        url: buildClientRequestUrl(checkout.setDataSourceShippingOption, {
+        url: buildCheckoutRequestUrl(checkout.setDataSourceShippingOption, {
           useFormData: true
         }),
         method: 'POST',
@@ -414,7 +439,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setRetailStore: build.mutation<CheckoutResponse, SetRetailStoreParams>({
       query: ({ retailStorePk, billingAddressPk }) => ({
-        url: buildClientRequestUrl(
+        url: buildCheckoutRequestUrl(
           '/orders/checkout?page=RetailStoreSelectionPage',
           {
             useFormData: true
@@ -429,13 +454,13 @@ export const checkoutApi = api.injectEndpoints({
     }),
     fetchPaymentOptions: build.query<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.setPaymentOption)
+        url: buildCheckoutRequestUrl(checkout.setPaymentOption)
       }),
       providesTags: ['PaymentOptions']
     }),
     setPaymentOption: build.mutation<CheckoutResponse, number>({
       query: (pk: number) => ({
-        url: buildClientRequestUrl(checkout.setPaymentOption, {
+        url: buildCheckoutRequestUrl(checkout.setPaymentOption, {
           useFormData: true
         }),
         method: 'POST',
@@ -461,7 +486,7 @@ export const checkoutApi = api.injectEndpoints({
       }
     >({
       query: ({ payment_option: pk, validationURL }) => ({
-        url: buildClientRequestUrl(checkout.setWalletSelectionPage, {
+        url: buildCheckoutRequestUrl(checkout.setWalletSelectionPage, {
           useFormData: true
         }),
         method: 'POST',
@@ -485,7 +510,7 @@ export const checkoutApi = api.injectEndpoints({
       }
     >({
       query: (requestBody) => ({
-        url: buildClientRequestUrl(checkout.setWalletPaymentPage, {
+        url: buildCheckoutRequestUrl(checkout.setWalletPaymentPage, {
           useFormData: true
         }),
         method: 'POST',
@@ -506,7 +531,7 @@ export const checkoutApi = api.injectEndpoints({
       }
     >({
       query: ({ success, ...additionalParams }) => ({
-        url: buildClientRequestUrl(checkout.setWalletCompletePage, {
+        url: buildCheckoutRequestUrl(checkout.setWalletCompletePage, {
           useFormData: true
         }),
         method: 'POST',
@@ -522,23 +547,25 @@ export const checkoutApi = api.injectEndpoints({
       }
     }),
     setBinNumber: build.mutation<CheckoutResponse, string>({
-      query: (binNumber: string) => {
+      async queryFn(binNumber, _queryApi, _extraOptions, baseQuery) {
+        const reduxStore = await getStore();
         const paymentOption =
-          store.getState().checkout?.preOrder?.payment_option;
+          reduxStore.getState().checkout?.preOrder?.payment_option;
         const binNumberUrl =
           paymentOption?.payment_type === 'masterpass'
             ? checkout.setMasterpassBinNumber
             : checkout.setBinNumber;
 
-        return {
-          url: buildClientRequestUrl(binNumberUrl, {
+        const result = await baseQuery({
+          url: buildCheckoutRequestUrl(binNumberUrl, {
             useFormData: true
           }),
           method: 'POST',
           body: {
             bin_number: binNumber
           }
-        };
+        });
+        return result as { data: CheckoutResponse } | { error: any };
       },
       async onQueryStarted(arg, { dispatch, queryFulfilled }) {
         dispatch(setPaymentStepBusy(true));
@@ -548,22 +575,25 @@ export const checkoutApi = api.injectEndpoints({
       }
     }),
     setInstallmentOption: build.mutation<CheckoutResponse, number>({
-      query: (pk: number) => {
+      async queryFn(pk, _queryApi, _extraOptions, baseQuery) {
+        const reduxStore = await getStore();
         const paymentOption =
-          store.getState().checkout?.preOrder?.payment_option;
+          reduxStore.getState().checkout?.preOrder?.payment_option;
         const installmentOption =
           paymentOption?.payment_type === 'masterpass'
             ? checkout.setMasterPassInstallmentOption
             : checkout.setInstallmentOption;
-        return {
-          url: buildClientRequestUrl(installmentOption, {
+
+        const result = await baseQuery({
+          url: buildCheckoutRequestUrl(installmentOption, {
             useFormData: true
           }),
           method: 'POST',
           body: {
             installment: String(pk)
           }
-        };
+        });
+        return result as { data: CheckoutResponse } | { error: any };
       },
       async onQueryStarted(arg, { dispatch, queryFulfilled }) {
         dispatch(setPaymentStepBusy(true));
@@ -573,7 +603,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setFundsTransferOption: build.mutation<CheckoutResponse, number>({
       query: (pk: number) => ({
-        url: buildClientRequestUrl(checkout.setFundsTransferOption, {
+        url: buildCheckoutRequestUrl(checkout.setFundsTransferOption, {
           useFormData: true
         }),
         method: 'POST',
@@ -590,7 +620,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setCreditPaymentOption: build.mutation<CheckoutResponse, number>({
       query: (pk: number) => ({
-        url: buildClientRequestUrl(checkout.setCreditPaymentOption, {
+        url: buildCheckoutRequestUrl(checkout.setCreditPaymentOption, {
           useFormData: true
         }),
         method: 'POST',
@@ -607,7 +637,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     confirmationCreditPayment: build.mutation<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.confirmationCreditPayment, {
+        url: buildCheckoutRequestUrl(checkout.confirmationCreditPayment, {
           useFormData: true
         }),
         method: 'POST',
@@ -623,7 +653,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     completeRedirectionPayment: build.mutation<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.completeRedirectionPayment, {
+        url: buildCheckoutRequestUrl(checkout.completeRedirectionPayment, {
           useFormData: true
         }),
         method: 'POST',
@@ -639,7 +669,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     applePaymentSelect: build.mutation<CheckoutResponse, ApplePaySelectParams>({
       query: ({ agreement, validationURL }) => ({
-        url: buildClientRequestUrl(checkout.confirmationPaymentSelect, {
+        url: buildCheckoutRequestUrl(checkout.confirmationPaymentSelect, {
           useFormData: true
         }),
         method: 'POST',
@@ -656,7 +686,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     appleQuery: build.mutation<CheckoutResponse, ApplePayQueryParams>({
       query: ({ agreement, paymentToken }) => ({
-        url: buildClientRequestUrl(checkout.confirmationQuery, {
+        url: buildCheckoutRequestUrl(checkout.confirmationQuery, {
           useFormData: true
         }),
         method: 'POST',
@@ -673,7 +703,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     completeConfirmation: build.mutation<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.confirmationComplete, {
+        url: buildCheckoutRequestUrl(checkout.confirmationComplete, {
           useFormData: true
         }),
         method: 'POST',
@@ -692,7 +722,7 @@ export const checkoutApi = api.injectEndpoints({
       PayOnDeliveryParams
     >({
       query: ({ paymentType }) => ({
-        url: buildClientRequestUrl(
+        url: buildCheckoutRequestUrl(
           `${checkout.fetchCheckout}?page=PayOnDeliveryPage`,
           { useFormData: true }
         ),
@@ -710,7 +740,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setPayOnDeliveryChoice: build.mutation<CheckoutResponse, string>({
       query: (body) => ({
-        url: buildClientRequestUrl(
+        url: buildCheckoutRequestUrl(
           `${checkout.fetchCheckout}?page=PayOnDeliveryPaymentChoicePage`,
           { useFormData: true }
         ),
@@ -727,7 +757,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     completeLoyaltyPayment: build.mutation<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.completeLoyaltyPayment, {
+        url: buildCheckoutRequestUrl(checkout.completeLoyaltyPayment, {
           useFormData: true
         }),
         method: 'POST',
@@ -743,12 +773,12 @@ export const checkoutApi = api.injectEndpoints({
     }),
     getCheckoutLoyaltyBalance: build.query<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.loyaltyMoneyUsage)
+        url: buildCheckoutRequestUrl(checkout.loyaltyMoneyUsage)
       })
     }),
     payWithLoyaltyBalance: build.mutation<any, string>({
       query: (amount) => ({
-        url: buildClientRequestUrl(checkout.loyaltyMoneyUsage, {
+        url: buildCheckoutRequestUrl(checkout.loyaltyMoneyUsage, {
           useFormData: true
         }),
         method: 'POST',
@@ -779,7 +809,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setOrderNote: build.mutation<CheckoutResponse, string>({
       query: (notes) => ({
-        url: buildClientRequestUrl(checkout.setOrderNote, {
+        url: buildCheckoutRequestUrl(checkout.setOrderNote, {
           useFormData: true
         }),
         method: 'POST',
@@ -799,7 +829,7 @@ export const checkoutApi = api.injectEndpoints({
         };
 
         return {
-          url: buildClientRequestUrl(checkout.deliveryBagsPage, {
+          url: buildCheckoutRequestUrl(checkout.deliveryBagsPage, {
             useFormData: true
           }),
           method: 'POST',
@@ -812,7 +842,7 @@ export const checkoutApi = api.injectEndpoints({
       Record<string, number>
     >({
       query: (options) => ({
-        url: buildClientRequestUrl(checkout.setAttributeBasedShippingOption, {
+        url: buildCheckoutRequestUrl(checkout.setAttributeBasedShippingOption, {
           useFormData: true
         }),
         method: 'POST',
@@ -831,7 +861,7 @@ export const checkoutApi = api.injectEndpoints({
       { extra_field: ExtraField }
     >({
       query: ({ extra_field }) => ({
-        url: buildClientRequestUrl(checkout.setOrderSelectionPage, {
+        url: buildCheckoutRequestUrl(checkout.setOrderSelectionPage, {
           useFormData: true
         }),
         method: 'POST',
@@ -842,7 +872,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     fetchLoyaltyData: build.query<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.loyaltyCardPage, {
+        url: buildCheckoutRequestUrl(checkout.loyaltyCardPage, {
           accept: 'application/json',
           contentType: 'application/json'
         }),
@@ -851,7 +881,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setLoyaltyData: build.mutation<CheckoutResponse, number | string>({
       query: (amount) => ({
-        url: buildClientRequestUrl(checkout.loyaltyCardPage, {
+        url: buildCheckoutRequestUrl(checkout.loyaltyCardPage, {
           useFormData: true
         }),
         method: 'POST',
@@ -862,7 +892,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     sendSms: build.mutation<CheckoutResponse, SendSmsType>({
       query: (body) => ({
-        url: buildClientRequestUrl(checkout.sendSmsPage, {
+        url: buildCheckoutRequestUrl(checkout.sendSmsPage, {
           useFormData: true
         }),
         method: 'POST',
@@ -871,7 +901,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     verifySms: build.mutation<CheckoutResponse, VerifySmsType>({
       query: (body) => ({
-        url: buildClientRequestUrl(checkout.verifySmsPage, {
+        url: buildCheckoutRequestUrl(checkout.verifySmsPage, {
           useFormData: true
         }),
         method: 'POST',
@@ -887,7 +917,7 @@ export const checkoutApi = api.injectEndpoints({
         });
 
         return {
-          url: buildClientRequestUrl(checkout.saveSampleProducts),
+          url: buildCheckoutRequestUrl(checkout.saveSampleProducts),
           method: 'POST',
           body: formData
         };