@akinon/next 1.8.0 → 1.10.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @akinon/next
 
+## 1.10.0
+
+### Minor Changes
+
+- ZERO-2330: Fix logout endpoint
+- ZERO-2327: Add service for bulk cancellation
+
+## 1.9.0
+
+### Minor Changes
+
+- ZERO-2297: Add landing page structure
+- ZERO-2317: Prevent browser cache using timestamp
+- ZERO-2293: Upgrade Redux
+- ZERO-2285: Allow custom headers in server data fetch functions
+- ZERO-1577: Add option to exclude payment options from iframe
+- ZERO-2282: Allow custom headers in client proxy API
+- ZERO-2308: Add B2B endpoints and types
+- ZERO-2202: Ensure commerce endpoints end with trailing slash
+
 ## 1.8.0
 
 ### Minor Changes

package/api/client.ts

@@ -29,7 +29,7 @@ async function proxyRequest(...args) {
     responseType: 'json'
   };
 
-  const slug = params.slug.join('/');
+  const slug = `${params.slug.join('/')}/`;
   const options_ = JSON.parse(
     decodeURIComponent((searchParams.get('options') as string) ?? '{}')
   );
@@ -37,23 +37,34 @@ async function proxyRequest(...args) {
 
   Object.assign(options, options_);
 
-  Array.from(searchParams.keys()).forEach((key) => {
-    if (key !== 'slug' && key !== 'options') {
+  Array.from(searchParams.keys())
+    .filter((key) => !['slug', 'options'].includes(key))
+    .forEach((key) => {
       urlSearchParams.append(key, `${searchParams.get(key)}`);
-    }
-  });
+    });
+
+  const extraHeaders = Object.fromEntries(req.headers.entries());
+
+  [
+    'x-forwarded-host',
+    'x-forwarded-for',
+    'x-forwarded-proto',
+    'x-forwarded-port',
+    'origin',
+    'host',
+    'referer',
+    'accept',
+    'content-length',
+    'content-type'
+  ].forEach((header) => delete extraHeaders[header]);
 
   const fetchOptions = {
     method: req.method,
     headers: {
+      ...extraHeaders,
       'X-Requested-With': 'XMLHttpRequest',
-      'X-CSRFToken': `${req.headers.get('x-csrftoken')}`,
-      'x-currency': `${req.headers.get('x-currency')}`,
-      'Accept-Language': `${req.headers.get('Accept-Language')}`,
-      'User-Agent': `${req.headers.get('User-Agent')}`,
       Referer: commerceUrl,
-      Accept: options.accept,
-      Cookie: `${req.headers.get('cookie')}`
+      Accept: options.accept
     }
   } as RequestInit;
 
@@ -68,7 +79,13 @@ async function proxyRequest(...args) {
     try {
       body = await req.json();
     } catch (error) {
-      console.log(error);
+      logger.error(
+        `Client Proxy Request - Error while parsing request body to JSON`,
+        {
+          url: req.url,
+          error
+        }
+      );
     }
 
     Object.keys(body ?? {}).forEach((key) => {
@@ -82,8 +99,8 @@ async function proxyRequest(...args) {
 
   let url = `${commerceUrl}/${slug.replace(/,/g, '/')}`;
 
-  if (options.useTrailingSlash) {
-    url += '/';
+  if (!options.useTrailingSlash) {
+    url = url.replace(/\/$/, '');
   }
 
   if (urlSearchParams.toString().length) {

package/data/client/account.ts

@@ -7,7 +7,8 @@ import {
   AccountOrderCancellation,
   AccountOrderCancellationReason,
   ContactFormType,
-  Order
+  Order,
+  Quotations
 } from '../../types';
 
 interface GetOrdersResponse {
@@ -21,6 +22,11 @@ interface GetOrdersParams {
   createdDate?: string;
 }
 
+export interface GetQuotationsResponse {
+  count: number;
+  results: Quotations[];
+}
+
 export type PasswordResetType = {
   password: string;
   repeatPassword: string;
@@ -102,6 +108,9 @@ const accountApi = api.injectEndpoints({
       query: ({ page, limit, createdDate } = {}) =>
         buildClientRequestUrl(account.getOrders({ page, limit, createdDate }))
     }),
+    getQuotations: builder.query<GetQuotationsResponse, void>({
+      query: () => buildClientRequestUrl(account.getQuotations)
+    }),
     sendContact: builder.mutation<void, ContactFormType>({
       query: (body) => ({
         url: buildClientRequestUrl(account.sendContact, {
@@ -121,6 +130,15 @@ const accountApi = api.injectEndpoints({
         body
       })
     }),
+    bulkCancellation: builder.mutation<void, AccountOrderCancellation>({
+      query: (body) => ({
+        url: buildClientRequestUrl(account.bulkCancellationRequest, {
+          contentType: 'application/json'
+        }),
+        method: 'POST',
+        body
+      })
+    }),
     getCancellationReasons: builder.query<AccountOrderCancellationReason, void>(
       {
         query: () => buildClientRequestUrl(account.cancellationReasons)
@@ -170,12 +188,14 @@ export const {
   useGetContactSubjectsQuery,
   useGetOrderQuery,
   useGetOrdersQuery,
+  useGetQuotationsQuery,
   useSendContactMutation,
   useUpdateEmailMutation,
   useUpdatePasswordMutation,
   useUpdateProfileMutation,
   useGetProfileInfoQuery,
   useCancelOrderMutation,
+  useBulkCancellationMutation,
   useGetCancellationReasonsQuery,
   useGetBasketOffersQuery,
   useGetFutureBasketOffersQuery,

package/data/client/b2b.ts

@@ -0,0 +1,32 @@
+import { buildClientRequestUrl } from '../../utils';
+import { api } from './api';
+import { b2b } from '../urls';
+import { Basket, BasketParams, BasketResponse, Division, GetResponse } from '../../types';
+
+const b2bApi = api.injectEndpoints({
+  endpoints: (build) => ({
+    getBasket: build.query<Basket, void>({
+      query: () =>
+        buildClientRequestUrl(b2b.basket, {
+          contentType: 'application/json'
+        }),
+      transformResponse: (response: { basket: Basket }) => response.basket,
+      providesTags: ['Basket']
+    }),
+    getDivisions: build.query<GetResponse<Division>, void>({
+      query: () => buildClientRequestUrl(b2b.divisions)
+    }),
+    addToBasket: build.mutation<BasketResponse, BasketParams>({
+      query: (body) => ({
+        url: buildClientRequestUrl(b2b.basket, {
+          contentType: 'application/json'
+        }),
+        method: 'POST',
+        body
+      })
+    }),
+  }),
+  overrideExisting: true
+});
+
+export const { useGetBasketQuery, useLazyGetDivisionsQuery, useAddToBasketMutation } = b2bApi;

package/data/client/basket.ts

@@ -39,7 +39,6 @@ export const basketApi = api.injectEndpoints({
     clearBasket: build.mutation<Basket, void>({
       query: (body) => ({
         url: buildClientRequestUrl(basket.getBasket, {
-          useTrailingSlash: false,
           contentType: 'application/json'
         }),
         method: 'DELETE',
@@ -51,7 +50,6 @@ export const basketApi = api.injectEndpoints({
     applyVoucherCode: build.mutation<Basket, { voucher_code: string }>({
       query: (body) => ({
         url: buildClientRequestUrl(basket.getBasket, {
-          useTrailingSlash: false,
           contentType: 'application/json'
         }),
         method: 'PATCH',
@@ -62,7 +60,6 @@ export const basketApi = api.injectEndpoints({
     removeVoucherCode: build.mutation<Basket, void>({
       query: () => ({
         url: buildClientRequestUrl(basket.getBasket, {
-          useTrailingSlash: false,
           contentType: 'application/json'
         }),
         method: 'PATCH',

package/data/client/misc.ts

@@ -77,7 +77,7 @@ export const miscApi = api.injectEndpoints({
     }),
     getWidget: builder.query<WidgetResultType<any>, string>({
       query: (slug: string) => ({
-        url: buildClientRequestUrl(widgets.getWidgets(slug))
+        url: buildClientRequestUrl(widgets.getWidget(slug))
       })
     }),
     getMenu: builder.query<MenuItemType[], number>({

package/data/server/category.ts

@@ -6,7 +6,11 @@ import { Cache, CacheKey } from '../../lib/cache';
 import { parse } from 'lossless-json';
 import logger from '../../utils/log';
 
-function getCategoryDataHandler(pk: number, searchParams?: URLSearchParams) {
+function getCategoryDataHandler(
+  pk: number,
+  searchParams?: URLSearchParams,
+  headers?: Record<string, string>
+) {
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
@@ -15,7 +19,8 @@ function getCategoryDataHandler(pk: number, searchParams?: URLSearchParams) {
       {
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
       },
       FetchResponseType.TEXT
@@ -59,14 +64,16 @@ function getCategoryDataHandler(pk: number, searchParams?: URLSearchParams) {
 
 export const getCategoryData = ({
   pk,
-  searchParams
+  searchParams,
+  headers
 }: {
   pk: number;
   searchParams?: URLSearchParams;
+  headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
-    CacheKey.Category(pk, searchParams),
-    getCategoryDataHandler(pk, searchParams),
+    CacheKey.Category(pk, searchParams, headers),
+    getCategoryDataHandler(pk, searchParams, headers),
     {
       expire: 300
     }
@@ -75,7 +82,7 @@ export const getCategoryData = ({
 
 function getCategoryBySlugDataHandler(slug: string) {
   return async function () {
-    let rawData = await appFetch<string>(
+    const rawData = await appFetch<string>(
       category.getCategoryBySlug(slug),
       {
         headers: {

package/data/server/index.ts

@@ -6,3 +6,4 @@ export * from './special-page';
 export * from './widget';
 export * from './seo';
 export * from './menu';
+export * from './landingpage';

package/data/server/landingpage.ts

@@ -0,0 +1,24 @@
+import { landingpage } from '../urls';
+import { LandingPage } from '../../types/commerce/landingpage';
+import appFetch from '../../utils/app-fetch';
+import { Cache, CacheKey } from '../../lib/cache';
+
+const getLandingPageHandler = (pk: number) => {
+  return async function () {
+    const data = await appFetch<LandingPage>(
+      landingpage.getLandingPageByPk(pk),
+      {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
+        }
+      }
+    );
+
+    return data;
+  };
+};
+
+export const getLandingPageData = ({ pk }: { pk: number }) => {
+  return Cache.wrap(CacheKey.LandingPage(pk), getLandingPageHandler(pk));
+};

package/data/server/list.ts

@@ -6,7 +6,10 @@ import appFetch, { FetchResponseType } from '../../utils/app-fetch';
 import { parse } from 'lossless-json';
 import logger from '../../utils/log';
 
-const getListDataHandler = (searchParams: URLSearchParams) => {
+const getListDataHandler = (
+  searchParams: URLSearchParams,
+  headers?: Record<string, string>
+) => {
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
@@ -15,7 +18,8 @@ const getListDataHandler = (searchParams: URLSearchParams) => {
       {
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
       },
       FetchResponseType.TEXT
@@ -42,13 +46,15 @@ const getListDataHandler = (searchParams: URLSearchParams) => {
 };
 
 export const getListData = async ({
-  searchParams
+  searchParams,
+  headers
 }: {
   searchParams: URLSearchParams;
+  headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
-    CacheKey.List(searchParams),
-    getListDataHandler(searchParams),
+    CacheKey.List(searchParams, headers),
+    getListDataHandler(searchParams, headers),
     {
       expire: 300
     }

package/data/server/seo.ts

@@ -29,7 +29,7 @@ function getSeoDataHandler(url: string) {
     try {
       data = await appFetch(misc.cmsSeo(url));
     } catch (error) {
-      logger.error('Error while fetching seo data', { url, error });
+      // logger.error('Error while fetching seo data', { url, error });
     }
 
     return data;

package/data/server/special-page.ts

@@ -3,10 +3,12 @@ import { category } from '../urls';
 import { GetCategoryResponse } from '../../types';
 import { generateCommerceSearchParams } from '../../utils';
 import appFetch from '../../utils/app-fetch';
+import header from '../../redux/reducers/header';
 
 const getSpecialPageDataHandler = (
   pk: number,
-  searchParams: URLSearchParams
+  searchParams: URLSearchParams,
+  headers?: Record<string, string>
 ) => {
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
@@ -16,7 +18,8 @@ const getSpecialPageDataHandler = (
       {
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
       }
     );
@@ -27,14 +30,16 @@ const getSpecialPageDataHandler = (
 
 export const getSpecialPageData = async ({
   pk,
-  searchParams
+  searchParams,
+  headers
 }: {
   pk: number;
   searchParams: URLSearchParams;
+  headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
-    CacheKey.SpecialPage(pk, searchParams),
-    getSpecialPageDataHandler(pk, searchParams),
+    CacheKey.SpecialPage(pk, searchParams, headers),
+    getSpecialPageDataHandler(pk, searchParams, headers),
     {
       expire: 300
     }

package/data/server/widget.ts

@@ -9,7 +9,7 @@ const getWidgetDataHandler = (slug: string) => async () => {
     return null;
   }
 
-  return await appFetch(widgets.getWidgets(slug));
+  return await appFetch(widgets.getWidget(slug));
 };
 
 export const getWidgetData = async <T>({

package/data/urls.ts

@@ -1,16 +1,18 @@
+/* eslint-disable @akinon/projectzero/client-url */
 import Settings from 'settings';
 
 const API_URL = Settings.commerceUrl;
 
 export const account = {
-  order: '/users/orders',
-  orderId: (id: string | string[]) => `/users/orders/${id}`,
-  cancelOrder: (id: string) => `/orders/${id}/cancel`,
-  cancellationReasons: '/users/orders/cancellation_reasons',
-  updatePassword: '/users/password/change',
-  updateEmail: '/users/email-change',
-  updateProfile: '/users/profile',
-  getContactSubjects: '/users/contact-us-subjects',
+  order: '/users/orders/',
+  orderId: (id: string | string[]) => `/users/orders/${id}/`,
+  cancelOrder: (id: string) => `/orders/${id}/cancel/`,
+  bulkCancellationRequest: '/users/orders/bulk_cancellation_requests/',
+  cancellationReasons: '/users/orders/cancellation_reasons/',
+  updatePassword: '/users/password/change/',
+  updateEmail: '/users/email-change/',
+  updateProfile: '/users/profile/',
+  getContactSubjects: '/users/contact-us-subjects/',
   getOrders: ({
     page,
     limit,
@@ -20,9 +22,10 @@ export const account = {
     limit?: number;
     createdDate?: string;
   }) =>
-    `/users/orders?page=${page || 1}&limit=${limit || 12} ${
+    `/users/orders/?page=${page || 1}&limit=${limit || 12} ${
       createdDate ? `&created_date__gte=${createdDate}` : ''
     }`,
+  getQuotations: '/b2b/my-quotations',
   sendContact: '/users/contact-us',
   passwordReset: (slug: string) => `/users/reset/${slug}`,
   anonymize: '/users/anonymize/',
@@ -31,95 +34,100 @@ export const account = {
 };
 
 export const address = {
-  base: '/address',
-  countries: '/address/country',
-  getAddresses: '/address/detailed',
-  getCities: (country: string) => `/address/city?country=${country}`,
-  getTownships: (city: string) => `/address/township?city=${city}`,
-  getDistricts: (township: string) => `/address/district?township=${township}`,
-  getRetailStore: '/address/city?retailstore__isnull=false',
+  base: '/address/',
+  countries: '/address/country/',
+  getAddresses: '/address/detailed/',
+  getCities: (country: string) => `/address/city/?country=${country}`,
+  getTownships: (city: string) => `/address/township/?city=${city}`,
+  getDistricts: (township: string) => `/address/district/?township=${township}`,
+  getRetailStore: '/address/city/?retailstore__isnull=false',
   getRetailStoreCities: (country: string) =>
-    `/address/city?retailstore__isnull=false&country=${country}`,
+    `/address/city/?retailstore__isnull=false&country=${country}`,
   getRetailStoreTownships: (city: string) =>
-    `/address/township?retailstore__isnull=false&city=${city}`,
-  editAddress: (pk: number) => `/address/${pk}`,
-  removeAddress: (id: number) => `/address/${id}`,
-  setDefaultAddress: (pk: number) => `/address/${pk}`
+    `/address/township/?retailstore__isnull=false&city=${city}`,
+  editAddress: (pk: number) => `/address/${pk}/`,
+  removeAddress: (id: number) => `/address/${id}/`,
+  setDefaultAddress: (pk: number) => `/address/${pk}/`
 };
 
 export const basket = {
-  getBasket: '/baskets/basket'
+  getBasket: '/baskets/basket/'
 };
 
 export const category = {
-  // eslint-disable-next-line projectzero/client-url
   list: '/list/',
   getCategoryByPk: (pk: number) => `/category/${pk}/`,
-  getCategoryBySlug: (slug: string) => `/${slug}`,
+  getCategoryBySlug: (slug: string) => `/${slug}/`,
   getSpecialPageByPk: (pk: number) => `/special-page/${pk}/`
 };
 
 export const checkout = {
-  get3dRedirectForm: '/orders/redirect-three-d',
-  fetchCheckout: '/orders/checkout',
+  get3dRedirectForm: '/orders/redirect-three-d/',
+  fetchCheckout: '/orders/checkout/',
   fetchCheckoutResult: (token: string) =>
-    `/orders/completed/${token}?format=json`,
-  getContract: (slug: string) => `/orders/contract?contract_name=${slug}`,
-  completeCreditCardPayment: '/orders/checkout?page=CreditCardConfirmationPage',
-  completeFundsTransfer: '/orders/checkout?page=FundsTransferPage',
-  guestLogin: '/orders/checkout?page=IndexPage',
-  setDeliveryOption: '/orders/checkout?page=DeliveryOptionSelectionPage',
-  setAddresses: '/orders/checkout?page=AddressSelectionPage',
-  setShippingOption: '/orders/checkout?page=ShippingOptionSelectionPage',
-  setPaymentOption: '/orders/checkout?page=PaymentOptionSelectionPage',
-  setBinNumber: '/orders/checkout?page=BinNumberPage',
-  setMasterpassBinNumber: '/orders/checkout?page=MasterpassBinNumberPage',
-  setInstallmentOption: '/orders/checkout?page=InstallmentSelectionPage',
+    `/orders/completed/${token}/?format=json`,
+  getContract: (slug: string) => `/orders/contract/?contract_name=${slug}`,
+  completeCreditCardPayment:
+    '/orders/checkout/?page=CreditCardConfirmationPage',
+  completeFundsTransfer: '/orders/checkout/?page=FundsTransferPage',
+  guestLogin: '/orders/checkout/?page=IndexPage',
+  setDeliveryOption: '/orders/checkout/?page=DeliveryOptionSelectionPage',
+  setAddresses: '/orders/checkout/?page=AddressSelectionPage',
+  setShippingOption: '/orders/checkout/?page=ShippingOptionSelectionPage',
+  setPaymentOption: '/orders/checkout/?page=PaymentOptionSelectionPage',
+  setBinNumber: '/orders/checkout/?page=BinNumberPage',
+  setMasterpassBinNumber: '/orders/checkout/?page=MasterpassBinNumberPage',
+  setInstallmentOption: '/orders/checkout/?page=InstallmentSelectionPage',
   setMasterPassInstallmentOption:
-    '/orders/checkout?page=MasterpassInstallmentPage',
-  setFundsTransferOption: '/orders/checkout?page=FundsTransferChoicePage',
-  getCheckoutProviders: '/orders/checkout?page=CheckoutProviderIndexPage',
-  setCheckoutProvider: '/orders/checkout?page=CheckoutProviderSelectionPage',
+    '/orders/checkout/?page=MasterpassInstallmentPage',
+  setFundsTransferOption: '/orders/checkout/?page=FundsTransferChoicePage',
+  getCheckoutProviders: '/orders/checkout-provider-list/',
+  getCheckoutProvidersIndex: '/orders/checkout/?page=CheckoutProviderIndexPage',
+  setCheckoutProvider: '/orders/checkout/?page=CheckoutProviderSelectionPage',
   completeRedirectionPayment:
-    '/orders/checkout?page=RedirectionPaymentSelectedPage',
+    '/orders/checkout/?page=RedirectionPaymentSelectedPage',
   confirmationPaymentSelect:
-    '/orders/checkout?page=ConfirmationPaymentSelectedPage',
-  confirmationQuery: '/orders/checkout?page=ConfirmationPaymentQueryPage',
-  confirmationComplete: '/orders/checkout?page=ConfirmationPaymentCompletePage',
-  completeLoyaltyPayment: '/orders/checkout?page=LoyaltyPaymentSelectedPage',
-  loyaltyMoneyUsage: '/orders/checkout?page=LoyaltyMoneyUsagePage',
-  setOrderNote: '/orders/checkout?page=OrderNotePage'
+    '/orders/checkout/?page=ConfirmationPaymentSelectedPage',
+  confirmationQuery: '/orders/checkout/?page=ConfirmationPaymentQueryPage',
+  confirmationComplete:
+    '/orders/checkout/?page=ConfirmationPaymentCompletePage',
+  completeLoyaltyPayment: '/orders/checkout/?page=LoyaltyPaymentSelectedPage',
+  loyaltyMoneyUsage: '/orders/checkout/?page=LoyaltyMoneyUsagePage',
+  setOrderNote: '/orders/checkout/?page=OrderNotePage'
 };
 
 export const flatpage = {
   getFlatPageByPk: (pk: number) => `/shop-flat-page/${pk}/`
 };
 
+export const landingpage = {
+  getLandingPageByPk: (pk: number) => `/landing-page/${pk}/`
+};
+
 export const misc = {
-  autocomplete: '/autocomplete',
-  stores: '/stores',
-  menu: '/misc/menus/generate',
+  autocomplete: '/autocomplete/',
+  stores: '/stores/',
+  menu: '/misc/menus/generate/',
   prettyUrl: (pathname: string) => `/misc/pretty-url${pathname}/`,
   prettyUrls: (pathname: string) => `/pretty_urls/?new_path__exact=${pathname}`,
-  emailSubscription: '/email-subscription',
+  emailSubscription: '/email-subscription/',
   menus: (depthHeight: number, parent?: string) =>
     `/menus/generate/?depth_height=${depthHeight}${
       parent ? `&parent=${parent}` : ''
     }`,
-  // eslint-disable-next-line projectzero/client-url
   cmsSeo: (slug: string | string[]) => `/cms/seo/?url=${slug ? slug : '/'}`,
-  setCurrency: '/users/activate-currency'
+  setCurrency: '/users/activate-currency/'
 };
 
 export const product = {
   category: (productId: number) => `/product/${productId}/category/`,
-  installments: (productId: number) => `/payments/cards/product/${productId}`,
-  getProductByPk: (pk: number) => `/product/${pk}`,
-  getGroupProductByPk: (pk: number) => `/group-product/${pk}`,
+  installments: (productId: number) => `/payments/cards/product/${productId}/`,
+  getProductByPk: (pk: number) => `/product/${pk}/`,
+  getGroupProductByPk: (pk: number) => `/group-product/${pk}/`,
   getRetailStoreStock: (productPk: string, queryString: string) =>
-    `/retail_store_stock/${productPk}?${queryString}`,
-  addProduct: '/baskets/basket',
-  slug: (slug: string) => `/${slug}`,
+    `/retail_store_stock/${productPk}/?${queryString}`,
+  addProduct: '/baskets/basket/',
+  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`
@@ -127,28 +135,38 @@ export const product = {
 
 export const wishlist = {
   getFavorites: ({ page, limit }: { page?: number; limit?: number }) =>
-    `/wishlists/favourite-products?limit=${limit || 12}&page=${page || 1}`,
-  addFavorite: '/wishlists/favourite-products',
-  removeFavorite: (favPk: number) => `/wishlists/favourite-products/${favPk}`,
-  addStockAlert: '/wishlists/product-alerts'
+    `/wishlists/favourite-products/?limit=${limit || 12}&page=${page || 1}`,
+  addFavorite: '/wishlists/favourite-products/',
+  removeFavorite: (favPk: number) => `/wishlists/favourite-products/${favPk}/`,
+  addStockAlert: '/wishlists/product-alerts/'
 };
 
 export const user = {
-  currentUser: '/current_user',
-  login: '/users/login',
-  // eslint-disable-next-line projectzero/client-url
+  currentUser: '/current_user/',
+  login: '/users/login/',
   register: '/users/registration/',
   logout: '/users/logout',
-  captcha: '/users/pz-captcha',
-  profiles: '/users/profile',
-  forgotPassword: '/users/password/reset',
-  changeEmailVerification: (token: string) => `/users/email-set-primary/${token}`,
-  confirmEmailVerification: (token: string) => `/users/registration/account-confirm-email/${token}`,
-  csrfToken: '/csrf_token'
+  captcha: '/users/pz-captcha/',
+  profiles: '/users/profile/',
+  forgotPassword: '/users/password/reset/',
+  changeEmailVerification: (token: string) =>
+    `/users/email-set-primary/${token}/`,
+  confirmEmailVerification: (token: string) =>
+    `/users/registration/account-confirm-email/${token}/`,
+  csrfToken: '/csrf_token/'
+};
+
+export const b2b = {
+  basket: '/b2b/basket/',
+  saveBasket: '/b2b/basket/save/',
+  draftBaskets: '/b2b/basket/drafts/',
+  divisions: '/b2b/my-divisions/',
+  myQuotations: '/b2b/my-quotations/',
+  loadBasket: (id) => `/b2b/basket/${id}/load/`
 };
 
 export const widgets = {
-  getWidgets: (slug: string) => `/widgets/${slug}`
+  getWidget: (slug: string) => `/widgets/${slug}/`
 };
 
 const URLS = {
@@ -166,6 +184,7 @@ const URLS = {
 };
 
 const UrlProxyHandler = {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   get(target, prop, receiver) {
     if (typeof target[prop] === 'function') {
       return new Proxy(target[prop], {

package/lib/cache.ts

@@ -4,19 +4,48 @@ import { CacheOptions } from '../types';
 import logger from '../utils/log';
 import { ServerVariables } from '../utils/server-variables';
 
+const hashCacheKey = (object?: Record<string, string>) => {
+  if (!object) {
+    return '';
+  }
+  const sortedFilters = Object.entries(object).sort(([firstKey], [secondKey]) =>
+    firstKey.localeCompare(secondKey)
+  );
+
+  const cacheKey = Buffer.from(
+    JSON.stringify(Object.fromEntries(sortedFilters))
+  ).toString('base64');
+
+  return `_${encodeURIComponent(cacheKey)}`;
+};
 export const CacheKey = {
-  List: (searchParams: URLSearchParams) =>
-    `list_${encodeURIComponent(JSON.stringify(searchParams))}`,
-  Category: (pk: number, searchParams?: URLSearchParams) =>
-    `category_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
+  List: (searchParams: URLSearchParams, headers?: Record<string, string>) =>
+    `list_${encodeURIComponent(JSON.stringify(searchParams))}${hashCacheKey(
+      headers
+    )}`,
+  Category: (
+    pk: number,
+    searchParams?: URLSearchParams,
+    headers?: Record<string, string>
+  ) =>
+    `category_${pk}_${encodeURIComponent(
+      JSON.stringify(searchParams)
+    )}${hashCacheKey(headers)}`,
   CategorySlug: (slug: string) => `category_${slug}`,
-  SpecialPage: (pk: number, searchParams: URLSearchParams) =>
-    `special_page_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
+  SpecialPage: (
+    pk: number,
+    searchParams: URLSearchParams,
+    headers?: Record<string, string>
+  ) =>
+    `special_page_${pk}_${encodeURIComponent(
+      JSON.stringify(searchParams)
+    )}${hashCacheKey(headers)}`,
   Product: (pk: number, searchParams: URLSearchParams) =>
     `product_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
   GroupProduct: (pk: number, searchParams: URLSearchParams) =>
     `group_product_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
   FlatPage: (pk: number) => `flat_page_${pk}`,
+  LandingPage: (pk: number) => `landing_page_${pk}`,
   Widget: (slug: string) => `widget_${slug}`,
   PrettyUrl: (pathname: string) => `pretty_url_${pathname}`,
   Menu: (depth: number, parent?: string) =>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -14,13 +14,13 @@
     "pz-postdev": "bin/pz-postdev.js"
   },
   "dependencies": {
-    "@reduxjs/toolkit": "1.9.2",
+    "@reduxjs/toolkit": "1.9.7",
     "cross-spawn": "7.0.3",
-    "react-redux": "8.0.5",
+    "react-redux": "8.1.3",
     "react-string-replace": "1.1.1",
     "redis": "4.5.1"
   },
   "devDependencies": {
-    "@types/react-redux": "7.1.23"
+    "@types/react-redux": "7.1.30"
   }
 }

package/redux/middlewares/checkout.ts

@@ -179,13 +179,19 @@ export const contextListMiddleware: Middleware = ({
                 : `/${currentLocale}${redirectUrl}`;
           }
 
+          const urlObj = new URL(url, window.location.origin);
+          urlObj.searchParams.set('t', new Date().getTime().toString());
+
           if (
-            isMobileApp ||
-            /iPad|iPhone|iPod|Android/i.test(navigator.userAgent)
+            (isMobileApp ||
+              /iPad|iPhone|iPod|Android/i.test(navigator.userAgent)) &&
+            !settings.checkout?.iframeExcludedPaymentOptions?.includes(
+              result.payload?.pre_order?.payment_option?.slug
+            )
           ) {
-            showMobile3dIframe(url);
+            showMobile3dIframe(urlObj.toString());
           } else {
-            window.location.href = url;
+            window.location.href = urlObj.toString();
           }
 
           return;

package/types/commerce/b2b.ts

@@ -0,0 +1,61 @@
+import { Product } from './product';
+
+export type Division = {
+  id: number;
+  name: string;
+  division_type: string;
+  parent: number;
+  erp_code: string;
+  country_id: number;
+  city_id: number;
+  township_id: number;
+  district_id: number;
+  address: string;
+  phone_number: string;
+  fax_number: string;
+  is_active: true;
+  latitude: null;
+  longitude: null;
+  monthly_order_limit: string;
+  current_balance: string;
+  current_balance_last_update: null | string;
+  extra_data: object;
+};
+
+interface ProductB2b extends Product {
+  asorti: string;
+  category: string;
+  currency: string;
+  variants: {
+    [key: string]: any;
+  };
+  product_image: string;
+}
+
+export type BasketResponse = {
+  id: number;
+  total_amount: string;
+  total_quantity: number;
+  basket_items: [
+    {
+      total_amount: string;
+      price: string;
+      quantity: number;
+      divisions: Division[];
+      product: ProductB2b;
+    }
+  ];
+};
+
+export type BasketParams = {
+  division: string;
+  product_remote_id: string;
+  quantity: string;
+};
+
+export interface GetResponse<T> {
+  count: number;
+  next: null;
+  previous: null;
+  results: T[];
+}

package/types/commerce/index.ts

@@ -8,3 +8,4 @@ export * from './product';
 export * from './widget';
 export * from './flatpage';
 export * from './order';
+export * from './b2b';

package/types/commerce/landingpage.ts

@@ -0,0 +1,7 @@
+export interface LandingPage {
+  landing_page: {
+    url: string;
+    template: string;
+    is_active: boolean;
+  };
+}

package/types/commerce/order.ts

@@ -106,3 +106,14 @@ export interface Order {
   tracking_number: string;
   tracking_url: string;
 }
+
+export interface Quotations {
+  id: number;
+  name: string;
+  net_amount: string;
+  number: string;
+  status: string;
+  total_amount: string;
+  modified_at: string;
+  created_at: string;
+}

package/types/index.ts

@@ -168,6 +168,12 @@ export interface Settings {
     source: string;
     destination: string;
   }>;
+  checkout?: {
+    /**
+     * If there is a need to exclude certain payment options from the iframe, for instance, due to CORS issues, this option can be utilized by passing the slugs associated with the desired payment options.
+     */
+    iframeExcludedPaymentOptions?: string[];
+  };
 }
 
 export interface CacheOptions {

package/utils/app-fetch.ts

@@ -58,7 +58,9 @@ const appFetch = async <T>(
 
     logger.trace(`FETCH RESPONSE`, { url, response, ip });
   } catch (error) {
-    logger.error(`FETCH FAILED`, { url, status, error, ip });
+    if (!url.toString().includes('/cms/seo/')) {
+      logger.error(`FETCH FAILED`, { url, status, error, ip });
+    }
   }
 
   return response;