@pisell/private-materials 6.4.56 → 6.4.57

package/lib/components/checkout/PaymentModal.js

@@ -64,6 +64,7 @@ var import_utils2 = require("./utils");
 var import_usePaymentLogger = __toESM(require("./hooks/usePaymentLogger"));
 var import_antd = require("antd");
 var import_priceKeyboard = require("../../pro/priceKeyboard");
+var import_pisellos = require("../ticketBooking/hooks/pisellos");
 var CheckoutHooks = {
   OnStateAmountChanged: "checkout:onStateAmountChanged",
   OnBalanceDueAmountChanged: "checkout:onBalanceDueAmountChanged",
@@ -104,6 +105,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)("");
@@ -378,7 +380,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}`
@@ -404,26 +406,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) {
@@ -438,11 +440,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();
@@ -505,7 +507,7 @@ var PaymentContent = (0, import_react.forwardRef)(
                     }
                   });
                 }
-              }
+              })
             );
             return () => {
               if (unsubscribe && typeof unsubscribe === "function") {
@@ -1061,6 +1063,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 handleRetry = async () => {
     const checkoutModule = pisellos == null ? void 0 : pisellos.getModule("checkout");
@@ -1463,7 +1466,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);
@@ -1569,7 +1572,7 @@ var PaymentModal = ({
               } else {
                 handlePaymentComplete(data2);
               }
-            }
+            })
           );
         } else if (isLocalOrderCreated.current) {
           console.log(

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);
@@ -325,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/eftpos/deviceList/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const _default: ({ input, ...formItemProps }: any) => JSX.Element;
 export default _default;

package/lib/components/eftpos/group/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { RadioGroupProps } from 'antd';
 export declare const CheckboxGroup: ({ direction, options, ...props }: any) => JSX.Element;
 export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {

package/lib/components/eftpos/icon/apiKey.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/lib/components/eftpos/icon/device.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/lib/components/eftpos/receipt/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 自定义组件设置
  * @description: 自定义组件设置

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

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/component/alert/warn.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/header/titlebar.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",

package/lib/components/eftposPay/component/step/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

package/lib/components/eftposPay/component/step/step.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string;

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

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, containerStyle, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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<"success" | "warn" | "loading" | "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<"payo" | "tyro" | "windcave" | "stripe" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/payo/config.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { StatusEnum } from '../const';
 export declare const POS: ({ api, onChange, }: {
     api: {

package/lib/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "success" | "warn" | "loading" | "fail" | "question";
+        status: "loading" | "success" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -295,20 +295,20 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
+        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
         subTitle?: string | undefined;
-        type?: "step" | "unset" | undefined;
+        type?: "unset" | "step" | undefined;
         render?: boolean | undefined;
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './tip.less';
 /**
  * @title: 支付状态未知页面

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description:

package/lib/components/eftposPay/windcave/receiptAction.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 按钮操作区
  * @description: 仅包含签名

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: ({ api, onChange, formatAmount, }: {
     api: any;
     onChange: any;

package/lib/components/eventBooking/components/ErrorTip/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ErrorTip: ({ text }: any) => JSX.Element;
 export default ErrorTip;

package/lib/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const EmptyHolderModal: (props: any) => JSX.Element;
 export default EmptyHolderModal;

package/lib/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const InformationOptionsModal: (props: any) => JSX.Element;
 export default InformationOptionsModal;

package/lib/components/eventBooking/components/Provider/OrderProductModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const OrderProductModal: (props: any) => JSX.Element;
 export default OrderProductModal;

package/lib/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const RemoveOptionConfirmModal: (props: any) => JSX.Element;
 export default RemoveOptionConfirmModal;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Status: (props: any) => JSX.Element;
 export default Status;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const WeekItem: (props: any) => JSX.Element;
 export default WeekItem;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare type CalenDateWeekProps = {
     currentDate: string;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const DayItem: (props: any) => JSX.Element;
 export default DayItem;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { CalendarItemProps } from '../../../../../type';
 declare const Item: (props: CalendarItemProps) => JSX.Element;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Status: (props: any) => JSX.Element;
 export default Status;

package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ScheduleTimeItem: ({ timeList }: any) => JSX.Element;
 export default ScheduleTimeItem;