@pisell/private-materials 6.5.5 → 6.5.7

package/es/components/checkout/PaymentModal.js

@@ -197,7 +197,19 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               var _method$name;
               return method.code === 'CASHMANUAL' || method.type === 'CASHMANUAL' || ((_method$name = method.name) === null || _method$name === void 0 ? void 0 : _method$name.toLowerCase().includes('cash'));
             });
-            _context.next = 3;
+            logger === null || logger === void 0 || logger.addLog({
+              type: 'info',
+              title: 'open_till',
+              metadata: {}
+            });
+            interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 || _interaction$utils$po.call(_interaction$utils, {
+              module: 'till',
+              key: 'open_till',
+              data: {
+                type: 'cash' // cash 不需要验证钱箱权限
+              }
+            });
+            _context.next = 5;
             return checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.addPaymentItemAsync({
               amount: result.amount,
               /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -212,19 +224,6 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               voucher_id: 0,
               rounding_amount: result.roundingAmount
             });
-          case 3:
-            logger === null || logger === void 0 || logger.addLog({
-              type: 'info',
-              title: 'open_till',
-              metadata: {}
-            });
-            interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 || _interaction$utils$po.call(_interaction$utils, {
-              module: 'till',
-              key: 'open_till',
-              data: {
-                type: 'cash' // cash 不需要验证钱箱权限
-              }
-            });
           case 5:
           case "end":
             return _context.stop();
@@ -236,11 +235,12 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     };
   }();
 
-  // 处理 surcharge 字符串，去除前面的 $ 符号
+  // 处理 surcharge 字符串，提取其中的金额数字（包括小数点）
   var processSurcharge = function processSurcharge(surcharge) {
     if (typeof surcharge === 'string') {
-      // 去除前面的 $ 符号和其他货币符号
-      return surcharge.replace(/^[$¥€£]+/, '');
+      // 使用正则表达式提取字符串中的数字（包括小数点）
+      var match = surcharge.match(/\d+(?:\.\d+)?/);
+      return match ? match[0] : undefined;
     }
     if (typeof surcharge === 'number') {
       // 如果是数字，转换为字符串
@@ -942,7 +942,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             voucherItems = [];
             select.forEach(function (item) {
               var mapCode = item.code ? WALLET_PASS_CODE_MAP[item.code] : null;
-              if (mapCode) {
+              if (mapCode && walletPassDetail.map[mapCode]) {
                 var _walletPassDetail$map, _walletPassDetail$map2, _walletPassDetail$map3, _walletPassDetail$map4;
                 voucherItems.push({
                   /** 支付金额 */
@@ -2474,6 +2474,20 @@ var PaymentModal = function PaymentModal(_ref18) {
               className: getClassName('menu-icon')
             }),
             onClick: handleOrderNoteClick
+          }, enabledAutoPrint ? {
+            key: 'print',
+            label: locales.getText('payment.result.printReceipt'),
+            icon: /*#__PURE__*/React.createElement(Printer, {
+              className: getClassName('action-icon')
+            }),
+            onClick: handlePrintReceiptClick
+          } : {
+            key: 'details',
+            label: locales.getText('payment.result.details'),
+            icon: /*#__PURE__*/React.createElement(FileCheck02, {
+              className: getClassName('action-icon')
+            }),
+            onClick: handleDetailsClick
           }],
           buttonProps: {
             className: getClassName('action-button'),
@@ -2484,7 +2498,7 @@ var PaymentModal = function PaymentModal(_ref18) {
         }]];
       case 'partially_paid':
         // 部分支付状态
-        return [[{
+        return [[enabledAutoPrint ? {
           id: 'details',
           buttonProps: {
             className: getClassName('action-button'),
@@ -2494,6 +2508,16 @@ var PaymentModal = function PaymentModal(_ref18) {
             }),
             children: locales.getText('payment.result.details')
           }
+        } : {
+          id: 'print',
+          buttonProps: {
+            className: getClassName('action-button'),
+            onClick: handlePrintReceiptClick,
+            icon: /*#__PURE__*/React.createElement(Printer, {
+              className: getClassName('action-icon')
+            }),
+            children: locales.getText('payment.result.printReceipt')
+          }
         }, {
           id: 'more',
           isMore: true,
@@ -2504,6 +2528,20 @@ var PaymentModal = function PaymentModal(_ref18) {
               className: getClassName('menu-icon')
             }),
             onClick: handleOrderNoteClick
+          }, enabledAutoPrint ? {
+            key: 'print',
+            label: locales.getText('payment.result.printReceipt'),
+            icon: /*#__PURE__*/React.createElement(Printer, {
+              className: getClassName('action-icon')
+            }),
+            onClick: handlePrintReceiptClick
+          } : {
+            key: 'details',
+            label: locales.getText('payment.result.details'),
+            icon: /*#__PURE__*/React.createElement(FileCheck02, {
+              className: getClassName('action-icon')
+            }),
+            onClick: handleDetailsClick
           }],
           buttonProps: {
             className: getClassName('action-button'),
@@ -2697,10 +2735,10 @@ var PaymentModal = function PaymentModal(_ref18) {
       open: showRetryModal,
       title: locales.getText('pisell2.checkout.tips'),
       footer: null,
-      closable: false,
-      maskClosable: false,
       keyboard: false,
-      onCancel: function onCancel() {} // 禁用关闭
+      onCancel: function onCancel() {
+        setShowRetryModal(false);
+      } // 禁用关闭
     }
   }, /*#__PURE__*/React.createElement("div", {
     style: {

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

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

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

@@ -1,5 +1,5 @@
 .additional-module {
-  // padding-bottom: 16px; // 底部间距
+  padding-bottom: 2px; // 底部间距
 
   // 标题样式
   &-title {

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

@@ -267,22 +267,23 @@ function AmountSummary(_ref2) {
 
   // 计算键盘输入的最小值和最大值
   var getKeyboardLimits = function getKeyboardLimits() {
-    var walletTotal = getWalletTotalAmount();
+    // const walletTotal = getWalletTotalAmount();
     // const orderDue = getBalanceDueAmount();
 
     // 使用 Decimal.js 进行精确计算，避免浮点数精度问题
-    var walletTotalDecimal = new Decimal(walletTotal);
+    // const walletTotalDecimal = new Decimal(walletTotal);
     var orderDueDecimal = new Decimal(Number(balanceDueAmount || 0));
     var minDecimal = new Decimal(0.01);
 
     // 计算 orderDue - walletTotal
-    var diffDecimal = orderDueDecimal.minus(walletTotalDecimal);
+    // const diffDecimal = orderDueDecimal.minus(walletTotalDecimal);
 
     // 取最大值：max(0.01, orderDue - walletTotal)
-    var maxAmountDecimal = Decimal.max(minDecimal, diffDecimal);
+    // const maxAmountDecimal = Decimal.max(minDecimal, diffDecimal);
+
     return {
       min: minDecimal.toNumber(),
-      max: maxAmountDecimal.toNumber()
+      max: orderDueDecimal.toNumber()
     };
   };
 
@@ -310,12 +311,6 @@ function AmountSummary(_ref2) {
       Toast.fail(getText('pisell2.amount-summary.amount-cannot-be-zero', 'The amount cannot be 0'));
       return;
     }
-
-    // 兜底策略：如果是空字符串、NaN或0，默认使用待支付金额
-    if (!inputStr || numericValue <= 0) {
-      numericValue = getOrderDueAmount();
-    }
-
     // 确保输入值在允许范围内
     var minDecimal = new Decimal(limits.min);
     var maxDecimal = new Decimal(limits.max);
@@ -630,6 +625,10 @@ function AmountSummary(_ref2) {
       return _depositPaidAmount < new Decimal(totalAmount).toNumber();
     }
   }, [paymentItems, paymentType, totalAmount]);
+  var showCancelSplitPayment = useMemo(function () {
+    // 如果 balanceDueAmount 和 balanceDueAmount 不一样，则展示取消拆分支付按钮
+    return balanceDueAmount !== customAmount;
+  }, [customAmount, balanceDueAmount]);
   var handleChangeDepositAmount = function handleChangeDepositAmount(value) {
     console.log('handleChangeDepositAmount', value);
     checkoutModule === null || checkoutModule === void 0 || checkoutModule.setDepositAmountAsync(value);
@@ -684,7 +683,7 @@ function AmountSummary(_ref2) {
   shouldShowConfirmMode() ? renderConfirmMode() : /*#__PURE__*/React.createElement("div", {
     className: classNames('balance-due-info')
   }, paymentType === 'deposit' ? /*#__PURE__*/React.createElement(PisellPriceKeyboardPopover, {
-    value: (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.depositAmount) || '0'
+    value: balanceDueAmount || '0'
     // onChange={handleKeyboardChange}
     ,
     onConfirm: handleChangeDepositAmount,
@@ -744,7 +743,12 @@ function AmountSummary(_ref2) {
     hideDecimalForWholeNumbers: false,
     useThousandsSeparator: true,
     showCurrencySymbol: true
-  })))), !shouldShowConfirmMode() && /*#__PURE__*/React.createElement(Popover, {
+  })))), !shouldShowConfirmMode() && (showCancelSplitPayment ? /*#__PURE__*/React.createElement(Button, {
+    className: classNames('cancel-split-payment-button'),
+    onClick: function onClick() {
+      return onAmountChange === null || onAmountChange === void 0 ? void 0 : onAmountChange(balanceDueAmount);
+    }
+  }, getText('split.cancel') || '取消部\n分支付') : /*#__PURE__*/React.createElement(Popover, {
     content: /*#__PURE__*/React.createElement("div", {
       onClick: function onClick(e) {
         return e.stopPropagation();
@@ -786,7 +790,7 @@ function AmountSummary(_ref2) {
     destroyTooltipOnHide: true
   }, /*#__PURE__*/React.createElement(Button, {
     className: classNames('split-payment-button')
-  }, getText('split.payment') || '拆分支付'))
+  }, getText('split.payment') || '拆分支付')))
   // <PisellPriceKeyboardPopover
   //   value={(() => {
   //     try {

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

@@ -476,6 +476,7 @@
 }
 
 .split-payment-button {
+  width: 80px;
   padding: 0 8px;
   background: #079455;
   color: white;
@@ -485,4 +486,16 @@
   white-space: pre-line; // 让换行符(\n)生效
   text-align: left; // 确保文本居中对齐
   min-width: 68px;
+}
+.cancel-split-payment-button {
+  width: 80px;
+  padding: 0 8px;
+  background: #DF5342;
+  color: white;
+  font-size: 14px;
+  border: 1px solid #C3B2E7;
+  height: 80px;
+  white-space: pre-line; // 让换行符(\n)生效
+  text-align: left; // 确保文本居中对齐
+  min-width: 68px;
 }

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

@@ -87,9 +87,11 @@ export function CashPaymentModule(_ref) {
     }
   };
 
-  // 使用防抖，1000毫秒内不重复执行
+  // 使用防抖，500毫秒内不重复执行
   var _useDebounceFn = useDebounceFn(handleCashPayInternal, {
-      wait: 1000
+      wait: 500,
+      leading: true,
+      trailing: false
     }),
     handleCashPay = _useDebounceFn.run;
 

package/es/components/checkout/components/PaymentOptionsModule/PaymentMethodItem.js

@@ -14,7 +14,7 @@ import React, { useState } from 'react';
 import classnames from 'classnames';
 import { formatAmount } from '@pisell/utils';
 import { Iconfont } from '@pisell/materials';
-import { Button, Popover } from 'antd';
+import { Button } from 'antd';
 import { PaymentKeyboard } from "../../../../pro/priceKeyboard";
 import "./index.less";
 
@@ -52,6 +52,7 @@ var PaymentMethodItem = function PaymentMethodItem(_ref) {
 
   // 处理右侧按钮点击事件
   var handleRightButtonClick = function handleRightButtonClick(e) {
+    if (!isEftpos) return;
     e.preventDefault();
     // e.stopPropagation(); // 防止事件冒泡到外层按钮
     if (disabled || !onClick) {
@@ -111,6 +112,10 @@ var PaymentMethodItem = function PaymentMethodItem(_ref) {
 
   // 判断是否为EFTPOS支付方式
   var isEftpos = method.code === 'EFTPOS' || method.type === 'eftpos';
+  var showKeyboard = function showKeyboard() {
+    if (isEftpos) return;
+    setIsKeyboardVisible(true);
+  };
 
   // 渲染左侧内容
   var renderLeftContent = function renderLeftContent() {
@@ -128,7 +133,7 @@ var PaymentMethodItem = function PaymentMethodItem(_ref) {
       className: classnames('payment-options-module-payment-info-inner-surcharge')
     }, !!(method !== null && method !== void 0 && method.is_surcharge) && calculateSurcharge(method) !== 0 && /*#__PURE__*/React.createElement("div", {
       className: classnames('payment-options-module-surcharge-text')
-    }, (getText === null || getText === void 0 ? void 0 : getText('pisell2.payment-options.surcharge-label', 'Surcharge')) || 'Surcharge', ":", formatAmount(calculateSurcharge(method), 2, amountSymbol)), !isEftpos && /*#__PURE__*/React.createElement("div", {
+    }, (getText === null || getText === void 0 ? void 0 : getText('pisell2.payment-options.surcharge-label', 'Surcharge')) || 'Surcharge', ":", formatAmount(calculateSurcharge(method), 2, amountSymbol)), false && /*#__PURE__*/React.createElement("div", {
       className: classnames('payment-options-module-surcharge-text'),
       style: {
         cursor: 'pointer'
@@ -146,49 +151,10 @@ var PaymentMethodItem = function PaymentMethodItem(_ref) {
       'payment-options-module-pointer': !disabled,
       'payment-options-module-disabled': disabled
     }),
+    onClick: showKeyboard,
     type: "button",
     disabled: disabled
-  }, !isEftpos ? /*#__PURE__*/React.createElement(Popover, {
-    content: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(PaymentKeyboard, {
-      paymentOriginalValue: String(customAmount || 0),
-      paymentDefaultValue: String(customAmount || 0),
-      enableExceedMaxAmount: !isEftpos,
-      payment: {
-        enable: true
-      },
-      surcharge: {
-        enable: !!(method !== null && method !== void 0 && method.is_surcharge) && calculateSurcharge(method) !== 0
-      },
-      surchargeDefaultValue: {
-        percent: method.percentage ? String(Number(method.percentage) * 100) : '',
-        fixed: method.fixed ? String(method.fixed) : ''
-      },
-      selectType: "light",
-      onChange: function onChange(value) {
-        console.log(value);
-      },
-      onPay: function onPay(args) {
-        console.log(args);
-        // 处理支付逻辑
-        setIsKeyboardVisible(false);
-        if (onClick) {
-          var _args$surcharge, _args$surcharge2;
-          onClick(_objectSpread(_objectSpread({}, method), {}, {
-            fixed: Number(((_args$surcharge = args.surcharge) === null || _args$surcharge === void 0 ? void 0 : _args$surcharge.fixed) || 0),
-            percentage: (_args$surcharge2 = args.surcharge) !== null && _args$surcharge2 !== void 0 && _args$surcharge2.percent ? Number(args.surcharge.percent) / 100 : 0,
-            totalAmount: String(formatAmount(args.amount, 2))
-          }));
-        }
-      }
-    })),
-    trigger: "click",
-    open: isKeyboardVisible,
-    onOpenChange: setIsKeyboardVisible,
-    placement: "bottom",
-    overlayClassName: "payment-keyboard-popover",
-    arrow: true,
-    destroyTooltipOnHide: true
-  }, /*#__PURE__*/React.createElement("div", null, renderLeftContent())) : renderLeftContent(), /*#__PURE__*/React.createElement("div", {
+  }, renderLeftContent(), /*#__PURE__*/React.createElement("div", {
     className: classnames('payment-options-module-payment-method-right'),
     onClick: handleRightButtonClick
   },
@@ -205,6 +171,44 @@ var PaymentMethodItem = function PaymentMethodItem(_ref) {
       fontSize: '30px',
       color: disabled ? '#D0D5DD' : '#7F56DA'
     }
-  })))));
+  })))), /*#__PURE__*/React.createElement(PaymentKeyboard, {
+    containerProps: {
+      renderType: 'modal',
+      open: isKeyboardVisible,
+      onCancel: function onCancel() {
+        return setIsKeyboardVisible(false);
+      }
+    },
+    paymentOriginalValue: String(customAmount || 0),
+    paymentDefaultValue: String(customAmount || 0),
+    enableExceedMaxAmount: !isEftpos,
+    payment: {
+      enable: true
+    },
+    surcharge: {
+      enable: !!(method !== null && method !== void 0 && method.is_surcharge) && calculateSurcharge(method) !== 0
+    },
+    surchargeDefaultValue: {
+      percent: method.percentage ? String(Number(method.percentage) * 100) : '',
+      fixed: method.fixed ? String(method.fixed) : ''
+    },
+    selectType: "dark",
+    onChange: function onChange(value) {
+      console.log(value);
+    },
+    onPay: function onPay(args) {
+      console.log(args);
+      // 处理支付逻辑
+      setIsKeyboardVisible(false);
+      if (onClick) {
+        var _args$surcharge, _args$surcharge2;
+        onClick(_objectSpread(_objectSpread({}, method), {}, {
+          fixed: Number(((_args$surcharge = args.surcharge) === null || _args$surcharge === void 0 ? void 0 : _args$surcharge.fixed) || 0),
+          percentage: (_args$surcharge2 = args.surcharge) !== null && _args$surcharge2 !== void 0 && _args$surcharge2.percent ? Number(args.surcharge.percent) / 100 : 0,
+          totalAmount: String(formatAmount(args.amount, 2))
+        }));
+      }
+    }
+  }));
 };
 export default PaymentMethodItem;

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

@@ -281,9 +281,3 @@
     /* 标题保持正常颜色 */
   }
 }
-
-.payment-keyboard-popover {
-  .pisell-lowcode-popover-inner{
-    padding: 0;
-  }
-}

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

@@ -61,7 +61,9 @@ var PaymentResultToast = /*#__PURE__*/memo(function (props) {
     maskClosable = _props$maskClosable === void 0 ? false : _props$maskClosable,
     _props$closable = props.closable,
     closable = _props$closable === void 0 ? true : _props$closable,
-    zIndex = props.zIndex;
+    zIndex = props.zIndex,
+    _props$clickOutsideTo = props.clickOutsideToClose,
+    clickOutsideToClose = _props$clickOutsideTo === void 0 ? true : _props$clickOutsideTo;
 
   // 倒计时相关状态
   var _useState = useState(false),
@@ -70,6 +72,11 @@ var PaymentResultToast = /*#__PURE__*/memo(function (props) {
     setIsAnimating = _useState2[1];
   var countdownTimeoutRef = useRef(null);
 
+  // 弹窗内容引用，用于 click outside 检测
+  var modalContentRef = useRef(null);
+  // Modal 根容器引用
+  var modalRef = useRef(null);
+
   // 使用ref保存回调函数，避免依赖变化导致倒计时重置
   var onCloseRef = useRef(onClose);
   var onCountdownCompleteRef = useRef(onCountdownComplete);
@@ -130,18 +137,40 @@ var PaymentResultToast = /*#__PURE__*/memo(function (props) {
     return clearCountdown;
   }, [clearCountdown]);
 
+  // Click outside 检测
+  useEffect(function () {
+    if (!clickOutsideToClose || !visible) {
+      return;
+    }
+    var handleClickOutside = function handleClickOutside(event) {
+      var target = event.target;
+      var modalContent = modalContentRef.current;
+      if (!modalContent) {
+        return;
+      }
+
+      // 检查点击的目标元素是否在弹窗内容之外
+      if (!modalContent.contains(target)) {
+        var _onCloseRef$current2;
+        // 点击在弹窗外部，关闭弹窗
+        clearCountdown(); // 取消倒计时
+        (_onCloseRef$current2 = onCloseRef.current) === null || _onCloseRef$current2 === void 0 || _onCloseRef$current2.call(onCloseRef);
+      }
+    };
+    document.addEventListener('mousedown', handleClickOutside);
+    // 清理函数
+    return function () {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  }, [clickOutsideToClose, visible, clearCountdown]);
+
   // 处理关闭操作（关闭按钮点击时也取消倒计时）
   var handleClose = useCallback(function () {
-    var _onCloseRef$current2;
+    var _onCloseRef$current3;
     clearCountdown(); // 取消倒计时
-    (_onCloseRef$current2 = onCloseRef.current) === null || _onCloseRef$current2 === void 0 || _onCloseRef$current2.call(onCloseRef);
+    (_onCloseRef$current3 = onCloseRef.current) === null || _onCloseRef$current3 === void 0 || _onCloseRef$current3.call(onCloseRef);
   }, [clearCountdown]);
 
-  // 注释掉点击处理，现在完全由CSS的pointer-events控制穿透
-  // const handleContentClick: React.MouseEventHandler<HTMLDivElement> = useCallback((e) => {
-  //   // 由CSS的pointer-events控制点击穿透，不需要JavaScript处理
-  // }, []);
-
   // 渲染标题（合并原副标题内容）
   var renderTitle = function renderTitle() {
     if (!subtitle) {
@@ -275,6 +304,7 @@ var PaymentResultToast = /*#__PURE__*/memo(function (props) {
     ,
     getContainer: false
   }, /*#__PURE__*/React.createElement("div", {
+    ref: modalContentRef,
     className: getClassName('content', statusClassName),
     style: {
       position: 'relative',

package/es/components/checkout/components/PaymentResultToast/types.d.ts

@@ -54,4 +54,6 @@ export interface PaymentResultToastConfig {
     closable?: boolean;
     /** 弹窗层级 */
     zIndex?: number;
+    /** 是否启用点击外部区域关闭弹窗（使用纯JS实现） */
+    clickOutsideToClose?: boolean;
 }

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

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

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

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

package/es/components/checkout/components/WalletPassModule/utils.js

@@ -63,7 +63,7 @@ export var formatDiscountWalletData = function formatDiscountWalletData(data) {
     var _item$product2;
     var name = "";
     var storeName = "";
-    if (item.tag === 'product_discount_card') {
+    if (item.tag === 'product_discount_card' || item.tag === 'discount_card') {
       var _item$metadata;
       if ((item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.discount_card_type) === "fixed_amount") {
         var amountValue = item !== null && item !== void 0 && item.savedAmount ? item === null || item === void 0 ? void 0 : item.savedAmount : item.par_value;
@@ -72,9 +72,9 @@ export var formatDiscountWalletData = function formatDiscountWalletData(data) {
           showCurrencySymbol: true
         }));
       } else {
-        name = locales.getText('pisell2.checkout.discount.percentage.off')(item.par_value);
+        name = locales.getText('pisell2.checkout.discount.percentage.off')(item.par_value || item.discount.percent);
       }
-      storeName = item.product_name;
+      storeName = item.product_name || item.format_title.auto;
     } else if (item.tag === 'good_pass') {
       var _locales$getText;
       name = item.product_name;
@@ -86,9 +86,10 @@ export var formatDiscountWalletData = function formatDiscountWalletData(data) {
       name = item.product_name;
     }
 
-    // 如果处理完最后还没有 name，并且是 isEditMode，则 name 为 item.name
+    // 如果处理完最后还没有 name，并且是 isEditMode，则 name 为 item.amount
     if (!name && item.isEditMode) {
-      name = item.name;
+      name = item.amount;
+      storeName = item.format_title.auto;
     }
     return _objectSpread(_objectSpread({}, item), {}, {
       id: item.id,

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

@@ -708,11 +708,16 @@ export var useWalletPass = function useWalletPass(props) {
         }))) {
           Toast === null || Toast === void 0 || Toast.info(locales.getText('wallet-pass-module-already-best-combination'));
         } else {
-          setWalletSelect(searchIdentificationCodeList);
-          handleFetchUserIdentificationCodes(searchIdentificationCodeList.map(function (item) {
+          var _select2 = searchIdentificationCodeList.filter(function (item) {
+            return item.unified_available_status;
+          });
+          setWalletSelect(_select2);
+          handleFetchUserIdentificationCodes(_select2.map(function (item) {
             return item.id;
-          }), searchIdentificationCodeList);
-          Toast === null || Toast === void 0 || Toast.success(locales.getText('wallet-pass-module-best-combination-selected'));
+          }), _select2);
+          if (_select2.length) {
+            Toast === null || Toast === void 0 || Toast.success(locales.getText('wallet-pass-module-best-combination-selected'));
+          }
         }
       }
       return;

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

@@ -25,6 +25,7 @@ declare const _default: {
         'partial.paid': string;
         'deposit.partial.paid': string;
         'split.payment': string;
+        'split.cancel': string;
         cash: string;
         rounding: string;
         'cash.payment': string;
@@ -191,6 +192,7 @@ declare const _default: {
         'partial.paid': string;
         'deposit.partial.paid': string;
         'split.payment': string;
+        'split.cancel': string;
         cash: string;
         rounding: string;
         'cash.payment': string;
@@ -357,6 +359,7 @@ declare const _default: {
         'partial.paid': string;
         'deposit.partial.paid': string;
         'split.payment': string;
+        'split.cancel': string;
         cash: string;
         rounding: string;
         'cash.payment': string;

package/es/components/checkout/locales.js

@@ -29,6 +29,7 @@ export default {
     'partial.paid': 'Partial Paid',
     'deposit.partial.paid': 'Deposit Paid',
     'split.payment': 'Pay\nPartially',
+    'split.cancel': 'Cancel\nPartial',
     // Cash Payment
     'cash': 'Cash',
     'rounding': 'Rounding',
@@ -82,7 +83,7 @@ export default {
       return "".concat(count, " Expired");
     },
     'wallet-pass-module-best-saving': 'Select Best',
-    'wallet-pass-module-clear-all': 'Clear All',
+    'wallet-pass-module-clear-all': 'Clear Selection',
     'wallet-pass-module-expired-modal-title': function walletPassModuleExpiredModalTitle(count) {
       return "".concat(count, " Expired Vouchers");
     },
@@ -242,6 +243,7 @@ export default {
     'partial.paid': '部分支付',
     'deposit.partial.paid': '定金部分支付',
     'split.payment': '部分付款',
+    'split.cancel': '取消\n部分支付',
     // Cash Payment
     'cash': '现金',
     'rounding': '舍入',
@@ -458,6 +460,7 @@ export default {
     'partial.paid': '部分支付',
     'deposit.partial.paid': '定金部分支付',
     'split.payment': '部分付款',
+    'split.cancel': '取消\n部分支付',
     // Cash Payment
     'cash': '現金',
     'rounding': '捨入',

package/es/components/eftpos/deviceList/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const _default: ({ input, ...formItemProps }: any) => JSX.Element;
 export default _default;

package/es/components/eftpos/form/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang

package/es/components/eftpos/group/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { RadioGroupProps } from 'antd';
 export declare const CheckboxGroup: ({ direction, options, ...props }: any) => JSX.Element;
 export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {