@pisell/private-materials 6.5.31 → 6.5.32

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

@@ -30,7 +30,7 @@ import useEngineContext from "../../../../../hooks/useEngineContext";
 import { getProductDetail } from "../../../info/service/serve";
 import { getIsBundleOrCombination } from "../../../info/utils";
 import { getProductExtend } from "./utils";
-import { formatProductListByCategory, getIsEject, getIsOnlySession, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
+import { formatProductListByCategory, getIsEject, getIsOnlySession, getMainPrice, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import { useUpdateEffect } from 'ahooks';
 import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
@@ -297,13 +297,12 @@ var Info = function Info(props) {
           _extend: {
             start_date: state.date.value,
             quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
-            price: _detail.price,
             product_name: item.title,
             other: other
           },
           new: 1
         });
-        console.log(cacheItem, 'cacheItem', e);
+        cacheItem._extend.price = getMainPrice(cacheItem, _detail.price);
         var _total = getProductTotalPrice(cacheItem);
         // 用于折扣 可修改
         cacheItem._extend.total = _total;

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

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

package/es/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/es/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/es/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/es/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/es/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/es/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/es/components/booking/notes/NoteBlock/NoteItem/index.d.ts

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

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

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

package/es/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/es/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/es/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/es/components/booking/utils.d.ts

@@ -152,6 +152,7 @@ export declare const getIsOnlySession: (item: any) => boolean;
  * @Date: 2024-01-26 14:09
  */
 export declare const getServerItemExtend: (state: any, cacheItem: any, timeObj: any) => any;
+export declare const getMainPrice: (item: any, price?: number) => number;
 export declare const getProductTotalPrice: (item: any) => number;
 /**
  * @title: 判断 duration

package/es/components/booking/utils.js

@@ -18,7 +18,7 @@ import { locales } from '@pisell/utils';
 import { isDayBooking, formatDayDate } from "./info/service2/utils";
 import { intersectionBy } from 'lodash';
 import { getAppointmentTimingPreference } from "./info2/utilsByBooking";
-import Decimal from 'decimal.js';
+import Decimal from "decimal.js";
 
 /**
  * @title: 高阶函数结果缓存（Memoization）
@@ -789,11 +789,24 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
   return _extend;
 };
 
+// 获取主商品价格 包含组合规格
+export var getMainPrice = function getMainPrice(item, price) {
+  var _item$_extend;
+  var newPrice = new Decimal(price || item._extend.price || 0);
+  var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
+
+  // 多规格
+  if (other !== null && other !== void 0 && other.product_variant_id) {
+    newPrice = new Decimal((other === null || other === void 0 ? void 0 : other.price) || 0);
+  }
+  return newPrice.toNumber();
+};
+
 // 商品价格:   (商品价格 + (套餐价格 + 单规格价格 * 单规格数量) * 套餐数量 + 单规格价格 * 单规格数量)  * 商品数量
 export var getProductTotalPrice = function getProductTotalPrice(item) {
-  var _item$_extend;
+  var _item$_extend2;
   var price = new Decimal(item._extend.price || 0);
-  var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
+  var other = (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other;
 
   // 多规格
   if (other !== null && other !== void 0 && other.product_variant_id) {

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

@@ -15,11 +15,13 @@ interface PaymentModalProps {
     data?: PaymentModalData;
     callback?: (result: any) => void;
     onClose?: (reset?: boolean) => void;
-    dispatch?: (action: {
-        type: string;
-        payload?: any;
-    }) => void;
-    state?: any;
+    paymentResultDisplayMode?: string;
+    shopDiscount?: number;
+    client?: any;
+    currentTotalPrice?: number;
+    onChangeShopDiscount?: (discount: string) => void;
+    onChangeOrderNote?: (note: string) => void;
+    onDeleteOrderNote?: () => void;
 }
 interface PaymentModalMainProps extends PaymentModalProps {
     onClose?: (reset?: boolean) => void;

package/es/components/checkout/PaymentModal.js

@@ -1,6 +1,5 @@
 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 _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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; }
@@ -33,7 +32,6 @@ import WalletPassModule from "./components/WalletPassModule";
 import PaymentOptionsModule, { SHOW_METHODS_CODE } from "./components/PaymentOptionsModule";
 import CashPaymentModule from "./components/CashPaymentModule";
 import AdditionalModule from "./components/AdditionalModule";
-import { getSumTotal } from "../booking/components/footer/amount";
 import { closePaymentResultToast, closeAllPaymentResultToasts, setTillButton } from "./components/PaymentResultToast";
 import { formatCurrency, calculateStatusClassName, calculateAutoCloseConfig, displayPaymentResultToast, createShowSuccessToast } from "./utils/PaymentResultToastUtils";
 import { Printer, FileCheck02, RefreshCw05, CreditCard02, MessageTextSquare02, ArrowLeft, DotsVertical } from '@pisell/icon';
@@ -66,15 +64,13 @@ var CheckoutHooks = {
 
 // 支付弹窗主体内容组件
 var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
-  var _parentModuleConfig$s, _state$client2, _state$client3;
+  var _parentModuleConfig$s;
   var cartData = _ref.cartData,
     orderInfo = _ref.orderInfo,
     isModalOpen = _ref.isModalOpen,
     onPaymentComplete = _ref.onPaymentComplete,
     onPaymentCancel = _ref.onPaymentCancel,
     onStatusChange = _ref.onStatusChange,
-    dispatch = _ref.dispatch,
-    state = _ref.state,
     showingCashToastRef = _ref.showingCashToastRef,
     onToastClose = _ref.onToastClose,
     orderNote = _ref.orderNote,
@@ -92,7 +88,14 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     generateActionButtons = _ref.generateActionButtons,
     paymentResultToastConfig = _ref.paymentResultToastConfig,
     updateOrderInfo = _ref.updateOrderInfo,
-    setCurrentEditOrderId = _ref.setCurrentEditOrderId;
+    setCurrentEditOrderId = _ref.setCurrentEditOrderId,
+    paymentResultDisplayMode = _ref.paymentResultDisplayMode,
+    shopDiscount = _ref.shopDiscount,
+    client = _ref.client,
+    currentTotalPrice = _ref.currentTotalPrice,
+    onChangeShopDiscount = _ref.onChangeShopDiscount,
+    onChangeOrderNote = _ref.onChangeOrderNote,
+    onDeleteOrderNote = _ref.onDeleteOrderNote;
   var context = useEngineContext();
   var utils = context.appHelper.utils || {};
   var pisellos = utils.pisellos,
@@ -579,7 +582,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           // );
           var orderPaymentAddedUnsubscribe = core.effects.on(CheckoutHooks.OnOrderPaymentAdded, executeIfActive( /*#__PURE__*/function () {
             var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(data) {
-              var orderInfo, balanceDueAmount, _state$bookingConfig, autoCloseConfig, _paymentItems, _totalAmount, serviceChargeTotal, isToastMode, paymentMethodName, isCashPayment, _interaction$utils3, _interaction$utils3$p;
+              var orderInfo, balanceDueAmount, autoCloseConfig, _paymentItems, _totalAmount, serviceChargeTotal, isToastMode, paymentMethodName, isCashPayment, _interaction$utils3, _interaction$utils3$p;
               return _regeneratorRuntime().wrap(function _callee5$(_context5) {
                 while (1) switch (_context5.prev = _context5.next) {
                   case 0:
@@ -620,7 +623,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                     }
                     console.log(_totalAmount, _paymentItems);
                     // 弹窗模式判断
-                    isToastMode = (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.payment_setting) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.payment_result_display_mode) !== 'modal';
+                    isToastMode = paymentResultDisplayMode !== 'modal';
                     if (!isToastMode) {
                       autoCloseConfig.autoClose = false;
                       autoCloseConfig.autoCloseDelay = 0;
@@ -914,64 +917,11 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       return walletPassRef.current.handleSearchIdentificationCode(keyword);
     }
   }, []);
-  var getDataFromHost = function getDataFromHost() {
-    try {
-      var is_price_include_tax = getData('is_price_include_tax');
-      var tax_rate = getData('tax_rate') || '10';
-      var tax_title = getData('tax_title') || 'GST';
-      var surcharge_list = getData('surcharge_list');
-      var schedule_list = getData('schedule_list');
-      var scheduleById = {};
-      // 提前转换，节省附加费计算时的遍历时间
-      if (Array.isArray(schedule_list)) {
-        var _iterator = _createForOfIteratorHelper(schedule_list),
-          _step;
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var item = _step.value;
-            scheduleById[item.id] = item;
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
-        }
-      }
-      return {
-        is_price_include_tax: is_price_include_tax,
-        tax_rate: tax_rate,
-        tax_title: tax_title,
-        surcharge_list: surcharge_list,
-        schedule_list: schedule_list,
-        scheduleById: scheduleById
-      };
-    } catch (error) {
-      console.error(error);
-      return {};
-    }
-  };
-
-  // 计算当前订单总价(不包含税费那些，所以应该是产品总价)
-  var currentTotalPrice = useMemo(function () {
-    if (!showPriceAdjustModal) return 0;
-    var ScheduleModule = pisellosAllModule.ScheduleModule;
-    try {
-      var _getSumTotal = getSumTotal(state, _objectSpread({
-          isEdit: true,
-          ScheduleModule: ScheduleModule
-        }, getDataFromHost())),
-        productAmount = _getSumTotal.productAmount;
-      return productAmount;
-    } catch (error) {
-      console.error('计算总价失败:', error);
-      return 0;
-    }
-  }, [state, showPriceAdjustModal]);
 
   // 手动折扣后订单总价
   var currentTotalPriceAfterDiscount = useMemo(function () {
-    return new Decimal(currentTotalPrice).minus(state.shop_discount || 0).toNumber();
-  }, [state.shop_discount, currentTotalPrice]);
+    return new Decimal(currentTotalPrice || 0).minus(shopDiscount || 0).toNumber();
+  }, [shopDiscount, currentTotalPrice]);
   var handleSelectWalletChange = useMemoizedFn( /*#__PURE__*/function () {
     var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(select) {
       var voucherItems, data;
@@ -1035,14 +985,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           case 0:
             try {
               if (checkoutModule && orderInfo !== null && orderInfo !== void 0 && orderInfo.totalAmount) {
-                if (dispatch) {
-                  dispatch({
-                    type: 'setState',
-                    payload: {
-                      shop_discount: discountAmount
-                    }
-                  });
-                }
+                onChangeShopDiscount === null || onChangeShopDiscount === void 0 || onChangeShopDiscount(discountAmount);
               }
             } catch (error) {
               console.error('Failed to adjust price:', error);
@@ -1174,8 +1117,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     };
   });
   var getCustomerInfo = function getCustomerInfo() {
-    var _state$client, _client$contacts;
-    var client = state === null || state === void 0 || (_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value;
+    var _client$contacts;
+    // const client = state?.client?.value;
 
     // 修复逻辑：只有在 undefined 或 null 时才使用默认值，空字符串应该保留
     var getValidName = function getValidName(value) {
@@ -1271,9 +1214,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 处理PaymentModal区域的点击事件
   var handleModalClick = useCallback(function (event) {
-    var _state$bookingConfig2;
     // 关闭所有Toast
-    var isToastMode = (state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.payment_setting) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.payment_result_display_mode) !== 'modal';
+    var isToastMode = paymentResultDisplayMode !== 'modal';
     if (isToastMode) {
       closeAllPaymentResultToasts();
     }
@@ -1297,14 +1239,14 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     },
     onSearch: handleSearch
   }, searchAndClientProps)), moduleConfig.showWalletPass && /*#__PURE__*/React.createElement(WalletPassModule, {
-    clientId: state === null || state === void 0 || (_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id,
+    clientId: client === null || client === void 0 ? void 0 : client.id,
     customAmount: balanceDueAmount,
     orderInfo: orderInfo || undefined,
     ref: walletPassRef,
     paymentItems: paymentItems,
     onSelectChange: handleSelectWalletChange
   })), /*#__PURE__*/React.createElement(AmountSummary, {
-    amountSymbol: state.amountSymbol,
+    amountSymbol: getData('shop_symbol'),
     orderInfo: orderInfo || undefined,
     cartData: cartData,
     open_deposit: open_deposit,
@@ -1312,7 +1254,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     balanceDueAmount: balanceDueAmount,
     paymentItems: paymentItems,
     walletPassData: walletPassData,
-    clientInfo: state === null || state === void 0 || (_state$client3 = state.client) === null || _state$client3 === void 0 ? void 0 : _state$client3.value,
+    clientInfo: client,
     onAmountChange: handleAmountChange,
     onDepositStatusChange: handleDepositStatusChange,
     onBalanceDueAmountClick: handleButtonClick,
@@ -1345,7 +1287,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       gridRow: (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) > 3 ? '1 / 3' : '1'
     } : {}
   }, /*#__PURE__*/React.createElement(PaymentOptionsModule, {
-    amountSymbol: state.amountSymbol,
+    amountSymbol: getData('shop_symbol'),
     orderInfo: orderInfo || undefined,
     onClick: onPaymentOptionClick,
     paymentMethods: paymentMethods,
@@ -1397,7 +1339,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     onEnter: handlePriceAdjustConfirm
   }), /*#__PURE__*/React.createElement(SavePayLaterHandler, {
     ref: savePayLaterHandlerRef,
-    amountSymbol: state.amountSymbol,
+    amountSymbol: getData('shop_symbol'),
     walletPassData: walletPassData,
     onSavePayLater: handleSavePayLater
   }), /*#__PURE__*/React.createElement(PaymentKeyboard, {
@@ -1445,10 +1387,15 @@ var PaymentModal = function PaymentModal(_ref18) {
     data = _ref18.data,
     callback = _ref18.callback,
     onClose = _ref18.onClose,
-    dispatch = _ref18.dispatch,
-    state = _ref18.state,
     setEditCartMode = _ref18.setEditCartMode,
-    editOrderId = _ref18.editOrderId;
+    editOrderId = _ref18.editOrderId,
+    paymentResultDisplayMode = _ref18.paymentResultDisplayMode,
+    shopDiscount = _ref18.shopDiscount,
+    client = _ref18.client,
+    currentTotalPrice = _ref18.currentTotalPrice,
+    onChangeShopDiscount = _ref18.onChangeShopDiscount,
+    onChangeOrderNote = _ref18.onChangeOrderNote,
+    onDeleteOrderNote = _ref18.onDeleteOrderNote;
   var context = useEngineContext();
   locales.init(checkoutLocales, ((_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getApp) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.locales) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getLocale) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.call(_context$appHelper$ut2)) || ((_context$appHelper$ut4 = context.appHelper.utils) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut4.storage) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.get('umi_locale')) || 'en');
   var _ref19 = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
@@ -1667,15 +1614,7 @@ var PaymentModal = function PaymentModal(_ref18) {
             Toast === null || Toast === void 0 || Toast.success(locales.getText('pisell2.checkout.order-note.updated-successfully'));
           case 13:
             // 同时把购物车的也给改了
-            if (dispatch) {
-              dispatch({
-                type: 'setNotes',
-                payload: {
-                  orderNote: noteValue,
-                  edit: true
-                }
-              });
-            }
+            onChangeOrderNote === null || onChangeOrderNote === void 0 || onChangeOrderNote(noteValue);
 
             // 根据打开来源执行不同的逻辑
             if (noteModalSource === 'payment-result-toast') {
@@ -1724,15 +1663,7 @@ var PaymentModal = function PaymentModal(_ref18) {
             Toast === null || Toast === void 0 || Toast.success(locales.getText('pisell2.checkout.order-note.deleted-successfully'));
           case 7:
             // 同时把购物车的也给改了
-            if (dispatch) {
-              dispatch({
-                type: 'setNotes',
-                payload: {
-                  orderNote: '',
-                  edit: true
-                }
-              });
-            }
+            onDeleteOrderNote === null || onDeleteOrderNote === void 0 || onDeleteOrderNote();
             _context18.next = 14;
             break;
           case 10:
@@ -2058,7 +1989,7 @@ var PaymentModal = function PaymentModal(_ref18) {
       }
     })), /*#__PURE__*/React.createElement("div", {
       className: "header__center"
-    }, translation('order.total'), "\uFF1A", formatCurrency(totalAmount, state === null || state === void 0 ? void 0 : state.amountSymbol)), /*#__PURE__*/React.createElement("div", {
+    }, translation('order.total'), "\uFF1A", formatCurrency(totalAmount, getData('shop_symbol'))), /*#__PURE__*/React.createElement("div", {
       className: "header__right"
     }, /*#__PURE__*/React.createElement(Button, {
       size: "small",
@@ -2165,7 +2096,7 @@ var PaymentModal = function PaymentModal(_ref18) {
               unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', executeIfActive( /*#__PURE__*/function () {
                 var _ref29 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(data) {
                   var _data$response, _responseData$payment2;
-                  var currentOrderId, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _state$bookingConfig3, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, _interaction$utils6, _interaction$utils6$a, _orderInfo3, isToastMode, paymentResult;
+                  var currentOrderId, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, _interaction$utils6, _interaction$utils6$a, _orderInfo3, isToastMode, paymentResult;
                   return _regeneratorRuntime().wrap(function _callee22$(_context22) {
                     while (1) switch (_context22.prev = _context22.next) {
                       case 0:
@@ -2270,7 +2201,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                         enabledAutoPrint = _context22.sent;
                       case 27:
                         _orderInfo3 = checkout.getCurrentOrderInfo(); // 弹窗模式判断
-                        isToastMode = (state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.payment_setting) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.payment_result_display_mode) !== 'modal';
+                        isToastMode = paymentResultDisplayMode !== 'modal';
                         if (!isToastMode) {
                           autoCloseConfig.autoClose = false;
                           autoCloseConfig.autoCloseDelay = 0;
@@ -2415,12 +2346,12 @@ var PaymentModal = function PaymentModal(_ref18) {
     getData: getData,
     interaction: interaction,
     Toast: Toast,
-    state: state,
     onToastClose: handleToastClose
   };
 
   // 支付结果弹窗按钮生成函数
-  var generateActionButtons = function generateActionButtons(paymentStatus, enabledAutoPrint) {
+  var generateActionButtons = function generateActionButtons(paymentStatus) {
+    var enabledAutoPrint = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var getClassName = function getClassName(suffix) {
       return "payment-result-toast-".concat(suffix);
     };
@@ -2829,8 +2760,13 @@ var PaymentModal = function PaymentModal(_ref18) {
     onPaymentCancel: handlePaymentCancel
     // onStatusChange={(status) => console.log('Status changed:', status)}
     ,
-    dispatch: dispatch,
-    state: state,
+    paymentResultDisplayMode: paymentResultDisplayMode,
+    shopDiscount: shopDiscount,
+    client: client,
+    currentTotalPrice: currentTotalPrice,
+    onChangeShopDiscount: onChangeShopDiscount,
+    onChangeOrderNote: onChangeOrderNote,
+    onDeleteOrderNote: onDeleteOrderNote,
     showingCashToastRef: showingCashToastRef,
     onToastClose: handleToastClose,
     orderNote: orderNote,

package/es/components/checkout/components/AdditionalModule/index.js

@@ -112,6 +112,8 @@ function AdditionalModule(_ref) {
           handleButtonClick('print-receipt');
         } else if (key === 'split-payment') {
           handleButtonClick('split-payment');
+        } else if (key === 'print-receipt') {
+          handleButtonClick('print-receipt');
         }
       }
     },

package/es/components/checkout/components/AmountSummary/index.less

@@ -248,7 +248,6 @@
 
   .balance-due-label {
     font-size: 16px;
-    color: #7f56da;
     font-weight: 400;
     line-height: 1.5;
     margin-bottom: 4px;
@@ -256,7 +255,7 @@
 
   .balance-due-amount {
     font-size: 14px;
-    font-weight: 400;
+    font-weight: 600;
     color: #7f56da;
     line-height: 0.75;
     text-decoration: underline;
@@ -272,13 +271,13 @@
   .pay-text {
     font-size: 16px;
     font-weight: 500;
-    color: #7f56da;
     letter-spacing: 0.09375em;
+    margin-top: 12px;
   }
 
   .pay-amount {
-    font-size: 32px;
-    font-weight: 400;
+    font-size: 36px;
+    font-weight: 600;
     color: #1e1830;
     line-height: 0.75;
   }

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

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

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/utils/PaymentResultToastUtils.d.ts

@@ -6,7 +6,6 @@ export interface PaymentResultToastConfig {
     getData: (key: string) => any;
     interaction: any;
     Toast: any;
-    state: any;
     onToastClose?: () => void;
 }
 export interface PaymentResultToastParams {

package/es/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/es/components/eftpos/form/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang

package/es/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/es/components/eftpos/hooks.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

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

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

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

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

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

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

package/es/components/eftpos/pos.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DeviceProp } from "./const";
 interface PosProps {
     eftposName: string;

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

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