@pisell/private-materials 6.4.6 → 6.4.8

package/es/components/checkout/PaymentModal.js

@@ -1,11 +1,11 @@
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -44,7 +44,7 @@ import useToast from "../../hooks/useToast";
 import "./index.less";
 import { WALLET_PASS_CODE_ARRAY, WALLET_PASS_CODE_MAP } from "./constants";
 import { cloneDeep } from 'lodash';
-import { getShopWalletPassId } from "./utils";
+import { getShopWalletPassId, reorderPaymentMethodList } from "./utils";
 import usePaymentLogger from "./hooks/usePaymentLogger";
 import { Button } from 'antd';
 
@@ -54,7 +54,8 @@ var CheckoutHooks = {
   OnBalanceDueAmountChanged: 'checkout:onBalanceDueAmountChanged',
   OnOrderSubmitStart: 'checkout:onOrderSubmitStart',
   OnOrderSubmitEnd: 'checkout:onOrderSubmitEnd',
-  OnOrderSyncFailed: 'checkout:onOrderSyncFailed'
+  OnOrderSyncFailed: 'checkout:onOrderSyncFailed',
+  OnOrderPaymentAdded: 'checkout:onPaymentItemAdded'
 };
 
 // 从 PaymentOptionsModule 导入扩展支付方法类型
@@ -85,7 +86,9 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     showSuccessToast = _ref.showSuccessToast,
     _ref$dynamicMaxHeight = _ref.dynamicMaxHeight,
     dynamicMaxHeight = _ref$dynamicMaxHeight === void 0 ? '600px' : _ref$dynamicMaxHeight,
-    onOrderSyncFailed = _ref.onOrderSyncFailed;
+    onOrderSyncFailed = _ref.onOrderSyncFailed,
+    generateActionButtons = _ref.generateActionButtons,
+    paymentResultToastConfig = _ref.paymentResultToastConfig;
   var context = useEngineContext();
   var utils = context.appHelper.utils || {};
   var pisellos = utils.pisellos,
@@ -209,6 +212,19 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+
+  // 处理 surcharge 字符串，去除前面的 $ 符号
+  var processSurcharge = function processSurcharge(surcharge) {
+    if (typeof surcharge === 'string') {
+      // 去除前面的 $ 符号和其他货币符号
+      return surcharge.replace(/^[$¥€£]+/, '');
+    }
+    if (typeof surcharge === 'number') {
+      // 如果是数字，转换为字符串
+      return String(surcharge);
+    }
+    return surcharge;
+  };
   var onPaymentOptionClick = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(method) {
       var _ref4, id, code, name, type, eftposCodes, mx51Code, payType, _paymentMethodsRef$cu, data, isSynced, orderId, service_charge;
@@ -264,7 +280,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                   orderId: data.orderId,
                   symbol: getData('shop_symbol'),
                   amount: customAmount,
-                  surcharge: method.surcharge
+                  surcharge: processSurcharge(method.surcharge)
                 },
                 mode: 'pay'
               },
@@ -377,18 +393,36 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       // setCustomAmount(cartData?.total?.expectAmount || 0);
     }
     if (checkoutModule && isModalOpen) {
-      checkoutModule.getPaymentMethodsAsync().then(function (paymentMethods) {
-        setPaymentMethods(paymentMethods);
-        // TODO: 现金枚举类型需要从os导入
-        var isShowCashPayment = paymentMethods.some(function (item) {
-          return item.code === 'CASHMANUAL';
-        });
-        setShowCashPayment(isShowCashPayment);
-        onShowCashPaymentChange === null || onShowCashPaymentChange === void 0 || onShowCashPaymentChange(isShowCashPayment);
-        if (!isShowCashPayment) {
-          setPaymentOptionsTitle(locales.getText('pisell2.checkout.payment.select-payment') || 'Select Payment');
-        }
-      });
+      checkoutModule.getPaymentMethodsAsync().then( /*#__PURE__*/function () {
+        var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(paymentMethods) {
+          var reorderedPaymentMethods, isShowCashPayment;
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.next = 2;
+                return reorderPaymentMethodList(paymentMethods, interaction);
+              case 2:
+                reorderedPaymentMethods = _context3.sent;
+                setPaymentMethods(reorderedPaymentMethods);
+                // TODO: 现金枚举类型需要从os导入
+                isShowCashPayment = paymentMethods.some(function (item) {
+                  return item.code === 'CASHMANUAL';
+                });
+                setShowCashPayment(isShowCashPayment);
+                onShowCashPaymentChange === null || onShowCashPaymentChange === void 0 || onShowCashPaymentChange(isShowCashPayment);
+                if (!isShowCashPayment) {
+                  setPaymentOptionsTitle(locales.getText('pisell2.checkout.payment.select-payment') || 'Select Payment');
+                }
+              case 8:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3);
+        }));
+        return function (_x3) {
+          return _ref6.apply(this, arguments);
+        };
+      }());
     }
   }, [checkoutModule, orderInfo]);
 
@@ -410,10 +444,10 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
         var core = checkoutModule.core;
         if (core.effects && typeof core.effects.on === 'function') {
           var unsubscribe = core.effects.on(CheckoutHooks.OnStateAmountChanged, /*#__PURE__*/function () {
-            var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(data) {
+            var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(data) {
               var _Toast$success, _Toast$success2, items;
-              return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                while (1) switch (_context3.prev = _context3.next) {
+              return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                while (1) switch (_context4.prev = _context4.next) {
                   case 0:
                     console.log("Amount changed from ".concat(data.oldAmount, " to ").concat(data.newAmount));
                     if (clientChangedRef.current) {
@@ -425,19 +459,19 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                       }
                     }
                     setCustomAmount(data.newAmount);
-                    _context3.next = 5;
+                    _context4.next = 5;
                     return checkoutModule.getCurrentOrderPaymentItemsAsync();
                   case 5:
-                    items = _context3.sent;
+                    items = _context4.sent;
                     setPaymentItems(items);
                   case 7:
                   case "end":
-                    return _context3.stop();
+                    return _context4.stop();
                 }
-              }, _callee3);
+              }, _callee4);
             }));
-            return function (_x3) {
-              return _ref6.apply(this, arguments);
+            return function (_x4) {
+              return _ref7.apply(this, arguments);
             };
           }());
           var amountChangedUnsubscribe = core.effects.on(CheckoutHooks.OnBalanceDueAmountChanged, function (data) {
@@ -471,7 +505,44 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           //     Toast?.fail(locales.getText('pisell2.checkout.order-sync-failed') || 'Order sync failed');
           //   }
           // );
+          var orderPaymentAddedUnsubscribe = core.effects.on(CheckoutHooks.OnOrderPaymentAdded, function (data) {
+            console.log('orderPaymentAddedUnsubscribe>>>>', data);
+            var balanceDueAmount = checkoutModule.getBalanceDueAmount();
+            if (Number(balanceDueAmount) > 0) {
+              var autoCloseConfig = calculateAutoCloseConfig('partially_paid', false);
+              // 获取订单总金额
+              var _orderInfo = checkoutModule.getCurrentOrderInfo();
 
+              // 根据支付状态展示不同的 toast
+              displayPaymentResultToast({
+                paymentStatus: 'partially_paid',
+                orderTotalAmount: _orderInfo.totalAmount,
+                gapAmount: balanceDueAmount,
+                failureReason: '',
+                autoCloseConfig: autoCloseConfig,
+                actionButtons: generateActionButtons === null || generateActionButtons === void 0 ? void 0 : generateActionButtons('partially_paid')
+              }, _objectSpread(_objectSpread({}, paymentResultToastConfig), {}, {
+                onToastClose: function onToastClose() {
+                  closePaymentResultToast();
+                },
+                onCountdownComplete: function onCountdownComplete() {
+                  closePaymentResultToast();
+                }
+              }));
+            }
+            // 判断是否为现金支付
+            var paymentMethodName = data.paymentMethodName || data.name || '';
+            var isCashPayment = data.paymentMethodCode === 'cash' || data.paymentMethodCode === 'CASH' || /现金|現金/i.test(paymentMethodName) || /cash/i.test(paymentMethodName);
+            if (isCashPayment) {
+              var _interaction$utils, _interaction$utils$as;
+              // handleToastClose();
+              // TODO: 等红阳的方法
+              interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$as = _interaction$utils.asyncDataManager) === null || _interaction$utils$as === void 0 || _interaction$utils$as.call(_interaction$utils, {
+                module: 'till',
+                key: 'open_till'
+              });
+            }
+          });
           return function () {
             if (unsubscribe && typeof unsubscribe === 'function') {
               unsubscribe();
@@ -485,6 +556,9 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             if (amountChangedUnsubscribe && typeof amountChangedUnsubscribe === 'function') {
               amountChangedUnsubscribe();
             }
+            if (orderPaymentAddedUnsubscribe && typeof orderPaymentAddedUnsubscribe === 'function') {
+              orderPaymentAddedUnsubscribe();
+            }
           };
         }
       } catch (error) {
@@ -495,160 +569,186 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 处理金额修改
   var handleAmountChange = useCallback( /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(newAmount) {
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newAmount) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             if (!checkoutModule) {
-              _context4.next = 10;
+              _context5.next = 10;
               break;
             }
-            _context4.prev = 1;
-            _context4.next = 4;
+            _context5.prev = 1;
+            _context5.next = 4;
             return checkoutModule.setStateAmountAsync(newAmount);
           case 4:
             setCustomAmount(newAmount);
-            _context4.next = 10;
+            _context5.next = 10;
             break;
           case 7:
-            _context4.prev = 7;
-            _context4.t0 = _context4["catch"](1);
-            console.error('Failed to set custom amount:', _context4.t0);
+            _context5.prev = 7;
+            _context5.t0 = _context5["catch"](1);
+            console.error('Failed to set custom amount:', _context5.t0);
           case 10:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4, null, [[1, 7]]);
+      }, _callee5, null, [[1, 7]]);
     }));
-    return function (_x4) {
-      return _ref7.apply(this, arguments);
+    return function (_x5) {
+      return _ref8.apply(this, arguments);
     };
   }(), [checkoutModule]);
 
   // 处理押金状态变更
   var handleDepositStatusChange = useCallback( /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(isDeposit) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(isDeposit) {
       var depositStatus;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
             if (!checkoutModule) {
-              _context5.next = 11;
+              _context6.next = 11;
               break;
             }
-            _context5.prev = 1;
+            _context6.prev = 1;
             depositStatus = isDeposit ? 1 : 0;
-            _context5.next = 5;
+            _context6.next = 5;
             return checkoutModule.updateOrderDepositStatusAsync(depositStatus);
           case 5:
             console.log("Deposit status updated to: ".concat(depositStatus, " (").concat(isDeposit ? 'deposit' : 'regular', ")"));
-            _context5.next = 11;
+            _context6.next = 11;
             break;
           case 8:
-            _context5.prev = 8;
-            _context5.t0 = _context5["catch"](1);
-            console.error('Failed to update deposit status:', _context5.t0);
+            _context6.prev = 8;
+            _context6.t0 = _context6["catch"](1);
+            console.error('Failed to update deposit status:', _context6.t0);
           case 11:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5, null, [[1, 8]]);
+      }, _callee6, null, [[1, 8]]);
     }));
-    return function (_x5) {
-      return _ref8.apply(this, arguments);
+    return function (_x6) {
+      return _ref9.apply(this, arguments);
     };
   }(), [checkoutModule]);
 
   // 当 walletpass 直接就满足订单支付时，触发此方法
   var handleWalletPassConfirmPay = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(action) {
-      var result;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(action) {
+      var result, _result$response, responseData, _responseData$payment, _responseData$payment2, params;
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             if (!(action === 'save-without-deduct')) {
-              _context6.next = 5;
+              _context7.next = 5;
               break;
             }
-            _context6.next = 3;
+            _context7.next = 3;
             return checkoutModule.updateVoucherPaymentItemsAsync([]);
           case 3:
-            _context6.next = 7;
+            _context7.next = 7;
             break;
           case 5:
             if (!(action === 'cancel')) {
-              _context6.next = 7;
+              _context7.next = 7;
               break;
             }
-            return _context6.abrupt("return");
+            return _context7.abrupt("return");
           case 7:
-            _context6.next = 9;
+            _context7.next = 9;
             return checkoutModule.manualSyncOrderAsync();
           case 9:
-            result = _context6.sent;
+            result = _context7.sent;
             showSuccessToast === null || showSuccessToast === void 0 || showSuccessToast(result);
+            if (result.success) {
+              responseData = (_result$response = result.response) === null || _result$response === void 0 ? void 0 : _result$response.data; // 打印订单完整信息
+              console.log('print_order_onOrderSynced>>>>', result);
+              try {
+                params = {
+                  type: '99',
+                  // 打印订单全部信息
+                  data: {
+                    order_id: responseData.order_id,
+                    machine_code_print_info: responseData === null || responseData === void 0 || (_responseData$payment = responseData.payment_info) === null || _responseData$payment === void 0 ? void 0 : _responseData$payment.machine_code_info,
+                    small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment2 = responseData.payment_info) === null || _responseData$payment2 === void 0 ? void 0 : _responseData$payment2.small_ticket_data
+                  }
+                };
+                console.log('print_order_onOrderSynced_params>>>>', params);
+                webPrint(params, function (res) {
+                  console.log('print_order_onOrderSynced_res>>>>', res);
+                });
+              } catch (error) {
+                console.error('print_order_onOrderSynced_error>>>>', error);
+              }
+            }
             // onPaymentCancel(true);
-          case 11:
+          case 12:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6);
+      }, _callee7);
     }));
-    return function handleWalletPassConfirmPay(_x6) {
-      return _ref9.apply(this, arguments);
+    return function handleWalletPassConfirmPay(_x7) {
+      return _ref10.apply(this, arguments);
     };
   }();
 
   // 处理 Save & Pay Later 的钱包余额确认
   var handleSavePayLater = useCallback( /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(action) {
-      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(action) {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
             if (!(action === 'apply-deduct-now')) {
-              _context7.next = 4;
+              _context8.next = 4;
               break;
             }
             console.log('立即应用并扣除钱包余额，然后保存稍后付款');
             // 执行扣除逻辑
-            _context7.next = 13;
+            _context8.next = 13;
             break;
           case 4:
             if (!(action === 'save-without-deduct')) {
-              _context7.next = 10;
+              _context8.next = 10;
               break;
             }
             console.log('保存但不扣除钱包余额，稍后付款');
             // 保存但不扣除，先把 os 里 voucher_id 的 payment 删除
-            _context7.next = 8;
+            _context8.next = 8;
             return checkoutModule.updateVoucherPaymentItemsAsync([]);
           case 8:
-            _context7.next = 13;
+            _context8.next = 13;
             break;
           case 10:
             if (!(action === 'cancel')) {
-              _context7.next = 13;
+              _context8.next = 13;
               break;
             }
             console.log('取消保存稍后付款');
-            return _context7.abrupt("return");
+            return _context8.abrupt("return");
           case 13:
             if (!checkoutModule) {
-              _context7.next = 17;
+              _context8.next = 18;
               break;
             }
-            _context7.next = 16;
+            _context8.next = 16;
             return checkoutModule.saveForLaterPaymentAsync();
           case 16:
-            onPaymentCancel(true);
-          case 17:
+            res = _context8.sent;
+            if (res.success) {
+              onPaymentCancel(true);
+              closePaymentResultToast();
+            }
+          case 18:
           case "end":
-            return _context7.stop();
+            return _context8.stop();
         }
-      }, _callee7);
+      }, _callee8);
     }));
-    return function (_x7) {
-      return _ref10.apply(this, arguments);
+    return function (_x8) {
+      return _ref11.apply(this, arguments);
     };
   }(), [checkoutModule, onPaymentCancel]);
   var moduleConfig = {
@@ -716,13 +816,13 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }
   }, [state, showPriceAdjustModal]);
   var handleSelectWalletChange = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(select) {
+    var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(select) {
       var voucherItems, data;
-      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
             if (!walletPassDetail.isShow) {
-              _context8.next = 7;
+              _context9.next = 7;
               break;
             }
             voucherItems = [];
@@ -751,7 +851,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               title: 'handleSelectWalletChange checkoutModule updateVoucherPaymentItemsAsync',
               metadata: {}
             });
-            _context8.next = 6;
+            _context9.next = 6;
             return checkoutModule.updateVoucherPaymentItemsAsync(voucherItems);
           case 6:
             // 更新钱包卡券数据
@@ -761,21 +861,21 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             }
           case 7:
           case "end":
-            return _context8.stop();
+            return _context9.stop();
         }
-      }, _callee8);
+      }, _callee9);
     }));
-    return function (_x8) {
-      return _ref11.apply(this, arguments);
+    return function (_x9) {
+      return _ref12.apply(this, arguments);
     };
   }());
 
   // 手动折扣相关处理函数
   var handlePriceAdjustConfirm = /*#__PURE__*/function () {
-    var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(newPrice) {
+    var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(newPrice) {
       var ScheduleModule, _getSumTotal2, productAmount, discountAmount;
-      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
           case 0:
             try {
               if (checkoutModule && orderInfo !== null && orderInfo !== void 0 && orderInfo.totalAmount) {
@@ -806,51 +906,51 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             setShowPriceAdjustModal(false);
           case 2:
           case "end":
-            return _context9.stop();
+            return _context10.stop();
         }
-      }, _callee9);
+      }, _callee10);
     }));
-    return function handlePriceAdjustConfirm(_x9) {
-      return _ref12.apply(this, arguments);
+    return function handlePriceAdjustConfirm(_x10) {
+      return _ref13.apply(this, arguments);
     };
   }();
   var handleButtonClick = /*#__PURE__*/function () {
-    var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(key) {
+    var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(key) {
       var _savePayLaterHandlerR;
       var data, isSynced, orderId, params, _paymentItems;
-      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+        while (1) switch (_context11.prev = _context11.next) {
           case 0:
             console.log('handleButtonClick', key);
-            _context10.t0 = key;
-            _context10.next = _context10.t0 === 'order-note' ? 4 : _context10.t0 === 'send-link' ? 6 : _context10.t0 === 'print-receipt' ? 8 : _context10.t0 === 'manual-discount' ? 24 : _context10.t0 === 'save-pay-later' ? 38 : 40;
+            _context11.t0 = key;
+            _context11.next = _context11.t0 === 'order-note' ? 4 : _context11.t0 === 'send-link' ? 6 : _context11.t0 === 'print-receipt' ? 8 : _context11.t0 === 'manual-discount' ? 24 : _context11.t0 === 'save-pay-later' ? 38 : 40;
             break;
           case 4:
             setNoteModalOpen(true);
-            return _context10.abrupt("break", 40);
+            return _context11.abrupt("break", 40);
           case 6:
             setPaymentLinkModalOpen(true);
-            return _context10.abrupt("break", 40);
+            return _context11.abrupt("break", 40);
           case 8:
-            _context10.next = 10;
+            _context11.next = 10;
             return checkoutModule.isCurrentOrderSynced();
           case 10:
-            isSynced = _context10.sent;
+            isSynced = _context11.sent;
             if (isSynced) {
-              _context10.next = 17;
+              _context11.next = 17;
               break;
             }
-            _context10.next = 14;
+            _context11.next = 14;
             return checkoutModule.manualSyncOrderAsync();
           case 14:
-            data = _context10.sent;
-            _context10.next = 21;
+            data = _context11.sent;
+            _context11.next = 21;
             break;
           case 17:
-            _context10.next = 19;
+            _context11.next = 19;
             return checkoutModule.getCurrentOrderId();
           case 19:
-            orderId = _context10.sent;
+            orderId = _context11.sent;
             data = {
               orderId: orderId
             };
@@ -875,47 +975,47 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 console.error('handleButtonClick_print-receipt_error>>>>', error);
               }
             }
-            return _context10.abrupt("break", 40);
+            return _context11.abrupt("break", 40);
           case 24:
             if (orderInfo !== null && orderInfo !== void 0 && orderInfo.totalAmount) {
-              _context10.next = 27;
+              _context11.next = 27;
               break;
             }
             Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.manual-discount.no-amount'));
-            return _context10.abrupt("return");
+            return _context11.abrupt("return");
           case 27:
-            _context10.next = 29;
+            _context11.next = 29;
             return checkoutModule.getCurrentOrderPaymentItemsAsync();
           case 29:
-            _paymentItems = _context10.sent;
+            _paymentItems = _context11.sent;
             if (!(_paymentItems !== null && _paymentItems !== void 0 && _paymentItems.length)) {
-              _context10.next = 33;
+              _context11.next = 33;
               break;
             }
             Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.manual-discount.has-payment-items'));
-            return _context10.abrupt("return");
+            return _context11.abrupt("return");
           case 33:
             if (!(Number(customAmount) <= 0 && Number(orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalAmount) >= 0)) {
-              _context10.next = 36;
+              _context11.next = 36;
               break;
             }
             Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.manual-discount.no-amount'));
-            return _context10.abrupt("return");
+            return _context11.abrupt("return");
           case 36:
             setShowPriceAdjustModal(true);
-            return _context10.abrupt("break", 40);
+            return _context11.abrupt("break", 40);
           case 38:
             // 通过 ref 调用 SavePayLaterHandler 的处理方法
             (_savePayLaterHandlerR = savePayLaterHandlerRef.current) === null || _savePayLaterHandlerR === void 0 || _savePayLaterHandlerR.handleSavePayLaterClick();
-            return _context10.abrupt("break", 40);
+            return _context11.abrupt("break", 40);
           case 40:
           case "end":
-            return _context10.stop();
+            return _context11.stop();
         }
-      }, _callee10);
+      }, _callee11);
     }));
-    return function handleButtonClick(_x10) {
-      return _ref13.apply(this, arguments);
+    return function handleButtonClick(_x11) {
+      return _ref14.apply(this, arguments);
     };
   }();
 
@@ -943,27 +1043,27 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     };
   };
   var handleSendCustomerPaymentLink = /*#__PURE__*/function () {
-    var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(data) {
+    var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(data) {
       var isCurrentOrderSynced, res;
-      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-        while (1) switch (_context11.prev = _context11.next) {
+      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+        while (1) switch (_context12.prev = _context12.next) {
           case 0:
             // 先检测订单是否同步过，如果没有，需要先手动下单
             isCurrentOrderSynced = checkoutModule.isCurrentOrderSynced();
             if (isCurrentOrderSynced) {
-              _context11.next = 4;
+              _context12.next = 4;
               break;
             }
-            _context11.next = 4;
+            _context12.next = 4;
             return checkoutModule.manualSyncOrderAsync();
           case 4:
-            _context11.next = 6;
+            _context12.next = 6;
             return checkoutModule.sendCustomerPayLinkAsync({
               emails: data.emails,
               order_ids: [checkoutModule.getCurrentOrderId()]
             });
           case 6:
-            res = _context11.sent;
+            res = _context12.sent;
             // 支付链接发送成功 转 toC，这边可以关掉了
             if (res.success) {
               Toast === null || Toast === void 0 || Toast.success(locales.getText('pisell2.checkout.send-payment-link.success'));
@@ -973,12 +1073,12 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             }
           case 8:
           case "end":
-            return _context11.stop();
+            return _context12.stop();
         }
-      }, _callee11);
+      }, _callee12);
     }));
-    return function handleSendCustomerPaymentLink(_x11) {
-      return _ref14.apply(this, arguments);
+    return function handleSendCustomerPaymentLink(_x12) {
+      return _ref15.apply(this, arguments);
     };
   }();
   var searchAndClientProps = useMemo(function () {
@@ -990,24 +1090,24 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     return {};
   }, [paymentItems]);
   var roundingFunction = /*#__PURE__*/function () {
-    var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(amount) {
+    var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(amount) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-        while (1) switch (_context12.prev = _context12.next) {
+      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+        while (1) switch (_context13.prev = _context13.next) {
           case 0:
-            _context12.next = 2;
+            _context13.next = 2;
             return checkoutModule.roundAmountAsync(amount);
           case 2:
-            res = _context12.sent;
-            return _context12.abrupt("return", res);
+            res = _context13.sent;
+            return _context13.abrupt("return", res);
           case 4:
           case "end":
-            return _context12.stop();
+            return _context13.stop();
         }
-      }, _callee12);
+      }, _callee13);
     }));
-    return function roundingFunction(_x12) {
-      return _ref15.apply(this, arguments);
+    return function roundingFunction(_x13) {
+      return _ref16.apply(this, arguments);
     };
   }();
   return /*#__PURE__*/React.createElement("div", {
@@ -1050,6 +1150,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       gridRow: '1'
     } : {}
   }, /*#__PURE__*/React.createElement(CashPaymentModule, {
+    isModalOpen: isModalOpen,
     amountSymbol: state.amountSymbol,
     orderInfo: orderInfo || undefined,
     onPaymentComplete: handleAddCashPayment,
@@ -1134,20 +1235,20 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
 // 主要的支付弹窗组件
 
-var PaymentModal = function PaymentModal(_ref16) {
+var PaymentModal = function PaymentModal(_ref17) {
   var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper;
-  var open = _ref16.open,
-    data = _ref16.data,
-    callback = _ref16.callback,
-    onClose = _ref16.onClose,
-    dispatch = _ref16.dispatch,
-    state = _ref16.state;
+  var open = _ref17.open,
+    data = _ref17.data,
+    callback = _ref17.callback,
+    onClose = _ref17.onClose,
+    dispatch = _ref17.dispatch,
+    state = _ref17.state;
   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 _ref17 = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
-    pisellos = _ref17.pisellos,
-    getData = _ref17.getData,
-    interaction = _ref17.interaction;
+  var _ref18 = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    pisellos = _ref18.pisellos,
+    getData = _ref18.getData,
+    interaction = _ref18.interaction;
   var _useState21 = useState(null),
     _useState22 = _slicedToArray(_useState21, 2),
     orderInfo = _useState22[0],
@@ -1172,10 +1273,10 @@ var PaymentModal = function PaymentModal(_ref16) {
 
   // 重试处理函数（逻辑由用户自己实现）
   var handleRetry = /*#__PURE__*/function () {
-    var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+    var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
       var checkoutModule, res;
-      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-        while (1) switch (_context13.prev = _context13.next) {
+      return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+        while (1) switch (_context14.prev = _context14.next) {
           case 0:
             // TODO: 用户在这里实现重试逻辑
             // console.log('重试按钮被点击，请在这里添加重试逻辑');
@@ -1187,10 +1288,10 @@ var PaymentModal = function PaymentModal(_ref16) {
             //   // 失败保持弹窗打开，允许继续重试
             // }
             checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
-            _context13.next = 3;
+            _context14.next = 3;
             return checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.manualSyncOrderAsync();
           case 3:
-            res = _context13.sent;
+            res = _context14.sent;
             console.log(res);
             if (res.success) {
               setShowRetryModal(false);
@@ -1199,12 +1300,12 @@ var PaymentModal = function PaymentModal(_ref16) {
             }
           case 6:
           case "end":
-            return _context13.stop();
+            return _context14.stop();
         }
-      }, _callee13);
+      }, _callee14);
     }));
     return function handleRetry() {
-      return _ref18.apply(this, arguments);
+      return _ref19.apply(this, arguments);
     };
   }();
 
@@ -1266,13 +1367,13 @@ var PaymentModal = function PaymentModal(_ref16) {
 
   // 订单备注相关处理函数
   var handleNoteConfirm = /*#__PURE__*/function () {
-    var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(noteValue) {
+    var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(noteValue) {
       var checkoutModule, orderId, _checkoutModule$editO, _checkoutModule, _checkoutModule$updat;
-      return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-        while (1) switch (_context14.prev = _context14.next) {
+      return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+        while (1) switch (_context15.prev = _context15.next) {
           case 0:
             if (!(noteModalSource === 'payment-result-toast')) {
-              _context14.next = 6;
+              _context15.next = 6;
               break;
             }
             checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
@@ -1283,15 +1384,15 @@ var PaymentModal = function PaymentModal(_ref16) {
               Toast === null || Toast === void 0 || Toast.success(locales.getText('pisell2.checkout.order-note.updated-successfully'));
             }
             setNoteModalOpen(false);
-            return _context14.abrupt("return");
+            return _context15.abrupt("return");
           case 6:
-            _context14.prev = 6;
+            _context15.prev = 6;
             _checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
             if (!_checkoutModule) {
-              _context14.next = 13;
+              _context15.next = 13;
               break;
             }
-            _context14.next = 11;
+            _context15.next = 11;
             return (_checkoutModule$updat = _checkoutModule.updateOrderNoteAsync) === null || _checkoutModule$updat === void 0 ? void 0 : _checkoutModule$updat.call(_checkoutModule, noteValue);
           case 11:
             setOrderNote(noteValue);
@@ -1317,38 +1418,38 @@ var PaymentModal = function PaymentModal(_ref16) {
               console.log('Note added from payment content');
               // 在支付内容中打开的，执行常规处理逻辑
             }
-            _context14.next = 21;
+            _context15.next = 21;
             break;
           case 17:
-            _context14.prev = 17;
-            _context14.t0 = _context14["catch"](6);
-            console.error('Failed to update order note:', _context14.t0);
+            _context15.prev = 17;
+            _context15.t0 = _context15["catch"](6);
+            console.error('Failed to update order note:', _context15.t0);
             Toast === null || Toast === void 0 || Toast.error(locales.getText('pisell2.checkout.order-note.update-failed'));
           case 21:
             setNoteModalOpen(false);
           case 22:
           case "end":
-            return _context14.stop();
+            return _context15.stop();
         }
-      }, _callee14, null, [[6, 17]]);
+      }, _callee15, null, [[6, 17]]);
     }));
-    return function handleNoteConfirm(_x13) {
-      return _ref19.apply(this, arguments);
+    return function handleNoteConfirm(_x14) {
+      return _ref20.apply(this, arguments);
     };
   }();
   var handleNoteDelete = /*#__PURE__*/function () {
-    var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+    var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
       var checkoutModule, _checkoutModule$updat2;
-      return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-        while (1) switch (_context15.prev = _context15.next) {
+      return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+        while (1) switch (_context16.prev = _context16.next) {
           case 0:
-            _context15.prev = 0;
+            _context16.prev = 0;
             checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
             if (!checkoutModule) {
-              _context15.next = 7;
+              _context16.next = 7;
               break;
             }
-            _context15.next = 5;
+            _context16.next = 5;
             return (_checkoutModule$updat2 = checkoutModule.updateOrderNoteAsync) === null || _checkoutModule$updat2 === void 0 ? void 0 : _checkoutModule$updat2.call(checkoutModule, '');
           case 5:
             setOrderNote('');
@@ -1364,23 +1465,23 @@ var PaymentModal = function PaymentModal(_ref16) {
                 }
               });
             }
-            _context15.next = 14;
+            _context16.next = 14;
             break;
           case 10:
-            _context15.prev = 10;
-            _context15.t0 = _context15["catch"](0);
-            console.error('Failed to delete order note:', _context15.t0);
+            _context16.prev = 10;
+            _context16.t0 = _context16["catch"](0);
+            console.error('Failed to delete order note:', _context16.t0);
             Toast === null || Toast === void 0 || Toast.error(locales.getText('pisell2.checkout.order-note.delete-failed'));
           case 14:
             setNoteModalOpen(false);
           case 15:
           case "end":
-            return _context15.stop();
+            return _context16.stop();
         }
-      }, _callee15, null, [[0, 10]]);
+      }, _callee16, null, [[0, 10]]);
     }));
     return function handleNoteDelete() {
-      return _ref20.apply(this, arguments);
+      return _ref21.apply(this, arguments);
     };
   }();
   var handleNoteCancel = function handleNoteCancel() {
@@ -1486,27 +1587,28 @@ var PaymentModal = function PaymentModal(_ref16) {
     _useState38 = _slicedToArray(_useState37, 2),
     isLocalOrderCreated = _useState38[0],
     setIsLocalOrderCreated = _useState38[1];
+  var unsubscribeRef = useRef(undefined);
 
   // 初始化checkout数据
   useEffect(function () {
     var initCheckoutData = /*#__PURE__*/function () {
-      var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
-        var checkout, _newData$subtotal_inf, shop_wallet_pass_id, newData, _orderInfo, _data$subtotal_info, _orderInfo2;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+      var _ref22 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+        var checkout, _newData$subtotal_inf, shop_wallet_pass_id, newData, _orderInfo2, _data$subtotal_info, _orderInfo3;
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              _context16.prev = 0;
+              _context17.prev = 0;
               // 获取 checkout 模块并处理订单数据
               checkout = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
               if (!(checkout && data && !isLocalOrderCreated)) {
-                _context16.next = 19;
+                _context17.next = 19;
                 break;
               }
               setIsLocalOrderCreated(true);
-              _context16.next = 6;
+              _context17.next = 6;
               return getShopWalletPassId(interaction);
             case 6:
-              shop_wallet_pass_id = _context16.sent;
+              shop_wallet_pass_id = _context17.sent;
               checkout.setOtherParams({
                 is_price_include_tax: getData('is_price_include_tax'),
                 tax_rate: getData('tax_rate') || '10',
@@ -1522,7 +1624,7 @@ var PaymentModal = function PaymentModal(_ref16) {
               console.time('initCheckoutData');
               newData = cloneDeep(data); // setTotalAmount(newData.total.expectAmount);
               // 先往 checkout 解决方案推送一条 local 数据
-              _context16.next = 12;
+              _context17.next = 12;
               return checkout.createLocalOrderAsync({
                 orderData: newData.order_info,
                 cartSummary: (_newData$subtotal_inf = newData.subtotal_info) === null || _newData$subtotal_inf === void 0 ? void 0 : _newData$subtotal_inf.subTotalList,
@@ -1533,15 +1635,18 @@ var PaymentModal = function PaymentModal(_ref16) {
               console.timeEnd('initCheckoutData');
 
               // 获取订单总金额
-              _orderInfo = checkout.getCurrentOrderInfo();
-              if (_orderInfo && _orderInfo.totalAmount) {
-                setTotalAmount(_orderInfo.totalAmount);
+              _orderInfo2 = checkout.getCurrentOrderInfo();
+              if (_orderInfo2 && _orderInfo2.totalAmount) {
+                setTotalAmount(_orderInfo2.totalAmount);
               }
-              setOrderInfo(_orderInfo);
+              setOrderInfo(_orderInfo2);
               // 监听订单同步完成，同步完成后显示订单完成 toast，关闭当前弹窗
-              checkout.core.effects.on('checkout:onOrderSynced', function (data) {
-                var _data$response, _responseData$payment;
-                console.log('checkout:onOrderSynced>>>>', data);
+              unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', function (data) {
+                var _data$response, _responseData$payment3;
+                // 获取支付状态和相关信息
+                var responseData = (_data$response = data.response) === null || _data$response === void 0 ? void 0 : _data$response.data;
+                // 获取支付状态
+                var paymentStatus = responseData === null || responseData === void 0 ? void 0 : responseData.payment_status;
                 if (data.isManual) return;
                 handlePaymentComplete(data);
                 // 如果正在显示现金支付 toast，跳过自动关闭逻辑
@@ -1549,20 +1654,37 @@ var PaymentModal = function PaymentModal(_ref16) {
                   return;
                 }
 
-                // 获取支付状态和相关信息
-                var responseData = (_data$response = data.response) === null || _data$response === void 0 ? void 0 : _data$response.data;
-                // 获取支付状态
-                var paymentStatus = responseData === null || responseData === void 0 ? void 0 : responseData.payment_status;
                 // 获取订单总金额
                 var orderTotalAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.total_amount) || 0);
-                // const gapAmount = Number(responseData?.amount_gap || 0);
-                var currentChangeGivenAmount = Number((responseData === null || responseData === void 0 || (_responseData$payment = responseData.payment_info) === null || _responseData$payment === void 0 ? void 0 : _responseData$payment.current_change_given_amount) || 0);
+                var gapAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.amount_gap) || 0);
+                var currentChangeGivenAmount = Number((responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.current_change_given_amount) || 0);
                 // const changeDue = Number(responseData?.amount_gap || 0);
                 // 获取失败原因
                 var failureReason = responseData === null || responseData === void 0 ? void 0 : responseData.failure_reason;
 
                 // 根据支付状态弹出对应的支付结果toast
                 if (paymentStatus) {
+                  // 打印订单完整信息
+                  console.log('print_order_onOrderSynced>>>>', responseData);
+                  try {
+                    var _responseData$payment4, _responseData$payment5;
+                    var params = {
+                      type: '99',
+                      // 打印订单全部信息
+                      data: {
+                        order_id: responseData.order_id,
+                        machine_code_print_info: responseData === null || responseData === void 0 || (_responseData$payment4 = responseData.payment_info) === null || _responseData$payment4 === void 0 ? void 0 : _responseData$payment4.machine_code_info,
+                        small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment5 = responseData.payment_info) === null || _responseData$payment5 === void 0 ? void 0 : _responseData$payment5.small_ticket_data
+                      }
+                    };
+                    console.log('print_order_onOrderSynced_params>>>>', params);
+                    webPrint(params, function (res) {
+                      console.log('print_order_onOrderSynced_res>>>>', res);
+                    });
+                  } catch (error) {
+                    console.error('print_order_onOrderSynced_error>>>>', error);
+                  }
+
                   // 确定支付状态
                   var statusClassName = calculateStatusClassName(paymentStatus);
                   var autoCloseConfig = calculateAutoCloseConfig(paymentStatus, !!currentChangeGivenAmount);
@@ -1571,7 +1693,7 @@ var PaymentModal = function PaymentModal(_ref16) {
                   displayPaymentResultToast({
                     paymentStatus: paymentStatus,
                     orderTotalAmount: orderTotalAmount,
-                    gapAmount: currentChangeGivenAmount,
+                    gapAmount: paymentStatus === 'partially_paid' ? gapAmount : currentChangeGivenAmount,
                     failureReason: failureReason,
                     autoCloseConfig: autoCloseConfig,
                     actionButtons: generateActionButtons(paymentStatus)
@@ -1587,48 +1709,26 @@ var PaymentModal = function PaymentModal(_ref16) {
                     }
                   });
                   handlePaymentComplete(paymentResult);
-
-                  // 打印订单完整信息
-                  console.log('print_order_onOrderSynced>>>>', responseData);
-                  try {
-                    var _responseData$payment2, _responseData$payment3;
-                    var params = {
-                      type: '99',
-                      // 打印订单全部信息
-                      data: {
-                        order_id: responseData.order_id,
-                        machine_code_print_info: responseData === null || responseData === void 0 || (_responseData$payment2 = responseData.payment_info) === null || _responseData$payment2 === void 0 ? void 0 : _responseData$payment2.machine_code_info,
-                        small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data
-                      }
-                    };
-                    console.log('print_order_onOrderSynced_params>>>>', params);
-                    webPrint(params, function (res) {
-                      console.log('print_order_onOrderSynced_res>>>>', res);
-                    });
-                  } catch (error) {
-                    console.error('print_order_onOrderSynced_error>>>>', error);
-                  }
                 } else {
                   handlePaymentComplete(data);
                 }
-
                 // 可以在这里执行同步完成后的业务逻辑
                 // 比如：通知其他系统、更新UI状态等
               });
-              _context16.next = 30;
+              _context17.next = 30;
               break;
             case 19:
               if (!isLocalOrderCreated) {
-                _context16.next = 30;
+                _context17.next = 30;
                 break;
               }
               // // 如果本地订单已创建，这时候还更新了 data，则需要销毁当前的订单数据，然后更新新的订单数据了
               console.log('🔄 PaymentModal: data changed, updating checkout data...');
               setIsLocalOrderCreated(false);
-              _context16.next = 24;
+              _context17.next = 24;
               return checkout.cancelCurrentOrderAsync();
             case 24:
-              _context16.next = 26;
+              _context17.next = 26;
               return checkout.createLocalOrderAsync({
                 orderData: data === null || data === void 0 ? void 0 : data.order_info,
                 cartSummary: data === null || data === void 0 || (_data$subtotal_info = data.subtotal_info) === null || _data$subtotal_info === void 0 ? void 0 : _data$subtotal_info.subTotalList,
@@ -1637,32 +1737,38 @@ var PaymentModal = function PaymentModal(_ref16) {
               });
             case 26:
               // 获取订单总金额
-              _orderInfo2 = checkout.getCurrentOrderInfo();
-              if (_orderInfo2 && _orderInfo2.totalAmount) {
-                setTotalAmount(_orderInfo2.totalAmount);
+              _orderInfo3 = checkout.getCurrentOrderInfo();
+              if (_orderInfo3 && _orderInfo3.totalAmount) {
+                setTotalAmount(_orderInfo3.totalAmount);
               }
-              setOrderInfo(_orderInfo2);
+              setOrderInfo(_orderInfo3);
               setIsLocalOrderCreated(true);
             case 30:
-              _context16.next = 35;
+              _context17.next = 35;
               break;
             case 32:
-              _context16.prev = 32;
-              _context16.t0 = _context16["catch"](0);
-              console.error('Failed to initialize checkout data:', _context16.t0);
+              _context17.prev = 32;
+              _context17.t0 = _context17["catch"](0);
+              console.error('Failed to initialize checkout data:', _context17.t0);
             case 35:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee16, null, [[0, 32]]);
+        }, _callee17, null, [[0, 32]]);
       }));
       return function initCheckoutData() {
-        return _ref21.apply(this, arguments);
+        return _ref22.apply(this, arguments);
       };
     }();
     if (data && open) {
       initCheckoutData();
     }
+    return function () {
+      if (typeof unsubscribeRef.current === 'function') {
+        var _unsubscribeRef$curre;
+        (_unsubscribeRef$curre = unsubscribeRef.current) === null || _unsubscribeRef$curre === void 0 || _unsubscribeRef$curre.call(unsubscribeRef);
+      }
+    };
   }, [data, open]);
 
   // 创建PaymentResultToast配置对象
@@ -1684,11 +1790,11 @@ var PaymentModal = function PaymentModal(_ref16) {
 
     // 通用回调函数
     var handleDetailsClick = /*#__PURE__*/function () {
-      var _ref22 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+      var _ref23 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
         var _context$appHelper2;
         var _context$appHelper$ut5, isTerminal, isWebPos, checkout, orderId;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               setTimeout(function () {
                 // 关闭支付结果toast
@@ -1698,15 +1804,15 @@ var PaymentModal = function PaymentModal(_ref16) {
               }, 0);
               _context$appHelper$ut5 = (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils, isTerminal = _context$appHelper$ut5.isTerminal, isWebPos = _context$appHelper$ut5.isWebPos;
               if (!(isTerminal !== null && isTerminal !== void 0 && isTerminal())) {
-                _context17.next = 8;
+                _context18.next = 8;
                 break;
               }
               checkout = pisellos.getModule('checkout');
-              _context17.next = 6;
+              _context18.next = 6;
               return checkout.getCurrentOrderId();
             case 6:
-              orderId = _context17.sent;
-              return _context17.abrupt("return", interaction.utils.postMessageToApp({
+              orderId = _context18.sent;
+              return _context18.abrupt("return", interaction.utils.postMessageToApp({
                 module: 'booking',
                 key: 'view_order',
                 data: {
@@ -1716,46 +1822,46 @@ var PaymentModal = function PaymentModal(_ref16) {
               }));
             case 8:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee17);
+        }, _callee18);
       }));
       return function handleDetailsClick() {
-        return _ref22.apply(this, arguments);
+        return _ref23.apply(this, arguments);
       };
     }();
     var handlePrintReceiptClick = /*#__PURE__*/function () {
-      var _ref23 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+      var _ref24 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
         var checkoutModule, data, isSynced, orderId, params;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
               if (checkoutModule) {
-                _context18.next = 3;
+                _context19.next = 3;
                 break;
               }
-              return _context18.abrupt("return");
+              return _context19.abrupt("return");
             case 3:
-              _context18.next = 5;
+              _context19.next = 5;
               return checkoutModule.isCurrentOrderSynced();
             case 5:
-              isSynced = _context18.sent;
+              isSynced = _context19.sent;
               if (isSynced) {
-                _context18.next = 12;
+                _context19.next = 12;
                 break;
               }
-              _context18.next = 9;
+              _context19.next = 9;
               return checkoutModule.manualSyncOrderAsync();
             case 9:
-              data = _context18.sent;
-              _context18.next = 16;
+              data = _context19.sent;
+              _context19.next = 16;
               break;
             case 12:
-              _context18.next = 14;
+              _context19.next = 14;
               return checkoutModule.getCurrentOrderId();
             case 14:
-              orderId = _context18.sent;
+              orderId = _context19.sent;
               data = {
                 orderId: orderId
               };
@@ -1781,12 +1887,12 @@ var PaymentModal = function PaymentModal(_ref16) {
               }
             case 17:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
-        }, _callee18);
+        }, _callee19);
       }));
       return function handlePrintReceiptClick() {
-        return _ref23.apply(this, arguments);
+        return _ref24.apply(this, arguments);
       };
     }();
     var handleRetryClick = function handleRetryClick() {
@@ -1798,9 +1904,14 @@ var PaymentModal = function PaymentModal(_ref16) {
       // 这里可以添加更改支付方式的逻辑
     };
     var handleSaveAsPartialPaidClick = function handleSaveAsPartialPaidClick() {
-      console.log(locales.getText('payment.result.actions.saveAsPartialPaidClicked'));
+      var _paymentContentRef$cu;
+      // console.log(
+      //   locales.getText('payment.result.actions.saveAsPartialPaidClicked')
+      // );
+      // savePayLaterHandlerRef.current?.handleSavePayLaterClick();
       // 直接关闭弹窗
-      handleToastClose();
+      // handleToastClose();
+      (_paymentContentRef$cu = paymentContentRef.current) === null || _paymentContentRef$cu === void 0 || _paymentContentRef$cu.handleButtonClick('save-pay-later');
     };
     var handleContinuePaymentClick = function handleContinuePaymentClick() {
       console.log(locales.getText('payment.result.actions.continuePaymentClicked'));
@@ -1862,17 +1973,19 @@ var PaymentModal = function PaymentModal(_ref16) {
       case 'partially_paid':
         // 部分支付状态
         return [[{
-          id: 'details',
+          id: 'saveAsPartialPaid',
           buttonProps: {
             className: getClassName('action-button'),
             onClick: handleSaveAsPartialPaidClick,
             children: locales.getText('payment.result.saveAsPartialPaid')
           }
         }, {
-          id: 'print',
+          id: 'continuePayment',
           buttonProps: {
             className: getClassName('action-button'),
-            onClick: handleContinuePaymentClick,
+            onClick: function onClick() {
+              closePaymentResultToast();
+            },
             children: locales.getText('payment.result.continuePayment')
           }
         }, {
@@ -2056,7 +2169,9 @@ var PaymentModal = function PaymentModal(_ref16) {
     dynamicMaxHeight: dynamicMaxHeight,
     onOrderSyncFailed: function onOrderSyncFailed() {
       return setShowRetryModal(true);
-    }
+    },
+    generateActionButtons: generateActionButtons,
+    paymentResultToastConfig: paymentResultToastConfig
   })), noteModalOpen && /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(NoteModal, {
     open: noteModalOpen,
     title: locales.getText('pisell2.text.add-order-notes'),