@akinon/next 1.123.0-rc.0 → 1.123.0

package/CHANGELOG.md

@@ -1,28 +1,16 @@
 # @akinon/next
 
-## 1.123.0-rc.0
+## 1.123.0
 
 ### Minor Changes
 
 - 8218dafa: ZERO-4160: Refactor oauth-login middleware to use fetch for login and callback responses
-- ZERO-4160: Enhance oauth-login middleware with improved request handling and logging
-- b55acb76: ZERO-2577: Fix pagination bug and update usePagination hook and ensure pagination controls rendering correctly
+- 2a8ddcf6: ZERO-4111: Add total balance field to store credit localization and update related components
 - 8a7fd0f4: ZERO-4065: Add '[segment]' to skipSegments in route generation
-- 760258c1: ZERO-4160: Enhance oauth-login middleware to handle fetch errors and improve response handling
 - 36143125: ZERO-3987: Add barcode scanner functionality with modal and button
 - 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
 - bcaad120: ZERO-4158: Add logging for OAuth login and callback redirects
-- 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
-- bfafa3f4: ZERO-4160: Refactor oauth-login middleware to use fetchCommerce for API calls and improve cookie handling
-- d99a6a7d: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
-- 591e345e: ZERO-3855: Enhance credit card payment handling in checkout middlewares
-- 4de5303c: ZERO-2504: add cookie filter to api client request
-- 95b139dc: ZERO-3795: Remove duplicate entry for SavedCard in PluginComponents map
-- 3909d322: Edit the duplicate Plugin.SimilarProducts in the plugin-module.
-- e18836b2: ZERO-4160: Restore scope in Sentry addon configuration in akinon.json
 
 ## 1.122.0
 

package/components/plugin-module.tsx

@@ -114,6 +114,7 @@ const PluginComponents = new Map([
     ]
   ],
   [Plugin.SavedCard, [Component.SavedCard, Component.IyzicoSavedCard]],
+  [Plugin.SavedCard, [Component.SavedCard]],
   [Plugin.FlowPayment, [Component.FlowPayment]],
   [
     Plugin.VirtualTryOn,

package/data/client/account.ts

@@ -7,6 +7,7 @@ import {
   AccountOrderCancellation,
   AccountOrderCancellationReason,
   ContactFormType,
+  LoyaltyBalanceItem,
   Order,
   Quotations
 } from '../../types';
@@ -220,7 +221,10 @@ const accountApi = api.injectEndpoints({
         method: 'PATCH'
       })
     }),
-    getLoyaltyBalance: builder.query<{ balance: number }, void>({
+    getLoyaltyBalance: builder.query<
+      { balance: number; balances?: LoyaltyBalanceItem[] },
+      void
+    >({
       query: () => buildClientRequestUrl(account.loyaltyBalance)
     }),
     getLoyaltyTransactions: builder.query<LoyaltyTransactions, void>({

package/data/client/checkout.ts

@@ -10,6 +10,7 @@ import {
 } from '../../redux/reducers/checkout';
 import {
   CheckoutContext,
+  AccountUsage,
   ExtraField,
   GuestLoginFormParams,
   Order,
@@ -776,16 +777,28 @@ export const checkoutApi = api.injectEndpoints({
         url: buildCheckoutRequestUrl(checkout.loyaltyMoneyUsage)
       })
     }),
-    payWithLoyaltyBalance: build.mutation<any, string>({
-      query: (amount) => ({
-        url: buildCheckoutRequestUrl(checkout.loyaltyMoneyUsage, {
-          useFormData: true
-        }),
-        method: 'POST',
-        body: {
-          loyalty_amount_to_use: amount
-        }
-      }),
+    payWithLoyaltyBalance: build.mutation<
+      any,
+      string | { account_usages: AccountUsage[] }
+    >({
+      query: (params) => {
+        const isAccountUsages =
+          typeof params === 'object' && 'account_usages' in params;
+
+        return {
+          url: buildCheckoutRequestUrl(checkout.loyaltyMoneyUsage, {
+            useFormData: true
+          }),
+          method: 'POST',
+          body: isAccountUsages
+            ? {
+                account_usages: JSON.stringify(params.account_usages)
+              }
+            : {
+                loyalty_amount_to_use: params
+              }
+        };
+      },
       async onQueryStarted(arg, { dispatch, queryFulfilled }) {
         dispatch(setPaymentStepBusy(true));
         dispatch(setPaymentOptions([]));

package/data/urls.ts

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

package/package.json

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

package/plugins.d.ts

@@ -37,16 +37,6 @@ declare module '@akinon/pz-cybersource-uc/src/redux/middleware' {
   export default middleware as any;
 }
 
-declare module '@akinon/pz-apple-pay' {}
-
-declare module '@akinon/pz-similar-products' {
-  export const SimilarProductsModal: any;
-  export const SimilarProductsFilterSidebar: any;
-  export const SimilarProductsResultsGrid: any;
-  export const SimilarProductsPlugin: any;
-  export const SimilarProductsButtonPlugin: any;
-}
-
 declare module '@akinon/pz-cybersource-uc/src/redux/reducer' {
   export default reducer as any;
 }

package/plugins.js

@@ -16,7 +16,6 @@ module.exports = [
   'pz-tabby-extension',
   'pz-apple-pay',
   'pz-tamara-extension',
-  'pz-similar-products',
   'pz-cybersource-uc',
   'pz-hepsipay',
   'pz-flow-payment',

package/redux/middlewares/checkout.ts

@@ -14,6 +14,7 @@ import {
   setHasGiftBox,
   setInstallmentOptions,
   setLoyaltyBalance,
+  setLoyaltyBalances,
   setPaymentChoices,
   setPaymentOptions,
   setRetailStores,
@@ -208,25 +209,15 @@ export const contextListMiddleware: Middleware = ({
             (ctx) => ctx.page_name === 'DeliveryOptionSelectionPage'
           )
         ) {
-          const isCreditCardPayment =
-            preOrder?.payment_option?.payment_type === 'credit_card' ||
-            preOrder?.payment_option?.payment_type === 'masterpass';
-
           if (context.page_context.card_type) {
             dispatch(setCardType(context.page_context.card_type));
-          } else if (isCreditCardPayment) {
-            dispatch(setCardType(null));
           }
 
           if (
             context.page_context.installments &&
             preOrder?.payment_option?.payment_type !== 'masterpass_rest'
           ) {
-            if (!isCreditCardPayment || context.page_context.card_type) {
-              dispatch(
-                setInstallmentOptions(context.page_context.installments)
-              );
-            }
+            dispatch(setInstallmentOptions(context.page_context.installments));
           }
         }
 
@@ -234,6 +225,14 @@ export const contextListMiddleware: Middleware = ({
           dispatch(setLoyaltyBalance(context.page_context.balance));
         }
 
+        if (context.page_context.balances) {
+          dispatch(setLoyaltyBalances(context.page_context.balances));
+        }
+
+        if (context.page_context.accounts) {
+          dispatch(setLoyaltyBalances(context.page_context.accounts));
+        }
+
         if (context.page_context.retail_stores) {
           dispatch(setRetailStores(context.page_context.retail_stores));
         }

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

@@ -14,17 +14,9 @@ export const installmentOptionMiddleware: Middleware = ({
       return result;
     }
 
-    const { installmentOptions, cardType } = getState().checkout;
+    const { installmentOptions } = getState().checkout;
     const { endpoints: apiEndpoints } = checkoutApi;
 
-    const isCreditCardPayment =
-      preOrder?.payment_option?.payment_type === 'credit_card' ||
-      preOrder?.payment_option?.payment_type === 'masterpass';
-
-    if (isCreditCardPayment && !cardType) {
-      return result;
-    }
-
     if (
       !preOrder?.installment &&
       preOrder?.payment_option?.payment_type !== 'saved_card' &&

package/redux/reducers/checkout.ts

@@ -9,6 +9,7 @@ import {
   CreditCardType,
   DeliveryOption,
   InstallmentOption,
+  LoyaltyBalanceItem,
   PaymentChoice,
   PaymentOption,
   CheckoutCreditPaymentOption,
@@ -49,6 +50,7 @@ export interface CheckoutState {
   bankAccounts: BankAccount[];
   selectedBankAccountPk: number;
   loyaltyBalance?: string;
+  loyaltyBalances?: LoyaltyBalanceItem[];
   retailStores: RetailStore[];
   attributeBasedShippingOptions: AttributeBasedShippingOption[];
   selectedShippingOptions: Record<string, number>;
@@ -188,6 +190,9 @@ const checkoutSlice = createSlice({
     setLoyaltyBalance(state, { payload }) {
       state.loyaltyBalance = payload;
     },
+    setLoyaltyBalances(state, { payload }) {
+      state.loyaltyBalances = payload;
+    },
     setRetailStores(state, { payload }) {
       state.retailStores = payload;
     },
@@ -234,6 +239,7 @@ export const {
   setBankAccounts,
   setSelectedBankAccountPk,
   setLoyaltyBalance,
+  setLoyaltyBalances,
   setRetailStores,
   setAttributeBasedShippingOptions,
   setSelectedShippingOptions,

package/types/commerce/checkout.ts

@@ -67,6 +67,18 @@ export interface CheckoutPaymentOption {
   viewProps?: any;
 }
 
+export interface LoyaltyBalanceItem {
+  label_id: number | null;
+  label: string | null;
+  balance: string;
+  currency?: string;
+}
+
+export interface AccountUsage {
+  label_id: number | null;
+  amount: number;
+}
+
 export interface GiftBox {
   note: string;
   gift_video: boolean;
@@ -90,6 +102,7 @@ export interface PreOrder {
   notes?: string;
   user_phone_number?: string;
   loyalty_money?: string;
+  loyalty_account_usages?: AccountUsage[];
   currency_type_label?: string;
   is_guest?: boolean;
   is_post_order?: boolean;
@@ -150,6 +163,8 @@ export interface CheckoutContext {
     redirect_url?: string;
     context_data?: any;
     balance?: string;
+    balances?: LoyaltyBalanceItem[];
+    accounts?: LoyaltyBalanceItem[];
     attribute_based_shipping_options?: AttributeBasedShippingOption[];
     paymentData?: any;
     paymentMethod?: string;

package/types/index.ts

@@ -83,12 +83,6 @@ export interface Settings {
   };
   usePrettyUrlRoute?: boolean;
   commerceUrl: string;
-  /**
-   * This option allows you to track Sentry events on the client side, in addition to server and edge environments.
-   *
-   * It overrides process.env.NEXT_PUBLIC_SENTRY_DSN and process.env.SENTRY_DSN.
-   */
-  sentryDsn?: string;
   redis: {
     defaultExpirationTime: number;
   };

package/utils/app-fetch.ts

@@ -2,7 +2,6 @@ import Settings from 'settings';
 import logger from '../utils/log';
 import { headers, cookies } from 'next/headers';
 import { ServerVariables } from './server-variables';
-import { notFound } from 'next/navigation';
 
 export enum FetchResponseType {
   JSON = 'json',
@@ -61,15 +60,13 @@ const appFetch = async <T>({
     status = req.status;
     logger.debug(`FETCH END ${url}`, { status: req.status, ip });
 
-    if (req.ok) {
-      if (responseType === FetchResponseType.JSON) {
-        response = (await req.json()) as T;
-      } else {
-        response = (await req.text()) as unknown as T;
-      }
-
-      logger.trace(`FETCH RESPONSE`, { url, response, ip });
+    if (responseType === FetchResponseType.JSON) {
+      response = (await req.json()) as T;
+    } else {
+      response = (await req.text()) as unknown as T;
     }
+
+    logger.trace(`FETCH RESPONSE`, { url, response, ip });
   } catch (error) {
     const logType = status === 500 ? 'fatal' : 'error';
 
@@ -78,10 +75,6 @@ const appFetch = async <T>({
     }
   }
 
-  if (status === 422) {
-    notFound();
-  }
-
   return response;
 };