tplus-components-touch 3.28.1 → 3.29.2

package/dist/components/settlement/settlementStore.js

@@ -425,7 +425,7 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'init',
-        value: function init(context, amounthandler, datasource, storeinfo, bquick, amount, type, data, payModeKey) {
+        value: function init(context, amounthandler, datasource, storeinfo, bquick, amount, type, data) {
             var _this3 = this;
 
             this.newStyle = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
@@ -441,15 +441,9 @@ var SettlementStore = (_class = function () {
                     if (global.DealSingleRowAmountSettingProcessorBlock) {
                         global.DealSingleRowAmountSettingProcessorBlock.execute(_this3.dto);
                     }
-
-                    var _enumController$getEn4 = _mutantsUtil.enumController.getEnumOj(),
-                        PayStyle = _enumController$getEn4.PayStyle;
-
-                    var isQuickCash = bquick && payModeKey == PayStyle.xianjin;
-
                     // 成交金额抹零
                     if (global.DealAmountSettingProcessorBlock) {
-                        global.DealAmountSettingProcessorBlock.execute(_this3.dto, isQuickCash);
+                        global.DealAmountSettingProcessorBlock.execute(_this3.dto);
                     }
                 });
                 // this.member=context.stores && context.stores.memberStore && context.stores.memberStore.member;
@@ -499,8 +493,8 @@ var SettlementStore = (_class = function () {
         value: function initByOriginReturn() {
             var _this5 = this;
 
-            var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn5.PayStyle;
+            var _enumController$getEn4 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn4.PayStyle;
 
             var _ref5 = _mutantsUtil.platform || {},
                 isNewRetailBCPos = _ref5.isNewRetailBCPos;
@@ -568,7 +562,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'quickSettle',
         value: function quickSettle(key) {
-            this.addPay(key, true);
+            this.addPay(key);
         }
 
         //outer call
@@ -579,8 +573,8 @@ var SettlementStore = (_class = function () {
         value: function changeFocusAndAddPay(type) {
             var _this6 = this;
 
-            var _enumController$getEn6 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn6.PayStyle;
+            var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn5.PayStyle;
 
             this.paymode.currentFocus = type;
             if (this.paymode.currentMode) {
@@ -617,11 +611,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'getLoginInfo',
         value: function getLoginInfo() {
-            var _ref7 = _mutantsMicrofx.localStore.get('user') || {},
-                _ref7$loginInfo = _ref7.loginInfo,
-                loginInfo = _ref7$loginInfo === undefined ? {} : _ref7$loginInfo;
-
-            return loginInfo;
+            return _mutantsMicrofx.stores.user.options.get('loginInfo');
         }
     }, {
         key: 'loadCzk',
@@ -638,8 +628,8 @@ var SettlementStore = (_class = function () {
             var IdStore = this.storeInfo.storeID;
             var StoreCode = this.storeInfo.storeCode; //_find(this.storeInfo.storeInfos,(store)=>{return store.ID==IdStore;}).Code;
 
-            var _ref8 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref8.isNewRetailBCPos;
+            var _ref7 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref7.isNewRetailBCPos;
 
             var address = '';
             if (isNewRetailBCPos) {
@@ -649,8 +639,8 @@ var SettlementStore = (_class = function () {
                     var data = result.data;
                     var m = data;
 
-                    var _ref9 = _mutantsUtil.platform || {},
-                        isNewRetailBCPos = _ref9.isNewRetailBCPos;
+                    var _ref8 = _mutantsUtil.platform || {},
+                        isNewRetailBCPos = _ref8.isNewRetailBCPos;
 
                     if (isNewRetailBCPos) {
                         _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
@@ -695,8 +685,8 @@ var SettlementStore = (_class = function () {
                     var data = JSON.parse(result.Data);
                     var m = data && data.length > 0 && data[0];
 
-                    var _ref10 = _mutantsUtil.platform || {},
-                        isNewRetailBCPos = _ref10.isNewRetailBCPos;
+                    var _ref9 = _mutantsUtil.platform || {},
+                        isNewRetailBCPos = _ref9.isNewRetailBCPos;
 
                     if (isNewRetailBCPos) {
                         _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
@@ -765,8 +755,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'setCurrentMode',
         value: function setCurrentMode(id, type, append) {
-            var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn7.PayStyle;
+            var _enumController$getEn6 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn6.PayStyle;
 
             var mode = (0, _find3.default)(this.paymode.thePaymodes, { paymethodId: id });
             if (mode) {
@@ -784,8 +774,8 @@ var SettlementStore = (_class = function () {
         value: function afterSetCurrentMode(type) {
             var _this8 = this;
 
-            var _enumController$getEn8 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn8.PayStyle;
+            var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn7.PayStyle;
 
             if (type == PayStyle.djq) {
                 this.paymode.calcDjqValue();
@@ -820,9 +810,9 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'genNewMode',
-        value: function genNewMode(type, notwithm, v, isQuick) {
-            var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn9.PayStyle;
+        value: function genNewMode(type, notwithm, v) {
+            var _enumController$getEn8 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn8.PayStyle;
 
             var value = (0, _utils.getFixedNumber)(v || (this.brefund ? this.paymode.receivable : Math.max(this.paymode.receivable, 0)));
             var themode = (0, _find3.default)(this.paymode.paymodes, { 'paymentType': type });
@@ -831,9 +821,9 @@ var SettlementStore = (_class = function () {
                 name: themode.name,
                 exchangeRate: themode.exchangeRate,
                 calDirection: themode.calDirection,
-                value: !isQuick ? 0 : value,
-                value2: !isQuick ? 0 : (0, _utils.getFixedNumber)(themode.calDirection == "88" ? value / themode.exchangeRate : value * themode.exchangeRate),
-                value3: !isQuick ? 0 : value,
+                value: value,
+                value2: (0, _utils.getFixedNumber)(themode.calDirection == "88" ? value / themode.exchangeRate : value * themode.exchangeRate),
+                value3: value,
                 order: this.paymode.thePaymodes.length + 1,
                 paymentType: type,
                 djqs: [],
@@ -865,8 +855,8 @@ var SettlementStore = (_class = function () {
         value: function setMaxAmount(type, mode) {
             var _this9 = this;
 
-            var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn10.PayStyle;
+            var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn9.PayStyle;
 
             var sum = 0;
             if (type == PayStyle.hyczk) {
@@ -942,8 +932,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'addPayDirectly',
         value: function addPayDirectly(pay) {
-            var _enumController$getEn11 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn11.PayStyle;
+            var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn10.PayStyle;
 
             if (!(0, _find3.default)(this.paymode.thePaymodes, { paymethodId: pay.paymethodId })) {
                 var pos = this.paymode.thePaymodes.length;
@@ -960,9 +950,9 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'addPay',
-        value: function addPay(type, isQuick) {
-            var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn12.PayStyle;
+        value: function addPay(type) {
+            var _enumController$getEn11 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn11.PayStyle;
 
             var pos = this.paymode.thePaymodes.length;
             if (type == PayStyle.hyczk) {
@@ -972,15 +962,14 @@ var SettlementStore = (_class = function () {
                 pos = index == -1 ? pos : index + 1;
             }
             // this.paymode.thePaymodes.push(this.genNewMode(type) );
-
-            this.paymode.thePaymodes.splice(pos, 0, this.genNewMode(type, this.newStyle && type == PayStyle.hyczk, undefined, isQuick));
+            this.paymode.thePaymodes.splice(pos, 0, this.genNewMode(type, this.newStyle && type == PayStyle.hyczk));
             this.paymode.calcReserved();
         }
     }, {
         key: 'delPay',
         value: function delPay(index) {
-            var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn13.PayStyle;
+            var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn12.PayStyle;
 
             (0, _remove3.default)(this.paymode.thePaymodes, function (mode) {
                 return mode.paymethodId === index;
@@ -991,8 +980,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'commit',
         value: function () {
-            var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
-                var _ref12, isNewRetailBCPos;
+            var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
+                var _ref11, isNewRetailBCPos;
 
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                     while (1) {
@@ -1008,7 +997,7 @@ var SettlementStore = (_class = function () {
                                 return _context2.abrupt('return', _promise2.default.resolve(true));
 
                             case 3:
-                                _ref12 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref12.isNewRetailBCPos;
+                                _ref11 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref11.isNewRetailBCPos;
                                 _context2.prev = 4;
 
                                 if (!(this.type == 1)) {
@@ -1064,7 +1053,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function commit(_x2) {
-                return _ref11.apply(this, arguments);
+                return _ref10.apply(this, arguments);
             }
 
             return commit;
@@ -1080,8 +1069,8 @@ var SettlementStore = (_class = function () {
         value: function saveMember() {
             var _this10 = this;
 
-            var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn14.PayStyle;
+            var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn13.PayStyle;
 
             (0, _mobx.runInAction)(function () {
                 _this10.dto.StorageMutiSettleDetails = [];
@@ -1122,16 +1111,16 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'save',
         value: function () {
-            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
                 var _this11 = this;
 
-                var _enumController$getEn15, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
+                var _enumController$getEn14, PayStyle, _ref14, isNewRetailBCPos, IPMSG, RetailTypeEnum;
 
                 return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
                         switch (_context3.prev = _context3.next) {
                             case 0:
-                                _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn15.PayStyle;
+                                _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn14.PayStyle;
 
                                 (0, _mobx.runInAction)(function () {
                                     _this11.dto.RetailPaymentDetails = [];
@@ -1205,8 +1194,8 @@ var SettlementStore = (_class = function () {
                                         }
                                     });
 
-                                    var _ref14 = _mutantsUtil.platform || {},
-                                        isNewRetailBCPos = _ref14.isNewRetailBCPos;
+                                    var _ref13 = _mutantsUtil.platform || {},
+                                        isNewRetailBCPos = _ref13.isNewRetailBCPos;
 
                                     if (_this11.dto.RetailStorageDetails.length > 0) {
                                         var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
@@ -1240,7 +1229,7 @@ var SettlementStore = (_class = function () {
                                         _this11.dto.Idmember = Idmember;
                                     }
                                 });
-                                _ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
+                                _ref14 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref14.isNewRetailBCPos;
 
                                 console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
 
@@ -1310,7 +1299,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function save() {
-                return _ref13.apply(this, arguments);
+                return _ref12.apply(this, arguments);
             }
 
             return save;
@@ -1323,7 +1312,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+            var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
                 return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
                         switch (_context4.prev = _context4.next) {
@@ -1351,7 +1340,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function querySettleResult() {
-                return _ref16.apply(this, arguments);
+                return _ref15.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1377,14 +1366,14 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
-                var _ref18, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
+            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
+                var _ref17, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
 
                 return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
                         switch (_context5.prev = _context5.next) {
                             case 0:
-                                _ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
+                                _ref17 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref17.isNewRetailBCPos;
                                 _context5.prev = 1;
 
                                 if (!isNewRetailBCPos) {
@@ -1469,7 +1458,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function validePwd(_x3) {
-                return _ref17.apply(this, arguments);
+                return _ref16.apply(this, arguments);
             }
 
             return validePwd;
@@ -1508,7 +1497,7 @@ var SettlementStore = (_class = function () {
         var _this13 = this;
 
         return function () {
-            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
+            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
                 var _getLoginInfo, IdStore, StoreCode, resp;
 
                 return _regenerator2.default.wrap(function _callee6$(_context6) {
@@ -1535,7 +1524,7 @@ var SettlementStore = (_class = function () {
             }));
 
             return function (_x4) {
-                return _ref19.apply(this, arguments);
+                return _ref18.apply(this, arguments);
             };
         }();
     }
@@ -1627,12 +1616,12 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 this.checkList = [];
             }
 
-            var _ref20 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref20.isNewRetailBCPos;
+            var _ref19 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref19.isNewRetailBCPos;
 
-            var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn16.PayStyle,
-                Differentiate = _enumController$getEn16.Differentiate;
+            var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn15.PayStyle,
+                Differentiate = _enumController$getEn15.Differentiate;
 
             if (q1) {
                 if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -1738,18 +1727,18 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             }
                         });
 
-                        var _ref21 = element || {},
-                            couponCode = _ref21.couponCode,
-                            name = _ref21.name,
-                            tieredAmountResult = _ref21.tieredAmountResult,
-                            fromDate = _ref21.fromDate,
-                            dateMount = _ref21.dateMount,
-                            promoMethodEnum = _ref21.promoMethodEnum,
-                            discountPct = _ref21.discountPct,
-                            nominalAmount = _ref21.nominalAmount,
-                            promoId = _ref21.promoId,
-                            id = _ref21.id,
-                            doorsill = _ref21.doorsill;
+                        var _ref20 = element || {},
+                            couponCode = _ref20.couponCode,
+                            name = _ref20.name,
+                            tieredAmountResult = _ref20.tieredAmountResult,
+                            fromDate = _ref20.fromDate,
+                            dateMount = _ref20.dateMount,
+                            promoMethodEnum = _ref20.promoMethodEnum,
+                            discountPct = _ref20.discountPct,
+                            nominalAmount = _ref20.nominalAmount,
+                            promoId = _ref20.promoId,
+                            id = _ref20.id,
+                            doorsill = _ref20.doorsill;
 
                         var condValue = tieredAmountResult.condValue,
                             promoDiscount = tieredAmountResult.promoDiscount,
@@ -1793,11 +1782,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqValue',
         value: function calcDjqValue(q1) {
-            var _ref22 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref22.isNewRetailBCPos;
+            var _ref21 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref21.isNewRetailBCPos;
 
-            var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
-                Differentiate = _enumController$getEn17.Differentiate;
+            var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
+                Differentiate = _enumController$getEn16.Differentiate;
 
             if (q1) {
                 if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -1859,8 +1848,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
             this.currentMode.errinfo = '';
             var sum = this.amount;
 
-            var _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn18.PayStyle;
+            var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn17.PayStyle;
 
             this.thePaymodes && this.thePaymodes.forEach(function (mode) {
                 if (mode.paymentType === PayStyle.hyczk) {
@@ -1870,7 +1859,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
 
             if (this.amount > 0 && (v === '' || v === '0.00') && sum !== 0) {
                 this.currentMode.errinfo = "实收金额必须录入";
-            } else if (Math.abs(parseFloat(v)) > Math.abs(sum)) {
+            } else if (Math.abs(parseFloat(v)) > Math.abs((0, _utils.getFixedNumber)(sum))) {
                 this.currentMode.errinfo = "实收不应大于应收";
             } else if (parseFloat(v) > 0 && parseFloat(v) > (max || 0)) {
                 this.currentMode.errinfo = "余额不足";
@@ -1884,16 +1873,16 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
+            var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
                 var _this15 = this;
 
-                var _enumController$getEn19, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
+                var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
                 return _regenerator2.default.wrap(function _callee7$(_context7) {
                     while (1) {
                         switch (_context7.prev = _context7.next) {
                             case 0:
-                                _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn19.settleStyleType, PayStyle = _enumController$getEn19.PayStyle;
+                                _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn18.settleStyleType, PayStyle = _enumController$getEn18.PayStyle;
                                 memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
                                 param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
                                 _context7.next = 5;
@@ -1939,7 +1928,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             }));
 
             function setPaymodes(_x5, _x6) {
-                return _ref23.apply(this, arguments);
+                return _ref22.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -2060,8 +2049,8 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref24 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref24.isNewRetailBCPos;
+            var _ref23 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref23.isNewRetailBCPos;
 
             m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
             m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);