@pisell/private-materials 6.4.5 → 6.4.7

package/es/components/checkout/PaymentModal.js

@@ -33,7 +33,7 @@ import PaymentOptionsModule from "./components/PaymentOptionsModule";
 import CashPaymentModule from "./components/CashPaymentModule";
 import AdditionalModule from "./components/AdditionalModule";
 import { getSumTotal } from "../booking/components/footer/amount";
-import { usePaymentResultToast, PaymentResultToastProvider, closePaymentResultToast } from "./components/PaymentResultToast";
+import { PaymentResultToastProvider, closePaymentResultToast } from "./components/PaymentResultToast";
 import { formatCurrency, calculateStatusClassName, calculateAutoCloseConfig, displayPaymentResultToast, createShowSuccessToast } from "./utils/PaymentResultToastUtils";
 import { Printer, FileCheck02, RefreshCw05, CreditCard02, MessageTextSquare02, ArrowLeft, DotsVertical } from '@pisell/icon';
 import { checkoutStyles } from "./styles";
@@ -66,6 +66,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _parentModuleConfig$s, _state$client2, _state$client3;
   var cartData = _ref.cartData,
     orderInfo = _ref.orderInfo,
+    isModalOpen = _ref.isModalOpen,
     onPaymentComplete = _ref.onPaymentComplete,
     onPaymentCancel = _ref.onPaymentCancel,
     onStatusChange = _ref.onStatusChange,
@@ -92,7 +93,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     pisellosAllModule = utils.pisellosAllModule,
     interaction = utils.interaction;
   var Toast = useToast();
-  var paymentResultToast = usePaymentResultToast();
+  // const paymentResultToast = usePaymentResultToast();
+
   var checkoutRef = useRef(null);
   var savePayLaterHandlerRef = useRef(null);
   // 剩余待付金额-可自定义修改，也可认作支付方式付出去需要付多少钱
@@ -352,8 +354,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 初始化自定义金额
   useEffect(function () {
-    console.time('initCustomAmount');
-    if (checkoutModule && orderInfo) {
+    if (checkoutModule && orderInfo && isModalOpen) {
       try {
         var currentAmount = checkoutModule.getStateAmount();
         if (currentAmount) {
@@ -375,8 +376,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       // 没有os 数据的时候先用外面传入的购物车数据展示
       // setCustomAmount(cartData?.total?.expectAmount || 0);
     }
-    console.timeEnd('initCustomAmount');
-    if (checkoutModule) {
+    if (checkoutModule && isModalOpen) {
       checkoutModule.getPaymentMethodsAsync().then(function (paymentMethods) {
         setPaymentMethods(paymentMethods);
         // TODO: 现金枚举类型需要从os导入
@@ -394,7 +394,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 初始化推荐金额
   useEffect(function () {
-    if (customAmount && checkoutModule && currency && orderInfo) {
+    if (customAmount && checkoutModule && currency && orderInfo && isModalOpen) {
       try {
         setRecommendAmounts(checkoutModule.payment.cash.getRecommendedAmount(customAmount, currency));
       } catch (error) {
@@ -405,7 +405,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 监听金额变化事件
   useEffect(function () {
-    if (checkoutModule && checkoutModule.core) {
+    if (checkoutModule && checkoutModule.core && isModalOpen) {
       try {
         var core = checkoutModule.core;
         if (core.effects && typeof core.effects.on === 'function') {
@@ -1136,7 +1136,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
 var PaymentModal = function PaymentModal(_ref16) {
   var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper;
-  var data = _ref16.data,
+  var open = _ref16.open,
+    data = _ref16.data,
     callback = _ref16.callback,
     onClose = _ref16.onClose,
     dispatch = _ref16.dispatch,
@@ -1444,7 +1445,7 @@ var PaymentModal = function PaymentModal(_ref16) {
       status: 'cancelled'
     });
     var checkout = pisellos.getModule('checkout');
-    checkout.cancelCheckoutAsync();
+    checkout.cancelCurrentOrderAsync();
     onClose === null || onClose === void 0 || onClose(reset || false);
   };
 
@@ -1564,13 +1565,13 @@ var PaymentModal = function PaymentModal(_ref16) {
                 if (paymentStatus) {
                   // 确定支付状态
                   var statusClassName = calculateStatusClassName(paymentStatus);
-                  var autoCloseConfig = calculateAutoCloseConfig(paymentStatus, !!gapAmount);
+                  var autoCloseConfig = calculateAutoCloseConfig(paymentStatus, !!currentChangeGivenAmount);
 
                   // 根据支付状态展示不同的 toast
                   displayPaymentResultToast({
                     paymentStatus: paymentStatus,
                     orderTotalAmount: orderTotalAmount,
-                    gapAmount: currentChangeGivenAmount,
+                    gapAmount: paymentStatus === 'partially_paid' ? gapAmount : currentChangeGivenAmount,
                     failureReason: failureReason,
                     autoCloseConfig: autoCloseConfig,
                     actionButtons: generateActionButtons(paymentStatus)
@@ -1581,7 +1582,7 @@ var PaymentModal = function PaymentModal(_ref16) {
                     toastInfo: {
                       status: paymentStatus,
                       amount: orderTotalAmount,
-                      gapAmount: gapAmount,
+                      gapAmount: currentChangeGivenAmount,
                       failureReason: failureReason
                     }
                   });
@@ -1659,10 +1660,10 @@ var PaymentModal = function PaymentModal(_ref16) {
         return _ref21.apply(this, arguments);
       };
     }();
-    if (data) {
+    if (data && open) {
       initCheckoutData();
     }
-  }, [data]);
+  }, [data, open]);
 
   // 创建PaymentResultToast配置对象
   var paymentResultToastConfig = {
@@ -2001,17 +2002,18 @@ var PaymentModal = function PaymentModal(_ref16) {
 
   // 使用新的工具方法创建showSuccessToast函数
   var showSuccessToast = createShowSuccessToast(paymentResultToastConfig, generateActionButtons);
-  console.log('✅ PaymentModal: Rendering PisellContainer with open=true');
-  return /*#__PURE__*/React.createElement(PaymentResultToastProvider, null, /*#__PURE__*/React.createElement(PisellContainer, {
+  return /*#__PURE__*/React.createElement(PaymentResultToastProvider, null, /*#__PURE__*/React.createElement(PisellContainer
+  // open={open}
+  , {
     renderType: "modal",
     props: {
-      open: true,
+      open: open,
       onCancel: function onCancel() {
         handlePaymentCancel(false);
       },
       title: /*#__PURE__*/React.createElement(CustomHeader, null),
       width: 880,
-      destroyOnClose: true,
+      destroyOnClose: false,
       maskClosable: false,
       footer: null,
       closeIcon: null,
@@ -2032,6 +2034,7 @@ var PaymentModal = function PaymentModal(_ref16) {
     }
   }, /*#__PURE__*/React.createElement(PaymentContent, {
     ref: paymentContentRef,
+    isModalOpen: open,
     cartData: cloneDeep(data),
     orderInfo: orderInfo,
     onPaymentComplete: handlePaymentComplete,

package/es/components/checkout/PaymentPlugin.d.ts

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

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

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

package/es/components/checkout/components/WalletPassModule/components/DiscountWallet/DiscountTextMode.js

@@ -1,4 +1,6 @@
 import React from 'react';
+import { PisellText } from '@pisell/materials';
+var Amount = PisellText.Amount;
 var DiscountTextMode = function DiscountTextMode(_ref) {
   var cardData = _ref.cardData,
     selectedWalletIds = _ref.selectedWalletIds;
@@ -14,7 +16,10 @@ var DiscountTextMode = function DiscountTextMode(_ref) {
       className: "discount-text-name"
     }, card.name), /*#__PURE__*/React.createElement("span", {
       className: "discount-text-amount"
-    }, "-", card.savedAmount ? "$".concat(card.savedAmount) : '$0'));
+    }, "-", /*#__PURE__*/React.createElement(Amount, {
+      value: card.savedAmount,
+      showCurrencySymbol: true
+    })));
   }) : /*#__PURE__*/React.createElement("div", {
     className: "discount-text-empty"
   }));

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

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

package/es/components/checkout/components/WalletPassModule/components/WalletPassTextMode/index.js

@@ -1,5 +1,7 @@
 import React from 'react';
+import { PisellText } from '@pisell/materials';
 import "./index.less";
+var Amount = PisellText.Amount;
 var WalletPassTextMode = function WalletPassTextMode(_ref) {
   var cardData = _ref.cardData,
     selectedWalletIds = _ref.selectedWalletIds;
@@ -15,7 +17,10 @@ var WalletPassTextMode = function WalletPassTextMode(_ref) {
       className: "wallet-pass-text-name"
     }, card.name), /*#__PURE__*/React.createElement("span", {
       className: "wallet-pass-text-amount"
-    }, "-", card.redeem ? "".concat(card.redeem) : '$0'));
+    }, "-", /*#__PURE__*/React.createElement(Amount, {
+      value: card.redeem,
+      showCurrencySymbol: true
+    })));
   }) : /*#__PURE__*/React.createElement("div", {
     className: "wallet-pass-text-empty"
   }));

package/es/components/checkout/utils/PaymentResultToastUtils.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { locales, formatAmount } from '@pisell/utils';
+import Decimal from 'decimal.js';
 import { showPaymentResultToastSuccess, showPaymentResultToastFailed } from "../components/PaymentResultToast";
 
 // 支付结果Toast工具类的配置参数接口
@@ -49,7 +50,7 @@ export var calculateSubtitle = function calculateSubtitle(status, amount, gapAmo
       }
       break;
     case 'partially_paid':
-      var displayAmount = gapAmount !== null && gapAmount !== void 0 ? gapAmount : amount;
+      var displayAmount = new Decimal(amount).minus(gapAmount !== null && gapAmount !== void 0 ? gapAmount : 0).toNumber();
       text = "".concat(locales.getText('payment.result.partiallyPaid') || 'Partially Paid', " ").concat(formatCurrency(displayAmount, amountSymbol));
       colorClass = 'partially-paid'; // 橙色
       break;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.css';
 /**
  * @title: 自定义组件设置

package/es/components/eftposPay/app.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PosProps, RouteType } from './const';
 declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
     action: RouteType;

package/es/components/eftposPay/component/fail/failCustom.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/fail/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/fail/unknow.d.ts

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

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

package/es/components/eftposPay/linkly/index.d.ts

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

package/es/components/eftposPay/pay.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PayProps } from './const';
 import './index.less';
 /**

package/es/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: "loading" | "warn" | "success" | "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" | "fullPay" | "pay" | "query" | undefined;
+        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
+        action?: "pay" | "amount" | "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?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/eventBooking/components/Provider/Cart/Item/Total.d.ts

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

package/es/components/eventBooking/components/Provider/Information/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts

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

package/es/components/eventBooking/components/scheduleCalendar/calendarItem.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem } from '../../type';
 declare type CalendarItemProps = {
     month: string;

package/es/components/eventBooking/index.d.ts

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

package/es/components/pay/toB/components/Cache/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ToBPayCache: (props: {
     open: boolean;

package/es/components/pay/toB/components/Card/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PayMethod } from '../../types';
 import './index.less';
 declare const ToBPayCard: ({ data, onChange, }: {

package/es/components/pay/toB/components/CardGroup/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PayMethod, PayMethodGroup } from '../../types';
 import './index.less';
 declare const ToBPayCardGroup: (props: {

package/es/components/pay/toB/components/Content/Footer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const ToBPayFooter: (props: {
     loading: boolean;
     submitDisabled: boolean;

package/es/components/pay/toB/components/Content/Header.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const ToBPayTitle: (props: {
     amount: number | string;
 }) => JSX.Element;

package/es/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.d.ts

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

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.d.ts

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

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/SDK.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.d.ts

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

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/PaymentRequestForm.d.ts

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

package/es/components/pay/toC/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -28,4 +29,11 @@ export interface PayGroup {
     pay_number?: string;
     _order: any;
 }
-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/pisellSelectCustomerModal/RightPanel/Add/PhoneField/index.d.ts

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

package/es/components/pisellSelectCustomerModal/RightPanel/index.d.ts

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

package/es/components/pisellSelectCustomerModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PopoverProps } from 'antd';
 import { CustomerCardProps } from './CustomerCard';
 import './index.less';

package/es/components/productExtension/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface ProductExtensionProps {
     onDataChange: any;

package/es/components/productSelect/components/TabProduct/index.d.ts

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

package/es/components/productSelect/components/productGroup/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare type BoolConfigVal = 0 | 1;
 export interface ProductCardConfig {

package/es/components/schedules/components/ScheduleList/RenderScheduleItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { ScheduleItem } from '../../../type';
 declare type Item = any;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,4 +69,11 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-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/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/AddSchedules/index.d.ts

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

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type Value = number[];
 declare const SchedulesModule: ({ value, onChange, drawerContainer, ruleFn, tabKey, previewItemChange, isSelf, isTitle, }: {

package/es/components/taxSelect/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
 import "./index.less";
 interface TaxSelectProps {

package/es/components/ticketBooking/components/addServiceVariant/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

package/es/components/ticketBooking/components/menuBar/index.d.ts

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

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -25,8 +25,8 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { locales } from '@pisell/utils';
 import { message } from 'antd';
-import { Iconfont } from '@pisell/materials';
-import { getOrderInfoByCode, getBookingDetail, getEventBookingDetail, getBookingConfig, getServices, voidAppointment } from "../../serve";
+import { Iconfont, PisellModal } from '@pisell/materials';
+import { getOrderInfoByCode, getBookingDetail, getEventBookingDetail, getBookingConfig, getServices } from "../../serve";
 import * as apis from "../../serve";
 import dayjs from 'dayjs';
 import useEngineContext from "../../../../hooks/useEngineContext";
@@ -247,6 +247,10 @@ var TicketBooking = function TicketBooking() {
     _useState2 = _slicedToArray(_useState, 2),
     activeBookingId = _useState2[0],
     setActiveBookingId = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    showTerminalUpgradeModal = _useState4[0],
+    setShowTerminalUpgradeModal = _useState4[1];
   var pisellFloatingPanelRef = useRef(null);
   var closeRef = useRef(null);
   var bookingTicket = useBookingTicket();
@@ -261,6 +265,26 @@ var TicketBooking = function TicketBooking() {
       changeCustomerToGlobalState: changeCustomerToGlobalState
     }),
     selectCustomer = _useCustomer.selectCustomer;
+
+  // 检测Terminal版本并显示升级提示
+  var checkTerminalVersion = useMemoizedFn(function () {
+    if (isTerminal()) {
+      var userAgent = navigator.userAgent;
+      if (userAgent.includes('terminal')) {
+        // 匹配 terminal/x.x.x(xxx) 格式，支持多位数
+        var terminalVersionMatch = userAgent.match(/terminal\/[\d.]+\((\d+)\)/i);
+        if (terminalVersionMatch && terminalVersionMatch[1]) {
+          var buildNumberStr = terminalVersionMatch[1];
+          var buildNumber = parseInt(buildNumberStr, 10);
+
+          // 确保解析成功且是有效数字
+          if (!isNaN(buildNumber) && buildNumber > 0 && buildNumber < 766) {
+            setShowTerminalUpgradeModal(true);
+          }
+        }
+      }
+    }
+  });
   useMemo(function () {
     openScan(function (data) {
       handleScan(data);
@@ -336,6 +360,9 @@ var TicketBooking = function TicketBooking() {
     });
     _setShopOpeningHours();
     _setIntervalTime(true);
+
+    // 检测Terminal版本
+    checkTerminalVersion();
     interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || _interaction$utils.mountFunction('bookingTicket', 'clearAllCart', function (type, orderId) {
       console.log('bookingTicket.clearAllCart');
       // 支付成功后清空状态
@@ -349,8 +376,9 @@ var TicketBooking = function TicketBooking() {
 
     // 作废预约
     interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || _interaction$utils2.mountFunction('booking', 'voidBooking', function (orderId) {
-      voidAppointment(orderId);
-      enableAllScanListeners();
+      // checkout2.0 结账时不生成订单 所以不需要作废订单
+      // voidAppointment(orderId);
+      // enableAllScanListeners();
     });
     return function () {
       off === null || off === void 0 || off();
@@ -387,6 +415,7 @@ var TicketBooking = function TicketBooking() {
       intervalSetTime: isInterval
     });
   };
+  useEffect(function () {}, []);
   var getDataFromHost = function getDataFromHost() {
     try {
       var is_price_include_tax = getData('is_price_include_tax');
@@ -1210,6 +1239,19 @@ var TicketBooking = function TicketBooking() {
     ref: pisellFloatingPanelRef,
     currentDate: currentDate,
     onBookingClick: handleBookingClick
+  }), /*#__PURE__*/React.createElement(PisellModal.Information, {
+    open: showTerminalUpgradeModal,
+    title: locales.getText('pisell2.ticket-booking.terminal-upgrade-title'),
+    describe: locales.getText('pisell2.ticket-booking.terminal-upgrade-description'),
+    okText: locales.getText('pisell2.ticket-booking.terminal-upgrade-ok'),
+    cancelText: locales.getText('pisell2.ticket-booking.terminal-upgrade-cancel'),
+    closable: true,
+    onOk: function onOk() {
+      return setShowTerminalUpgradeModal(false);
+    },
+    onCancel: function onCancel() {
+      return setShowTerminalUpgradeModal(false);
+    }
   }));
 };
 export default TicketBooking;

package/es/components/ticketBooking/components/timeBar/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { Dayjs } from 'dayjs';
 import './index.less';
 interface ITimeBarProps {

package/es/components/ticketBooking/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface TicketBookingProps {
     productExtensionType: string[];