tplus-components-touch 3.27.1 → 3.27.2

package/dist/components/settlement/settlement.less

@@ -999,7 +999,7 @@
           button{
             background-color: white ;
             opacity:1;
-          } 
+          }
         }
     }
       .paymode{
@@ -1592,4 +1592,10 @@
       }
     }
   }
+}
+.freight{
+  margin-left: 5px;
+  vertical-align: middle;
+  color: #666666;
+  font-size: 12px;
 }

package/dist/components/settlement/settlementStore.js

@@ -41,7 +41,7 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
-var _desc, _value, _class, _descriptor, _descriptor2, _descriptor3, _desc2, _value2, _class3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _desc3, _value3, _class5, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16;
+var _desc, _value, _class, _descriptor, _descriptor2, _desc2, _value2, _class3, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _desc3, _value3, _class5, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15;
 
 var _mobx = require('mobx');
 
@@ -161,6 +161,7 @@ function _initializerWarningHelper(descriptor, context) {
 var t = _mutantsMicrofx.i18n.getFixedT(null, 'newretail');
 
 var SettlementStore = (_class = function () {
+    //type==2
     function SettlementStore() {
         var _this2 = this;
 
@@ -172,7 +173,6 @@ var SettlementStore = (_class = function () {
         this.bquick = false;
         this.boriginReturn = false;
         this.newStyle = true;
-        this.freight = 0;
 
         _initDefineProp(this, 'queryPwd', _descriptor, this);
 
@@ -319,8 +319,6 @@ var SettlementStore = (_class = function () {
             return (0, _tplusApi.ccApi)(data, '/retail/RetailPos/getPosFreight', false, false);
         };
 
-        _initDefineProp(this, 'updataFreight', _descriptor3, this);
-
         this.checkCoupon = function () {
             var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(sn) {
                 var _ref4, isNewRetailBCPos, _enumController$getEn3, PayStyle, Differentiate;
@@ -428,8 +426,7 @@ var SettlementStore = (_class = function () {
         var params = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('cloudPrintArguments');
         if (params) this.cloudPrintArguments = params;
         this.newStyle = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
-    } //type==2
-
+    }
 
     (0, _createClass3.default)(SettlementStore, [{
         key: 'initPaymodes',
@@ -477,9 +474,12 @@ var SettlementStore = (_class = function () {
 
                 if (IdbusiType == 38 && Book && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
                     value = value * PercentageWhenBook / 100;
+                    (0, _mobx.runInAction)(function () {
+                        _this3.dto.PrepaidAmount = value;
+                    });
                 }
                 if (IdbusiType == 38 && Book && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
-                    value += this.freight;
+                    value += this.dto.BuyerPayFreight || 0;
                 }
                 if (IdbusiType == 39) {
                     value = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
@@ -1569,15 +1569,6 @@ var SettlementStore = (_class = function () {
             };
         }();
     }
-}), _descriptor3 = _applyDecoratedDescriptor(_class.prototype, 'updataFreight', [_mobx.action], {
-    enumerable: true,
-    initializer: function initializer() {
-        var _this14 = this;
-
-        return function (freight) {
-            _this14.freight = freight;
-        };
-    }
 }), _applyDecoratedDescriptor(_class.prototype, 'addDjq', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addDjq'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeClickFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeClickFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeValue'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPayDirectly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPayDirectly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'delPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'delPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'setDtoID', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setDtoID'), _class.prototype)), _class);
 exports.default = SettlementStore;
 var PayMode = exports.PayMode = (_class3 = function () {
@@ -1592,15 +1583,15 @@ var PayMode = exports.PayMode = (_class3 = function () {
         this.onlineamount = 0;
         this.maxamount = 0;
 
-        _initDefineProp(this, 'currentFocus', _descriptor4, this);
+        _initDefineProp(this, 'currentFocus', _descriptor3, this);
 
-        _initDefineProp(this, 'received', _descriptor5, this);
+        _initDefineProp(this, 'received', _descriptor4, this);
 
-        _initDefineProp(this, 'receivable', _descriptor6, this);
+        _initDefineProp(this, 'receivable', _descriptor5, this);
 
-        _initDefineProp(this, 'paymodes', _descriptor7, this);
+        _initDefineProp(this, 'paymodes', _descriptor6, this);
 
-        _initDefineProp(this, 'thePaymodes', _descriptor8, this);
+        _initDefineProp(this, 'thePaymodes', _descriptor7, this);
 
         this.currentMode = null;
         this.checkList = [];
@@ -1609,11 +1600,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
             hotKey: "Ctrl+M"
         };
 
-        _initDefineProp(this, 'calcCheckList', _descriptor9, this);
+        _initDefineProp(this, 'calcCheckList', _descriptor8, this);
 
-        _initDefineProp(this, 'setCouponNum', _descriptor10, this);
+        _initDefineProp(this, 'setCouponNum', _descriptor9, this);
 
-        _initDefineProp(this, 'addDjqs', _descriptor11, this);
+        _initDefineProp(this, 'addDjqs', _descriptor10, this);
     }
     // @observable store = null;
 
@@ -1652,7 +1643,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqCheckValue',
         value: function calcDjqCheckValue(q1, dto, params) {
-            var _this15 = this;
+            var _this14 = this;
 
             var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
             var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
@@ -1699,7 +1690,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             if (!q1.checked) {
                 this.checkList.forEach(function (ele, i) {
                     if (ele.id === q1.id) {
-                        _this15.checkList.splice(i, 1);
+                        _this14.checkList.splice(i, 1);
                     }
                 });
             } else {
@@ -1771,7 +1762,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 if (result && result.length != 0) {
                     result.forEach(function (element, index) {
                         var djq1 = false;
-                        _this15.currentMode.djqs.forEach(function (djq) {
+                        _this14.currentMode.djqs.forEach(function (djq) {
                             if (element.id === djq.id) {
                                 djq1 = true;
                             }
@@ -1816,10 +1807,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             //     couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
                             //     id
                             // })
-                            _this15.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
+                            _this14.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
                             djq1 = false;
                         } else {
-                            _this15.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
+                            _this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
                             // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
                             // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
                         }
@@ -1924,7 +1915,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
         key: 'setPaymodes',
         value: function () {
             var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
-                var _this16 = this;
+                var _this15 = this;
 
                 var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
@@ -1964,7 +1955,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                                 calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88"
                                             });
                                         });
-                                        _this16.paymodes = paymodes;
+                                        _this15.paymodes = paymodes;
                                         //modes.QuickSettleStyles
                                     });
                                 }
@@ -1995,47 +1986,47 @@ var PayMode = exports.PayMode = (_class3 = function () {
         }
     }]);
     return PayMode;
-}(), (_descriptor4 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
+}(), (_descriptor3 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return "";
     }
-}), _descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
+}), _descriptor4 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return 0;
     }
-}), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
+}), _descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return 0;
     }
-}), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
+}), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return [];
     }
-}), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
+}), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return [];
     }
-}), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
+}), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this17 = this;
+        var _this16 = this;
 
         return function () {
-            _this17.checkList = [];
+            _this16.checkList = [];
         };
     }
-}), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
+}), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this18 = this;
+        var _this17 = this;
 
         return function (id, couponNum, promoMethodEnum, nominalAmount, promoDiscount) {
-            _this18.currentMode.djqs.forEach(function (ele) {
+            _this17.currentMode.djqs.forEach(function (ele) {
                 if (ele.id === id) {
                     promoMethodEnum == "CASH_COUPON" ? ele.amount = nominalAmount : ele.amount = promoDiscount;
                     ele.couponCategoryEnum = couponNum;
@@ -2045,10 +2036,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
             });
         };
     }
-}), _descriptor11 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
+}), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this19 = this;
+        var _this18 = this;
 
         return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
             var djq = {
@@ -2070,25 +2061,25 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 couponCategoryEnum: couponCategoryEnum,
                 id: id
             };
-            _this19.currentMode.djqs.push(djq);
+            _this18.currentMode.djqs.push(djq);
         };
     }
 }), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'reCalculationDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'reCalculationDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clearDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clearDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'setCurrentModeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'setCurrentModeValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcMemberBalance', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcMemberBalance'), _class3.prototype)), _class3);
 var Member = exports.Member = (_class5 = function () {
     function Member(m) {
-        var _this20 = this;
+        var _this19 = this;
 
         (0, _classCallCheck3.default)(this, Member);
 
-        _initDefineProp(this, 'cardNo', _descriptor12, this);
+        _initDefineProp(this, 'cardNo', _descriptor11, this);
 
-        _initDefineProp(this, 'balance', _descriptor13, this);
+        _initDefineProp(this, 'balance', _descriptor12, this);
 
-        _initDefineProp(this, 'exchangable', _descriptor14, this);
+        _initDefineProp(this, 'exchangable', _descriptor13, this);
 
-        _initDefineProp(this, 'MeStorageCardId', _descriptor15, this);
+        _initDefineProp(this, 'MeStorageCardId', _descriptor14, this);
 
-        _initDefineProp(this, 'StorageCardNo', _descriptor16, this);
+        _initDefineProp(this, 'StorageCardNo', _descriptor15, this);
 
         if (m) {
             this.id = m.ID;
@@ -2105,11 +2096,11 @@ var Member = exports.Member = (_class5 = function () {
             m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
             m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);
             (0, _mobx.runInAction)(function () {
-                _this20.cardNo = m.CardCode;
+                _this19.cardNo = m.CardCode;
                 if (index >= 0) {
-                    _this20.balance = parseFloat(m.DynamicPropertyValues[index]);
+                    _this19.balance = parseFloat(m.DynamicPropertyValues[index]);
                 } else {
-                    _this20.balance = _this20.rawbalance;
+                    _this19.balance = _this19.rawbalance;
                 }
             });
             this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
@@ -2141,19 +2132,19 @@ var Member = exports.Member = (_class5 = function () {
         }
     }]);
     return Member;
-}(), (_descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
+}(), (_descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor13 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
+}), _descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor14 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
+}), _descriptor13 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'MeStorageCardId', [_mobx.observable], {
+}), _descriptor14 = _applyDecoratedDescriptor(_class5.prototype, 'MeStorageCardId', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor16 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {
+}), _descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
 }), _applyDecoratedDescriptor(_class5.prototype, 'setExchangable', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setExchangable'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setCardNo'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setMeStorageCardId', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setMeStorageCardId'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setStorageCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setStorageCardNo'), _class5.prototype)), _class5);