@pisell/private-materials 6.5.11 → 6.5.13

package/es/components/checkout/PaymentModal.js

@@ -113,41 +113,46 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     balanceDueAmount = _useState4[0],
     setBalanceDueAmount = _useState4[1];
-  var _useState5 = useState([]),
+  // 剩余待付金额-跟定金无关的一个订单总体待付金额，上面这个 balanceDueAmount 是会收到订单影响的，下面这个不会
+  var _useState5 = useState(''),
     _useState6 = _slicedToArray(_useState5, 2),
-    recommendAmounts = _useState6[0],
-    setRecommendAmounts = _useState6[1];
-  var paymentMethodsRef = useRef(null);
+    balanceDueTotalAmount = _useState6[0],
+    setBalanceDueTotalAmount = _useState6[1];
   var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    paymentMethods = _useState8[0],
-    setPaymentMethods = _useState8[1];
-  var _useState9 = useState(false),
+    recommendAmounts = _useState8[0],
+    setRecommendAmounts = _useState8[1];
+  var paymentMethodsRef = useRef(null);
+  var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    showCashPayment = _useState10[0],
-    setShowCashPayment = _useState10[1];
-  var _useState11 = useState(locales.getText('cards.and.digitals') || 'Cards & Digitals'),
+    paymentMethods = _useState10[0],
+    setPaymentMethods = _useState10[1];
+  var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    paymentOptionsTitle = _useState12[0],
-    setPaymentOptionsTitle = _useState12[1];
+    showCashPayment = _useState12[0],
+    setShowCashPayment = _useState12[1];
+  var _useState13 = useState(locales.getText('cards.and.digitals') || 'Cards & Digitals'),
+    _useState14 = _slicedToArray(_useState13, 2),
+    paymentOptionsTitle = _useState14[0],
+    setPaymentOptionsTitle = _useState14[1];
   var clientChangedRef = useRef(false);
   var walletPassRef = useRef(null);
   // 已保存的支付项数据
-  var _useState13 = useState([]),
-    _useState14 = _slicedToArray(_useState13, 2),
-    paymentItems = _useState14[0],
-    setPaymentItems = _useState14[1];
-  // 钱包卡券数据
-  var _useState15 = useState({}),
+  var _useState15 = useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
-    walletPassData = _useState16[0],
-    setWalletPassData = _useState16[1];
+    paymentItems = _useState16[0],
+    setPaymentItems = _useState16[1];
+  // 钱包卡券数据
+  var _useState17 = useState({}),
+    _useState18 = _slicedToArray(_useState17, 2),
+    walletPassData = _useState18[0],
+    setWalletPassData = _useState18[1];
   var _usePrinter = usePrinter(),
     nativePrint = _usePrinter.nativePrint;
-  var _useState17 = useState(false),
-    _useState18 = _slicedToArray(_useState17, 2),
-    syncingLock = _useState18[0],
-    setSyncingLock = _useState18[1];
+  var _useState19 = useState(false),
+    _useState20 = _slicedToArray(_useState19, 2),
+    syncingLock = _useState20[0],
+    setSyncingLock = _useState20[1];
   var isOrderFree = useMemo(function () {
     if (!customAmount) return false;
     var amount = parseFloat(customAmount);
@@ -155,14 +160,14 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, [customAmount]);
 
   // 新增状态：订单备注和手动折扣
-  var _useState19 = useState(false),
-    _useState20 = _slicedToArray(_useState19, 2),
-    paymentLinkModalOpen = _useState20[0],
-    setPaymentLinkModalOpen = _useState20[1];
   var _useState21 = useState(false),
     _useState22 = _slicedToArray(_useState21, 2),
-    showPriceAdjustModal = _useState22[0],
-    setShowPriceAdjustModal = _useState22[1];
+    paymentLinkModalOpen = _useState22[0],
+    setPaymentLinkModalOpen = _useState22[1];
+  var _useState23 = useState(false),
+    _useState24 = _slicedToArray(_useState23, 2),
+    showPriceAdjustModal = _useState24[0],
+    setShowPriceAdjustModal = _useState24[1];
   var logger = usePaymentLogger();
   var currency = getData('shop_currency_code') || 'USD';
 
@@ -418,6 +423,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           var _cartData$order_info;
           setCustomAmount(currentAmount);
           setBalanceDueAmount(currentAmount);
+          setBalanceDueTotalAmount(orderInfo.totalAmount || '0');
           // 设置订单备注默认值 - 优先从 checkoutModule 获取，如果没有则从购物车数据获取
           var currentNote = checkoutModule.getOrderNote();
           if (currentNote) {
@@ -520,6 +526,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           }());
           var amountChangedUnsubscribe = core.effects.on(CheckoutHooks.OnBalanceDueAmountChanged, function (data) {
             setBalanceDueAmount(data.newAmount);
+            setBalanceDueTotalAmount(data.totalAmount || '0');
           });
           var orderSubmitStartUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitStart, function () {
             var _Toast$loading;
@@ -563,7 +570,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); // 获取订单总金额
@@ -575,7 +582,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;
@@ -583,13 +590,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(),
@@ -607,7 +620,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);
@@ -626,7 +639,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                         }
                       });
                     }
-                  case 16:
+                  case 17:
                   case "end":
                     return _context5.stop();
                 }
@@ -1288,7 +1301,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     amountButtons: recommendAmounts,
     customAmount: customAmount,
     roundingFunction: roundingFunction,
-    balanceDueAmount: balanceDueAmount
+    balanceDueAmount: balanceDueAmount,
+    balanceDueTotalAmount: balanceDueTotalAmount
   })), moduleConfig.showPaymentOptions && /*#__PURE__*/React.createElement("div", {
     className: showCashPayment ? '' : 'payment-options-module-container',
     style: showCashPayment ? {
@@ -1370,30 +1384,30 @@ var PaymentModal = function PaymentModal(_ref18) {
     getData = _ref19.getData,
     interaction = _ref19.interaction,
     isWebPos = _ref19.isWebPos;
-  var _useState23 = useState(null),
-    _useState24 = _slicedToArray(_useState23, 2),
-    orderInfo = _useState24[0],
-    setOrderInfo = _useState24[1];
-  var _useState25 = useState(0),
+  var _useState25 = useState(null),
     _useState26 = _slicedToArray(_useState25, 2),
-    totalAmount = _useState26[0],
-    setTotalAmount = _useState26[1];
-  var _useState27 = useState(true),
+    orderInfo = _useState26[0],
+    setOrderInfo = _useState26[1];
+  var _useState27 = useState(0),
     _useState28 = _slicedToArray(_useState27, 2),
-    actualShowCashPayment = _useState28[0],
-    setActualShowCashPayment = _useState28[1];
-  var _useState29 = useState(0),
+    totalAmount = _useState28[0],
+    setTotalAmount = _useState28[1];
+  var _useState29 = useState(true),
     _useState30 = _slicedToArray(_useState29, 2),
-    windowHeight = _useState30[0],
-    setWindowHeight = _useState30[1];
-  var _useState31 = useState(false),
+    actualShowCashPayment = _useState30[0],
+    setActualShowCashPayment = _useState30[1];
+  var _useState31 = useState(0),
     _useState32 = _slicedToArray(_useState31, 2),
-    showRetryModal = _useState32[0],
-    setShowRetryModal = _useState32[1];
-  var _useState33 = useState(editOrderId || 0),
+    windowHeight = _useState32[0],
+    setWindowHeight = _useState32[1];
+  var _useState33 = useState(false),
     _useState34 = _slicedToArray(_useState33, 2),
-    currentEditOrderId = _useState34[0],
-    _setCurrentEditOrderId = _useState34[1];
+    showRetryModal = _useState34[0],
+    setShowRetryModal = _useState34[1];
+  var _useState35 = useState(editOrderId || 0),
+    _useState36 = _slicedToArray(_useState35, 2),
+    currentEditOrderId = _useState36[0],
+    _setCurrentEditOrderId = _useState36[1];
   var Toast = useToast();
   var _usePrinter2 = usePrinter(),
     nativePrint = _usePrinter2.nativePrint;
@@ -1528,18 +1542,18 @@ var PaymentModal = function PaymentModal(_ref18) {
   }, []);
 
   // 订单备注相关状态
-  var _useState35 = useState(false),
-    _useState36 = _slicedToArray(_useState35, 2),
-    noteModalOpen = _useState36[0],
-    setNoteModalOpen = _useState36[1];
-  var _useState37 = useState(''),
+  var _useState37 = useState(false),
     _useState38 = _slicedToArray(_useState37, 2),
-    orderNote = _useState38[0],
-    setOrderNote = _useState38[1];
-  var _useState39 = useState('payment-content'),
+    noteModalOpen = _useState38[0],
+    setNoteModalOpen = _useState38[1];
+  var _useState39 = useState(''),
     _useState40 = _slicedToArray(_useState39, 2),
-    noteModalSource = _useState40[0],
-    setNoteModalSource = _useState40[1];
+    orderNote = _useState40[0],
+    setOrderNote = _useState40[1];
+  var _useState41 = useState('payment-content'),
+    _useState42 = _slicedToArray(_useState41, 2),
+    noteModalSource = _useState42[0],
+    setNoteModalSource = _useState42[1];
 
   // 订单备注相关处理函数
   var handleNoteConfirm = /*#__PURE__*/function () {

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

@@ -503,8 +503,8 @@ function AmountSummary(_ref2) {
     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);
+      if (item.isSynced && (paymentType === 'regular' && item.order_payment_type !== 'deposit' || paymentType === 'deposit' && item.order_payment_type === 'deposit')) {
+        return acc.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
       }
       return acc;
     }, new Decimal(0)).toNumber();
@@ -615,7 +615,7 @@ function AmountSummary(_ref2) {
     if (paymentType === 'regular') {
       var depositPaidAmount = paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.reduce(function (acc, item) {
         if (item.order_payment_type === 'deposit') {
-          return acc.plus(item.amount).plus(Math.abs(item.rounding_amount));
+          return acc.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
         }
         return acc;
       }, new Decimal(0)).toNumber();
@@ -627,7 +627,7 @@ function AmountSummary(_ref2) {
       // 如果是定金支付，且定金已付款金额大于等于订单总金额，则不可以再切换到普通支付
       var _depositPaidAmount = paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.reduce(function (acc, item) {
         if (item.order_payment_type === 'deposit') {
-          return acc.plus(item.amount);
+          return acc.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
         }
         return acc;
       }, new Decimal(0)).toNumber();

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

@@ -13,10 +13,12 @@ export interface CashPaymentModuleProps {
         roundingDifference: number;
     }>;
     balanceDueAmount?: string;
+    balanceDueTotalAmount?: string;
     syncingLock?: boolean;
 }
 export declare function CashPaymentModule({ amountSymbol, orderInfo, onPaymentComplete, customAmount, amountButtons, // 按钮列表，默认5个推荐金额
 disabled, // 禁用状态
-roundingFunction, balanceDueAmount, // 剩余支付金额
+roundingFunction, balanceDueAmount, // 当前阶段剩余支付金额（定金或普通支付）
+balanceDueTotalAmount, // 完整订单剩余待付金额
 syncingLock, }: CashPaymentModuleProps): JSX.Element;
 export default CashPaymentModule;

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

@@ -29,6 +29,8 @@ export function CashPaymentModule(_ref) {
     roundingFunction = _ref.roundingFunction,
     _ref$balanceDueAmount = _ref.balanceDueAmount,
     balanceDueAmount = _ref$balanceDueAmount === void 0 ? '0' : _ref$balanceDueAmount,
+    _ref$balanceDueTotalA = _ref.balanceDueTotalAmount,
+    balanceDueTotalAmount = _ref$balanceDueTotalA === void 0 ? '0' : _ref$balanceDueTotalA,
     _ref$syncingLock = _ref.syncingLock,
     syncingLock = _ref$syncingLock === void 0 ? false : _ref$syncingLock;
   var _useState = useState(customAmount || ''),
@@ -56,7 +58,7 @@ export function CashPaymentModule(_ref) {
   };
   useEffect(function () {
     handleKeyboardConfirm(customAmount || '');
-  }, [customAmount, balanceDueAmount]);
+  }, [customAmount, balanceDueAmount, orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.isDeposit]);
 
   // 检查是否应该禁用按钮：原本disabled为true 或者 订单金额为0
   var isAmountButtonsDisabled = disabled || Number(customAmount || 0) === 0;
@@ -125,33 +127,35 @@ export function CashPaymentModule(_ref) {
               break;
             }
             setAmount('');
-            _context.next = 32;
+            _context.next = 33;
             break;
           case 13:
             // 移除可能的货币符号和多余空格
             cleanValue = finalValue.replace(/[$\s]/g, '');
             numValue = parseFloat(cleanValue); // 检查当前金额是否等于剩余支付金额
-            balanceDue = parseFloat(balanceDueAmount);
+            debugger;
+            // 需要确认当前是否是定金模式，如果是定金模式则 balanceDue 应该为完整订单剩余待付金额
+            balanceDue = parseFloat(orderInfo !== null && orderInfo !== void 0 && orderInfo.isDeposit ? balanceDueTotalAmount || '0' : balanceDueAmount);
             shouldApplyRounding = Math.abs(numValue - balanceDue) < 0.01; // 使用小数精度比较
             finalAmount = numValue;
             roundingDiff = 0;
             if (!(shouldApplyRounding && roundingFunction)) {
-              _context.next = 29;
+              _context.next = 30;
               break;
             }
-            _context.next = 22;
+            _context.next = 23;
             return roundingFunction(numValue);
-          case 22:
+          case 23:
             _result = _context.sent;
             _ref3 = _result || {}, _ref3$roundedAmount = _ref3.roundedAmount, roundedAmount = _ref3$roundedAmount === void 0 ? numValue : _ref3$roundedAmount, _ref3$roundingDiffere = _ref3.roundingDifference, roundingDifference = _ref3$roundingDiffere === void 0 ? 0 : _ref3$roundingDiffere;
             finalAmount = roundedAmount;
             roundingDiff = roundingDifference;
             console.log('应用抹零：', numValue, '->', roundedAmount, '差额:', roundingDifference);
-            _context.next = 30;
+            _context.next = 31;
             break;
-          case 29:
-            console.log('不应用抹零，用户输入金额:', numValue, '剩余支付金额:', balanceDue);
           case 30:
+            console.log('不应用抹零，用户输入金额:', numValue, '剩余支付金额:', balanceDue);
+          case 31:
             setRoundingAmount(roundingDiff);
             if (isNaN(numValue)) {
               setAmount('');
@@ -159,7 +163,7 @@ export function CashPaymentModule(_ref) {
               setAmount(finalAmount.toString());
               console.log('设置金额为:', finalAmount);
             }
-          case 32:
+          case 33:
           case "end":
             return _context.stop();
         }

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

@@ -105,20 +105,11 @@ function PaymentDetailModal(_ref) {
       return !item.voucher_id || item.isSynced;
     }).reduce(function (total, item) {
       var amount = new Decimal(Math.abs(item.amount));
-      var roundingAmount = new Decimal(Math.abs(item.rounding_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);
   };
 
-  // 计算优惠券扣减总额 (只计算带voucher_id的支付项)
-  var getTotalVoucherAmount = function getTotalVoucherAmount() {
-    return paymentItems.filter(function (item) {
-      return item.voucher_id;
-    }).reduce(function (total, item) {
-      return new Decimal(total).plus(new Decimal(Math.abs(item.amount))).toNumber();
-    }, 0);
-  };
-
   // 计算Balance Due金额 (customAmount + 所有voucher扣减金额)
   var getBalanceDueAmount = function getBalanceDueAmount() {
     // debugger
@@ -152,10 +143,10 @@ function PaymentDetailModal(_ref) {
       }, 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(Math.abs(item.rounding_amount || 0))).toNumber();
+      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(Math.abs(item.rounding_amount || 0))).toNumber();
+      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')
@@ -182,7 +173,7 @@ function PaymentDetailModal(_ref) {
         className: classNames('payment-item-actions')
       }, /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-amount')
-      }, "-", formatAmountWithOptions(new Decimal(Math.abs(item.amount)).plus(new Decimal(Math.abs(item.rounding_amount))).toNumber(), 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,
@@ -215,7 +206,7 @@ function PaymentDetailModal(_ref) {
         className: classNames('payment-item-actions')
       }, /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-amount')
-      }, "-", formatAmountWithOptions(new Decimal(Math.abs(item.amount)).plus(new Decimal(Math.abs(item.rounding_amount))).toNumber(), 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,

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

@@ -57,7 +57,10 @@ function PaymentOptionsModule(_ref) {
         onClick(method);
       }
     }, {
-      wait: 500 // 500ms 防抖延迟
+      wait: 1000,
+      // 500ms 防抖延迟
+      leading: true,
+      trailing: false
     }),
     handlePaymentClick = _useDebounceFn.run;
   return /*#__PURE__*/React.createElement("div", {

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/eftpos/deviceList/index.d.ts

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

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

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

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

@@ -1,4 +1,3 @@
-/// <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 & {

package/es/components/eftpos/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/es/components/eftpos/icon/apiKey.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/es/components/eftpos/icon/device.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos, DeviceStatus } from './const';
 import './index.less';
 interface PosProps {

package/es/components/eftpos/pos.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { DeviceProp } from "./const";
 interface PosProps {
     eftposName: string;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 自定义组件设置
  * @description: 自定义组件设置

package/es/components/eftposPay/amount.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PosProps } from './const';
 /**
  * @title: 支付金额信息配置页
@@ -9,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/component/alert/warn.d.ts

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

package/es/components/eftposPay/component/fail/failCustom.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/fail/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/fail/network.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 断网(客户端)提示页

package/es/components/eftposPay/component/fail/unknow.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

package/es/components/eftposPay/component/header/titlebar.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",

package/es/components/eftposPay/component/manual/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 import './index.less';
 /**

package/es/components/eftposPay/component/signature/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 取消签名确认页

package/es/components/eftposPay/component/step/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

package/es/components/eftposPay/component/step/step.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string;

package/es/components/eftposPay/device.d.ts

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, containerStyle, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/linkly/hooks/normal.js

@@ -74,7 +74,7 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
     var status = res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.status;
 
     // 继续查询交易状态
-    if (status === 0) {
+    if (status == 0) {
       var _res$data2;
       // 交易流水号
       numRef.current = res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.session_id;
@@ -89,7 +89,7 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
       setTimeout(function () {
         var _resultQueryRef$curre;
         (_resultQueryRef$curre = resultQueryRef.current) === null || _resultQueryRef$curre === void 0 || _resultQueryRef$curre.call(resultQueryRef);
-      });
+      }, 300);
       return;
     }
 
@@ -99,7 +99,7 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
     }));
 
     // 交易成功
-    if (status === 1) {
+    if (status == 1) {
       var _handleLinklySuccessR;
       (_handleLinklySuccessR = handleLinklySuccessRef.current) === null || _handleLinklySuccessR === void 0 || _handleLinklySuccessR.call(handleLinklySuccessRef, res);
       return;