@pisell/private-materials 6.4.81 → 6.4.83

package/es/components/checkout/PaymentModal.js

@@ -1,6 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -33,7 +32,6 @@ import WalletPassModule from "./components/WalletPassModule";
 import PaymentOptionsModule, { SHOW_METHODS_CODE } from "./components/PaymentOptionsModule";
 import CashPaymentModule from "./components/CashPaymentModule";
 import AdditionalModule from "./components/AdditionalModule";
-import { getSumTotal } from "../booking/components/footer/amount";
 import { closePaymentResultToast, closeAllPaymentResultToasts, setTillButton } from "./components/PaymentResultToast";
 import { formatCurrency, calculateStatusClassName, calculateAutoCloseConfig, displayPaymentResultToast, createShowSuccessToast } from "./utils/PaymentResultToastUtils";
 import { Printer, FileCheck02, RefreshCw05, CreditCard02, MessageTextSquare02, ArrowLeft, DotsVertical } from '@pisell/icon';
@@ -65,15 +63,13 @@ var CheckoutHooks = {
 
 // 支付弹窗主体内容组件
 var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
-  var _parentModuleConfig$s, _state$client2, _state$client3;
+  var _parentModuleConfig$s;
   var cartData = _ref.cartData,
     orderInfo = _ref.orderInfo,
     isModalOpen = _ref.isModalOpen,
     onPaymentComplete = _ref.onPaymentComplete,
     onPaymentCancel = _ref.onPaymentCancel,
     onStatusChange = _ref.onStatusChange,
-    dispatch = _ref.dispatch,
-    state = _ref.state,
     showingCashToastRef = _ref.showingCashToastRef,
     onToastClose = _ref.onToastClose,
     orderNote = _ref.orderNote,
@@ -91,7 +87,16 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     generateActionButtons = _ref.generateActionButtons,
     paymentResultToastConfig = _ref.paymentResultToastConfig,
     updateOrderInfo = _ref.updateOrderInfo,
-    setCurrentEditOrderId = _ref.setCurrentEditOrderId;
+    setCurrentEditOrderId = _ref.setCurrentEditOrderId,
+    config = _ref.config,
+    paymentResultDisplayMode = _ref.paymentResultDisplayMode,
+    shopDiscount = _ref.shopDiscount,
+    client = _ref.client,
+    currentTotalPrice = _ref.currentTotalPrice,
+    onChangeShopDiscount = _ref.onChangeShopDiscount,
+    onChangeOrderNote = _ref.onChangeOrderNote,
+    onDeleteOrderNote = _ref.onDeleteOrderNote,
+    any = _ref.config;
   var context = useEngineContext();
   var utils = context.appHelper.utils || {};
   var pisellos = utils.pisellos,
@@ -229,7 +234,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               /** 支付类型，跟支付列表上对应的支付方式保持一致 */
               code: cashPaymentMethod === null || cashPaymentMethod === void 0 ? void 0 : cashPaymentMethod.code,
               /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-              id: cashPaymentMethod === null || cashPaymentMethod === void 0 ? void 0 : cashPaymentMethod.id,
+              custom_payment_id: cashPaymentMethod === null || cashPaymentMethod === void 0 ? void 0 : cashPaymentMethod.id,
               /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
               name: cashPaymentMethod === null || cashPaymentMethod === void 0 ? void 0 : cashPaymentMethod.name,
               /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
@@ -341,7 +346,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                     // 支付金额
                     code: code,
                     // 支付类型code
-                    id: id,
+                    custom_payment_id: id,
                     // 支付类型id
                     name: name,
                     // 支付类型name
@@ -409,7 +414,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               /** 支付类型，跟支付列表上对应的支付方式保持一致 */
               code: method.code,
               /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-              id: method.id,
+              custom_payment_id: method.id,
               /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
               name: method.name,
               /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
@@ -576,7 +581,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           // );
           var orderPaymentAddedUnsubscribe = core.effects.on(CheckoutHooks.OnOrderPaymentAdded, executeIfActive( /*#__PURE__*/function () {
             var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(data) {
-              var orderInfo, balanceDueAmount, _state$bookingConfig, autoCloseConfig, _paymentItems, _totalAmount, serviceChargeTotal, isToastMode, paymentMethodName, isCashPayment, _interaction$utils3, _interaction$utils3$p;
+              var orderInfo, balanceDueAmount, autoCloseConfig, _paymentItems, _totalAmount, serviceChargeTotal, isToastMode, paymentMethodName, isCashPayment, _interaction$utils3, _interaction$utils3$p;
               return _regeneratorRuntime().wrap(function _callee5$(_context5) {
                 while (1) switch (_context5.prev = _context5.next) {
                   case 0:
@@ -617,7 +622,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                     }
                     console.log(_totalAmount, _paymentItems);
                     // 弹窗模式判断
-                    isToastMode = (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.payment_setting) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.payment_result_display_mode) !== 'modal';
+                    isToastMode = paymentResultDisplayMode !== 'modal';
                     if (!isToastMode) {
                       autoCloseConfig.autoClose = false;
                       autoCloseConfig.autoCloseDelay = 0;
@@ -910,64 +915,11 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       return walletPassRef.current.handleSearchIdentificationCode(keyword);
     }
   }, []);
-  var getDataFromHost = function getDataFromHost() {
-    try {
-      var is_price_include_tax = getData('is_price_include_tax');
-      var tax_rate = getData('tax_rate') || '10';
-      var tax_title = getData('tax_title') || 'GST';
-      var surcharge_list = getData('surcharge_list');
-      var schedule_list = getData('schedule_list');
-      var scheduleById = {};
-      // 提前转换，节省附加费计算时的遍历时间
-      if (Array.isArray(schedule_list)) {
-        var _iterator = _createForOfIteratorHelper(schedule_list),
-          _step;
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var item = _step.value;
-            scheduleById[item.id] = item;
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
-        }
-      }
-      return {
-        is_price_include_tax: is_price_include_tax,
-        tax_rate: tax_rate,
-        tax_title: tax_title,
-        surcharge_list: surcharge_list,
-        schedule_list: schedule_list,
-        scheduleById: scheduleById
-      };
-    } catch (error) {
-      console.error(error);
-      return {};
-    }
-  };
-
-  // 计算当前订单总价(不包含税费那些，所以应该是产品总价)
-  var currentTotalPrice = useMemo(function () {
-    if (!showPriceAdjustModal) return 0;
-    var ScheduleModule = pisellosAllModule.ScheduleModule;
-    try {
-      var _getSumTotal = getSumTotal(state, _objectSpread({
-          isEdit: true,
-          ScheduleModule: ScheduleModule
-        }, getDataFromHost())),
-        productAmount = _getSumTotal.productAmount;
-      return productAmount;
-    } catch (error) {
-      console.error('计算总价失败:', error);
-      return 0;
-    }
-  }, [state, showPriceAdjustModal]);
 
   // 手动折扣后订单总价
   var currentTotalPriceAfterDiscount = useMemo(function () {
-    return new Decimal(currentTotalPrice).minus(state.shop_discount || 0).toNumber();
-  }, [state.shop_discount, currentTotalPrice]);
+    return new Decimal(currentTotalPrice || 0).minus(shopDiscount || 0).toNumber();
+  }, [shopDiscount, currentTotalPrice]);
   var handleSelectWalletChange = useMemoizedFn( /*#__PURE__*/function () {
     var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(select) {
       var voucherItems, data;
@@ -1031,14 +983,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           case 0:
             try {
               if (checkoutModule && orderInfo !== null && orderInfo !== void 0 && orderInfo.totalAmount) {
-                if (dispatch) {
-                  dispatch({
-                    type: 'setState',
-                    payload: {
-                      shop_discount: discountAmount
-                    }
-                  });
-                }
+                onChangeShopDiscount === null || onChangeShopDiscount === void 0 || onChangeShopDiscount(discountAmount);
               }
             } catch (error) {
               console.error('Failed to adjust price:', error);
@@ -1170,8 +1115,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     };
   });
   var getCustomerInfo = function getCustomerInfo() {
-    var _state$client, _client$contacts;
-    var client = state === null || state === void 0 || (_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value;
+    var _client$contacts;
+    // const client = state?.client?.value;
 
     // 修复逻辑：只有在 undefined 或 null 时才使用默认值，空字符串应该保留
     var getValidName = function getValidName(value) {
@@ -1236,13 +1181,11 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     };
   }();
   var searchAndClientProps = useMemo(function () {
-    if ((paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.length) > 0) {
-      return {
-        disabledSwitch: true
-      };
-    }
-    return {};
-  }, [paymentItems]);
+    return {
+      disabledSwitch: (config === null || config === void 0 ? void 0 : config.disabledSwitchClient) || false
+    };
+  }, [paymentItems, config]);
+  console.log(searchAndClientProps, 'searchAndClientProps');
   var roundingFunction = /*#__PURE__*/function () {
     var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(amount) {
       var res;
@@ -1267,9 +1210,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 处理PaymentModal区域的点击事件
   var handleModalClick = useCallback(function (event) {
-    var _state$bookingConfig2;
     // 关闭所有Toast
-    var isToastMode = (state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.payment_setting) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.payment_result_display_mode) !== 'modal';
+    var isToastMode = paymentResultDisplayMode !== 'modal';
     if (isToastMode) {
       closeAllPaymentResultToasts();
     }
@@ -1293,14 +1235,14 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     },
     onSearch: handleSearch
   }, searchAndClientProps)), moduleConfig.showWalletPass && /*#__PURE__*/React.createElement(WalletPassModule, {
-    clientId: state === null || state === void 0 || (_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id,
+    clientId: client === null || client === void 0 ? void 0 : client.id,
     customAmount: balanceDueAmount,
     orderInfo: orderInfo || undefined,
     ref: walletPassRef,
     paymentItems: paymentItems,
     onSelectChange: handleSelectWalletChange
   })), /*#__PURE__*/React.createElement(AmountSummary, {
-    amountSymbol: state.amountSymbol,
+    amountSymbol: getData('shop_symbol'),
     orderInfo: orderInfo || undefined,
     cartData: cartData,
     open_deposit: open_deposit,
@@ -1308,7 +1250,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     balanceDueAmount: balanceDueAmount,
     paymentItems: paymentItems,
     walletPassData: walletPassData,
-    clientInfo: state === null || state === void 0 || (_state$client3 = state.client) === null || _state$client3 === void 0 ? void 0 : _state$client3.value,
+    clientInfo: client,
     onAmountChange: handleAmountChange,
     onDepositStatusChange: handleDepositStatusChange,
     onBalanceDueAmountClick: handleButtonClick,
@@ -1341,7 +1283,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
       gridRow: (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) > 3 ? '1 / 3' : '1'
     } : {}
   }, /*#__PURE__*/React.createElement(PaymentOptionsModule, {
-    amountSymbol: state.amountSymbol,
+    amountSymbol: getData('shop_symbol'),
     orderInfo: orderInfo || undefined,
     onClick: onPaymentOptionClick,
     paymentMethods: paymentMethods,
@@ -1393,7 +1335,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     onEnter: handlePriceAdjustConfirm
   }), /*#__PURE__*/React.createElement(SavePayLaterHandler, {
     ref: savePayLaterHandlerRef,
-    amountSymbol: state.amountSymbol,
+    amountSymbol: getData('shop_symbol'),
     walletPassData: walletPassData,
     onSavePayLater: handleSavePayLater
   }), /*#__PURE__*/React.createElement(PaymentKeyboard, {
@@ -1441,10 +1383,20 @@ var PaymentModal = function PaymentModal(_ref18) {
     data = _ref18.data,
     callback = _ref18.callback,
     onClose = _ref18.onClose,
-    dispatch = _ref18.dispatch,
-    state = _ref18.state,
     setEditCartMode = _ref18.setEditCartMode,
-    editOrderId = _ref18.editOrderId;
+    editOrderId = _ref18.editOrderId,
+    paymentResultDisplayMode = _ref18.paymentResultDisplayMode,
+    shopDiscount = _ref18.shopDiscount,
+    client = _ref18.client,
+    currentTotalPrice = _ref18.currentTotalPrice,
+    onChangeShopDiscount = _ref18.onChangeShopDiscount,
+    onChangeOrderNote = _ref18.onChangeOrderNote,
+    onDeleteOrderNote = _ref18.onDeleteOrderNote,
+    _ref18$config = _ref18.config,
+    config = _ref18$config === void 0 ? {
+      showHeaderCenter: true,
+      showHeaderRightButton: true
+    } : _ref18$config;
   var context = useEngineContext();
   locales.init(checkoutLocales, ((_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getApp) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.locales) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getLocale) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.call(_context$appHelper$ut2)) || ((_context$appHelper$ut4 = context.appHelper.utils) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut4.storage) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.get('umi_locale')) || 'en');
   var _ref19 = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
@@ -1661,15 +1613,7 @@ var PaymentModal = function PaymentModal(_ref18) {
             Toast === null || Toast === void 0 || Toast.success(locales.getText('pisell2.checkout.order-note.updated-successfully'));
           case 13:
             // 同时把购物车的也给改了
-            if (dispatch) {
-              dispatch({
-                type: 'setNotes',
-                payload: {
-                  orderNote: noteValue,
-                  edit: true
-                }
-              });
-            }
+            onChangeOrderNote === null || onChangeOrderNote === void 0 || onChangeOrderNote(noteValue);
 
             // 根据打开来源执行不同的逻辑
             if (noteModalSource === 'payment-result-toast') {
@@ -1718,15 +1662,7 @@ var PaymentModal = function PaymentModal(_ref18) {
             Toast === null || Toast === void 0 || Toast.success(locales.getText('pisell2.checkout.order-note.deleted-successfully'));
           case 7:
             // 同时把购物车的也给改了
-            if (dispatch) {
-              dispatch({
-                type: 'setNotes',
-                payload: {
-                  orderNote: '',
-                  edit: true
-                }
-              });
-            }
+            onDeleteOrderNote === null || onDeleteOrderNote === void 0 || onDeleteOrderNote();
             _context18.next = 14;
             break;
           case 10:
@@ -2050,9 +1986,9 @@ var PaymentModal = function PaymentModal(_ref18) {
           handlePaymentCancel(false);
         }
       }
-    })), /*#__PURE__*/React.createElement("div", {
+    })), (config === null || config === void 0 ? void 0 : config.showHeaderCenter) && /*#__PURE__*/React.createElement("div", {
       className: "header__center"
-    }, translation('order.total'), "\uFF1A", formatCurrency(totalAmount, state === null || state === void 0 ? void 0 : state.amountSymbol)), /*#__PURE__*/React.createElement("div", {
+    }, translation('order.total'), "\uFF1A", formatCurrency(totalAmount, getData('shop_symbol'))), (config === null || config === void 0 ? void 0 : config.showHeaderRightButton) && /*#__PURE__*/React.createElement("div", {
       className: "header__right"
     }, /*#__PURE__*/React.createElement(Button, {
       size: "small",
@@ -2078,7 +2014,7 @@ var PaymentModal = function PaymentModal(_ref18) {
   useEffect(function () {
     var initCheckoutData = /*#__PURE__*/function () {
       var _ref28 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
-        var checkout, shop_wallet_pass_id, newData, _newData$subtotal_inf, _newData$subtotal_inf2, _orderInfo2, _data$subtotal_info, _data$subtotal_info2, _orderInfo4;
+        var checkout, shop_wallet_pass_id, newData, existPayment, _newData$subtotal_inf, _newData$subtotal_inf2, _orderInfo2, _data$subtotal_info, _data$subtotal_info2, _orderInfo4;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
             case 0:
@@ -2086,7 +2022,7 @@ var PaymentModal = function PaymentModal(_ref18) {
               // 获取 checkout 模块并处理订单数据
               checkout = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
               if (!(checkout && data && !isLocalOrderCreated.current)) {
-                _context23.next = 25;
+                _context23.next = 26;
                 break;
               }
               isLocalOrderCreated.current = true;
@@ -2106,24 +2042,26 @@ var PaymentModal = function PaymentModal(_ref18) {
                 order_rounding_setting: getData('order_rounding_setting'),
                 shop_wallet_pass_id: shop_wallet_pass_id
               });
-              newData = cloneDeep(data); // setTotalAmount(newData.total.expectAmount);
+              newData = cloneDeep(data);
+              existPayment = newData.existPayment; // setTotalAmount(newData.total.expectAmount);
               // 先往 checkout 解决方案推送一条 local 数据
               if (!(editOrderId || currentEditOrderId)) {
-                _context23.next = 14;
+                _context23.next = 15;
                 break;
               }
-              _context23.next = 12;
+              _context23.next = 13;
               return checkout.updateLocalOrderAsync({
                 orderId: editOrderId || currentEditOrderId,
                 orderData: newData.order_info,
                 cartSummary: (_newData$subtotal_inf = newData.subtotal_info) === null || _newData$subtotal_inf === void 0 ? void 0 : _newData$subtotal_inf.subTotalList,
                 autoPayment: true,
-                totalInfo: newData.subtotal_info
+                totalInfo: newData.subtotal_info,
+                existPayment: existPayment
               });
-            case 12:
-              _context23.next = 17;
+            case 13:
+              _context23.next = 18;
               break;
-            case 14:
+            case 15:
               logger === null || logger === void 0 || logger.addLog({
                 type: 'info',
                 title: '正常创建 createLocalOrderAsync',
@@ -2131,14 +2069,14 @@ var PaymentModal = function PaymentModal(_ref18) {
                   data: data
                 }
               });
-              _context23.next = 17;
+              _context23.next = 18;
               return checkout.createLocalOrderAsync({
                 orderData: newData.order_info,
                 cartSummary: (_newData$subtotal_inf2 = newData.subtotal_info) === null || _newData$subtotal_inf2 === void 0 ? void 0 : _newData$subtotal_inf2.subTotalList,
                 autoPayment: true,
                 totalInfo: newData.subtotal_info
               });
-            case 17:
+            case 18:
               // 获取订单总金额
               _orderInfo2 = checkout.getCurrentOrderInfo();
               console.log(_orderInfo2);
@@ -2159,7 +2097,7 @@ var PaymentModal = function PaymentModal(_ref18) {
               unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', executeIfActive( /*#__PURE__*/function () {
                 var _ref29 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(data) {
                   var _data$response, _responseData$payment2;
-                  var currentOrderId, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _state$bookingConfig3, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, _interaction$utils6, _interaction$utils6$a, _orderInfo3, isToastMode, paymentResult;
+                  var currentOrderId, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, _interaction$utils6, _interaction$utils6$a, _orderInfo3, isToastMode, paymentResult;
                   return _regeneratorRuntime().wrap(function _callee22$(_context22) {
                     while (1) switch (_context22.prev = _context22.next) {
                       case 0:
@@ -2263,7 +2201,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                         enabledAutoPrint = _context22.sent;
                       case 27:
                         _orderInfo3 = checkout.getCurrentOrderInfo(); // 弹窗模式判断
-                        isToastMode = (state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.payment_setting) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.payment_result_display_mode) !== 'modal';
+                        isToastMode = paymentResultDisplayMode !== 'modal';
                         if (!isToastMode) {
                           autoCloseConfig.autoClose = false;
                           autoCloseConfig.autoCloseDelay = 0;
@@ -2310,24 +2248,24 @@ var PaymentModal = function PaymentModal(_ref18) {
                   return _ref29.apply(this, arguments);
                 };
               }()));
-              _context23.next = 42;
+              _context23.next = 43;
               break;
-            case 25:
+            case 26:
               if (!isLocalOrderCreated.current) {
-                _context23.next = 42;
+                _context23.next = 43;
                 break;
               }
               // // 如果本地订单已创建，这时候还更新了 data，则需要销毁当前的订单数据，然后更新新的订单数据了
               console.log('🔄 PaymentModal: data changed, updating checkout data...');
               isLocalOrderCreated.current = false;
-              _context23.next = 30;
+              _context23.next = 31;
               return checkout.cancelCurrentOrderAsync();
-            case 30:
+            case 31:
               if (!(editOrderId || currentEditOrderId)) {
-                _context23.next = 35;
+                _context23.next = 36;
                 break;
               }
-              _context23.next = 33;
+              _context23.next = 34;
               return checkout.updateLocalOrderAsync({
                 orderId: editOrderId || currentEditOrderId,
                 orderData: data === null || data === void 0 ? void 0 : data.order_info,
@@ -2335,10 +2273,10 @@ var PaymentModal = function PaymentModal(_ref18) {
                 autoPayment: true,
                 totalInfo: data === null || data === void 0 ? void 0 : data.subtotal_info
               });
-            case 33:
-              _context23.next = 38;
+            case 34:
+              _context23.next = 39;
               break;
-            case 35:
+            case 36:
               logger === null || logger === void 0 || logger.addLog({
                 type: 'info',
                 title: '含有 localOrderCreate, 调用 createLocalOrderAsync',
@@ -2346,14 +2284,14 @@ var PaymentModal = function PaymentModal(_ref18) {
                   data: data
                 }
               });
-              _context23.next = 38;
+              _context23.next = 39;
               return checkout.createLocalOrderAsync({
                 orderData: data === null || data === void 0 ? void 0 : data.order_info,
                 cartSummary: data === null || data === void 0 || (_data$subtotal_info2 = data.subtotal_info) === null || _data$subtotal_info2 === void 0 ? void 0 : _data$subtotal_info2.subTotalList,
                 autoPayment: true,
                 totalInfo: data === null || data === void 0 ? void 0 : data.subtotal_info
               });
-            case 38:
+            case 39:
               // 获取订单总金额
               _orderInfo4 = checkout.getCurrentOrderInfo();
               if (_orderInfo4 && _orderInfo4.totalAmount) {
@@ -2361,11 +2299,11 @@ var PaymentModal = function PaymentModal(_ref18) {
               }
               setOrderInfo(_orderInfo4);
               isLocalOrderCreated.current = true;
-            case 42:
-              _context23.next = 49;
+            case 43:
+              _context23.next = 50;
               break;
-            case 44:
-              _context23.prev = 44;
+            case 45:
+              _context23.prev = 45;
               _context23.t0 = _context23["catch"](0);
               console.error('Failed to initialize checkout data:', _context23.t0);
               logger === null || logger === void 0 || logger.addLog({
@@ -2377,11 +2315,11 @@ var PaymentModal = function PaymentModal(_ref18) {
               });
               // 如果订单创建失败，弹出提示让重新加载 app
               setShowCreateErrorModal(true);
-            case 49:
+            case 50:
             case "end":
               return _context23.stop();
           }
-        }, _callee23, null, [[0, 44]]);
+        }, _callee23, null, [[0, 45]]);
       }));
       return function initCheckoutData() {
         return _ref28.apply(this, arguments);
@@ -2408,12 +2346,12 @@ var PaymentModal = function PaymentModal(_ref18) {
     getData: getData,
     interaction: interaction,
     Toast: Toast,
-    state: state,
     onToastClose: handleToastClose
   };
 
   // 支付结果弹窗按钮生成函数
-  var generateActionButtons = function generateActionButtons(paymentStatus, enabledAutoPrint) {
+  var generateActionButtons = function generateActionButtons(paymentStatus) {
+    var enabledAutoPrint = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var getClassName = function getClassName(suffix) {
       return "payment-result-toast-".concat(suffix);
     };
@@ -2822,8 +2760,13 @@ var PaymentModal = function PaymentModal(_ref18) {
     onPaymentCancel: handlePaymentCancel
     // onStatusChange={(status) => console.log('Status changed:', status)}
     ,
-    dispatch: dispatch,
-    state: state,
+    paymentResultDisplayMode: paymentResultDisplayMode,
+    shopDiscount: shopDiscount,
+    client: client,
+    currentTotalPrice: currentTotalPrice,
+    onChangeShopDiscount: onChangeShopDiscount,
+    onChangeOrderNote: onChangeOrderNote,
+    onDeleteOrderNote: onDeleteOrderNote,
     showingCashToastRef: showingCashToastRef,
     onToastClose: handleToastClose,
     orderNote: orderNote,
@@ -2845,7 +2788,8 @@ var PaymentModal = function PaymentModal(_ref18) {
     },
     setCurrentEditOrderId: function setCurrentEditOrderId(orderId) {
       return _setCurrentEditOrderId(orderId);
-    }
+    },
+    config: config
   })), noteModalOpen && /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(NoteModal, {
     open: noteModalOpen,
     title: locales.getText('pisell2.text.add-order-notes'),

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

@@ -169,7 +169,7 @@ function PaymentDetailModal(_ref) {
         className: classNames('payment-item-content')
       }, /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-text')
-      }, item.name, " - ", new Date().toLocaleDateString(), ' ', getText('pisell2.checkout.payment-detail.by') || 'by', ' ', getCustomerInfo().nickname), /*#__PURE__*/React.createElement("div", {
+      }, item.name, " - ", item.created_at || new Date().toLocaleDateString(), ' ', getText('pisell2.checkout.payment-detail.by') || 'by', ' ', getCustomerInfo().nickname), /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-actions')
       }, /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-amount')
@@ -202,7 +202,7 @@ function PaymentDetailModal(_ref) {
         className: classNames('payment-item-content')
       }, /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-text')
-      }, item.name, " - ", new Date().toLocaleDateString(), ' ', getText('pisell2.checkout.payment-detail.by') || 'by', ' ', getCustomerInfo().nickname), /*#__PURE__*/React.createElement("div", {
+      }, item.name, " - ", item.created_at || new Date().toLocaleDateString(), ' ', getText('pisell2.checkout.payment-detail.by') || 'by', ' ', getCustomerInfo().nickname), /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-actions')
       }, /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-amount')