@pisell/private-materials 6.4.63 → 6.4.65

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.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface FooterProps {
     state: any;
     reload: () => void;

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

@@ -1,10 +1 @@
-/// <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;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/forms/sendModal/useSendModal.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

package/lib/components/booking/forms/single/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

package/lib/components/booking/forms/table/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

package/lib/components/booking/hooks/useClearCart.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
 export default useClearCart;

package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/lib/components/booking/info/date/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => JSX.Element;

package/lib/components/booking/info/dateRange/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

package/lib/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

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

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

package/lib/components/booking/info/notes/index.d.ts

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

package/lib/components/booking/info/service/actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;

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: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const BookingList: ({ items }: {
     items: any[];
 }) => JSX.Element;

package/lib/components/booking/info/service/like/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

package/lib/components/booking/info/service/serviceItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

package/lib/components/booking/info/service/serviceList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

package/lib/components/booking/info/service2/Lists.d.ts

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

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

@@ -49,6 +49,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,
@@ -65,6 +66,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)();
@@ -256,13 +258,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/actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;

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: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info2/service/serviceItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

package/lib/components/booking/info2/service/serviceList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

package/lib/components/booking/materiels/contacts/index.d.ts

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

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface DurationProps extends SelectProps {
     locale?: string;

package/lib/components/booking/materiels/holder/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

package/lib/components/booking/materiels/startTime/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

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

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

package/lib/components/booking/notes/NoteBlock/NoteItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     isEdit: boolean;

package/lib/components/booking/notes/NoteBlock/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     title?: string;

package/lib/components/booking/notes/addNote/index.d.ts

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

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

@@ -1,10 +1 @@
-/// <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;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -1,10 +1 @@
-/// <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;
-}>;
+export declare const Provider: any, Context: any;

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)("");
@@ -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, "", 0);
-              }
+              })
             );
             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") {
@@ -1062,6 +1064,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");
@@ -1464,7 +1467,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);
@@ -1570,7 +1573,7 @@ var PaymentModal = ({
               } else {
                 handlePaymentComplete(data2);
               }
-            }
+            })
           );
         } else if (isLocalOrderCreated.current) {
           console.log(

package/lib/components/checkout/components/SearchAndClientModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export interface IScanResult {
     status: 'success' | 'failed';

package/lib/components/checkout/components/WalletPassModule/components/ConflictModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellWalletPassCardProps } from '../../types';
 export declare const TestModule: () => JSX.Element;
 declare const ConflictModal: (props: {

package/lib/components/checkout/components/WalletPassModule/components/DiscountWallet/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface DiscountWalletProps {
     isCardMode: boolean;