@akinon/next 1.59.0 → 1.60.0-rc.7

package/data/client/checkout.ts

@@ -57,6 +57,7 @@ export interface CompleteCreditCardParams {
   card_month: string;
   card_year: string;
   use_three_d?: boolean;
+  save?: boolean;
 }
 
 interface GetContractResponse {
@@ -228,7 +229,8 @@ export const checkoutApi = api.injectEndpoints({
         card_number,
         card_month,
         card_year,
-        use_three_d = true
+        use_three_d = true,
+        save = undefined
       }) => {
         const paymentOption =
           store.getState().checkout?.preOrder?.payment_option;
@@ -242,20 +244,26 @@ export const checkoutApi = api.injectEndpoints({
           };
         }
 
+        const body: Record<string, string> = {
+          agreement: '1',
+          use_three_d: use_three_d ? '1' : '0',
+          card_cvv,
+          card_holder,
+          card_month,
+          card_number,
+          card_year
+        };
+
+        if (save !== undefined) {
+          body.save = save ? '1' : '0';
+        }
+
         return {
           url: buildClientRequestUrl(checkout.completeCreditCardPayment, {
             useFormData: true
           }),
           method: 'POST',
-          body: {
-            agreement: '1',
-            use_three_d: use_three_d ? '1' : '0',
-            card_cvv,
-            card_holder,
-            card_month,
-            card_number,
-            card_year
-          }
+          body
         };
       },
       async onQueryStarted(args, { dispatch, queryFulfilled }) {
@@ -380,6 +388,22 @@ export const checkoutApi = api.injectEndpoints({
         dispatch(setShippingStepBusy(false));
       }
     }),
+    setDataSourceShippingOptions: build.mutation<CheckoutResponse, number[]>({
+      query: (pks) => ({
+        url: buildClientRequestUrl(checkout.setDataSourceShippingOption, {
+          useFormData: true
+        }),
+        method: 'POST',
+        body: {
+          data_source_shipping_options: JSON.stringify(pks)
+        }
+      }),
+      async onQueryStarted(arg, { dispatch, queryFulfilled }) {
+        dispatch(setShippingStepBusy(true));
+        await queryFulfilled;
+        dispatch(setShippingStepBusy(false));
+      }
+    }),
     setRetailStore: build.mutation<CheckoutResponse, SetRetailStoreParams>({
       query: ({ retailStorePk, billingAddressPk }) => ({
         url: buildClientRequestUrl(
@@ -681,6 +705,25 @@ export const checkoutApi = api.injectEndpoints({
         };
       }
     }),
+    setAttributeBasedShippingOptions: build.mutation<
+      CheckoutResponse,
+      Record<string, number>
+    >({
+      query: (options) => ({
+        url: buildClientRequestUrl(checkout.setAttributeBasedShippingOption, {
+          useFormData: true
+        }),
+        method: 'POST',
+        body: {
+          attribute_based_shipping_options: JSON.stringify(options)
+        }
+      }),
+      async onQueryStarted(arg, { dispatch, queryFulfilled }) {
+        dispatch(setShippingStepBusy(true));
+        await queryFulfilled;
+        dispatch(setShippingStepBusy(false));
+      }
+    }),
     setOrderSelectionPage: build.mutation<
       CheckoutResponse,
       { extra_field: ExtraField }
@@ -712,6 +755,7 @@ export const {
   useSetDeliveryOptionMutation,
   useSetAddressesMutation,
   useSetShippingOptionMutation,
+  useSetDataSourceShippingOptionsMutation,
   useSetPaymentOptionMutation,
   useSetBinNumberMutation,
   useSetInstallmentOptionMutation,
@@ -730,5 +774,6 @@ export const {
   usePayWithLoyaltyBalanceMutation,
   useSetOrderNoteMutation,
   useSetDeliveryBagsMutation,
+  useSetAttributeBasedShippingOptionsMutation,
   useSetOrderSelectionPageMutation
 } = checkoutApi;

package/data/client/user.ts

@@ -22,11 +22,12 @@ const userApi = api.injectEndpoints({
     getCaptcha: build.query<GetCaptchaResponse, void>({
       query: () => buildClientRequestUrl(user.captcha),
       transformResponse: (response: { html: string }) => {
-        const siteKeyMatch = response.html.match(/sitekey=["|'][^"']+/gi);
+        const siteKey = response.html.match(/data-sitekey="([^"]+)"/i)[1];
+
         const csrfTokenMatch = response.html.match(
           /name=['|"]csrfmiddlewaretoken['|"] value=['|"][^'"]+/gi
         );
-        const siteKey = siteKeyMatch?.[0].replace(/sitekey=["|']/, '') || '';
+
         const csrfToken =
           csrfTokenMatch?.[0].replace(
             /name=['|"]csrfmiddlewaretoken['|"] value=['|"]/gi,

package/data/server/category.ts

@@ -5,26 +5,32 @@ import { category, product } from '../urls';
 import { Cache, CacheKey } from '../../lib/cache';
 import { parse } from 'lossless-json';
 import logger from '../../utils/log';
+import { headers as nHeaders } from 'next/headers';
+import { ServerVariables } from '../../utils/server-variables';
 
 function getCategoryDataHandler(
   pk: number,
+  locale: string,
+  currency: string,
   searchParams?: URLSearchParams,
   headers?: Record<string, string>
 ) {
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    const rawData = await appFetch<string>(
-      `${category.getCategoryByPk(pk)}${params ? params : ''}`,
-      {
+    const rawData = await appFetch<string>({
+      url: `${category.getCategoryByPk(pk)}${params ? params : ''}`,
+      locale,
+      currency,
+      init: {
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json',
           ...(headers ?? {})
         }
       },
-      FetchResponseType.TEXT
-    );
+      responseType: FetchResponseType.TEXT
+    });
 
     let data: GetCategoryResponse;
 
@@ -58,15 +64,17 @@ function getCategoryDataHandler(
       return { data, breadcrumbData: undefined };
     }
 
-    const breadcrumbData = await appFetch<any>(
-      product.breadcrumbUrl(menuItemModel),
-      {
+    const breadcrumbData = await appFetch<any>({
+      url: product.breadcrumbUrl(menuItemModel),
+      locale,
+      currency,
+      init: {
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json'
         }
       }
-    );
+    });
 
     return { data, breadcrumbData: breadcrumbData?.menu };
   };
@@ -75,33 +83,44 @@ function getCategoryDataHandler(
 export const getCategoryData = ({
   pk,
   searchParams,
-  headers
+  headers,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency
 }: {
   pk: number;
+  locale?: string;
+  currency?: string;
   searchParams?: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.Category(pk, searchParams, headers),
-    getCategoryDataHandler(pk, searchParams, headers),
+    locale,
+    getCategoryDataHandler(pk, locale, currency, searchParams, headers),
     {
       expire: 300
     }
   );
 };
 
-function getCategoryBySlugDataHandler(slug: string) {
+function getCategoryBySlugDataHandler(
+  slug: string,
+  locale: string,
+  currency: string
+) {
   return async function () {
-    const rawData = await appFetch<string>(
-      category.getCategoryBySlug(slug),
-      {
+    const rawData = await appFetch<string>({
+      url: category.getCategoryBySlug(slug),
+      locale,
+      currency,
+      init: {
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json'
         }
       },
-      FetchResponseType.TEXT
-    );
+      responseType: FetchResponseType.TEXT
+    });
 
     let data: GetCategoryResponse;
 
@@ -129,10 +148,15 @@ function getCategoryBySlugDataHandler(slug: string) {
   };
 }
 
-export const getCategoryBySlugData = async ({ slug }) => {
+export const getCategoryBySlugData = async ({
+  slug,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency
+}) => {
   return Cache.wrap(
     CacheKey.CategorySlug(slug),
-    getCategoryBySlugDataHandler(slug),
+    locale,
+    getCategoryBySlugDataHandler(slug, locale, currency),
     {
       expire: 300
     }

package/data/server/flatpage.ts

@@ -2,13 +2,23 @@ import { flatpage } from '../urls';
 import { FlatPage } from '../../types';
 import appFetch from '../../utils/app-fetch';
 import { Cache, CacheKey } from '../../lib/cache';
+import { ServerVariables } from '../../utils/server-variables';
 
-const getFlatPageDataHandler = (pk: number) => {
+const getFlatPageDataHandler = (
+  pk: number,
+  locale: string,
+  currency: string
+) => {
   return async function () {
-    const data = await appFetch<FlatPage>(flatpage.getFlatPageByPk(pk), {
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json'
+    const data = await appFetch<FlatPage>({
+      url: flatpage.getFlatPageByPk(pk),
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
+        }
       }
     });
 
@@ -16,6 +26,18 @@ const getFlatPageDataHandler = (pk: number) => {
   };
 };
 
-export const getFlatPageData = ({ pk }: { pk: number }) => {
-  return Cache.wrap(CacheKey.FlatPage(pk), getFlatPageDataHandler(pk));
+export const getFlatPageData = ({
+  pk,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency
+}: {
+  pk: number;
+  locale?: string;
+  currency?: string;
+}) => {
+  return Cache.wrap(
+    CacheKey.FlatPage(pk),
+    locale,
+    getFlatPageDataHandler(pk, locale, currency)
+  );
 };

package/data/server/form.ts

@@ -1,15 +1,21 @@
-import { Cache, CacheKey } from "../../lib/cache";
-import { FormType } from "../../types/commerce/form";
+import { Cache, CacheKey } from '../../lib/cache';
+import { FormType } from '../../types/commerce/form';
 
-import appFetch from "../../utils/app-fetch";
-import { form } from "../urls";
+import appFetch from '../../utils/app-fetch';
+import { ServerVariables } from '../../utils/server-variables';
+import { form } from '../urls';
 
-const getFormDataHandler = (pk: number) => {
+const getFormDataHandler = (pk: number, locale: string, currency: string) => {
   return async function () {
-    const data = await appFetch<FormType>(form.getForm(pk), {
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json'
+    const data = await appFetch<FormType>({
+      url: form.getForm(pk),
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
+        }
       }
     });
 
@@ -17,6 +23,18 @@ const getFormDataHandler = (pk: number) => {
   };
 };
 
-export const getFormData = ({ pk }: { pk: number }) => {
-  return Cache.wrap(CacheKey.Form(pk), getFormDataHandler(pk));
+export const getFormData = ({
+  pk,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency
+}: {
+  pk: number;
+  locale?: string;
+  currency?: string;
+}) => {
+  return Cache.wrap(
+    CacheKey.Form(pk),
+    locale,
+    getFormDataHandler(pk, locale, currency)
+  );
 };

package/data/server/landingpage.ts

@@ -2,23 +2,42 @@ import { landingpage } from '../urls';
 import { LandingPage } from '../../types/commerce/landingpage';
 import appFetch from '../../utils/app-fetch';
 import { Cache, CacheKey } from '../../lib/cache';
+import { ServerVariables } from '../../utils/server-variables';
 
-const getLandingPageHandler = (pk: number) => {
+const getLandingPageHandler = (
+  pk: number,
+  locale: string,
+  currency: string
+) => {
   return async function () {
-    const data = await appFetch<LandingPage>(
-      landingpage.getLandingPageByPk(pk),
-      {
+    const data = await appFetch<LandingPage>({
+      url: landingpage.getLandingPageByPk(pk),
+      locale,
+      currency,
+      init: {
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json'
         }
       }
-    );
+    });
 
     return data;
   };
 };
 
-export const getLandingPageData = ({ pk }: { pk: number }) => {
-  return Cache.wrap(CacheKey.LandingPage(pk), getLandingPageHandler(pk));
+export const getLandingPageData = ({
+  pk,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency
+}: {
+  pk: number;
+  locale?: string;
+  currency?: string;
+}) => {
+  return Cache.wrap(
+    CacheKey.LandingPage(pk),
+    locale,
+    getLandingPageHandler(pk, locale, currency)
+  );
 };

package/data/server/list.ts

@@ -5,25 +5,30 @@ import { generateCommerceSearchParams } from '../../utils';
 import appFetch, { FetchResponseType } from '../../utils/app-fetch';
 import { parse } from 'lossless-json';
 import logger from '../../utils/log';
+import { ServerVariables } from '../../utils/server-variables';
 
 const getListDataHandler = (
+  locale,
+  currency,
   searchParams: URLSearchParams,
   headers?: Record<string, string>
 ) => {
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    const rawData = await appFetch<string>(
-      `${category.list}${params}`,
-      {
+    const rawData = await appFetch<string>({
+      url: `${category.list}${params}`,
+      locale,
+      currency,
+      init: {
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json',
           ...(headers ?? {})
         }
       },
-      FetchResponseType.TEXT
-    );
+      responseType: FetchResponseType.TEXT
+    });
 
     let data: GetCategoryResponse;
 
@@ -51,15 +56,20 @@ const getListDataHandler = (
 };
 
 export const getListData = async ({
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency,
   searchParams,
   headers
 }: {
+  locale?: string;
+  currency?: string;
   searchParams: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.List(searchParams, headers),
-    getListDataHandler(searchParams, headers),
+    locale,
+    getListDataHandler(locale, currency, searchParams, headers),
     {
       expire: 300
     }

package/data/server/menu.ts

@@ -1,6 +1,7 @@
 import { Cache, CacheKey } from '../../lib/cache';
 import { MenuItemType } from '../../types';
 import appFetch from '../../utils/app-fetch';
+import { ServerVariables } from '../../utils/server-variables';
 import { misc } from '../urls';
 
 interface MenuResponse {
@@ -8,6 +9,8 @@ interface MenuResponse {
 }
 
 interface MenuHandlerParams {
+  locale?: string;
+  currency?: string;
   depth?: number;
   parent?: string;
 }
@@ -15,9 +18,18 @@ interface MenuHandlerParams {
 const DEFAULT_DEPTH = 3;
 
 const getMenuHandler =
-  ({ depth, parent }: MenuHandlerParams = { depth: DEFAULT_DEPTH }) =>
+  ({
+    locale = ServerVariables.locale,
+    currency = ServerVariables.currency,
+    depth,
+    parent
+  }: MenuHandlerParams = {}) =>
   async () => {
-    const response = await appFetch<MenuResponse>(misc.menus(depth, parent));
+    const response = await appFetch<MenuResponse>({
+      url: misc.menus(depth ?? DEFAULT_DEPTH, parent),
+      locale,
+      currency
+    });
 
     return response?.menu;
   };
@@ -30,6 +42,7 @@ const getMenuHandler =
 export const getMenu = async (params?: MenuHandlerParams) => {
   return Cache.wrap(
     CacheKey.Menu(params?.depth ?? DEFAULT_DEPTH, params?.parent),
+    params?.locale ?? ServerVariables.locale,
     getMenuHandler(params)
   );
 };

package/data/server/product.ts

@@ -2,16 +2,21 @@ import { Cache, CacheKey } from '../../lib/cache';
 import { product } from '../urls';
 import { ProductCategoryResult, ProductResult } from '../../types';
 import appFetch from '../../utils/app-fetch';
+import { ServerVariables } from '../../utils/server-variables';
 import logger from '../../utils/log';
 
 type GetProduct = {
   pk: number;
+  locale?: string;
+  currency?: string;
   searchParams?: URLSearchParams;
   groupProduct?: boolean;
 };
 
 const getProductDataHandler = ({
   pk,
+  locale,
+  currency,
   searchParams,
   groupProduct
 }: GetProduct) => {
@@ -28,24 +33,31 @@ const getProductDataHandler = ({
           .join('&');
     }
 
-    const data = await appFetch<ProductResult>(url, {
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json'
+    const data = await appFetch<ProductResult>({
+      url,
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
+        }
       }
     });
 
     const categoryUrl = product.categoryUrl(data.product.pk);
 
-    const productCategoryData = await appFetch<ProductCategoryResult>(
-      categoryUrl,
-      {
+    const productCategoryData = await appFetch<ProductCategoryResult>({
+      url: categoryUrl,
+      locale,
+      currency,
+      init: {
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json'
         }
       }
-    );
+    });
 
     const menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
 
@@ -59,10 +71,15 @@ const getProductDataHandler = ({
 
     const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
 
-    const breadcrumbData = await appFetch<any>(breadcrumbUrl, {
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json'
+    const breadcrumbData = await appFetch<any>({
+      url: breadcrumbUrl,
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
+        }
       }
     });
 
@@ -75,6 +92,8 @@ const getProductDataHandler = ({
 
 export const getProductData = async ({
   pk,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency,
   searchParams,
   groupProduct
 }: GetProduct) => {
@@ -83,7 +102,8 @@ export const getProductData = async ({
       pk,
       searchParams ?? new URLSearchParams()
     ),
-    getProductDataHandler({ pk, searchParams, groupProduct }),
+    locale,
+    getProductDataHandler({ pk, locale, currency, searchParams, groupProduct }),
     {
       expire: 300
     }

package/data/server/seo.ts

@@ -1,23 +1,15 @@
 import appFetch from '../../utils/app-fetch';
 import { Cache, CacheKey } from '../../lib/cache';
 import { misc } from '../../data/urls';
-import logger from '../../utils/log';
+import { ServerVariables } from '../../utils/server-variables';
 
-function getRootSeoDataHandler() {
-  return async function () {
-    let data = {};
-
-    try {
-      data = await appFetch<{ [key: string]: string }>(misc.cmsSeo('/'));
-    } catch (error) {
-      logger.error('Error while fetching root seo data', error);
-    }
-
-    return data;
-  };
+interface SeoDataParams {
+  url: string;
+  locale?: string;
+  currency?: string;
 }
 
-function getSeoDataHandler(url: string) {
+function getSeoDataHandler({ url, locale, currency }: SeoDataParams) {
   return async function () {
     let data = {} as {
       title: string;
@@ -27,7 +19,7 @@ function getSeoDataHandler(url: string) {
     };
 
     try {
-      data = await appFetch(misc.cmsSeo(url));
+      data = await appFetch({ url: misc.cmsSeo(url), locale, currency });
     } catch (error) {
       // logger.error('Error while fetching seo data', { url, error });
     }
@@ -36,13 +28,14 @@ function getSeoDataHandler(url: string) {
   };
 }
 
-/**
- * @deprecated Use getSeoData instead
- */
-export const getRootSeo = async () => {
-  return Cache.wrap(CacheKey.RootSeo, getRootSeoDataHandler());
-};
-
-export const getSeoData = async (url: string) => {
-  return Cache.wrap(CacheKey.Seo(url), getSeoDataHandler(url));
+export const getSeoData = async (
+  url,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency
+) => {
+  return Cache.wrap(
+    CacheKey.Seo(url),
+    locale,
+    getSeoDataHandler({ url, locale, currency })
+  );
 };