@pisell/private-materials 6.4.48 → 6.4.50

package/es/components/checkout/PaymentModal.js

@@ -560,7 +560,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                     updateOrderInfo === null || updateOrderInfo === void 0 || updateOrderInfo(orderInfo);
                     balanceDueAmount = checkoutModule.getBalanceDueAmount();
                     if (!(Number(balanceDueAmount) > 0)) {
-                      _context5.next = 13;
+                      _context5.next = 14;
                       break;
                     }
                     autoCloseConfig = calculateAutoCloseConfig('partially_paid', false); // 获取订单总金额
@@ -572,7 +572,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                     if (_paymentItems.length > 0 && _paymentItems.filter(function (n) {
                       return n.isSynced;
                     }).some(function (item) {
-                      return item.service_charge;
+                      return item.service_charge || item.rounding_amount;
                     })) {
                       serviceChargeTotal = _paymentItems.reduce(function (acc, item) {
                         var _item$service_charge, _item$service_charge2;
@@ -580,13 +580,19 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                         var chargePercentage = new Decimal(((_item$service_charge2 = item.service_charge) === null || _item$service_charge2 === void 0 ? void 0 : _item$service_charge2.percentage) || 0);
                         var itemAmount = new Decimal(item.amount || 0);
                         var itemServiceCharge = chargeAmount.add(chargePercentage.mul(itemAmount));
+                        // 如果支付项的 rounding_amount 是正数，需要减掉rounding_amount
+                        if (Number(item.rounding_amount) > 0) {
+                          itemServiceCharge = itemServiceCharge.sub(new Decimal(item.rounding_amount));
+                        }
+                        console.log(itemServiceCharge);
                         return acc.add(itemServiceCharge);
                       }, new Decimal(0));
                       _totalAmount = _totalAmount.add(serviceChargeTotal);
                     }
+                    console.log(_totalAmount, _paymentItems);
 
                     // 根据支付状态展示不同的 toast
-                    _context5.next = 13;
+                    _context5.next = 14;
                     return displayPaymentResultToast({
                       paymentStatus: 'partially_paid',
                       orderTotalAmount: _totalAmount.toNumber(),
@@ -604,7 +610,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                         // 不自动关闭Modal，让两个弹窗独立管理
                       }
                     }));
-                  case 13:
+                  case 14:
                     // 判断是否为现金支付
                     paymentMethodName = data.paymentMethodName || data.name || '';
                     isCashPayment = data.paymentMethodCode === 'CASHMANUAL' || /现金|現金/i.test(paymentMethodName) || /cash/i.test(paymentMethodName);
@@ -623,7 +629,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                         }
                       });
                     }
-                  case 16:
+                  case 17:
                   case "end":
                     return _context5.stop();
                 }
@@ -754,19 +760,23 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             return showSuccessToast === null || showSuccessToast === void 0 ? void 0 : showSuccessToast(result);
           case 12:
             if (!result.success) {
-              _context8.next = 22;
+              _context8.next = 23;
               break;
             }
+            // 触发 voucher 的更新
+            checkoutModule.core.effects.emit('checkout:onPaymentStarted', {
+              paymentMethodCode: ''
+            });
             // 检查订单此时是不是定金支付订单
             _orderInfo = checkoutModule.getCurrentOrderInfo();
             setCurrentEditOrderId === null || setCurrentEditOrderId === void 0 || setCurrentEditOrderId(result.orderId);
-            if (!(result.is_deposit && Number(_orderInfo.depositAmount < _orderInfo.totalAmount))) {
-              _context8.next = 18;
+            if (!(result.is_deposit && Number(_orderInfo.depositAmount) < Number(_orderInfo.totalAmount))) {
+              _context8.next = 19;
               break;
             }
             updateOrderInfo === null || updateOrderInfo === void 0 || updateOrderInfo(_orderInfo);
             return _context8.abrupt("return");
-          case 18:
+          case 19:
             responseData = (_result$response = result.response) === null || _result$response === void 0 ? void 0 : _result$response.data; // 打印订单完整信息
             console.log('print_order_onOrderSynced>>>>', result);
             try {
@@ -788,7 +798,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             }
             // 支付成功时关闭 PaymentModal
             onPaymentCancel(true);
-          case 22:
+          case 23:
           case "end":
             return _context8.stop();
         }
@@ -1360,7 +1370,8 @@ var PaymentModal = function PaymentModal(_ref18) {
   var _ref19 = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
     pisellos = _ref19.pisellos,
     getData = _ref19.getData,
-    interaction = _ref19.interaction;
+    interaction = _ref19.interaction,
+    isWebPos = _ref19.isWebPos;
   var _useState23 = useState(null),
     _useState24 = _slicedToArray(_useState23, 2),
     orderInfo = _useState24[0],
@@ -1989,7 +2000,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 = 24;
+                _context23.next = 25;
                 break;
               }
               isLocalOrderCreated.current = true;
@@ -2024,17 +2035,24 @@ var PaymentModal = function PaymentModal(_ref18) {
                 totalInfo: newData.subtotal_info
               });
             case 12:
-              _context23.next = 16;
+              _context23.next = 17;
               break;
             case 14:
-              _context23.next = 16;
+              logger === null || logger === void 0 || logger.addLog({
+                type: 'info',
+                title: '正常创建 createLocalOrderAsync',
+                metadata: {
+                  data: data
+                }
+              });
+              _context23.next = 17;
               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 16:
+            case 17:
               // 获取订单总金额
               _orderInfo2 = checkout.getCurrentOrderInfo();
               console.log(_orderInfo2);
@@ -2055,7 +2073,7 @@ var PaymentModal = function PaymentModal(_ref18) {
               unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', /*#__PURE__*/function () {
                 var _ref29 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(data) {
                   var _data$response, _responseData$payment2;
-                  var currentOrderId, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _interaction$utils6, _interaction$utils6$a, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, _orderInfo3, paymentResult;
+                  var currentOrderId, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, _interaction$utils6, _interaction$utils6$a, _orderInfo3, paymentResult;
                   return _regeneratorRuntime().wrap(function _callee22$(_context22) {
                     while (1) switch (_context22.prev = _context22.next) {
                       case 0:
@@ -2086,7 +2104,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                         // 获取失败原因
                         failureReason = responseData === null || responseData === void 0 ? void 0 : responseData.failure_reason; // 根据支付状态弹出对应的支付结果toast
                         if (!paymentStatus) {
-                          _context22.next = 30;
+                          _context22.next = 35;
                           break;
                         }
                         // 打印订单完整信息
@@ -2140,15 +2158,26 @@ var PaymentModal = function PaymentModal(_ref18) {
                         // 确定支付状态
                         statusClassName = calculateStatusClassName(paymentStatus);
                         autoCloseConfig = calculateAutoCloseConfig(paymentStatus, !!currentChangeGivenAmount);
-                        _context22.next = 21;
+                        enabledAutoPrint = false;
+                        if (!isWebPos) {
+                          _context22.next = 24;
+                          break;
+                        }
+                        // web pos 没有自动打印配置
+                        enabledAutoPrint = false;
+                        _context22.next = 27;
+                        break;
+                      case 24:
+                        _context22.next = 26;
                         return interaction === null || interaction === void 0 || (_interaction$utils6 = interaction.utils) === null || _interaction$utils6 === void 0 || (_interaction$utils6$a = _interaction$utils6.asyncDataManager) === null || _interaction$utils6$a === void 0 ? void 0 : _interaction$utils6$a.call(_interaction$utils6, {
                           module: 'get',
                           key: 'auto_print_receipt'
                         });
-                      case 21:
+                      case 26:
                         enabledAutoPrint = _context22.sent;
+                      case 27:
                         _orderInfo3 = checkout.getCurrentOrderInfo(); // 根据支付状态展示不同的 toast
-                        _context22.next = 25;
+                        _context22.next = 30;
                         return displayPaymentResultToast({
                           paymentStatus: paymentStatus,
                           orderTotalAmount: _orderInfo3.isDeposit ? _orderInfo3.depositAmount : orderTotalAmount,
@@ -2157,7 +2186,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                           autoCloseConfig: autoCloseConfig,
                           actionButtons: generateActionButtons(paymentStatus, enabledAutoPrint)
                         }, paymentResultToastConfig);
-                      case 25:
+                      case 30:
                         // 当支付状态为 paid 时，关闭 paymentModal
                         if (paymentStatus === 'paid') {
                           handleModalClose();
@@ -2173,11 +2202,11 @@ var PaymentModal = function PaymentModal(_ref18) {
                           }
                         });
                         handlePaymentComplete(paymentResult);
-                        _context22.next = 31;
+                        _context22.next = 36;
                         break;
-                      case 30:
+                      case 35:
                         handlePaymentComplete(data);
-                      case 31:
+                      case 36:
                       case "end":
                         return _context22.stop();
                     }
@@ -2187,24 +2216,24 @@ var PaymentModal = function PaymentModal(_ref18) {
                   return _ref29.apply(this, arguments);
                 };
               }());
-              _context23.next = 40;
+              _context23.next = 42;
               break;
-            case 24:
+            case 25:
               if (!isLocalOrderCreated.current) {
-                _context23.next = 40;
+                _context23.next = 42;
                 break;
               }
               // // 如果本地订单已创建，这时候还更新了 data，则需要销毁当前的订单数据，然后更新新的订单数据了
               console.log('🔄 PaymentModal: data changed, updating checkout data...');
               isLocalOrderCreated.current = false;
-              _context23.next = 29;
+              _context23.next = 30;
               return checkout.cancelCurrentOrderAsync();
-            case 29:
+            case 30:
               if (!(editOrderId || currentEditOrderId)) {
-                _context23.next = 34;
+                _context23.next = 35;
                 break;
               }
-              _context23.next = 32;
+              _context23.next = 33;
               return checkout.updateLocalOrderAsync({
                 orderId: editOrderId || currentEditOrderId,
                 orderData: data === null || data === void 0 ? void 0 : data.order_info,
@@ -2212,18 +2241,25 @@ var PaymentModal = function PaymentModal(_ref18) {
                 autoPayment: true,
                 totalInfo: data === null || data === void 0 ? void 0 : data.subtotal_info
               });
-            case 32:
-              _context23.next = 36;
+            case 33:
+              _context23.next = 38;
               break;
-            case 34:
-              _context23.next = 36;
+            case 35:
+              logger === null || logger === void 0 || logger.addLog({
+                type: 'info',
+                title: '含有 localOrderCreate, 调用 createLocalOrderAsync',
+                metadata: {
+                  data: data
+                }
+              });
+              _context23.next = 38;
               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 36:
+            case 38:
               // 获取订单总金额
               _orderInfo4 = checkout.getCurrentOrderInfo();
               if (_orderInfo4 && _orderInfo4.totalAmount) {
@@ -2231,11 +2267,11 @@ var PaymentModal = function PaymentModal(_ref18) {
               }
               setOrderInfo(_orderInfo4);
               isLocalOrderCreated.current = true;
-            case 40:
-              _context23.next = 46;
-              break;
             case 42:
-              _context23.prev = 42;
+              _context23.next = 48;
+              break;
+            case 44:
+              _context23.prev = 44;
               _context23.t0 = _context23["catch"](0);
               console.error('Failed to initialize checkout data:', _context23.t0);
               logger === null || logger === void 0 || logger.addLog({
@@ -2245,11 +2281,11 @@ var PaymentModal = function PaymentModal(_ref18) {
                   error: _context23.t0
                 }
               });
-            case 46:
+            case 48:
             case "end":
               return _context23.stop();
           }
-        }, _callee23, null, [[0, 42]]);
+        }, _callee23, null, [[0, 44]]);
       }));
       return function initCheckoutData() {
         return _ref28.apply(this, arguments);

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

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

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

@@ -201,7 +201,7 @@ function AmountSummary(_ref2) {
     // 获取部分付款信息
     // 计算非 walletpass 的支付项金额
     var nonWalletPassAmount = (paymentItems === null || paymentItems === void 0 || (_paymentItems$reduce = paymentItems.reduce(function (acc, item) {
-      if (!item.voucher_id) {
+      if (!item.voucher_id || item.voucher_id && item.isSynced) {
         var itemAmount = new Decimal(item.amount || '0');
 
         // 如果有 rounding_amount 且为负数，将其作为已付的一部分加入计算
@@ -499,7 +499,16 @@ function AmountSummary(_ref2) {
     // 使用 Decimal.js 进行精确计算
     var balanceDecimal = new Decimal(balanceAmountValue);
 
-    // 添加折扣卡金额
+    // 需要减去已经同步给后端过的 voucher
+    var syncedVoucherAmount = paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.reduce(function (acc, item) {
+      // 如果当前是普通支付，则减去order_payment_type不为 deposit的支付项
+      // 如果当前是定金支付，则减去order_payment_type为 deposit的支付项
+      if (item.voucher_id && item.isSynced && (paymentType === 'regular' && item.order_payment_type !== 'deposit' || paymentType === 'deposit' && item.order_payment_type === 'deposit')) {
+        return acc.plus(item.amount).plus(item.rounding_amount);
+      }
+      return acc;
+    }, new Decimal(0)).toNumber();
+    balanceDecimal = balanceDecimal.minus(syncedVoucherAmount);
     // if (walletPassData?.selectedDiscountList && walletPassData.selectedDiscountList.length > 0) {
     //   walletPassData?.availableDiscountList?.forEach((discountItem: any) => {
     //     discountItem.appliedProductDetails?.forEach((productDetail: any) => {
@@ -627,12 +636,20 @@ function AmountSummary(_ref2) {
   }, [paymentItems, paymentType, totalAmount]);
   var showCancelSplitPayment = useMemo(function () {
     // 如果 balanceDueAmount 和 balanceDueAmount 不一样，则展示取消拆分支付按钮
-    return balanceDueAmount !== customAmount;
+    return balanceDueAmount !== customAmount && Number(balanceDueAmount) > 0 && Number(customAmount) > 0;
   }, [customAmount, balanceDueAmount]);
   var handleChangeDepositAmount = function handleChangeDepositAmount(value) {
     console.log('handleChangeDepositAmount', value);
     checkoutModule === null || checkoutModule === void 0 || checkoutModule.setDepositAmountAsync(value);
   };
+  var hasDepositPayment = useMemo(function () {
+    return paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.some(function (item) {
+      return item.order_payment_type === 'deposit' && item.status !== 'voided';
+    });
+  }, [paymentItems]);
+  var showCanNotChangeDepositAmount = function showCanNotChangeDepositAmount() {
+    Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.can-not-change-deposit-amount'));
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: classNames('amount-summary-module', 'amount-summary-container')
   }, /*#__PURE__*/React.createElement("div", {
@@ -682,7 +699,25 @@ function AmountSummary(_ref2) {
   // 如果应该显示确认模式，直接返回确认界面
   shouldShowConfirmMode() ? renderConfirmMode() : /*#__PURE__*/React.createElement("div", {
     className: classNames('balance-due-info')
-  }, paymentType === 'deposit' ? /*#__PURE__*/React.createElement(PisellPriceKeyboardPopover, {
+  }, paymentType === 'deposit' ? hasDepositPayment ? /*#__PURE__*/React.createElement("div", {
+    onClick: function onClick() {
+      return showCanNotChangeDepositAmount();
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: classNames('balance-due-label')
+  }, getText('deposit.due') || 'Deposit Due'), /*#__PURE__*/React.createElement("div", {
+    className: classNames('balance-due-amount')
+  }, formatAmountWithOptions(balanceDueAmount, amountSymbol, {
+    precision: 2,
+    hideDecimalForWholeNumbers: false,
+    useThousandsSeparator: true,
+    showCurrencySymbol: true
+  }), /*#__PURE__*/React.createElement(Edit05, {
+    className: classNames('edit-icon'),
+    style: {
+      color: '#7F56DA'
+    }
+  }))) : /*#__PURE__*/React.createElement(PisellPriceKeyboardPopover, {
     value: balanceDueAmount || '0'
     // onChange={handleKeyboardChange}
     ,

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

@@ -12,6 +12,7 @@ import checkoutLocales from "../../locales";
 import "./index.less";
 import classNames from 'classnames';
 import useEngineContext from "../../../../hooks/useEngineContext";
+import Decimal from 'decimal.js';
 
 // 小计数据类型
 
@@ -101,26 +102,21 @@ function PaymentDetailModal(_ref) {
   // 计算已支付总额 (只计算不带voucher_id的支付项)
   var getTotalPaidAmount = function getTotalPaidAmount() {
     return paymentItems.filter(function (item) {
-      return !item.voucher_id;
+      return !item.voucher_id || item.isSynced;
     }).reduce(function (total, item) {
-      return total + Math.abs(item.amount) + Math.abs(item.rounding_amount);
-    }, 0);
-  };
-
-  // 计算优惠券扣减总额 (只计算带voucher_id的支付项)
-  var getTotalVoucherAmount = function getTotalVoucherAmount() {
-    return paymentItems.filter(function (item) {
-      return item.voucher_id;
-    }).reduce(function (total, item) {
-      return total + Math.abs(item.amount);
+      var amount = new Decimal(Math.abs(item.amount));
+      var roundingAmount = new Decimal(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
+      return new Decimal(total).plus(amount).plus(roundingAmount).toNumber();
     }, 0);
   };
 
   // 计算Balance Due金额 (customAmount + 所有voucher扣减金额)
   var getBalanceDueAmount = function getBalanceDueAmount() {
-    var baseAmount = customAmount ? parseFloat(customAmount) : 0;
-    var voucherDeductions = getTotalVoucherAmount();
-    return baseAmount + voucherDeductions;
+    // debugger
+    // const baseAmount = customAmount ? parseFloat(customAmount) : 0;
+    // const voucherDeductions = getTotalVoucherAmount();
+    // return baseAmount + voucherDeductions;
+    return new Decimal(orderInfo.totalAmount || 0).sub(new Decimal(getTotalPaidAmount())).toNumber().toFixed(2);
   };
 
   // 处理 Void 按钮点击
@@ -133,25 +129,76 @@ function PaymentDetailModal(_ref) {
 
   // 渲染支付项 (只渲染不带voucher_id的支付项)
   var renderPaymentItems = function renderPaymentItems() {
+    var depositPayments = paymentItems.filter(function (item) {
+      return item.order_payment_type === 'deposit' && item.isSynced;
+    });
     var regularPayments = paymentItems.filter(function (item) {
-      return !item.voucher_id;
+      return item.isSynced && item.order_payment_type !== 'deposit';
     });
-    if (!paymentItems || paymentItems.length === 0 || regularPayments.length === 0) {
+    if (!paymentItems || paymentItems.length === 0 || regularPayments.length === 0 && depositPayments.length === 0) {
       return /*#__PURE__*/React.createElement("div", {
         className: classNames('section-content')
       }, /*#__PURE__*/React.createElement("div", {
         className: classNames('no-payment-text')
       }, getText('no.payments.recorded') || 'No payments recorded'));
     }
+    var depositPaymentSummary = depositPayments.reduce(function (acc, item) {
+      return new Decimal(acc).plus(new Decimal(item.amount)).plus(new Decimal(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber();
+    }, 0);
+    var regularPaymentSummary = regularPayments.reduce(function (acc, item) {
+      return new Decimal(acc).plus(new Decimal(item.amount)).plus(new Decimal(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber();
+    }, 0);
     return /*#__PURE__*/React.createElement("div", {
       className: classNames('section-content')
     }, /*#__PURE__*/React.createElement("div", {
       className: classNames('payment-record-container')
-    }, regularPayments.map(function (item) {
+    }, depositPayments.length > 0 && /*#__PURE__*/React.createElement("div", {
+      className: classNames('payment-item-header')
+    }, /*#__PURE__*/React.createElement("div", null, getText('pisell2.subtotal.deposit') || 'Deposit'), /*#__PURE__*/React.createElement("div", null, formatAmountWithOptions(depositPaymentSummary, amountSymbol, {
+      precision: 2,
+      hideDecimalForWholeNumbers: false,
+      useThousandsSeparator: true,
+      showCurrencySymbol: true
+    }))), depositPayments.map(function (item) {
+      return /*#__PURE__*/React.createElement("div", {
+        key: item.uuid,
+        className: classNames('payment-item')
+      }, /*#__PURE__*/React.createElement("div", {
+        className: classNames('payment-item-bullet')
+      }), /*#__PURE__*/React.createElement("div", {
+        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", {
+        className: classNames('payment-item-actions')
+      }, /*#__PURE__*/React.createElement("div", {
+        className: classNames('payment-item-amount')
+      }, "-", formatAmountWithOptions(new Decimal(Math.abs(item.amount)).plus(new Decimal(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber(), amountSymbol, {
+        precision: 2,
+        hideDecimalForWholeNumbers: false,
+        useThousandsSeparator: true,
+        showCurrencySymbol: true
+      })), shouldShowVoidButton(item) && /*#__PURE__*/React.createElement("button", {
+        className: classNames('void-button'),
+        onClick: function onClick() {
+          return handleVoidPayment(item);
+        },
+        type: "button"
+      }, getText('void') || 'Void'))));
+    }), regularPayments.length > 0 && /*#__PURE__*/React.createElement("div", {
+      className: classNames('payment-item-header')
+    }, /*#__PURE__*/React.createElement("div", null, getText('payment.text') || 'Payment'), /*#__PURE__*/React.createElement("div", null, formatAmountWithOptions(regularPaymentSummary, amountSymbol, {
+      precision: 2,
+      hideDecimalForWholeNumbers: false,
+      useThousandsSeparator: true,
+      showCurrencySymbol: true
+    }))), regularPayments.map(function (item) {
       return /*#__PURE__*/React.createElement("div", {
         key: item.uuid,
         className: classNames('payment-item')
       }, /*#__PURE__*/React.createElement("div", {
+        className: classNames('payment-item-bullet')
+      }), /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-content')
       }, /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-text')
@@ -159,7 +206,7 @@ function PaymentDetailModal(_ref) {
         className: classNames('payment-item-actions')
       }, /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-amount')
-      }, "-", formatAmountWithOptions(Math.abs(item.amount) + Math.abs(item.rounding_amount), amountSymbol, {
+      }, "-", formatAmountWithOptions(new Decimal(Math.abs(item.amount)).plus(new Decimal(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber(), amountSymbol, {
         precision: 2,
         hideDecimalForWholeNumbers: false,
         useThousandsSeparator: true,
@@ -181,7 +228,7 @@ function PaymentDetailModal(_ref) {
 
     // 1. 添加 paymentItems 中带 voucher_id 的支付项
     // 这块先不用 下面钱包卡券应该包含了
-    // const voucherPayments = paymentItems.filter(item => item.voucher_id);
+    // const voucherPayments = paymentItems.filter(item => item.voucher_id && !item.isSynced);
     // voucherPayments.forEach((item) => {
     //   items.push(
     //     <div key={`payment-${item.uuid}`} className={classNames('balance-item-row')}>
@@ -189,7 +236,12 @@ function PaymentDetailModal(_ref) {
     //         {item.name} - {item.voucher_id}
     //       </div>
     //       <div className={classNames('balance-item-amount')}>
-    //         -${Math.abs(item.amount).toFixed(2)}
+    //         -{formatAmountWithOptions(Math.abs(item.amount), amountSymbol, {
+    //           precision: 2,
+    //           hideDecimalForWholeNumbers: false,
+    //           useThousandsSeparator: true,
+    //           showCurrencySymbol: true,
+    //         })}
     //       </div>
     //     </div>
     //   );

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

@@ -263,7 +263,7 @@
   flex-direction: column;
   justify-content: flex-start;
   align-items: flex-start;
-  gap: 16px;
+  gap: 8px;
 }
 
 .payment-record-header {
@@ -299,12 +299,33 @@
   line-height: 20px;
   word-wrap: break-word;
 }
+.payment-item-header {
+  width: 100%;
+  color: black;
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 20px;
+  word-wrap: break-word;
+  display: flex;
+  justify-content: space-between;
+}
 
 .payment-item {
   align-self: stretch;
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-start;
   align-items: center;
+  gap: 8px;
+  margin-left: 10px;
+  margin-right: 64px;
+}
+
+.payment-item-bullet {
+  width: 6px;
+  height: 6px;
+  background-color: #475467;
+  border-radius: 50%;
+  flex-shrink: 0;
 }
 
 .payment-item-content {

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

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

package/es/components/checkout/components/WalletPassModule/components/ConflictModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellWalletPassCardProps } from '../../types';
 export declare const TestModule: () => JSX.Element;
 declare const ConflictModal: (props: {

package/es/components/checkout/components/WalletPassModule/components/DiscountWallet/index.d.ts

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

package/es/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any[];
+    expiredWalletIds: any;
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

package/es/components/checkout/hooks/useWalletPass.js

@@ -433,6 +433,7 @@ export var useWalletPass = function useWalletPass(props) {
     } else {
       setWalletSelect([]);
       notSetWalletSelectRef.current = false;
+      onSelectChange === null || onSelectChange === void 0 || onSelectChange([]);
     }
 
     // 获取折扣列表并按初始顺序排序（isSelected为true的在前）

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

@@ -122,6 +122,7 @@ declare const _default: {
         'pisell2.checkout.manual-discount.no-amount': string;
         'pisell2.checkout.manual-discount.has-payment-items': string;
         'pisell2.checkout.manual-discount.invalid-amount': string;
+        'pisell2.checkout.can-not-change-deposit-amount': string;
         'pisell2.checkout.wallet-balance-confirm.title': string;
         'pisell2.checkout.wallet-balance-confirm.description-before': string;
         'pisell2.checkout.wallet-balance-confirm.description-after': string;
@@ -281,6 +282,7 @@ declare const _default: {
         'pisell2.checkout.manual-discount.no-amount': string;
         'pisell2.checkout.manual-discount.has-payment-items': string;
         'pisell2.checkout.manual-discount.invalid-amount': string;
+        'pisell2.checkout.can-not-change-deposit-amount': string;
         'pisell2.checkout.wallet-balance-confirm.title': string;
         'pisell2.checkout.wallet-balance-confirm.description-before': string;
         'pisell2.checkout.wallet-balance-confirm.description-after': string;
@@ -456,6 +458,7 @@ declare const _default: {
         'pisell2.checkout.manual-discount.no-amount': string;
         'pisell2.checkout.manual-discount.has-payment-items': string;
         'pisell2.checkout.manual-discount.invalid-amount': string;
+        'pisell2.checkout.can-not-change-deposit-amount': string;
         'pisell2.checkout.wallet-balance-confirm.title': string;
         'pisell2.checkout.wallet-balance-confirm.description-before': string;
         'pisell2.checkout.wallet-balance-confirm.description-after': string;