tplus-components-touch 3.27.39 → 3.27.40

package/dist/components/settlement/settlement.js

@@ -493,9 +493,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
       var isAutoShowCouponWhenCash = (0, _tplusPoslogin.PosInitData)('IsAutoShowCouponWhenCash');
       // 支持异步验证过程
-      _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate(function (data) {
-        return _this2.isNoProductTip(data);
-      })).then(function (result) {
+      _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate({ fn: function fn(data) {
+          return _this2.isNoProductTip(data);
+        } })).then(function (result) {
         if (result) {
           _this2.setState({
             settleDisabled: false
@@ -1797,7 +1797,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.settleSuccess = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
-      var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, getSettleGift, type, resp1;
+      var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, _this2$store6, getSettleGift, isFull, type, resp1;
 
       return _regenerator2.default.wrap(function _callee8$(_context8) {
         while (1) {
@@ -1857,7 +1857,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }
               };
 
-              getSettleGift = _this2.store.getSettleGift;
+              _this2$store6 = _this2.store, getSettleGift = _this2$store6.getSettleGift, isFull = _this2$store6.isFull;
               type = _this2.props.type;
               resp1 = false;
 
@@ -1906,7 +1906,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 } else if (MemberPoints && Number(amount) == Number(0)) {
                   message = "兑换成功";
                 }
-                window.__successModal = (0, _utils.showSuccessModal)(amount, received, charge, _this.props.onModalClose, isXianjin, message, resp1 && resp1.data, _mutantsMicrofx.stores, IdbusiType, function () {
+                window.__successModal = (0, _utils.showSuccessModal)(amount, received, charge, _this.props.onModalClose, isXianjin, message, resp1 && resp1.data, _mutantsMicrofx.stores, IdbusiType, isFull, function () {
                   _this.handleGuestShow(5);
                 });
                 _this2.setState({ isXianjin: false });
@@ -2063,7 +2063,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           };
         }();
 
-        var _enumController$getEn21, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
+        var _enumController$getEn21, PayStyle, _this2$store7, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
 
         return _regenerator2.default.wrap(function _callee11$(_context11) {
           while (1) {
@@ -2074,7 +2074,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
                 console.log("settlement.handleSettle开始执行，参数：", +args);
                 _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.PayStyle;
-                _this2$store6 = _this2.store, paymode = _this2$store6.paymode, brefund = _this2$store6.brefund, boriginReturn = _this2$store6.boriginReturn, newStyle = _this2$store6.newStyle;
+                _this2$store7 = _this2.store, paymode = _this2$store7.paymode, brefund = _this2$store7.brefund, boriginReturn = _this2$store7.boriginReturn, newStyle = _this2$store7.newStyle;
                 isQuickPay = args === 'quickPay';
                 that = _this2;
                 status = false;
@@ -2634,7 +2634,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.btnDebounced = function () {
       var _ref27 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(type, bquick) {
-        var IdbusiType, CustomerPhone, DistributionMode, Address, title, _enumController$getEn23, PayStyle, _this2$store7, paymode, brefund, boriginReturn, newStyle, status;
+        var IdbusiType, CustomerPhone, DistributionMode, Address, title, _enumController$getEn23, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
 
         return _regenerator2.default.wrap(function _callee16$(_context16) {
           while (1) {
@@ -2671,7 +2671,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   isInputMember: true
                 });
                 _enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn23.PayStyle;
-                _this2$store7 = _this2.store, paymode = _this2$store7.paymode, brefund = _this2$store7.brefund, boriginReturn = _this2$store7.boriginReturn, newStyle = _this2$store7.newStyle;
+                _this2$store8 = _this2.store, paymode = _this2$store8.paymode, brefund = _this2$store8.brefund, boriginReturn = _this2$store8.boriginReturn, newStyle = _this2$store8.newStyle;
 
                 if (!(bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type))) {
                   _context16.next = 15;
@@ -3160,9 +3160,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkCurrentModeHaveMutex = function (type) {
-      var _this2$store8 = _this2.store,
-          paymode = _this2$store8.paymode,
-          newStyle = _this2$store8.newStyle;
+      var _this2$store9 = _this2.store,
+          paymode = _this2$store9.paymode,
+          newStyle = _this2$store9.newStyle;
 
       var _enumController$getEn28 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn28.PayStyle;
@@ -3700,19 +3700,26 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (IdbusiType == 38 && this.isBook && this.percentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
         totalTaxAmount = totalTaxAmount * this.percentageWhenBook / 100;
       }
-      if (IdbusiType == 39) {
-        totalTaxAmount = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
-      }
 
       // 单据模式
       var thePaymodes = newStyle ? (0, _filter3.default)(paymode.thePaymodes, function (m) {
+        if (IdbusiType == 39) {
+          return !(_this8.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0) && m.paymentType != PayStyle.hyczk;
+        }
         return !(_this8.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
       }) : paymode.thePaymodes;
       var paymodes = paymode.paymodes,
           settle = paymode.settle,
           currentMode = paymode.currentMode;
-      // 积分兑换 总积分
 
+
+      if (IdbusiType == 39) {
+        totalTaxAmount = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
+        paymodes = (0, _filter3.default)(paymodes, function (mode) {
+          return mode.paymentType != PayStyle.hyczk;
+        }); //取货过滤掉储值
+      }
+      // 积分兑换 总积分
       var ExchangeIntegral = this.context && this.context.viewModel && this.context.viewModel.data.ExchangeIntegral;
 
       var _hasSMZF = (0, _find3.default)(paymodes, function (item) {
@@ -3728,7 +3735,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
 
       var quickPay = boriginReturn ? [] : (0, _filter3.default)(paymodes, function (paymode) {
-        return paymode.isQuick;
+        if (IdbusiType == 39) {
+          return paymode.isQuick && paymode.paymentType != PayStyle.hyczk; //取货过滤掉储值
+        } else {
+          return paymode.isQuick;
+        }
       });
       var productsIsEmpty = type != 1 && this.context.viewModel.data.RetailDetails.length == 0 || type == 1 && parseFloat(amount || 0) <= 0 || memberDisabled || noIsMinAmount;
       var moreToolbtns = [];