@pisell/private-materials 6.4.72 → 6.4.74

package/es/components/checkout/PaymentModal.js

@@ -30,7 +30,7 @@ import SendPaymentLinkModal from "./components/SendPaymentLinkModal";
 import AmountSummary from "./components/AmountSummary/index";
 import SavePayLaterHandler from "./components/SavePayLaterHandler";
 import WalletPassModule from "./components/WalletPassModule";
-import PaymentOptionsModule from "./components/PaymentOptionsModule";
+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";
@@ -46,7 +46,7 @@ import { cloneDeep } from 'lodash';
 import { getShopWalletPassId, reorderPaymentMethodList } from "./utils";
 import usePaymentLogger from "./hooks/usePaymentLogger";
 import { Button } from 'antd';
-import { DiscountKeyboard } from "../../pro/priceKeyboard";
+import { DiscountKeyboard, PaymentKeyboard } from "../../pro/priceKeyboard";
 import { useActiveExecute } from "../ticketBooking/hooks/pisellos";
 
 // Checkout 模块的事件常量
@@ -124,35 +124,44 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     recommendAmounts = _useState8[0],
     setRecommendAmounts = _useState8[1];
-  var paymentMethodsRef = useRef(null);
-  var _useState9 = useState([]),
+  var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    paymentMethods = _useState10[0],
-    setPaymentMethods = _useState10[1];
-  var _useState11 = useState(false),
+    showSplitPaymentKeyboard = _useState10[0],
+    setShowSplitPaymentKeyboard = _useState10[1];
+  var paymentMethodsRef = useRef(null);
+  var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    showCashPayment = _useState12[0],
-    setShowCashPayment = _useState12[1];
-  var _useState13 = useState(locales.getText('cards.and.digitals') || 'Cards & Digitals'),
+    paymentMethods = _useState12[0],
+    setPaymentMethods = _useState12[1];
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    paymentOptionsTitle = _useState14[0],
-    setPaymentOptionsTitle = _useState14[1];
+    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]);
   var clientChangedRef = useRef(false);
   var walletPassRef = useRef(null);
   // 已保存的支付项数据
-  var _useState15 = useState([]),
-    _useState16 = _slicedToArray(_useState15, 2),
-    paymentItems = _useState16[0],
-    setPaymentItems = _useState16[1];
-  // 钱包卡券数据
-  var _useState17 = useState({}),
+  var _useState17 = useState([]),
     _useState18 = _slicedToArray(_useState17, 2),
-    walletPassData = _useState18[0],
-    setWalletPassData = _useState18[1];
-  var _useState19 = useState(false),
+    paymentItems = _useState18[0],
+    setPaymentItems = _useState18[1];
+  // 钱包卡券数据
+  var _useState19 = useState({}),
     _useState20 = _slicedToArray(_useState19, 2),
-    syncingLock = _useState20[0],
-    setSyncingLock = _useState20[1];
+    walletPassData = _useState20[0],
+    setWalletPassData = _useState20[1];
+  var _useState21 = useState(false),
+    _useState22 = _slicedToArray(_useState21, 2),
+    syncingLock = _useState22[0],
+    setSyncingLock = _useState22[1];
   var isOrderFree = useMemo(function () {
     if (!customAmount) return false;
     var amount = parseFloat(customAmount);
@@ -160,14 +169,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),
-    showPriceAdjustModal = _useState24[0],
-    setShowPriceAdjustModal = _useState24[1];
+    paymentLinkModalOpen = _useState24[0],
+    setPaymentLinkModalOpen = _useState24[1];
+  var _useState25 = useState(false),
+    _useState26 = _slicedToArray(_useState25, 2),
+    showPriceAdjustModal = _useState26[0],
+    setShowPriceAdjustModal = _useState26[1];
   var logger = usePaymentLogger();
   var currency = getData('shop_currency_code') || 'USD';
 
@@ -567,7 +576,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, paymentMethodName, isCashPayment, _interaction$utils3, _interaction$utils3$p;
+              var orderInfo, balanceDueAmount, _state$bookingConfig, 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:
@@ -577,7 +586,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                     updateOrderInfo === null || updateOrderInfo === void 0 || updateOrderInfo(orderInfo);
                     balanceDueAmount = checkoutModule.getBalanceDueAmount();
                     if (!(Number(balanceDueAmount) > 0)) {
-                      _context5.next = 14;
+                      _context5.next = 16;
                       break;
                     }
                     autoCloseConfig = calculateAutoCloseConfig('partially_paid', false); // 获取订单总金额
@@ -607,9 +616,16 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                       _totalAmount = _totalAmount.add(serviceChargeTotal);
                     }
                     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';
+                    if (!isToastMode) {
+                      autoCloseConfig.autoClose = false;
+                      autoCloseConfig.autoCloseDelay = 0;
+                      autoCloseConfig.maskClosable = false;
+                    }
 
                     // 根据支付状态展示不同的 toast
-                    _context5.next = 14;
+                    _context5.next = 16;
                     return displayPaymentResultToast({
                       paymentStatus: 'partially_paid',
                       orderTotalAmount: _totalAmount.toNumber(),
@@ -627,7 +643,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                         // 不自动关闭Modal，让两个弹窗独立管理
                       }
                     }));
-                  case 14:
+                  case 16:
                     // 判断是否为现金支付
                     paymentMethodName = data.paymentMethodName || data.name || '';
                     isCashPayment = data.paymentMethodCode === 'CASHMANUAL' || /现金|現金/i.test(paymentMethodName) || /cash/i.test(paymentMethodName);
@@ -646,7 +662,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                         }
                       });
                     }
-                  case 17:
+                  case 19:
                   case "end":
                     return _context5.stop();
                 }
@@ -1047,38 +1063,42 @@ 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 === 'print-receipt' ? 8 : _context12.t0 === 'manual-discount' ? 24 : _context12.t0 === 'save-pay-later' ? 38 : 40;
+            _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;
             break;
           case 4:
             setNoteModalOpen(true);
-            return _context12.abrupt("break", 40);
+            return _context12.abrupt("break", 42);
           case 6:
             setPaymentLinkModalOpen(true);
-            return _context12.abrupt("break", 40);
+            return _context12.abrupt("break", 42);
           case 8:
-            _context12.next = 10;
-            return checkoutModule.isCurrentOrderSynced();
+            // 唤醒分账支付键盘
+            setShowSplitPaymentKeyboard(true);
+            return _context12.abrupt("break", 42);
           case 10:
+            _context12.next = 12;
+            return checkoutModule.isCurrentOrderSynced();
+          case 12:
             isSynced = _context12.sent;
             if (isSynced) {
-              _context12.next = 17;
+              _context12.next = 19;
               break;
             }
-            _context12.next = 14;
+            _context12.next = 16;
             return checkoutModule.manualSyncOrderAsync();
-          case 14:
+          case 16:
             data = _context12.sent;
-            _context12.next = 21;
+            _context12.next = 23;
             break;
-          case 17:
-            _context12.next = 19;
-            return checkoutModule.getCurrentOrderId();
           case 19:
+            _context12.next = 21;
+            return checkoutModule.getCurrentOrderId();
+          case 21:
             _orderId2 = _context12.sent;
             data = {
               orderId: _orderId2
             };
-          case 21:
+          case 23:
             console.log('handleButtonClick_print-receipt_data>>>>', data);
             // data.orderId 就是订单号，可以用来打印小票
             if (data.orderId) {
@@ -1099,40 +1119,40 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 console.error('handleButtonClick_print-receipt_error>>>>', error);
               }
             }
-            return _context12.abrupt("break", 40);
-          case 24:
+            return _context12.abrupt("break", 42);
+          case 26:
             if (orderInfo !== null && orderInfo !== void 0 && orderInfo.totalAmount) {
-              _context12.next = 27;
+              _context12.next = 29;
               break;
             }
             Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.manual-discount.no-amount'));
             return _context12.abrupt("return");
-          case 27:
-            _context12.next = 29;
-            return checkoutModule.getCurrentOrderPaymentItemsAsync();
           case 29:
+            _context12.next = 31;
+            return checkoutModule.getCurrentOrderPaymentItemsAsync();
+          case 31:
             _paymentItems2 = _context12.sent;
             if (!(_paymentItems2 !== null && _paymentItems2 !== void 0 && _paymentItems2.length)) {
-              _context12.next = 33;
+              _context12.next = 35;
               break;
             }
             Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.manual-discount.has-payment-items'));
             return _context12.abrupt("return");
-          case 33:
+          case 35:
             if (!(Number(customAmount) <= 0 && Number(orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalAmount) >= 0)) {
-              _context12.next = 36;
+              _context12.next = 38;
               break;
             }
             Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.manual-discount.no-amount'));
             return _context12.abrupt("return");
-          case 36:
-            setShowPriceAdjustModal(true);
-            return _context12.abrupt("break", 40);
           case 38:
+            setShowPriceAdjustModal(true);
+            return _context12.abrupt("break", 42);
+          case 40:
             // 通过 ref 调用 SavePayLaterHandler 的处理方法
             (_savePayLaterHandlerR = savePayLaterHandlerRef.current) === null || _savePayLaterHandlerR === void 0 || _savePayLaterHandlerR.handleSavePayLaterClick();
-            return _context12.abrupt("break", 40);
-          case 40:
+            return _context12.abrupt("break", 42);
+          case 42:
           case "end":
             return _context12.stop();
         }
@@ -1247,8 +1267,12 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 处理PaymentModal区域的点击事件
   var handleModalClick = useCallback(function (event) {
+    var _state$bookingConfig2;
     // 关闭所有Toast
-    closeAllPaymentResultToasts();
+    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';
+    if (isToastMode) {
+      closeAllPaymentResultToasts();
+    }
   }, []);
   return /*#__PURE__*/React.createElement("div", {
     ref: checkoutRef,
@@ -1295,7 +1319,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, showCashPayment && /*#__PURE__*/React.createElement("div", {
     style: showCashPayment ? {
       gridColumn: '1',
-      gridRow: '1'
+      gridRow: (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) === 1 ? 'span 2' : '1'
     } : {}
   }, /*#__PURE__*/React.createElement(CashPaymentModule, {
     disabled: isOrderFree,
@@ -1308,12 +1332,13 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     customAmount: customAmount,
     roundingFunction: roundingFunction,
     balanceDueAmount: balanceDueAmount,
-    balanceDueTotalAmount: balanceDueTotalAmount
-  })), moduleConfig.showPaymentOptions && /*#__PURE__*/React.createElement("div", {
+    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", {
     className: showCashPayment ? '' : 'payment-options-module-container',
     style: showCashPayment ? {
       gridColumn: '2',
-      gridRow: '1 / 3'
+      gridRow: (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) > 3 ? '1 / 3' : '1'
     } : {}
   }, /*#__PURE__*/React.createElement(PaymentOptionsModule, {
     amountSymbol: state.amountSymbol,
@@ -1327,8 +1352,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   })), moduleConfig.showAdditionalModule && /*#__PURE__*/React.createElement("div", {
     className: showCashPayment ? '' : 'additional-module-container',
     style: showCashPayment ? {
-      gridColumn: '1',
-      gridRow: '2'
+      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'
     } : {}
   }, /*#__PURE__*/React.createElement(AdditionalModule, {
     orderInfo: orderInfo || undefined,
@@ -1336,7 +1361,9 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     handleButtonClick: handleButtonClick,
     hasOrderNote: !!orderNote && orderNote.trim().length > 0,
     disabled: isOrderFree,
-    showCashPayment: showCashPayment
+    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)
   }))), /*#__PURE__*/React.createElement(PaymentMethods, {
     ref: paymentMethodsRef,
     dynamicMaxHeight: dynamicMaxHeight,
@@ -1358,6 +1385,7 @@ 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,
@@ -1368,6 +1396,40 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     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));
+    }
   }));
 });
 
@@ -1390,34 +1452,34 @@ var PaymentModal = function PaymentModal(_ref18) {
     getData = _ref19.getData,
     interaction = _ref19.interaction,
     isWebPos = _ref19.isWebPos;
-  var _useState25 = useState(null),
-    _useState26 = _slicedToArray(_useState25, 2),
-    orderInfo = _useState26[0],
-    setOrderInfo = _useState26[1];
-  var _useState27 = useState(0),
+  var _useState27 = useState(null),
     _useState28 = _slicedToArray(_useState27, 2),
-    totalAmount = _useState28[0],
-    setTotalAmount = _useState28[1];
-  var _useState29 = useState(true),
+    orderInfo = _useState28[0],
+    setOrderInfo = _useState28[1];
+  var _useState29 = useState(0),
     _useState30 = _slicedToArray(_useState29, 2),
-    actualShowCashPayment = _useState30[0],
-    setActualShowCashPayment = _useState30[1];
-  var _useState31 = useState(0),
+    totalAmount = _useState30[0],
+    setTotalAmount = _useState30[1];
+  var _useState31 = useState(true),
     _useState32 = _slicedToArray(_useState31, 2),
-    windowHeight = _useState32[0],
-    setWindowHeight = _useState32[1];
-  var _useState33 = useState(false),
+    actualShowCashPayment = _useState32[0],
+    setActualShowCashPayment = _useState32[1];
+  var _useState33 = useState(0),
     _useState34 = _slicedToArray(_useState33, 2),
-    showRetryModal = _useState34[0],
-    setShowRetryModal = _useState34[1];
+    windowHeight = _useState34[0],
+    setWindowHeight = _useState34[1];
   var _useState35 = useState(false),
     _useState36 = _slicedToArray(_useState35, 2),
-    showCreateErrorModal = _useState36[0],
-    setShowCreateErrorModal = _useState36[1];
-  var _useState37 = useState(editOrderId || 0),
+    showRetryModal = _useState36[0],
+    setShowRetryModal = _useState36[1];
+  var _useState37 = useState(false),
     _useState38 = _slicedToArray(_useState37, 2),
-    currentEditOrderId = _useState38[0],
-    _setCurrentEditOrderId = _useState38[1];
+    showCreateErrorModal = _useState38[0],
+    setShowCreateErrorModal = _useState38[1];
+  var _useState39 = useState(editOrderId || 0),
+    _useState40 = _slicedToArray(_useState39, 2),
+    currentEditOrderId = _useState40[0],
+    _setCurrentEditOrderId = _useState40[1];
   var _useActiveExecute2 = useActiveExecute(),
     executeIfActive = _useActiveExecute2.executeIfActive;
   var Toast = useToast();
@@ -1552,18 +1614,18 @@ var PaymentModal = function PaymentModal(_ref18) {
   }, []);
 
   // 订单备注相关状态
-  var _useState39 = useState(false),
-    _useState40 = _slicedToArray(_useState39, 2),
-    noteModalOpen = _useState40[0],
-    setNoteModalOpen = _useState40[1];
-  var _useState41 = useState(''),
+  var _useState41 = useState(false),
     _useState42 = _slicedToArray(_useState41, 2),
-    orderNote = _useState42[0],
-    setOrderNote = _useState42[1];
-  var _useState43 = useState('payment-content'),
+    noteModalOpen = _useState42[0],
+    setNoteModalOpen = _useState42[1];
+  var _useState43 = useState(''),
     _useState44 = _slicedToArray(_useState43, 2),
-    noteModalSource = _useState44[0],
-    setNoteModalSource = _useState44[1];
+    orderNote = _useState44[0],
+    setOrderNote = _useState44[1];
+  var _useState45 = useState('payment-content'),
+    _useState46 = _slicedToArray(_useState45, 2),
+    noteModalSource = _useState46[0],
+    setNoteModalSource = _useState46[1];
 
   // 订单备注相关处理函数
   var handleNoteConfirm = /*#__PURE__*/function () {
@@ -2097,7 +2159,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, paymentResult;
+                  var currentOrderId, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _state$bookingConfig3, _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:
@@ -2128,7 +2190,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                         // 获取失败原因
                         failureReason = responseData === null || responseData === void 0 ? void 0 : responseData.failure_reason; // 根据支付状态弹出对应的支付结果toast
                         if (!paymentStatus) {
-                          _context22.next = 35;
+                          _context22.next = 37;
                           break;
                         }
                         // 打印订单完整信息
@@ -2200,8 +2262,16 @@ var PaymentModal = function PaymentModal(_ref18) {
                       case 26:
                         enabledAutoPrint = _context22.sent;
                       case 27:
-                        _orderInfo3 = checkout.getCurrentOrderInfo(); // 根据支付状态展示不同的 toast
-                        _context22.next = 30;
+                        _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';
+                        if (!isToastMode) {
+                          autoCloseConfig.autoClose = false;
+                          autoCloseConfig.autoCloseDelay = 0;
+                          autoCloseConfig.maskClosable = false;
+                        }
+
+                        // 根据支付状态展示不同的 toast
+                        _context22.next = 32;
                         return displayPaymentResultToast({
                           paymentStatus: paymentStatus,
                           orderTotalAmount: _orderInfo3.isDeposit ? _orderInfo3.depositAmount : orderTotalAmount,
@@ -2210,7 +2280,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                           autoCloseConfig: autoCloseConfig,
                           actionButtons: generateActionButtons(paymentStatus, enabledAutoPrint)
                         }, paymentResultToastConfig);
-                      case 30:
+                      case 32:
                         // 当支付状态为 paid 时，关闭 paymentModal
                         if (paymentStatus === 'paid') {
                           handleModalClose();
@@ -2226,11 +2296,11 @@ var PaymentModal = function PaymentModal(_ref18) {
                           }
                         });
                         handlePaymentComplete(paymentResult);
-                        _context22.next = 36;
+                        _context22.next = 38;
                         break;
-                      case 35:
+                      case 37:
                         handlePaymentComplete(data);
-                      case 36:
+                      case 38:
                       case "end":
                         return _context22.stop();
                     }

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

@@ -8,6 +8,8 @@ interface AdditionalModuleProps {
     hasOrderNote?: boolean;
     disabled?: boolean;
     showCashPayment?: boolean;
+    isFullWidth?: boolean;
+    showMore?: boolean;
 }
-declare function AdditionalModule({ orderInfo, customAmount, handleButtonClick, hasOrderNote, disabled, showCashPayment, }: AdditionalModuleProps): JSX.Element;
+declare function AdditionalModule({ orderInfo, customAmount, handleButtonClick, hasOrderNote, disabled, showCashPayment, isFullWidth, showMore }: AdditionalModuleProps): JSX.Element;
 export default AdditionalModule;

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

@@ -18,7 +18,11 @@ function AdditionalModule(_ref) {
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     _ref$showCashPayment = _ref.showCashPayment,
-    showCashPayment = _ref$showCashPayment === void 0 ? false : _ref$showCashPayment;
+    showCashPayment = _ref$showCashPayment === void 0 ? false : _ref$showCashPayment,
+    _ref$isFullWidth = _ref.isFullWidth,
+    isFullWidth = _ref$isFullWidth === void 0 ? false : _ref$isFullWidth,
+    _ref$showMore = _ref.showMore,
+    showMore = _ref$showMore === void 0 ? true : _ref$showMore;
   // 初始化国际化
   locales.init(localeTexts, getLocale());
 
@@ -27,6 +31,12 @@ function AdditionalModule(_ref) {
     key: 'send-link',
     label: locales.getText('pisell2.text.send-link'),
     icon: /*#__PURE__*/React.createElement(LinkOutlined, null)
+  }, {
+    key: 'print-receipt',
+    label: locales.getText('pisell2.text.print-receipt'),
+    icon: /*#__PURE__*/React.createElement(Icon, {
+      type: "pisell2-printer"
+    })
   }];
   var Toast = useToast();
   return /*#__PURE__*/React.createElement("div", {
@@ -35,9 +45,9 @@ function AdditionalModule(_ref) {
     className: "additional-module-title"
   }, locales.getText('pisell2.text.others')), /*#__PURE__*/React.createElement("div", {
     className: "additional-module-buttons-container"
-  }, showCashPayment ?
+  }, showCashPayment && !isFullWidth ?
   /*#__PURE__*/
-  // Grid布局模式：两行布局（显示现金支付模块时）
+  // Grid布局模式：两行布局（显示现金支付模块且非全宽时）
   React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "additional-module-button-row"
   }, /*#__PURE__*/React.createElement(Button, {
@@ -57,14 +67,14 @@ function AdditionalModule(_ref) {
   }))), /*#__PURE__*/React.createElement(Button, {
     className: "additional-module-button-base purple-theme",
     onClick: function onClick() {
-      handleButtonClick('print-receipt');
+      handleButtonClick('split-payment');
     },
     icon: /*#__PURE__*/React.createElement(Icon, {
-      type: "pisell2-printer",
+      type: "pisell2-coins-01",
       className: "additional-module-button-icon"
     }),
     size: "large"
-  }, locales.getText('pisell2.text.print-receipt'))), /*#__PURE__*/React.createElement("div", {
+  }, locales.getText('split.payment'))), /*#__PURE__*/React.createElement("div", {
     className: "additional-module-button-row"
   }, /*#__PURE__*/React.createElement(Button, {
     className: "additional-module-button-base purple-theme",
@@ -86,7 +96,7 @@ function AdditionalModule(_ref) {
     icon: /*#__PURE__*/React.createElement(ClockCircleOutlined, {
       className: "additional-module-button-icon"
     })
-  }, locales.getText('pisell2.text.save-pay-later')), /*#__PURE__*/React.createElement(Dropdown, {
+  }, locales.getText('pisell2.text.save-pay-later')), showMore && /*#__PURE__*/React.createElement(Dropdown, {
     menu: {
       items: moreMenuItems,
       onClick: function onClick(_ref2) {
@@ -98,6 +108,8 @@ function AdditionalModule(_ref) {
           } else {
             Toast.fail(locales.getText('pisell2.text.order-no-payment-cannot-send-link'));
           }
+        } else if (key === 'split-payment') {
+          handleButtonClick('split-payment');
         }
       }
     },
@@ -118,9 +130,29 @@ function AdditionalModule(_ref) {
       type: "pisell2-dots-vertical",
       size: 20
     })
-  })))) :
+  }))), !showMore && /*#__PURE__*/React.createElement("div", {
+    className: "additional-module-button-row"
+  }, /*#__PURE__*/React.createElement(Button, {
+    className: "additional-module-button-base purple-theme",
+    onClick: function onClick() {
+      handleButtonClick('send-link');
+    },
+    disabled: disabled,
+    size: "large",
+    icon: /*#__PURE__*/React.createElement(LinkOutlined, null)
+  }, locales.getText('pisell2.text.send-link')), /*#__PURE__*/React.createElement(Button, {
+    className: "additional-module-button-base purple-theme",
+    onClick: function onClick() {
+      handleButtonClick('print-receipt');
+    },
+    disabled: disabled,
+    size: "large",
+    icon: /*#__PURE__*/React.createElement(Icon, {
+      type: "pisell2-printer"
+    })
+  }, locales.getText('pisell2.text.print-receipt')))) :
   /*#__PURE__*/
-  // Flex布局模式：一行布局（不显示现金支付模块时）
+  // Flex布局模式：一行布局（不显示现金支付模块或强制全宽时）
   React.createElement("div", {
     className: "additional-module-button-row"
   }, /*#__PURE__*/React.createElement(Button, {
@@ -140,14 +172,14 @@ function AdditionalModule(_ref) {
   }))), /*#__PURE__*/React.createElement(Button, {
     className: "additional-module-button-base purple-theme",
     onClick: function onClick() {
-      handleButtonClick('print-receipt');
+      handleButtonClick('split-payment');
     },
     size: "large",
     icon: /*#__PURE__*/React.createElement(Icon, {
-      type: "pisell2-printer",
+      type: "pisell2-coins-01",
       className: "additional-module-button-icon"
     })
-  }, locales.getText('pisell2.text.print-receipt')), /*#__PURE__*/React.createElement(Button, {
+  }, locales.getText('split.payment')), /*#__PURE__*/React.createElement(Button, {
     className: "additional-module-button-base purple-theme",
     onClick: function onClick() {
       handleButtonClick('manual-discount');