@pisell/private-materials 6.5.12 → 6.5.14

package/lib/components/booking/components/voucher/index.js

@@ -45,16 +45,7 @@ var import_ahooks = require("ahooks");
 var import_utils2 = require("./utils");
 var import_pisellos = require("../../../ticketBooking/hooks/pisellos");
 var import_utils3 = require("../../info/clientVariant/utils");
-var ShopDiscountHooks = {
-  onInited: "shopDiscount:onInited",
-  onDestroy: "shopDiscount:onDestroy",
-  onLoadDiscountList: "shopDiscount:onLoadDiscountList",
-  onCustomerChange: "shopDiscount:onCustomerChange",
-  onScanCustomerChange: "shopDiscount:onScanCustomerChange",
-  onDiscountListChange: "shopDiscount:onDiscountListChange",
-  onRulesListChange: "shopDiscount:onRulesListChange",
-  onLoadPrepareCalcResult: "shopDiscount:onLoadPrepareCalcResult"
-};
+var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var services = {};
 var VoucherCard = (props) => {
   var _a, _b, _c, _d;
@@ -67,7 +58,8 @@ var VoucherCard = (props) => {
   const serviceValueRef = (0, import_react.useRef)(state.service.value);
   const addonsValueRef = (0, import_react.useRef)(state.addons.value);
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
-  const shopDiscount = pisellos.getModule("shopDiscount");
+  const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
+  const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   services = state.service;
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
     dispatch({
@@ -93,7 +85,7 @@ var VoucherCard = (props) => {
     }
   );
   (0, import_react.useEffect)(() => {
-    if (isBooking4Shop) {
+    if (isBooking4Shop && shopDiscount) {
       shopDiscount.setProductList([
         ...state.service.value,
         ...state.addons.value
@@ -123,9 +115,10 @@ var VoucherCard = (props) => {
     onScanCode(e.detail.code);
   });
   (0, import_react.useEffect)(() => {
-    window.addEventListener("onScanWallPassCode", onScanWallPassCode);
+    const wrappedOnScanWallPassCode = executeIfActive(onScanWallPassCode);
+    window.addEventListener("onScanWallPassCode", wrappedOnScanWallPassCode);
     return () => {
-      window.removeEventListener("onScanWallPassCode", onScanWallPassCode);
+      window.removeEventListener("onScanWallPassCode", wrappedOnScanWallPassCode);
     };
   }, []);
   const addonsMemo = (0, import_react.useMemo)(() => {
@@ -176,14 +169,13 @@ var VoucherCard = (props) => {
     run();
   }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), isBooking4Shop]);
   (0, import_react.useEffect)(() => {
-    var _a2;
-    if (pisellos) {
-      (_a2 = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _a2.on("shopDiscount:onSelectedDiscountListChange", fn);
+    if (shopDiscount) {
+      const wrappedHandler = executeIfActive(fn);
+      shopDiscount == null ? void 0 : shopDiscount.effectsOn("onSelectedDiscountListChange", wrappedHandler);
       return () => {
-        var _a3;
-        (_a3 = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _a3.off(
-          "shopDiscount:onSelectedDiscountListChange",
-          fn
+        shopDiscount == null ? void 0 : shopDiscount.effectsOff(
+          "onSelectedDiscountListChange",
+          wrappedHandler
         );
       };
     }
@@ -196,7 +188,7 @@ var VoucherCard = (props) => {
     productListToValue(result.productList);
   });
   (0, import_react.useEffect)(() => {
-    if (!isBooking4Shop) return;
+    if (!isBooking4Shop || !shopDiscount) return;
     const onScanCustomerChange = (customer) => {
       const clientVariantClose = (0, import_utils3.getClientVariantClose)();
       if (clientVariantClose) {
@@ -207,25 +199,28 @@ var VoucherCard = (props) => {
     const onDiscountListChange = (discount) => {
       setDisCountList(discount);
     };
-    pisellos.effects.on(
-      ShopDiscountHooks.onScanCustomerChange,
-      onScanCustomerChange
+    const wrappedOnScanCustomerChangeHandler = executeIfActive(onScanCustomerChange);
+    const wrappedOnDiscountListChangeHandler = executeIfActive(onDiscountListChange);
+    const wrappedFn = executeIfActive(fn);
+    shopDiscount.effectsOn(
+      "onScanCustomerChange",
+      wrappedOnScanCustomerChangeHandler
     );
-    pisellos.effects.on(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-    pisellos.effects.on(
-      ShopDiscountHooks.onDiscountListChange,
-      onDiscountListChange
+    shopDiscount.effectsOn("onLoadPrepareCalcResult", wrappedFn);
+    shopDiscount.effectsOn(
+      "onDiscountListChange",
+      wrappedOnDiscountListChangeHandler
     );
     return () => {
       shopDiscount.clear();
-      pisellos.effects.off(
-        ShopDiscountHooks.onScanCustomerChange,
-        onScanCustomerChange
+      shopDiscount.effectsOff(
+        "onScanCustomerChange",
+        wrappedOnScanCustomerChangeHandler
       );
-      pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-      pisellos.effects.off(
-        ShopDiscountHooks.onDiscountListChange,
-        onDiscountListChange
+      shopDiscount.effectsOff("onLoadPrepareCalcResult", wrappedFn);
+      shopDiscount.effectsOff(
+        "onDiscountListChange",
+        wrappedOnDiscountListChangeHandler
       );
     };
   }, [state.bookingId, isBooking4Shop, fn]);
@@ -273,12 +268,11 @@ var VoucherCard = (props) => {
   };
   const availableData = (0, import_react.useMemo)(() => {
     if (!isBooking4Shop) return [];
-    const shopDiscount2 = pisellos.getModule("shopDiscount");
     return discountList.filter((item) => !!item.isAvailable).map((discount) => {
       return {
         ...discount,
         isDisabled: discount.isDisabled || discount.isDisabledForProductUsed || disabled,
-        savedAmount: shopDiscount2.calcDiscountApplicableProductTotalPrice(discount)
+        savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(discount)
       };
     });
   }, [discountList, isBooking4Shop, disabled]);
@@ -321,8 +315,7 @@ var VoucherCard = (props) => {
         dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
         mixedSort,
         onChange: (val) => {
-          const shopDiscount2 = pisellos.getModule("shopDiscount");
-          const detail = shopDiscount2.setDiscountSelected({
+          const detail = shopDiscount.setDiscountSelected({
             discountId: val.id,
             isSelected: val.isSelected
           });

package/lib/components/booking/forms/footer.js

@@ -39,37 +39,31 @@ var import_useSendModal = __toESM(require("./sendModal/useSendModal"));
 var import_sendModal = __toESM(require("./sendModal"));
 var import_utils = require("@pisell/utils");
 var Footer = ({ state, reload }) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d;
   const { open, setOpen, handleOpen, handleValuesChange, handleOk } = (0, import_useSendModal.default)(state == null ? void 0 : state.bookingId);
   const handleReload = async () => {
     await reload();
     import_materials.message.success(import_utils.locales.getText("pisell2.text.send-form-reminder-refresh"));
   };
-  const isAllCompleted = (0, import_react.useMemo)(() => {
-    var _a2;
-    return Object.values(((_a2 = state == null ? void 0 : state.form) == null ? void 0 : _a2.value) || {}).every(
-      (item) => item.length > 0
-    );
-  }, [(_a = state == null ? void 0 : state.form) == null ? void 0 : _a.value]);
   const defaultValues = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f, _g, _h, _i, _j;
+    var _a2, _b2, _c2, _d2, _e, _f, _g, _h, _i, _j;
     return {
       sendSms: !!((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.phone),
       sendEmail: !!((_d2 = (_c2 = state.client) == null ? void 0 : _c2.value) == null ? void 0 : _d2.email),
-      email: (_f = (_e2 = state.client) == null ? void 0 : _e2.value) == null ? void 0 : _f.email,
+      email: (_f = (_e = state.client) == null ? void 0 : _e.value) == null ? void 0 : _f.email,
       phone: {
         code: (_h = (_g = state.client) == null ? void 0 : _g.value) == null ? void 0 : _h.country_calling_code,
         phone: (_j = (_i = state.client) == null ? void 0 : _i.value) == null ? void 0 : _j.phone
       }
     };
-  }, [(_b = state.client) == null ? void 0 : _b.value]);
-  if (!state.bookingId || !((_c = state == null ? void 0 : state.form) == null ? void 0 : _c.forms.length)) {
+  }, [(_a = state.client) == null ? void 0 : _a.value]);
+  if (!state.bookingId || !((_b = state == null ? void 0 : state.form) == null ? void 0 : _b.forms.length)) {
     return null;
   }
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-form-footer" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Tooltip, { title: import_utils.locales.getText("pisell2.text.send-form-reminder-tooltip") }, /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", icon: /* @__PURE__ */ import_react.default.createElement(import_icons.ReloadOutlined, null), onClick: handleReload })), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", block: true, type: "primary", onClick: handleOpen, disabled: isAllCompleted }, !isAllCompleted ? import_utils.locales.getText("pisell2.text.send-form-reminder") : import_utils.locales.getText("pisell2.text.send-form-reminder-completed")), /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-form-footer" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Tooltip, { title: import_utils.locales.getText("pisell2.text.send-form-reminder-tooltip") }, /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", icon: /* @__PURE__ */ import_react.default.createElement(import_icons.ReloadOutlined, null), onClick: handleReload })), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", block: true, type: "primary", onClick: handleOpen }, import_utils.locales.getText("pisell2.text.send-form-reminder")), /* @__PURE__ */ import_react.default.createElement(
     import_sendModal.default,
     {
-      refreshKey: (_e = (_d = state.client) == null ? void 0 : _d.value) == null ? void 0 : _e.id,
+      refreshKey: (_d = (_c = state.client) == null ? void 0 : _c.value) == null ? void 0 : _d.id,
       open,
       onCancel: () => setOpen(false),
       onOk: handleOk,

package/lib/components/booking/forms/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/info/model.d.ts

@@ -1,5 +1,14 @@
+/// <reference types="react" />
+import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info2/cartClientCard/index.js

@@ -48,6 +48,7 @@ var import_useTranslationOriginal = __toESM(require("../../../../hooks/useTransl
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_model = require("../../info/model");
 var import_index = require("./index.less");
+var import_IsActiveContext = require("../../../ticketBooking/context/IsActiveContext");
 var CartClientCard = (0, import_react.forwardRef)(({
   clientCardProps = {},
   beforeSwitchModalOpen,
@@ -64,6 +65,7 @@ var CartClientCard = (0, import_react.forwardRef)(({
   const translationOriginal = (0, import_useTranslationOriginal.default)();
   const [keyword, setKeyword] = (0, import_react.useState)("");
   const keywordRef = (0, import_react.useRef)("");
+  const isActive = (0, import_IsActiveContext.useIsActive)();
   keywordRef.current = keyword;
   const Toast = (0, import_materials.useToast)();
   const { openScan, closeScan } = (0, import_useScanCustomer.default)();
@@ -231,13 +233,15 @@ var CartClientCard = (0, import_react.forwardRef)(({
     setPendingCustomer(null);
   };
   (0, import_react.useMemo)(() => {
-    (0, import_utils3.setHandleSetClient)(handleSetClient);
-  }, []);
+    if (isActive) {
+      (0, import_utils3.setHandleSetClient)(handleSetClient);
+    }
+  }, [isActive]);
   (0, import_react.useEffect)(() => {
     return () => {
       (0, import_utils3.setHandleSetClient)(null);
     };
-  }, []);
+  }, [isActive]);
   const tags = (0, import_react.useMemo)(() => {
     var _a2;
     if (!selectedCustomer) return;

package/lib/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -105,4 +106,11 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/notes/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/payments/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/utils.d.ts

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/checkout/PaymentModal.js

@@ -65,6 +65,7 @@ var import_usePaymentLogger = __toESM(require("./hooks/usePaymentLogger"));
 var import_antd = require("antd");
 var import_printer = __toESM(require("../../hooks/printer"));
 var import_priceKeyboard = require("../../pro/priceKeyboard");
+var import_pisellos = require("../ticketBooking/hooks/pisellos");
 var CheckoutHooks = {
   OnStateAmountChanged: "checkout:onStateAmountChanged",
   OnBalanceDueAmountChanged: "checkout:onBalanceDueAmountChanged",
@@ -105,6 +106,7 @@ var PaymentContent = (0, import_react.forwardRef)(
     const utils = context.appHelper.utils || {};
     const { pisellos, getData, pisellosAllModule, interaction } = utils;
     const Toast = (0, import_materials.useToast)();
+    const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
     const checkoutRef = (0, import_react.useRef)(null);
     const savePayLaterHandlerRef = (0, import_react.useRef)(null);
     const [customAmount, setCustomAmount] = (0, import_react.useState)("");
@@ -379,7 +381,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           if (core.effects && typeof core.effects.on === "function") {
             const unsubscribe = core.effects.on(
               CheckoutHooks.OnStateAmountChanged,
-              async (data) => {
+              executeIfActive(async (data) => {
                 var _a2, _b2;
                 console.log(
                   `Amount changed from ${data.oldAmount} to ${data.newAmount}`
@@ -405,26 +407,26 @@ var PaymentContent = (0, import_react.forwardRef)(
                 setCustomAmount(data.newAmount);
                 const items = await checkoutModule.getCurrentOrderPaymentItemsAsync();
                 setPaymentItems(items);
-              }
+              })
             );
             const amountChangedUnsubscribe = core.effects.on(
               CheckoutHooks.OnBalanceDueAmountChanged,
-              (data) => {
+              executeIfActive((data) => {
                 setBalanceDueAmount(data.newAmount);
                 setBalanceDueTotalAmount(data.totalAmount || "0");
-              }
+              })
             );
             const orderSubmitStartUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderSubmitStart,
-              () => {
+              executeIfActive(() => {
                 var _a2;
                 setSyncingLock(true);
                 (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast);
-              }
+              })
             );
             const orderSubmitEndUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderSubmitEnd,
-              (res) => {
+              executeIfActive((res) => {
                 var _a2, _b2;
                 setSyncingLock(false);
                 if (res.success) {
@@ -439,11 +441,11 @@ var PaymentContent = (0, import_react.forwardRef)(
                     );
                   }
                 }
-              }
+              })
             );
             const orderPaymentAddedUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderPaymentAdded,
-              async (data) => {
+              executeIfActive(async (data) => {
                 var _a2, _b2;
                 console.log("orderPaymentAddedUnsubscribe>>>>", data);
                 const orderInfo2 = checkoutModule.getCurrentOrderInfo();
@@ -506,7 +508,7 @@ var PaymentContent = (0, import_react.forwardRef)(
                     }
                   });
                 }
-              }
+              })
             );
             return () => {
               if (unsubscribe && typeof unsubscribe === "function") {
@@ -1063,6 +1065,7 @@ var PaymentModal = ({
   const [windowHeight, setWindowHeight] = (0, import_react.useState)(0);
   const [showRetryModal, setShowRetryModal] = (0, import_react.useState)(false);
   const [currentEditOrderId, setCurrentEditOrderId] = (0, import_react.useState)(editOrderId || 0);
+  const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   const Toast = (0, import_materials.useToast)();
   const { nativePrint } = (0, import_printer.default)();
   const handleRetry = async () => {
@@ -1466,7 +1469,7 @@ var PaymentModal = ({
           }
           unsubscribeRef.current = checkout.core.effects.on(
             "checkout:onOrderSynced",
-            async (data2) => {
+            executeIfActive(async (data2) => {
               var _a3, _b3, _c3, _d3, _e2;
               const currentOrderId = checkout.getCurrentOrderId();
               setCurrentEditOrderId(currentOrderId);
@@ -1573,7 +1576,7 @@ var PaymentModal = ({
               } else {
                 handlePaymentComplete(data2);
               }
-            }
+            })
           );
         } else if (isLocalOrderCreated.current) {
           console.log(

package/lib/components/checkout/components/CashPaymentModule/index.js

@@ -128,7 +128,6 @@ function CashPaymentModule({
     } else {
       const cleanValue = finalValue.replace(/[$\s]/g, "");
       const numValue = parseFloat(cleanValue);
-      debugger;
       const balanceDue = parseFloat((orderInfo == null ? void 0 : orderInfo.isDeposit) ? balanceDueTotalAmount || "0" : balanceDueAmount);
       const shouldApplyRounding = Math.abs(numValue - balanceDue) < 0.01;
       let finalAmount = numValue;

package/lib/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any;
+    expiredWalletIds: any[];
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

package/lib/components/checkout/hooks/useWalletPass.js

@@ -41,9 +41,12 @@ var import_useEngineContext = require("../../../hooks/useEngineContext");
 var import_utils2 = require("../components/WalletPassModule/utils");
 var import_usePaymentLogger = __toESM(require("./usePaymentLogger"));
 var import_utils3 = require("../../booking/utils");
+var import_pisellos = require("../../ticketBooking/hooks/pisellos");
+var import_useShopDiscountModule = require("../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var useWalletPass = (props) => {
   const { onSelectChange, customAmount, clientId } = props;
   const logger = (0, import_usePaymentLogger.default)();
+  const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   const [walletRecommendList, setWalletRecommendList] = (0, import_react.useState)([]);
   const [userIdentificationCodes, setUserIdentificationCodes] = (0, import_react.useState)(
     []
@@ -68,7 +71,7 @@ var useWalletPass = (props) => {
   const [error, setError] = (0, import_react.useState)(null);
   const [discountList, setDiscountList] = (0, import_react.useState)([]);
   const checkoutModule = pisellos.getModule("checkout");
-  const shopDiscount = pisellos.getModule("shopDiscount");
+  const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const paymentModule = checkoutModule == null ? void 0 : checkoutModule.payment;
   const setWalletSelect = (0, import_ahooks.useMemoizedFn)((data2) => {
     setSelectedWallet(data2);
@@ -242,7 +245,10 @@ var useWalletPass = (props) => {
       });
     }
     setDisabledWalletData(isDisabledData);
-    const newValues = [...selectedWalletRef.current, ...isAvailableData];
+    let newValues = [...selectedWalletRef.current];
+    if (isAvailableData.length === 1) {
+      newValues = [...selectedWalletRef.current, ...isAvailableData];
+    }
     setSearchIdentificationCodeList(cachedSearchResults);
     setWalletSelect(newValues);
     handleFetchUserIdentificationCodes(newValues.map((item) => item.id));
@@ -322,62 +328,71 @@ var useWalletPass = (props) => {
   (0, import_react.useEffect)(() => {
     if (!paymentModule) return;
     const core = pisellos;
-    core.effects.on(
-      "wallet:onWalletRecommendListUpdated",
-      handleWalletRecommendListUpdated
+    const wrappedHandlePaymentStarted = executeIfActive(handlePaymentStarted);
+    const wrappedOnOrderCreated = executeIfActive(onOrderCreated);
+    const wrappedHandleWalletRecommendListUpdated = executeIfActive(handleWalletRecommendListUpdated);
+    const wrappedHandleUserIdentificationCodesUpdated = executeIfActive(handleUserIdentificationCodesUpdated);
+    const wrappedHandleWalletCacheCleared = executeIfActive(handleWalletCacheCleared);
+    const wrappedHandleSearchIdentificationCodeCompleted = executeIfActive(handleSearchIdentificationCodeCompleted);
+    const wrappedHandleWalletInitializationStarted = executeIfActive(handleWalletInitializationStarted);
+    const wrappedHandleWalletInitializationCompleted = executeIfActive(handleWalletInitializationCompleted);
+    const wrappedHandleWalletInitializationFailed = executeIfActive(handleWalletInitializationFailed);
+    paymentModule.effectsOn(
+      "onWalletRecommendListUpdated",
+      wrappedHandleWalletRecommendListUpdated
     );
-    core.effects.on("checkout:onPaymentStarted", handlePaymentStarted);
-    core.effects.on("checkout:onPaymentItemAdded", handlePaymentStarted);
-    core.effects.on(
-      "wallet:onUserIdentificationCodesUpdated",
-      handleUserIdentificationCodesUpdated
+    checkoutModule.effectsOn("onPaymentStarted", wrappedHandlePaymentStarted);
+    checkoutModule.effectsOn("onPaymentItemAdded", wrappedHandlePaymentStarted);
+    paymentModule.effectsOn(
+      "onUserIdentificationCodesUpdated",
+      wrappedHandleUserIdentificationCodesUpdated
     );
-    core.effects.on("wallet:onWalletCacheCleared", handleWalletCacheCleared);
-    core.effects.on(
-      "wallet:onSearchIdentificationCodeCompleted",
-      handleSearchIdentificationCodeCompleted
+    paymentModule.effectsOn("onWalletCacheCleared", wrappedHandleWalletCacheCleared);
+    paymentModule.effectsOn(
+      "onSearchIdentificationCodeCompleted",
+      wrappedHandleSearchIdentificationCodeCompleted
     );
-    core.effects.on("checkout:onWalletDataInitialized", onOrderCreated);
-    core.effects.on(
-      "wallet:onWalletInitializationStarted",
-      handleWalletInitializationStarted
+    checkoutModule.effectsOn("onWalletDataInitialized", wrappedOnOrderCreated);
+    paymentModule.effectsOn(
+      "onWalletInitializationStarted",
+      wrappedHandleWalletInitializationStarted
     );
-    core.effects.on(
-      "wallet:onWalletInitializationCompleted",
-      handleWalletInitializationCompleted
+    paymentModule.effectsOn(
+      "onWalletInitializationCompleted",
+      wrappedHandleWalletInitializationCompleted
     );
-    core.effects.on(
-      "wallet:onWalletInitializationFailed",
-      handleWalletInitializationFailed
+    paymentModule.effectsOn(
+      "onWalletInitializationFailed",
+      wrappedHandleWalletInitializationFailed
     );
     return () => {
-      core.effects.off(
-        "wallet:onWalletRecommendListUpdated",
-        handleWalletRecommendListUpdated
+      paymentModule.effectsOff(
+        "onWalletRecommendListUpdated",
+        wrappedHandleWalletRecommendListUpdated
       );
-      core.effects.off("checkout:onPaymentStarted", handlePaymentStarted);
-      core.effects.off("checkout:onPaymentItemAdded", handlePaymentStarted);
-      core.effects.off(
-        "wallet:onUserIdentificationCodesUpdated",
-        handleUserIdentificationCodesUpdated
+      checkoutModule.effectsOff("onPaymentStarted", wrappedHandlePaymentStarted);
+      checkoutModule.effectsOff("onPaymentItemAdded", wrappedHandlePaymentStarted);
+      paymentModule.effectsOff(
+        "onUserIdentificationCodesUpdated",
+        wrappedHandleUserIdentificationCodesUpdated
       );
-      core.effects.off("wallet:onWalletCacheCleared", handleWalletCacheCleared);
-      core.effects.off(
-        "wallet:onSearchIdentificationCodeCompleted",
-        handleSearchIdentificationCodeCompleted
+      paymentModule.effectsOff("onWalletCacheCleared", wrappedHandleWalletCacheCleared);
+      paymentModule.effectsOff(
+        "onSearchIdentificationCodeCompleted",
+        wrappedHandleSearchIdentificationCodeCompleted
       );
-      core.effects.off("checkout:onWalletDataInitialized", onOrderCreated);
-      core.effects.off(
-        "wallet:onWalletInitializationStarted",
-        handleWalletInitializationStarted
+      checkoutModule.effectsOff("onWalletDataInitialized", wrappedOnOrderCreated);
+      paymentModule.effectsOff(
+        "onWalletInitializationStarted",
+        wrappedHandleWalletInitializationStarted
       );
-      core.effects.off(
-        "wallet:onWalletInitializationCompleted",
-        handleWalletInitializationCompleted
+      paymentModule.effectsOff(
+        "onWalletInitializationCompleted",
+        wrappedHandleWalletInitializationCompleted
       );
-      core.effects.off(
-        "wallet:onWalletInitializationFailed",
-        handleWalletInitializationFailed
+      paymentModule.effectsOff(
+        "onWalletInitializationFailed",
+        wrappedHandleWalletInitializationFailed
       );
     };
   }, [paymentModule]);

package/lib/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };