@akinon/next 2.0.0-beta.8 → 2.0.0

package/components/plugin-module.tsx

@@ -20,7 +20,14 @@ enum Plugin {
   B2B = 'pz-b2b',
   Akifast = 'pz-akifast',
   MultiBasket = 'pz-multi-basket',
-  SavedCard = 'pz-saved-card'
+  SavedCard = 'pz-saved-card',
+  FlowPayment = 'pz-flow-payment',
+  VirtualTryOn = 'pz-virtual-try-on',
+  Hepsipay = 'pz-hepsipay',
+  MasterpassRest = 'pz-masterpass-rest',
+  SimilarProducts = 'pz-similar-products',
+  Haso = 'pz-haso',
+  GooglePay = 'pz-google-pay'
 }
 
 export enum Component {
@@ -45,7 +52,23 @@ export enum Component {
   AkifastQuickLoginButton = 'QuickLoginButton',
   AkifastCheckoutButton = 'CheckoutButton',
   MultiBasket = 'MultiBasket',
-  SavedCard = 'SavedCardOption'
+  SavedCard = 'SavedCardOption',
+  VirtualTryOnPlugin = 'VirtualTryOnPlugin',
+  BasketVirtualTryOn = 'BasketVirtualTryOn',
+  BarcodeScannerPlugin = 'BarcodeScannerPlugin',
+  IyzicoSavedCard = 'IyzicoSavedCardOption',
+  Hepsipay = 'Hepsipay',
+  FlowPayment = 'FlowPayment',
+  MasterpassRest = 'MasterpassRestOption',
+  SimilarProductsModal = 'SimilarProductsModal',
+  SimilarProductsFilterSidebar = 'SimilarProductsFilterSidebar',
+  SimilarProductsResultsGrid = 'SimilarProductsResultsGrid',
+  SimilarProductsPlugin = 'SimilarProductsPlugin',
+  ProductImageSearchFeature = 'ProductImageSearchFeature',
+  ImageSearchButton = 'ImageSearchButton',
+  HeaderImageSearchFeature = 'HeaderImageSearchFeature',
+  HasoPaymentGateway = 'HasoPaymentGateway',
+  GooglePay = 'GooglePay'
 }
 
 const PluginComponents = new Map([
@@ -78,7 +101,29 @@ const PluginComponents = new Map([
     [Component.AkifastQuickLoginButton, Component.AkifastCheckoutButton]
   ],
   [Plugin.MultiBasket, [Component.MultiBasket]],
-  [Plugin.SavedCard, [Component.SavedCard]]
+  [
+    Plugin.SimilarProducts,
+    [
+      Component.SimilarProductsModal,
+      Component.SimilarProductsFilterSidebar,
+      Component.SimilarProductsResultsGrid,
+      Component.SimilarProductsPlugin,
+      Component.ProductImageSearchFeature,
+      Component.ImageSearchButton,
+      Component.HeaderImageSearchFeature
+    ]
+  ],
+  [Plugin.SavedCard, [Component.SavedCard, Component.IyzicoSavedCard]],
+  [Plugin.SavedCard, [Component.SavedCard]],
+  [Plugin.FlowPayment, [Component.FlowPayment]],
+  [
+    Plugin.VirtualTryOn,
+    [Component.VirtualTryOnPlugin, Component.BasketVirtualTryOn, Component.BarcodeScannerPlugin]
+  ],
+  [Plugin.Hepsipay, [Component.Hepsipay]],
+  [Plugin.MasterpassRest, [Component.MasterpassRest]],
+  [Plugin.Haso, [Component.HasoPaymentGateway]],
+  [Plugin.GooglePay, [Component.GooglePay]]
 ]);
 
 const getPlugin = (component: Component) => {
@@ -143,6 +188,20 @@ export default function PluginModule({
               promise = import(`${'@akinon/pz-multi-basket'}`);
             } else if (plugin === Plugin.SavedCard) {
               promise = import(`${'@akinon/pz-saved-card'}`);
+            } else if (plugin === Plugin.Hepsipay) {
+              promise = import(`${'@akinon/pz-hepsipay'}`);
+            } else if (plugin === Plugin.FlowPayment) {
+              promise = import(`${'@akinon/pz-flow-payment'}`);
+            } else if (plugin === Plugin.VirtualTryOn) {
+              promise = import(`${'@akinon/pz-virtual-try-on'}`);
+            } else if (plugin === Plugin.MasterpassRest) {
+              promise = import(`${'@akinon/pz-masterpass-rest'}`);
+            } else if (plugin === Plugin.SimilarProducts) {
+              promise = import(`${'@akinon/pz-similar-products'}`);
+            } else if (plugin === Plugin.Haso) {
+              promise = import(`${'@akinon/pz-haso'}`);
+            } else if (plugin === Plugin.GooglePay) {
+              promise = import(`${'@akinon/pz-google-pay'}`);
             }
           } catch (error) {
             logger.error(error);

package/components/price.tsx

@@ -55,8 +55,8 @@ export const Price = (props: NumericFormatProps & PriceProps) => {
       : formattedValue;
 
   const currentCurrencyDecimalScale = Settings.localization.currencies.find(
-    (currency) => currency.code === currencyCode_
-  ).decimalScale;
+    (currency) => currency?.code === currencyCode_
+  )?.decimalScale;
 
   return (
     <NumericFormat

package/components/select.tsx

@@ -1,5 +1,5 @@
 import { forwardRef } from 'react';
-import { SelectProps } from '@theme/components/types';
+import type { SelectProps } from '@theme/components/types';
 import clsx from 'clsx';
 import { Icon } from './icon';
 import { twMerge } from 'tailwind-merge';
@@ -41,7 +41,7 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
         ref={ref}
         className={twMerge(
           clsx(
-            'cursor-pointer truncate h-10 w-40 px-2.5 shrink-0 outline-hidden',
+            'cursor-pointer truncate h-10 w-40 px-2.5 shrink-0 outline-none',
             !borderless &&
               'border border-gray-200 transition-all duration-150 hover:border-primary'
           ),
@@ -59,7 +59,7 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
         ))}
       </select>
       {error && (
-        <span className="mt-1 text-sm text-error">{error.message}</span>
+        <span className="mt-1 text-sm text-error">{String(error.message)}</span>
       )}
     </label>
   );

package/components/selected-payment-option-view.tsx

@@ -16,6 +16,7 @@ const paymentTypeToView = {
   gpay: 'gpay',
   loyalty_money: 'loyalty',
   masterpass: 'credit-card',
+  masterpass_rest: 'masterpass-rest',
   pay_on_delivery: 'pay-on-delivery',
   redirection: 'redirection',
   saved_card: 'saved-card'
@@ -57,6 +58,26 @@ export default function SelectedPaymentOptionView({
           ) {
             const mod = await import('@akinon/pz-apple-pay');
 
+            return typeof mod?.default === 'function'
+              ? mod.default
+              : fallbackView;
+          } else if (
+            payment_option?.payment_type === 'wallet' &&
+            wallet_method === 'cybersource_uc'
+          ) {
+            const mod = await import('@akinon/pz-cybersource-uc');
+
+            return typeof mod?.CyberSourceUcPaymentOption === 'function'
+              ? mod.CyberSourceUcPaymentOption
+              : fallbackView;
+          }
+
+          if (
+            payment_option?.payment_type === 'wallet' &&
+            wallet_method === 'checkout_flow'
+          ) {
+            const mod = await import('@akinon/pz-flow-payment');
+
             return typeof mod?.default === 'function'
               ? mod.default
               : fallbackView;

package/data/client/account.ts

@@ -7,6 +7,7 @@ import {
   AccountOrderCancellation,
   AccountOrderCancellationReason,
   ContactFormType,
+  LoyaltyBalanceItem,
   Order,
   Quotations
 } from '../../types';
@@ -77,6 +78,10 @@ interface LoyaltyTransactions {
   }[];
 }
 
+interface PasswordResetValidateResponse {
+  validlink: boolean;
+}
+
 const accountApi = api.injectEndpoints({
   endpoints: (builder) => ({
     updatePassword: builder.mutation<void, AccountChangePasswordFormType>({
@@ -216,11 +221,20 @@ 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>({
       query: () => buildClientRequestUrl(account.loyaltyTransactions)
+    }),
+    getValidatePasswordResetToken: builder.query<
+      PasswordResetValidateResponse,
+      string
+    >({
+      query: (slug) => buildClientRequestUrl(account.passwordReset(slug))
     })
   }),
   overrideExisting: true
@@ -247,5 +261,6 @@ export const {
   usePasswordResetMutation,
   useAnonymizeMutation,
   useGetLoyaltyBalanceQuery,
-  useGetLoyaltyTransactionsQuery
+  useGetLoyaltyTransactionsQuery,
+  useGetValidatePasswordResetTokenQuery
 } = accountApi;

package/data/client/basket.ts

@@ -104,6 +104,45 @@ export const basketApi = api.injectEndpoints({
         method: 'PUT',
         body
       }),
+      async onQueryStarted(_, { dispatch, queryFulfilled }) {
+        try {
+          const { data } = await queryFulfilled;
+
+          dispatch(
+            basketApi.util.updateQueryData(
+              'getBasket',
+              undefined,
+              () => data.basket
+            )
+          );
+
+          if (data.basket.namespace) {
+            dispatch(
+              basketApi.util.updateQueryData(
+                'getBasketDetail',
+                { namespace: data.basket.namespace },
+                () => data.basket
+              )
+            );
+          }
+
+          dispatch(
+            basketApi.util.updateQueryData(
+              'getAllBaskets',
+              undefined,
+              (baskets) => {
+                if (!baskets) return baskets;
+
+                return baskets.map((basket) =>
+                  basket.pk === data.basket.pk ? data.basket : basket
+                );
+              }
+            )
+          );
+        } catch (error) {
+          console.error('Error updating quantity:', error);
+        }
+      },
       invalidatesTags: ['MultiBasket', 'Basket', 'MiniBasket']
     }),
     clearBasket: build.mutation<Basket, void>({