@pisell/private-materials 6.4.61 → 6.4.63

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

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

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

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

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

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

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

@@ -17,6 +17,7 @@ import React, { useContext, useEffect, useImperativeHandle, useMemo, useState, f
 import { useMemoizedFn, useDebounceFn } from 'ahooks';
 import { PisellModal, useToast } from '@pisell/materials';
 import { locales } from '@pisell/utils';
+import { cloneDeep } from 'lodash';
 import localeTexts from "./locales";
 import ClientCard from "../../../../plus/clientCard";
 import ClientSearch from "../../../../plus/clinetSearch";
@@ -29,7 +30,6 @@ import useTranslationOriginal from "../../../../hooks/useTranslationOriginal";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { Context } from "../../info/model";
 import "./index.less";
-import { useIsActive } from "../../../ticketBooking/context/IsActiveContext";
 
 // 导出类型
 
@@ -61,7 +61,6 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
     keyword = _useState8[0],
     setKeyword = _useState8[1];
   var keywordRef = useRef('');
-  var isActive = useIsActive();
   keywordRef.current = keyword;
   var Toast = useToast();
   var _useScanCustomer = useScanCustomer(),
@@ -186,12 +185,40 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 处理查看客户
   var handleViewClient = function handleViewClient(data) {
+    var newSelectedCustomer = cloneDeep(selectedCustomer);
     state.action({
       type: 'pisell1.handleOpenCustomerModal',
       data: {
         id: state.client.value.id
       },
-      callback: function callback(data) {}
+      callback: function callback(data) {
+        console.log('data>>>>>', data);
+        var _selectedCustomer = _objectSpread(_objectSpread({}, newSelectedCustomer || {}), {}, {
+          display_name: (data === null || data === void 0 ? void 0 : data.display_name) || "",
+          email: (data === null || data === void 0 ? void 0 : data.email) || "",
+          phone: (data === null || data === void 0 ? void 0 : data.phone) || "",
+          nickname: (data === null || data === void 0 ? void 0 : data.nickname) || "",
+          country_calling_code: (data === null || data === void 0 ? void 0 : data.country_calling_code) || "",
+          first_name: (data === null || data === void 0 ? void 0 : data.first_name) || "",
+          last_name: (data === null || data === void 0 ? void 0 : data.last_name) || "",
+          contacts_info: (data === null || data === void 0 ? void 0 : data.contacts_info) || null
+        });
+        selectCustomer(_selectedCustomer);
+
+        // 如果联系信息发生变动需要更新
+        if (JSON.stringify((newSelectedCustomer === null || newSelectedCustomer === void 0 ? void 0 : newSelectedCustomer.contacts_info) || {}) !== JSON.stringify((data === null || data === void 0 ? void 0 : data.contacts_info) || {})) {
+          dispatch({
+            type: 'setContactsInfo',
+            payload: {
+              value: (data === null || data === void 0 ? void 0 : data.contacts_info) || {},
+              client_id: data === null || data === void 0 ? void 0 : data.id
+            }
+          });
+        }
+
+        // 重置客户搜索框内容
+        handleSearchClient('');
+      }
     });
   };
 
@@ -317,15 +344,13 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
     setPendingCustomer(null);
   };
   useMemo(function () {
-    if (isActive) {
-      setHandleSetClient(handleSetClient);
-    }
-  }, [isActive]);
+    setHandleSetClient(handleSetClient);
+  }, []);
   useEffect(function () {
     return function () {
       setHandleSetClient(null);
     };
-  }, [isActive]);
+  }, []);
   var tags = useMemo(function () {
     var _latest_wallet_detail;
     if (!selectedCustomer) return;

package/es/components/booking/info2/index.js

@@ -35,6 +35,7 @@ import { getLocale } from "../../../utils/locales";
 import { useDebounceEffect } from 'ahooks';
 import CartClientCard from "./cartClientCard";
 import { Iconfont, useToast } from '@pisell/materials';
+import ContactInfoMode from "./service/contactInfoMode";
 var defaultModules = {
   client: 1,
   date: 1,
@@ -44,7 +45,7 @@ var defaultModules = {
 };
 locales.init(localeTexts, getLocale());
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state3, _modal$state5, _modal$state6;
+  var _modal$state2, _modal$state3, _modal$state5, _modal$state6, _modal$state7;
   // return <Payments {...props} />;
   var style = props.style,
     globalState = props.globalState,
@@ -340,7 +341,7 @@ var Info = Provider(function (props) {
       color: '#fff',
       fontSize: 42
     }
-  })) : null), modules.holder && !((_modal$state6 = modal.state) !== null && _modal$state6 !== void 0 && _modal$state6.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
+  })) : null), (modal === null || modal === void 0 || (_modal$state6 = modal.state) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.bookingConfig) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.config) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.cart_settings_tab) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.display_contact_info) === null || _modal$state6 === void 0 ? void 0 : _modal$state6.show_contact_info) === true ? /*#__PURE__*/React.createElement(ContactInfoMode, null) : null, modules.holder && !((_modal$state7 = modal.state) !== null && _modal$state7 !== void 0 && _modal$state7.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
     loading: globalState.loading,
     round: true,
     active: true,

package/es/components/booking/info2/service/actions/index.d.ts

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

package/es/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/es/components/booking/info2/service/contactInfoMode/index.d.ts

@@ -0,0 +1,2 @@
+declare const ContactInfoMode: () => JSX.Element;
+export default ContactInfoMode;

package/es/components/booking/info2/service/contactInfoMode/index.js

@@ -0,0 +1,94 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import React, { useContext, useEffect } from 'react';
+import { locales } from '@pisell/utils';
+import ContactInfo from "../../../../../plus/contactInfo";
+import { Context } from "../../../info/model";
+var ContactInfoMode = function ContactInfoMode() {
+  var _state$client$value6, _state$contacts_info3, _state$contacts_info4;
+  var _useContext = useContext(Context),
+    state = _useContext.state,
+    dispatch = _useContext.dispatch;
+  console.log('state>>>>>>>>>', state);
+  useEffect(function () {
+    var _state$contacts_info, _state$client$value, _state$client$value2, _state$contacts_info2;
+    // 如果客户id发生变化，则获取客户信息中的ContactInfo，如果不存在，则使用客户信息填充ContactInfo
+    console.log('state>>>>>>>>>111', state === null || state === void 0 || (_state$contacts_info = state.contacts_info) === null || _state$contacts_info === void 0 ? void 0 : _state$contacts_info.client_id);
+    console.log('state>>>>>>>>>222', (_state$client$value = state.client.value) === null || _state$client$value === void 0 ? void 0 : _state$client$value.id);
+    if (((_state$client$value2 = state.client.value) === null || _state$client$value2 === void 0 ? void 0 : _state$client$value2.id) != (state === null || state === void 0 || (_state$contacts_info2 = state.contacts_info) === null || _state$contacts_info2 === void 0 ? void 0 : _state$contacts_info2.client_id)) {
+      var _state$client$value3;
+      var contactInfo = (_state$client$value3 = state.client.value) === null || _state$client$value3 === void 0 || (_state$client$value3 = _state$client$value3.contacts_info) === null || _state$client$value3 === void 0 ? void 0 : _state$client$value3.value;
+      if (!contactInfo) {
+        var _state$client, _state$client$value4;
+        var _ref = ((_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value) || {},
+          first_name = _ref.first_name,
+          last_name = _ref.last_name,
+          phone = _ref.phone,
+          country_calling_code = _ref.country_calling_code,
+          country_code = _ref.country_code,
+          email = _ref.email;
+        dispatch({
+          type: 'setContactsInfo',
+          payload: {
+            value: {
+              first_name: first_name || '',
+              last_name: last_name || '',
+              phone: {
+                phone: phone || '',
+                country_calling_code: country_calling_code || '',
+                country_code: country_code || ''
+              },
+              email: email || ''
+            },
+            client_id: (_state$client$value4 = state.client.value) === null || _state$client$value4 === void 0 ? void 0 : _state$client$value4.id
+          }
+        });
+      } else {
+        var _state$client$value5;
+        dispatch({
+          type: 'setContactsInfo',
+          payload: {
+            value: _objectSpread({}, contactInfo || {}),
+            client_id: (_state$client$value5 = state.client.value) === null || _state$client$value5 === void 0 ? void 0 : _state$client$value5.id
+          }
+        });
+      }
+    }
+  }, [(_state$client$value6 = state.client.value) === null || _state$client$value6 === void 0 ? void 0 : _state$client$value6.id, state === null || state === void 0 || (_state$contacts_info3 = state.contacts_info) === null || _state$contacts_info3 === void 0 ? void 0 : _state$contacts_info3.client_id]);
+  var handleSave = function handleSave(value) {
+    dispatch({
+      type: 'setContactsInfo',
+      payload: {
+        value: value,
+        edit: true
+      }
+    });
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '24px'
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-contact-info-title",
+    style: {
+      fontSize: '16px',
+      fontWeight: 500,
+      marginBottom: '8px'
+    }
+  }, locales.getText('pisell2.booking.text.contact-info.title')), /*#__PURE__*/React.createElement(ContactInfo, {
+    dataSource: ((_state$contacts_info4 = state.contacts_info) === null || _state$contacts_info4 === void 0 ? void 0 : _state$contacts_info4.value) || null,
+    isShowDelete: false,
+    isShowAvatar: false,
+    isShowPhone: true,
+    isShowEmail: true,
+    style: {
+      padding: '14px 0 14px 14px'
+    },
+    onSave: handleSave
+  }));
+};
+export default ContactInfoMode;

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

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

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

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

package/es/components/booking/locales.d.ts

@@ -302,6 +302,7 @@ declare const _default: {
         'pisell2.text.quotation.product.change.describe': string;
         'pisell2.booking.notes.placeholder': string;
         'pisell2.text.form.link.to.another.record.more': string;
+        'pisell2.booking.text.contact-info.title': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -606,6 +607,7 @@ declare const _default: {
         'pisell2.text.quotation.product.change.describe': string;
         'pisell2.booking.notes.placeholder': string;
         'pisell2.text.form.link.to.another.record.more': string;
+        'pisell2.booking.text.contact-info.title': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -910,6 +912,7 @@ declare const _default: {
         'pisell2.text.quotation.product.change.describe': string;
         'pisell2.booking.notes.placeholder': string;
         'pisell2.text.form.link.to.another.record.more': string;
+        'pisell2.booking.text.contact-info.title': string;
     };
 };
 export default _default;

package/es/components/booking/locales.js

@@ -354,7 +354,9 @@ export default {
     'pisell2.text.quotation.product.change.describe': "Product updates available: Please refresh the following items to load the latest data.",
     // Notes
     'pisell2.booking.notes.placeholder': 'Enter a note...',
-    'pisell2.text.form.link.to.another.record.more': 'View More'
+    'pisell2.text.form.link.to.another.record.more': 'View More',
+    // 联系信息
+    'pisell2.booking.text.contact-info.title': 'Contact info'
   },
   'zh-CN': {
     'pisell2.text.refunded-amount': '已退金额',
@@ -715,7 +717,9 @@ export default {
     'pisell2.text.quotation.product.change.describe': "以下商品信息已更新，请重新编辑相关商品以同步最新数据。",
     // Notes
     'pisell2.booking.notes.placeholder': '输入备注...',
-    'pisell2.text.form.link.to.another.record.more': '查看更多'
+    'pisell2.text.form.link.to.another.record.more': '查看更多',
+    // 联系信息
+    'pisell2.booking.text.contact-info.title': '联系信息'
   },
   'zh-HK': {
     'pisell2.text.refunded-amount': '已退金額',
@@ -1076,6 +1080,8 @@ export default {
     'pisell2.text.quotation.product.change.describe': "以下商品信息已更新，请重新编辑相关商品以同步最新数据。",
     // Notes
     'pisell2.booking.notes.placeholder': '輸入備註...',
-    'pisell2.text.form.link.to.another.record.more': '查看更多'
+    'pisell2.text.form.link.to.another.record.more': '查看更多',
+    // 联系信息
+    'pisell2.booking.text.contact-info.title': '聯繫信息'
   }
 };

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

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

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

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

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

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -26,6 +27,10 @@ export interface FormState {
         };
         edit: boolean;
     };
+    contacts_info: {
+        edit: boolean;
+        value: any;
+    };
     date: {
         value: any;
         end_date: any;
@@ -105,4 +110,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/es/components/booking/model.js

@@ -27,6 +27,9 @@ var apis = {
   },
   getFormData: function getFormData() {
     return [];
+  },
+  getContactsInfo: function getContactsInfo() {
+    return null;
   }
 };
 export var walkInData = {

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

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

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

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

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

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

package/es/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/es/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/es/components/checkout/PaymentModal.js

@@ -47,7 +47,6 @@ import { getShopWalletPassId, reorderPaymentMethodList } from "./utils";
 import usePaymentLogger from "./hooks/usePaymentLogger";
 import { Button } from 'antd';
 import { DiscountKeyboard } from "../../pro/priceKeyboard";
-import { useActiveExecute } from "../ticketBooking/hooks/pisellos";
 
 // Checkout 模块的事件常量
 var CheckoutHooks = {
@@ -99,8 +98,6 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     pisellosAllModule = utils.pisellosAllModule,
     interaction = utils.interaction;
   var Toast = useToast();
-  var _useActiveExecute = useActiveExecute(),
-    executeIfActive = _useActiveExecute.executeIfActive;
   // const paymentResultToast = usePaymentResultToast();
 
   var checkoutRef = useRef(null);
@@ -500,7 +497,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       try {
         var core = checkoutModule.core;
         if (core.effects && typeof core.effects.on === 'function') {
-          var unsubscribe = core.effects.on(CheckoutHooks.OnStateAmountChanged, executeIfActive( /*#__PURE__*/function () {
+          var unsubscribe = core.effects.on(CheckoutHooks.OnStateAmountChanged, /*#__PURE__*/function () {
             var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(data) {
               var _Toast$success, _Toast$success2, items;
               return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -530,17 +527,17 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             return function (_x4) {
               return _ref7.apply(this, arguments);
             };
-          }()));
-          var amountChangedUnsubscribe = core.effects.on(CheckoutHooks.OnBalanceDueAmountChanged, executeIfActive(function (data) {
+          }());
+          var amountChangedUnsubscribe = core.effects.on(CheckoutHooks.OnBalanceDueAmountChanged, function (data) {
             setBalanceDueAmount(data.newAmount);
             setBalanceDueTotalAmount(data.totalAmount || '0');
-          }));
-          var orderSubmitStartUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitStart, executeIfActive(function () {
+          });
+          var orderSubmitStartUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitStart, function () {
             var _Toast$loading2;
             setSyncingLock(true);
             Toast === null || Toast === void 0 || (_Toast$loading2 = Toast.loading) === null || _Toast$loading2 === void 0 || _Toast$loading2.call(Toast, '', 0);
-          }));
-          var orderSubmitEndUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitEnd, executeIfActive(function (res) {
+          });
+          var orderSubmitEndUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitEnd, function (res) {
             setSyncingLock(false);
             if (res.success) {
               var _Toast$hide;
@@ -556,7 +553,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.order-sync-failed') || 'Order sync failed');
               }
             }
-          }));
+          });
 
           // const orderSyncFailedUnsubscribe = core.effects.on(
           //   CheckoutHooks.OnOrderSyncFailed,
@@ -565,7 +562,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           //     Toast?.fail(locales.getText('pisell2.checkout.order-sync-failed') || 'Order sync failed');
           //   }
           // );
-          var orderPaymentAddedUnsubscribe = core.effects.on(CheckoutHooks.OnOrderPaymentAdded, executeIfActive( /*#__PURE__*/function () {
+          var orderPaymentAddedUnsubscribe = core.effects.on(CheckoutHooks.OnOrderPaymentAdded, /*#__PURE__*/function () {
             var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(data) {
               var orderInfo, balanceDueAmount, autoCloseConfig, _paymentItems, _totalAmount, serviceChargeTotal, paymentMethodName, isCashPayment, _interaction$utils3, _interaction$utils3$p;
               return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -655,7 +652,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             return function (_x5) {
               return _ref8.apply(this, arguments);
             };
-          }()));
+          }());
           return function () {
             if (unsubscribe && typeof unsubscribe === 'function') {
               unsubscribe();
@@ -1414,8 +1411,6 @@ var PaymentModal = function PaymentModal(_ref18) {
     _useState36 = _slicedToArray(_useState35, 2),
     currentEditOrderId = _useState36[0],
     _setCurrentEditOrderId = _useState36[1];
-  var _useActiveExecute2 = useActiveExecute(),
-    executeIfActive = _useActiveExecute2.executeIfActive;
   var Toast = useToast();
 
   // 重试处理函数（逻辑由用户自己实现）
@@ -2090,7 +2085,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                 unsubscribeRef.current = undefined;
               }
               // 监听订单同步完成，同步完成后显示订单完成 toast，关闭当前弹窗
-              unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', executeIfActive( /*#__PURE__*/function () {
+              unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', /*#__PURE__*/function () {
                 var _ref29 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(data) {
                   var _data$response, _responseData$payment2;
                   var currentOrderId, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, _interaction$utils6, _interaction$utils6$a, _orderInfo3, paymentResult;
@@ -2235,7 +2230,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                 return function (_x17) {
                   return _ref29.apply(this, arguments);
                 };
-              }()));
+              }());
               _context23.next = 42;
               break;
             case 25:

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

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

package/es/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/es/components/checkout/hooks/useWalletPass.js

@@ -27,8 +27,6 @@ import { usePisellOS } from "../../../hooks/useEngineContext";
 import { formatDiscountWalletData, formatMachineCodeServer2CardList, isSameContent } from "../components/WalletPassModule/utils";
 import usePaymentLogger from "./usePaymentLogger";
 import { isWalkIn } from "../../booking/utils";
-import { useActiveExecute } from "../../ticketBooking/hooks/pisellos";
-import { useShopDiscountModule } from "../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 
 /**
  * 自定义Hook：使用WalletPass功能
@@ -38,8 +36,6 @@ export var useWalletPass = function useWalletPass(props) {
     customAmount = props.customAmount,
     clientId = props.clientId;
   var logger = usePaymentLogger();
-  var _useActiveExecute = useActiveExecute(),
-    executeIfActive = _useActiveExecute.executeIfActive;
 
   // 钱包推荐列表
   var _useState = useState([]),
@@ -118,7 +114,7 @@ export var useWalletPass = function useWalletPass(props) {
 
   // 获取checkout模块
   var checkoutModule = pisellos.getModule('checkout');
-  var shopDiscount = useShopDiscountModule();
+  var shopDiscount = pisellos.getModule('shopDiscount');
   var paymentModule = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.payment;
   var setWalletSelect = useMemoizedFn(function (data) {
     setSelectedWallet(data);
@@ -519,41 +515,30 @@ export var useWalletPass = function useWalletPass(props) {
     if (!paymentModule) return;
     var core = pisellos; // 获取core实例
 
-    // checkout 单实例，执行时判断是否active
-    var wrappedHandlePaymentStarted = executeIfActive(handlePaymentStarted);
-    var wrappedOnOrderCreated = executeIfActive(onOrderCreated);
-    var wrappedHandleWalletRecommendListUpdated = executeIfActive(handleWalletRecommendListUpdated);
-    var wrappedHandleUserIdentificationCodesUpdated = executeIfActive(handleUserIdentificationCodesUpdated);
-    var wrappedHandleWalletCacheCleared = executeIfActive(handleWalletCacheCleared);
-    var wrappedHandleSearchIdentificationCodeCompleted = executeIfActive(handleSearchIdentificationCodeCompleted);
-    var wrappedHandleWalletInitializationStarted = executeIfActive(handleWalletInitializationStarted);
-    var wrappedHandleWalletInitializationCompleted = executeIfActive(handleWalletInitializationCompleted);
-    var wrappedHandleWalletInitializationFailed = executeIfActive(handleWalletInitializationFailed);
     // 注册事件监听器
-    paymentModule.effectsOn('onWalletRecommendListUpdated', wrappedHandleWalletRecommendListUpdated);
-    // checkout 单实例，执行时判断是否active
-    checkoutModule.effectsOn('onPaymentStarted', wrappedHandlePaymentStarted);
-    checkoutModule.effectsOn('onPaymentItemAdded', wrappedHandlePaymentStarted);
-    paymentModule.effectsOn('onUserIdentificationCodesUpdated', wrappedHandleUserIdentificationCodesUpdated);
-    paymentModule.effectsOn('onWalletCacheCleared', wrappedHandleWalletCacheCleared);
-    paymentModule.effectsOn('onSearchIdentificationCodeCompleted', wrappedHandleSearchIdentificationCodeCompleted);
-    checkoutModule.effectsOn('onWalletDataInitialized', wrappedOnOrderCreated);
-    paymentModule.effectsOn('onWalletInitializationStarted', wrappedHandleWalletInitializationStarted);
-    paymentModule.effectsOn('onWalletInitializationCompleted', wrappedHandleWalletInitializationCompleted);
-    paymentModule.effectsOn('onWalletInitializationFailed', wrappedHandleWalletInitializationFailed);
+    core.effects.on('wallet:onWalletRecommendListUpdated', handleWalletRecommendListUpdated);
+    core.effects.on('checkout:onPaymentStarted', handlePaymentStarted);
+    core.effects.on('checkout:onPaymentItemAdded', handlePaymentStarted);
+    core.effects.on('wallet:onUserIdentificationCodesUpdated', handleUserIdentificationCodesUpdated);
+    core.effects.on('wallet:onWalletCacheCleared', handleWalletCacheCleared);
+    core.effects.on('wallet:onSearchIdentificationCodeCompleted', handleSearchIdentificationCodeCompleted);
+    core.effects.on('checkout:onWalletDataInitialized', onOrderCreated);
+    core.effects.on('wallet:onWalletInitializationStarted', handleWalletInitializationStarted);
+    core.effects.on('wallet:onWalletInitializationCompleted', handleWalletInitializationCompleted);
+    core.effects.on('wallet:onWalletInitializationFailed', handleWalletInitializationFailed);
 
     // 清理事件监听器
     return function () {
-      paymentModule.effectsOff('onWalletRecommendListUpdated', wrappedHandleWalletRecommendListUpdated);
-      checkoutModule.effectsOff('onPaymentStarted', wrappedHandlePaymentStarted);
-      checkoutModule.effectsOff('onPaymentItemAdded', wrappedHandlePaymentStarted);
-      paymentModule.effectsOff('onUserIdentificationCodesUpdated', wrappedHandleUserIdentificationCodesUpdated);
-      paymentModule.effectsOff('onWalletCacheCleared', wrappedHandleWalletCacheCleared);
-      paymentModule.effectsOff('onSearchIdentificationCodeCompleted', wrappedHandleSearchIdentificationCodeCompleted);
-      checkoutModule.effectsOff('onWalletDataInitialized', wrappedOnOrderCreated);
-      paymentModule.effectsOff('onWalletInitializationStarted', wrappedHandleWalletInitializationStarted);
-      paymentModule.effectsOff('onWalletInitializationCompleted', wrappedHandleWalletInitializationCompleted);
-      paymentModule.effectsOff('onWalletInitializationFailed', wrappedHandleWalletInitializationFailed);
+      core.effects.off('wallet:onWalletRecommendListUpdated', handleWalletRecommendListUpdated);
+      core.effects.off('checkout:onPaymentStarted', handlePaymentStarted);
+      core.effects.off('checkout:onPaymentItemAdded', handlePaymentStarted);
+      core.effects.off('wallet:onUserIdentificationCodesUpdated', handleUserIdentificationCodesUpdated);
+      core.effects.off('wallet:onWalletCacheCleared', handleWalletCacheCleared);
+      core.effects.off('wallet:onSearchIdentificationCodeCompleted', handleSearchIdentificationCodeCompleted);
+      core.effects.off('checkout:onWalletDataInitialized', onOrderCreated);
+      core.effects.off('wallet:onWalletInitializationStarted', handleWalletInitializationStarted);
+      core.effects.off('wallet:onWalletInitializationCompleted', handleWalletInitializationCompleted);
+      core.effects.off('wallet:onWalletInitializationFailed', handleWalletInitializationFailed);
     };
   }, [paymentModule]);
 

package/es/components/eftpos/deviceList/index.d.ts

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