@pisell/private-materials 6.7.6 → 6.7.8

package/es/components/checkout/PaymentModal.js

@@ -1,5 +1,6 @@
 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; }
@@ -29,9 +30,10 @@ import SendPaymentLinkModal from "./components/SendPaymentLinkModal";
 import AmountSummary from "./components/AmountSummary/index";
 import SavePayLaterHandler from "./components/SavePayLaterHandler";
 import WalletPassModule from "./components/WalletPassModule";
-import PaymentOptionsModule, { SHOW_METHODS_CODE } from "./components/PaymentOptionsModule";
+import PaymentOptionsModule 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';
@@ -45,7 +47,7 @@ import { getShopWalletPassId, reorderPaymentMethodList } from "./utils";
 import usePaymentLogger from "./hooks/usePaymentLogger";
 import { Button } from 'antd';
 import usePrinter from "../../hooks/printer";
-import { DiscountKeyboard, PaymentKeyboard } from "../../pro/priceKeyboard";
+import { DiscountKeyboard } from "../../pro/priceKeyboard";
 import { useActiveExecute } from "../ticketBooking/hooks/pisellos";
 
 // Checkout 模块的事件常量
@@ -64,13 +66,15 @@ var CheckoutHooks = {
 
 // 支付弹窗主体内容组件
 var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
-  var _parentModuleConfig$s;
+  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,
+    dispatch = _ref.dispatch,
+    state = _ref.state,
     showingCashToastRef = _ref.showingCashToastRef,
     onToastClose = _ref.onToastClose,
     orderNote = _ref.orderNote,
@@ -88,14 +92,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     generateActionButtons = _ref.generateActionButtons,
     paymentResultToastConfig = _ref.paymentResultToastConfig,
     updateOrderInfo = _ref.updateOrderInfo,
-    setCurrentEditOrderId = _ref.setCurrentEditOrderId,
-    paymentResultDisplayMode = _ref.paymentResultDisplayMode,
-    shopDiscount = _ref.shopDiscount,
-    client = _ref.client,
-    currentTotalPrice = _ref.currentTotalPrice,
-    onChangeShopDiscount = _ref.onChangeShopDiscount,
-    onChangeOrderNote = _ref.onChangeOrderNote,
-    onDeleteOrderNote = _ref.onDeleteOrderNote;
+    setCurrentEditOrderId = _ref.setCurrentEditOrderId;
   var context = useEngineContext();
   var utils = context.appHelper.utils || {};
   var pisellos = utils.pisellos,
@@ -128,46 +125,37 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     recommendAmounts = _useState8[0],
     setRecommendAmounts = _useState8[1];
-  var _useState9 = useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    showSplitPaymentKeyboard = _useState10[0],
-    setShowSplitPaymentKeyboard = _useState10[1];
   var paymentMethodsRef = useRef(null);
-  var _useState11 = useState([]),
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    paymentMethods = _useState10[0],
+    setPaymentMethods = _useState10[1];
+  var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    paymentMethods = _useState12[0],
-    setPaymentMethods = _useState12[1];
-  var _useState13 = useState(false),
+    showCashPayment = _useState12[0],
+    setShowCashPayment = _useState12[1];
+  var _useState13 = useState(locales.getText('cards.and.digitals') || 'Cards & Digitals'),
     _useState14 = _slicedToArray(_useState13, 2),
-    showCashPayment = _useState14[0],
-    setShowCashPayment = _useState14[1];
-  var _useState15 = useState(locales.getText('cards.and.digitals') || 'Cards & Digitals'),
-    _useState16 = _slicedToArray(_useState15, 2),
-    paymentOptionsTitle = _useState16[0],
-    setPaymentOptionsTitle = _useState16[1];
-  var paymentOptionList = useMemo(function () {
-    return paymentMethods.filter(function (item) {
-      return !(item.type === 'app' && item.code === 'EFTPOS_LINKLY') && (['custom'].includes(item.type) || SHOW_METHODS_CODE.includes(item.code));
-    });
-  }, [paymentMethods]);
+    paymentOptionsTitle = _useState14[0],
+    setPaymentOptionsTitle = _useState14[1];
   var clientChangedRef = useRef(false);
   var walletPassRef = useRef(null);
   // 已保存的支付项数据
-  var _useState17 = useState([]),
-    _useState18 = _slicedToArray(_useState17, 2),
-    paymentItems = _useState18[0],
-    setPaymentItems = _useState18[1];
+  var _useState15 = useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    paymentItems = _useState16[0],
+    setPaymentItems = _useState16[1];
   // 钱包卡券数据
-  var _useState19 = useState({}),
-    _useState20 = _slicedToArray(_useState19, 2),
-    walletPassData = _useState20[0],
-    setWalletPassData = _useState20[1];
+  var _useState17 = useState({}),
+    _useState18 = _slicedToArray(_useState17, 2),
+    walletPassData = _useState18[0],
+    setWalletPassData = _useState18[1];
   var _usePrinter = usePrinter(),
     nativePrint = _usePrinter.nativePrint;
-  var _useState21 = useState(false),
-    _useState22 = _slicedToArray(_useState21, 2),
-    syncingLock = _useState22[0],
-    setSyncingLock = _useState22[1];
+  var _useState19 = useState(false),
+    _useState20 = _slicedToArray(_useState19, 2),
+    syncingLock = _useState20[0],
+    setSyncingLock = _useState20[1];
   var isOrderFree = useMemo(function () {
     if (!customAmount) return false;
     var amount = parseFloat(customAmount);
@@ -175,14 +163,14 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, [customAmount]);
 
   // 新增状态：订单备注和手动折扣
+  var _useState21 = useState(false),
+    _useState22 = _slicedToArray(_useState21, 2),
+    paymentLinkModalOpen = _useState22[0],
+    setPaymentLinkModalOpen = _useState22[1];
   var _useState23 = useState(false),
     _useState24 = _slicedToArray(_useState23, 2),
-    paymentLinkModalOpen = _useState24[0],
-    setPaymentLinkModalOpen = _useState24[1];
-  var _useState25 = useState(false),
-    _useState26 = _slicedToArray(_useState25, 2),
-    showPriceAdjustModal = _useState26[0],
-    setShowPriceAdjustModal = _useState26[1];
+    showPriceAdjustModal = _useState24[0],
+    setShowPriceAdjustModal = _useState24[1];
   var logger = usePaymentLogger();
   var currency = getData('shop_currency_code') || 'USD';
 
@@ -582,7 +570,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, autoCloseConfig, _paymentItems, _totalAmount, serviceChargeTotal, isToastMode, paymentMethodName, isCashPayment, _interaction$utils3, _interaction$utils3$p;
+              var orderInfo, balanceDueAmount, autoCloseConfig, _paymentItems, _totalAmount, serviceChargeTotal, paymentMethodName, isCashPayment, _interaction$utils3, _interaction$utils3$p;
               return _regeneratorRuntime().wrap(function _callee5$(_context5) {
                 while (1) switch (_context5.prev = _context5.next) {
                   case 0:
@@ -592,7 +580,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                     updateOrderInfo === null || updateOrderInfo === void 0 || updateOrderInfo(orderInfo);
                     balanceDueAmount = checkoutModule.getBalanceDueAmount();
                     if (!(Number(balanceDueAmount) > 0)) {
-                      _context5.next = 16;
+                      _context5.next = 14;
                       break;
                     }
                     autoCloseConfig = calculateAutoCloseConfig('partially_paid', false); // 获取订单总金额
@@ -622,16 +610,9 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                       _totalAmount = _totalAmount.add(serviceChargeTotal);
                     }
                     console.log(_totalAmount, _paymentItems);
-                    // 弹窗模式判断
-                    isToastMode = paymentResultDisplayMode !== 'modal';
-                    if (!isToastMode) {
-                      autoCloseConfig.autoClose = false;
-                      autoCloseConfig.autoCloseDelay = 0;
-                      autoCloseConfig.maskClosable = false;
-                    }
 
                     // 根据支付状态展示不同的 toast
-                    _context5.next = 16;
+                    _context5.next = 14;
                     return displayPaymentResultToast({
                       paymentStatus: 'partially_paid',
                       orderTotalAmount: _totalAmount.toNumber(),
@@ -649,7 +630,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                         // 不自动关闭Modal，让两个弹窗独立管理
                       }
                     }));
-                  case 16:
+                  case 14:
                     // 判断是否为现金支付
                     paymentMethodName = data.paymentMethodName || data.name || '';
                     isCashPayment = data.paymentMethodCode === 'CASHMANUAL' || /现金|現金/i.test(paymentMethodName) || /cash/i.test(paymentMethodName);
@@ -668,7 +649,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                         }
                       });
                     }
-                  case 19:
+                  case 17:
                   case "end":
                     return _context5.stop();
                 }
@@ -917,11 +898,64 @@ 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 || 0).minus(shopDiscount || 0).toNumber();
-  }, [shopDiscount, currentTotalPrice]);
+    return new Decimal(currentTotalPrice).minus(state.shop_discount || 0).toNumber();
+  }, [state.shop_discount, currentTotalPrice]);
   var handleSelectWalletChange = useMemoizedFn( /*#__PURE__*/function () {
     var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(select) {
       var voucherItems, data;
@@ -985,7 +1019,14 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           case 0:
             try {
               if (checkoutModule && orderInfo !== null && orderInfo !== void 0 && orderInfo.totalAmount) {
-                onChangeShopDiscount === null || onChangeShopDiscount === void 0 || onChangeShopDiscount(discountAmount);
+                if (dispatch) {
+                  dispatch({
+                    type: 'setState',
+                    payload: {
+                      shop_discount: discountAmount
+                    }
+                  });
+                }
               }
             } catch (error) {
               console.error('Failed to adjust price:', error);
@@ -1010,42 +1051,38 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           case 0:
             console.log('handleButtonClick', key);
             _context12.t0 = key;
-            _context12.next = _context12.t0 === 'order-note' ? 4 : _context12.t0 === 'send-link' ? 6 : _context12.t0 === 'split-payment' ? 8 : _context12.t0 === 'print-receipt' ? 10 : _context12.t0 === 'manual-discount' ? 26 : _context12.t0 === 'save-pay-later' ? 40 : 42;
+            _context12.next = _context12.t0 === 'order-note' ? 4 : _context12.t0 === 'send-link' ? 6 : _context12.t0 === 'print-receipt' ? 8 : _context12.t0 === 'manual-discount' ? 24 : _context12.t0 === 'save-pay-later' ? 38 : 40;
             break;
           case 4:
             setNoteModalOpen(true);
-            return _context12.abrupt("break", 42);
+            return _context12.abrupt("break", 40);
           case 6:
             setPaymentLinkModalOpen(true);
-            return _context12.abrupt("break", 42);
+            return _context12.abrupt("break", 40);
           case 8:
-            // 唤醒分账支付键盘
-            setShowSplitPaymentKeyboard(true);
-            return _context12.abrupt("break", 42);
-          case 10:
-            _context12.next = 12;
+            _context12.next = 10;
             return checkoutModule.isCurrentOrderSynced();
-          case 12:
+          case 10:
             isSynced = _context12.sent;
             if (isSynced) {
-              _context12.next = 19;
+              _context12.next = 17;
               break;
             }
-            _context12.next = 16;
+            _context12.next = 14;
             return checkoutModule.manualSyncOrderAsync();
-          case 16:
+          case 14:
             data = _context12.sent;
-            _context12.next = 23;
-            break;
-          case 19:
             _context12.next = 21;
+            break;
+          case 17:
+            _context12.next = 19;
             return checkoutModule.getCurrentOrderId();
-          case 21:
+          case 19:
             _orderId2 = _context12.sent;
             data = {
               orderId: _orderId2
             };
-          case 23:
+          case 21:
             console.log('handleButtonClick_print-receipt_data>>>>', data);
             // data.orderId 就是订单号，可以用来打印小票
             if (data.orderId) {
@@ -1066,40 +1103,40 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 console.error('handleButtonClick_print-receipt_error>>>>', error);
               }
             }
-            return _context12.abrupt("break", 42);
-          case 26:
+            return _context12.abrupt("break", 40);
+          case 24:
             if (orderInfo !== null && orderInfo !== void 0 && orderInfo.totalAmount) {
-              _context12.next = 29;
+              _context12.next = 27;
               break;
             }
             Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.manual-discount.no-amount'));
             return _context12.abrupt("return");
-          case 29:
-            _context12.next = 31;
+          case 27:
+            _context12.next = 29;
             return checkoutModule.getCurrentOrderPaymentItemsAsync();
-          case 31:
+          case 29:
             _paymentItems2 = _context12.sent;
             if (!(_paymentItems2 !== null && _paymentItems2 !== void 0 && _paymentItems2.length)) {
-              _context12.next = 35;
+              _context12.next = 33;
               break;
             }
             Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.manual-discount.has-payment-items'));
             return _context12.abrupt("return");
-          case 35:
+          case 33:
             if (!(Number(customAmount) <= 0 && Number(orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalAmount) >= 0)) {
-              _context12.next = 38;
+              _context12.next = 36;
               break;
             }
             Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.manual-discount.no-amount'));
             return _context12.abrupt("return");
-          case 38:
+          case 36:
             setShowPriceAdjustModal(true);
-            return _context12.abrupt("break", 42);
-          case 40:
+            return _context12.abrupt("break", 40);
+          case 38:
             // 通过 ref 调用 SavePayLaterHandler 的处理方法
             (_savePayLaterHandlerR = savePayLaterHandlerRef.current) === null || _savePayLaterHandlerR === void 0 || _savePayLaterHandlerR.handleSavePayLaterClick();
-            return _context12.abrupt("break", 42);
-          case 42:
+            return _context12.abrupt("break", 40);
+          case 40:
           case "end":
             return _context12.stop();
         }
@@ -1117,8 +1154,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     };
   });
   var getCustomerInfo = function getCustomerInfo() {
-    var _client$contacts;
-    // const client = state?.client?.value;
+    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;
 
     // 修复逻辑：只有在 undefined 或 null 时才使用默认值，空字符串应该保留
     var getValidName = function getValidName(value) {
@@ -1215,10 +1252,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   // 处理PaymentModal区域的点击事件
   var handleModalClick = useCallback(function (event) {
     // 关闭所有Toast
-    var isToastMode = paymentResultDisplayMode !== 'modal';
-    if (isToastMode) {
-      closeAllPaymentResultToasts();
-    }
+    closeAllPaymentResultToasts();
   }, []);
   return /*#__PURE__*/React.createElement("div", {
     ref: checkoutRef,
@@ -1239,14 +1273,14 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     },
     onSearch: handleSearch
   }, searchAndClientProps)), moduleConfig.showWalletPass && /*#__PURE__*/React.createElement(WalletPassModule, {
-    clientId: client === null || client === void 0 ? void 0 : client.id,
+    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,
     customAmount: balanceDueAmount,
     orderInfo: orderInfo || undefined,
     ref: walletPassRef,
     paymentItems: paymentItems,
     onSelectChange: handleSelectWalletChange
   })), /*#__PURE__*/React.createElement(AmountSummary, {
-    amountSymbol: getData('shop_symbol'),
+    amountSymbol: state.amountSymbol,
     orderInfo: orderInfo || undefined,
     cartData: cartData,
     open_deposit: open_deposit,
@@ -1254,7 +1288,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     balanceDueAmount: balanceDueAmount,
     paymentItems: paymentItems,
     walletPassData: walletPassData,
-    clientInfo: client,
+    clientInfo: state === null || state === void 0 || (_state$client3 = state.client) === null || _state$client3 === void 0 ? void 0 : _state$client3.value,
     onAmountChange: handleAmountChange,
     onDepositStatusChange: handleDepositStatusChange,
     onBalanceDueAmountClick: handleButtonClick,
@@ -1265,7 +1299,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, showCashPayment && /*#__PURE__*/React.createElement("div", {
     style: showCashPayment ? {
       gridColumn: '1',
-      gridRow: (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) === 1 ? 'span 2' : '1'
+      gridRow: '1'
     } : {}
   }, /*#__PURE__*/React.createElement(CashPaymentModule, {
     disabled: isOrderFree,
@@ -1278,16 +1312,15 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     customAmount: customAmount,
     roundingFunction: roundingFunction,
     balanceDueAmount: balanceDueAmount,
-    balanceDueTotalAmount: balanceDueTotalAmount,
-    shortcutsSize: (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) === 3 || (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) === 1 ? 'large' : 'default'
-  })), moduleConfig.showPaymentOptions && (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) > 0 && /*#__PURE__*/React.createElement("div", {
+    balanceDueTotalAmount: balanceDueTotalAmount
+  })), moduleConfig.showPaymentOptions && /*#__PURE__*/React.createElement("div", {
     className: showCashPayment ? '' : 'payment-options-module-container',
     style: showCashPayment ? {
       gridColumn: '2',
-      gridRow: (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) > 3 ? '1 / 3' : '1'
+      gridRow: '1 / 3'
     } : {}
   }, /*#__PURE__*/React.createElement(PaymentOptionsModule, {
-    amountSymbol: getData('shop_symbol'),
+    amountSymbol: state.amountSymbol,
     orderInfo: orderInfo || undefined,
     onClick: onPaymentOptionClick,
     paymentMethods: paymentMethods,
@@ -1298,8 +1331,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   })), moduleConfig.showAdditionalModule && /*#__PURE__*/React.createElement("div", {
     className: showCashPayment ? '' : 'additional-module-container',
     style: showCashPayment ? {
-      gridColumn: (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) > 3 ? '1' : (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) <= 1 ? '2' : 'span 2',
-      gridRow: (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) === 0 ? '1' : '2'
+      gridColumn: '1',
+      gridRow: '2'
     } : {}
   }, /*#__PURE__*/React.createElement(AdditionalModule, {
     orderInfo: orderInfo || undefined,
@@ -1307,9 +1340,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     handleButtonClick: handleButtonClick,
     hasOrderNote: !!orderNote && orderNote.trim().length > 0,
     disabled: isOrderFree,
-    showCashPayment: showCashPayment,
-    isFullWidth: !((paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) > 3 || (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) <= 1),
-    showMore: !(showCashPayment && (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) === 0)
+    showCashPayment: showCashPayment
   }))), /*#__PURE__*/React.createElement(PaymentMethods, {
     ref: paymentMethodsRef,
     dynamicMaxHeight: dynamicMaxHeight,
@@ -1331,7 +1362,6 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
         return setShowPriceAdjustModal(false);
       }
     },
-    tips: locales.getText('pisell2.checkout.modal.price-adjustment-tips') || 'Changing amount will update order total',
     selectType: "dark",
     originalValue: currentTotalPrice,
     defaultValue: currentTotalPriceAfterDiscount,
@@ -1339,43 +1369,9 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     onEnter: handlePriceAdjustConfirm
   }), /*#__PURE__*/React.createElement(SavePayLaterHandler, {
     ref: savePayLaterHandlerRef,
-    amountSymbol: getData('shop_symbol'),
+    amountSymbol: state.amountSymbol,
     walletPassData: walletPassData,
     onSavePayLater: handleSavePayLater
-  }), /*#__PURE__*/React.createElement(PaymentKeyboard, {
-    containerProps: {
-      renderType: 'modal',
-      open: showSplitPaymentKeyboard,
-      onCancel: function onCancel() {
-        return setShowSplitPaymentKeyboard(false);
-      }
-    }
-    // 原始值：此支付阶段的待支付金额，reset时还原为此值
-    ,
-    paymentOriginalValue: balanceDueAmount,
-    paymentDefaultValue: String(customAmount || 0),
-    enableExceedMaxAmount: false,
-    payment: {
-      enable: true
-    },
-    surcharge: {
-      enable: false
-    },
-    surchargeDefaultValue: {
-      percent: '0',
-      fixed: '0'
-    },
-    selectType: "light",
-    onChange: function onChange(value) {
-      console.log(value);
-    },
-    doneText: locales.getText('confirm') || '确认',
-    onPay: function onPay(args) {
-      console.log(args);
-      // 处理支付逻辑
-      setShowSplitPaymentKeyboard(false);
-      handleAmountChange(String(args.amount));
-    }
   }));
 });
 
@@ -1387,15 +1383,10 @@ 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,
-    paymentResultDisplayMode = _ref18.paymentResultDisplayMode,
-    shopDiscount = _ref18.shopDiscount,
-    client = _ref18.client,
-    currentTotalPrice = _ref18.currentTotalPrice,
-    onChangeShopDiscount = _ref18.onChangeShopDiscount,
-    onChangeOrderNote = _ref18.onChangeOrderNote,
-    onDeleteOrderNote = _ref18.onDeleteOrderNote;
+    editOrderId = _ref18.editOrderId;
   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) || {},
@@ -1403,34 +1394,30 @@ var PaymentModal = function PaymentModal(_ref18) {
     getData = _ref19.getData,
     interaction = _ref19.interaction,
     isWebPos = _ref19.isWebPos;
-  var _useState27 = useState(null),
+  var _useState25 = useState(null),
+    _useState26 = _slicedToArray(_useState25, 2),
+    orderInfo = _useState26[0],
+    setOrderInfo = _useState26[1];
+  var _useState27 = useState(0),
     _useState28 = _slicedToArray(_useState27, 2),
-    orderInfo = _useState28[0],
-    setOrderInfo = _useState28[1];
-  var _useState29 = useState(0),
+    totalAmount = _useState28[0],
+    setTotalAmount = _useState28[1];
+  var _useState29 = useState(true),
     _useState30 = _slicedToArray(_useState29, 2),
-    totalAmount = _useState30[0],
-    setTotalAmount = _useState30[1];
-  var _useState31 = useState(true),
+    actualShowCashPayment = _useState30[0],
+    setActualShowCashPayment = _useState30[1];
+  var _useState31 = useState(0),
     _useState32 = _slicedToArray(_useState31, 2),
-    actualShowCashPayment = _useState32[0],
-    setActualShowCashPayment = _useState32[1];
-  var _useState33 = useState(0),
+    windowHeight = _useState32[0],
+    setWindowHeight = _useState32[1];
+  var _useState33 = useState(false),
     _useState34 = _slicedToArray(_useState33, 2),
-    windowHeight = _useState34[0],
-    setWindowHeight = _useState34[1];
-  var _useState35 = useState(false),
+    showRetryModal = _useState34[0],
+    setShowRetryModal = _useState34[1];
+  var _useState35 = useState(editOrderId || 0),
     _useState36 = _slicedToArray(_useState35, 2),
-    showRetryModal = _useState36[0],
-    setShowRetryModal = _useState36[1];
-  var _useState37 = useState(false),
-    _useState38 = _slicedToArray(_useState37, 2),
-    showCreateErrorModal = _useState38[0],
-    setShowCreateErrorModal = _useState38[1];
-  var _useState39 = useState(editOrderId || 0),
-    _useState40 = _slicedToArray(_useState39, 2),
-    currentEditOrderId = _useState40[0],
-    _setCurrentEditOrderId = _useState40[1];
+    currentEditOrderId = _useState36[0],
+    _setCurrentEditOrderId = _useState36[1];
   var _useActiveExecute2 = useActiveExecute(),
     executeIfActive = _useActiveExecute2.executeIfActive;
   var Toast = useToast();
@@ -1567,18 +1554,18 @@ var PaymentModal = function PaymentModal(_ref18) {
   }, []);
 
   // 订单备注相关状态
-  var _useState41 = useState(false),
+  var _useState37 = useState(false),
+    _useState38 = _slicedToArray(_useState37, 2),
+    noteModalOpen = _useState38[0],
+    setNoteModalOpen = _useState38[1];
+  var _useState39 = useState(''),
+    _useState40 = _slicedToArray(_useState39, 2),
+    orderNote = _useState40[0],
+    setOrderNote = _useState40[1];
+  var _useState41 = useState('payment-content'),
     _useState42 = _slicedToArray(_useState41, 2),
-    noteModalOpen = _useState42[0],
-    setNoteModalOpen = _useState42[1];
-  var _useState43 = useState(''),
-    _useState44 = _slicedToArray(_useState43, 2),
-    orderNote = _useState44[0],
-    setOrderNote = _useState44[1];
-  var _useState45 = useState('payment-content'),
-    _useState46 = _slicedToArray(_useState45, 2),
-    noteModalSource = _useState46[0],
-    setNoteModalSource = _useState46[1];
+    noteModalSource = _useState42[0],
+    setNoteModalSource = _useState42[1];
 
   // 订单备注相关处理函数
   var handleNoteConfirm = /*#__PURE__*/function () {
@@ -1614,7 +1601,15 @@ var PaymentModal = function PaymentModal(_ref18) {
             Toast === null || Toast === void 0 || Toast.success(locales.getText('pisell2.checkout.order-note.updated-successfully'));
           case 13:
             // 同时把购物车的也给改了
-            onChangeOrderNote === null || onChangeOrderNote === void 0 || onChangeOrderNote(noteValue);
+            if (dispatch) {
+              dispatch({
+                type: 'setNotes',
+                payload: {
+                  orderNote: noteValue,
+                  edit: true
+                }
+              });
+            }
 
             // 根据打开来源执行不同的逻辑
             if (noteModalSource === 'payment-result-toast') {
@@ -1663,7 +1658,15 @@ var PaymentModal = function PaymentModal(_ref18) {
             Toast === null || Toast === void 0 || Toast.success(locales.getText('pisell2.checkout.order-note.deleted-successfully'));
           case 7:
             // 同时把购物车的也给改了
-            onDeleteOrderNote === null || onDeleteOrderNote === void 0 || onDeleteOrderNote();
+            if (dispatch) {
+              dispatch({
+                type: 'setNotes',
+                payload: {
+                  orderNote: '',
+                  edit: true
+                }
+              });
+            }
             _context18.next = 14;
             break;
           case 10:
@@ -1989,7 +1992,7 @@ var PaymentModal = function PaymentModal(_ref18) {
       }
     })), /*#__PURE__*/React.createElement("div", {
       className: "header__center"
-    }, translation('order.total'), "\uFF1A", formatCurrency(totalAmount, getData('shop_symbol'))), /*#__PURE__*/React.createElement("div", {
+    }, translation('order.total'), "\uFF1A", formatCurrency(totalAmount, state === null || state === void 0 ? void 0 : state.amountSymbol)), /*#__PURE__*/React.createElement("div", {
       className: "header__right"
     }, /*#__PURE__*/React.createElement(Button, {
       size: "small",
@@ -2096,7 +2099,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, _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, paymentResult;
                   return _regeneratorRuntime().wrap(function _callee22$(_context22) {
                     while (1) switch (_context22.prev = _context22.next) {
                       case 0:
@@ -2127,7 +2130,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                         // 获取失败原因
                         failureReason = responseData === null || responseData === void 0 ? void 0 : responseData.failure_reason; // 根据支付状态弹出对应的支付结果toast
                         if (!paymentStatus) {
-                          _context22.next = 37;
+                          _context22.next = 35;
                           break;
                         }
                         // 打印订单完整信息
@@ -2200,16 +2203,8 @@ var PaymentModal = function PaymentModal(_ref18) {
                       case 26:
                         enabledAutoPrint = _context22.sent;
                       case 27:
-                        _orderInfo3 = checkout.getCurrentOrderInfo(); // 弹窗模式判断
-                        isToastMode = paymentResultDisplayMode !== 'modal';
-                        if (!isToastMode) {
-                          autoCloseConfig.autoClose = false;
-                          autoCloseConfig.autoCloseDelay = 0;
-                          autoCloseConfig.maskClosable = false;
-                        }
-
-                        // 根据支付状态展示不同的 toast
-                        _context22.next = 32;
+                        _orderInfo3 = checkout.getCurrentOrderInfo(); // 根据支付状态展示不同的 toast
+                        _context22.next = 30;
                         return displayPaymentResultToast({
                           paymentStatus: paymentStatus,
                           orderTotalAmount: _orderInfo3.isDeposit ? _orderInfo3.depositAmount : orderTotalAmount,
@@ -2218,7 +2213,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                           autoCloseConfig: autoCloseConfig,
                           actionButtons: generateActionButtons(paymentStatus, enabledAutoPrint)
                         }, paymentResultToastConfig);
-                      case 32:
+                      case 30:
                         // 当支付状态为 paid 时，关闭 paymentModal
                         if (paymentStatus === 'paid') {
                           handleModalClose();
@@ -2234,11 +2229,11 @@ var PaymentModal = function PaymentModal(_ref18) {
                           }
                         });
                         handlePaymentComplete(paymentResult);
-                        _context22.next = 38;
+                        _context22.next = 36;
                         break;
-                      case 37:
+                      case 35:
                         handlePaymentComplete(data);
-                      case 38:
+                      case 36:
                       case "end":
                         return _context22.stop();
                     }
@@ -2300,7 +2295,7 @@ var PaymentModal = function PaymentModal(_ref18) {
               setOrderInfo(_orderInfo4);
               isLocalOrderCreated.current = true;
             case 42:
-              _context23.next = 49;
+              _context23.next = 48;
               break;
             case 44:
               _context23.prev = 44;
@@ -2313,9 +2308,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                   error: _context23.t0
                 }
               });
-              // 如果订单创建失败，弹出提示让重新加载 app
-              setShowCreateErrorModal(true);
-            case 49:
+            case 48:
             case "end":
               return _context23.stop();
           }
@@ -2346,12 +2339,12 @@ var PaymentModal = function PaymentModal(_ref18) {
     getData: getData,
     interaction: interaction,
     Toast: Toast,
+    state: state,
     onToastClose: handleToastClose
   };
 
   // 支付结果弹窗按钮生成函数
-  var generateActionButtons = function generateActionButtons(paymentStatus) {
-    var enabledAutoPrint = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var generateActionButtons = function generateActionButtons(paymentStatus, enabledAutoPrint) {
     var getClassName = function getClassName(suffix) {
       return "payment-result-toast-".concat(suffix);
     };
@@ -2760,13 +2753,8 @@ var PaymentModal = function PaymentModal(_ref18) {
     onPaymentCancel: handlePaymentCancel
     // onStatusChange={(status) => console.log('Status changed:', status)}
     ,
-    paymentResultDisplayMode: paymentResultDisplayMode,
-    shopDiscount: shopDiscount,
-    client: client,
-    currentTotalPrice: currentTotalPrice,
-    onChangeShopDiscount: onChangeShopDiscount,
-    onChangeOrderNote: onChangeOrderNote,
-    onDeleteOrderNote: onDeleteOrderNote,
+    dispatch: dispatch,
+    state: state,
     showingCashToastRef: showingCashToastRef,
     onToastClose: handleToastClose,
     orderNote: orderNote,
@@ -2826,39 +2814,7 @@ var PaymentModal = function PaymentModal(_ref18) {
       width: '100%',
       marginTop: '80px'
     }
-  }, locales.getText('retry') || '重试'))), /*#__PURE__*/React.createElement(PisellContainer, {
-    renderType: "modal",
-    props: {
-      open: showCreateErrorModal,
-      title: locales.getText('pisell2.checkout.tips'),
-      footer: null,
-      keyboard: false,
-      onCancel: function onCancel() {
-        setShowCreateErrorModal(false);
-      } // 禁用关闭
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      textAlign: 'center',
-      padding: '20px'
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      marginBottom: '16px',
-      fontSize: '16px'
-    }
-  }, locales.getText('pisell2.checkout.order-create-failed')), /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    size: "large",
-    onClick: function onClick() {
-      setShowCreateErrorModal(false);
-      window.location.reload();
-    },
-    style: {
-      width: '100%',
-      marginTop: '80px'
-    }
-  }, locales.getText('confirm') || '确认'))));
+  }, locales.getText('retry') || '重试'))));
 };
 
 // 导出类型供外部使用