tplus-components-touch 3.20.1 → 3.21.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/settlement/settlement.js +117 -88
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlement.less +62 -10
- package/dist/components/settlement/settlementStore.js +330 -156
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/dist/components/ticon/iconfont/demo_index.html +95 -3
- package/dist/components/ticon/iconfont/iconfont.css +19 -3
- package/dist/components/ticon/iconfont/iconfont.js +4 -4
- package/dist/components/ticon/iconfont/iconfont.js.map +1 -1
- package/dist/components/ticon/iconfont/iconfont.json +28 -0
- package/dist/components/ticon/iconfont/iconfont.ttf +0 -0
- package/dist/components/ticon/iconfont/iconfont.woff +0 -0
- package/dist/components/ticon/iconfont/iconfont.woff2 +0 -0
- package/package.json +35 -35
|
@@ -41,7 +41,7 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
|
|
|
41
41
|
|
|
42
42
|
var _createClass3 = _interopRequireDefault(_createClass2);
|
|
43
43
|
|
|
44
|
-
var _desc, _value, _class, _descriptor, _descriptor2, _desc2, _value2, _class3, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _desc3, _value3, _class5,
|
|
44
|
+
var _desc, _value, _class, _descriptor, _descriptor2, _desc2, _value2, _class3, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _desc3, _value3, _class5, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14;
|
|
45
45
|
|
|
46
46
|
var _mobx = require('mobx');
|
|
47
47
|
|
|
@@ -93,6 +93,10 @@ var _utils = require('./utils');
|
|
|
93
93
|
|
|
94
94
|
var _tplusApi = require('tplus-api');
|
|
95
95
|
|
|
96
|
+
var _cloneDeep = require('lodash/cloneDeep');
|
|
97
|
+
|
|
98
|
+
var _cloneDeep2 = _interopRequireDefault(_cloneDeep);
|
|
99
|
+
|
|
96
100
|
var _message = require('../message');
|
|
97
101
|
|
|
98
102
|
var _message2 = _interopRequireDefault(_message);
|
|
@@ -194,6 +198,9 @@ var SettlementStore = (_class = function () {
|
|
|
194
198
|
if (dto.OnlinePaymentAmount) {
|
|
195
199
|
onlinePaymentAmount = dto.OnlinePaymentAmount;
|
|
196
200
|
}
|
|
201
|
+
promoVoucher.promoLinks = (0, _filter3.default)(_this2.paymode.currentMode.djqs, function (djq) {
|
|
202
|
+
return djq.checked;
|
|
203
|
+
});
|
|
197
204
|
promoVoucher.totalAmountWithTax = Math.Minus(dto.TotalTaxAmount, onlinePaymentAmount);
|
|
198
205
|
promoVoucher.redBlueFlagEnum = "BLUE";
|
|
199
206
|
promoVoucher.meMemberId = dto.Idmember;
|
|
@@ -259,7 +266,8 @@ var SettlementStore = (_class = function () {
|
|
|
259
266
|
var condValue = tieredAmountResult.condValue,
|
|
260
267
|
promoDiscount = tieredAmountResult.promoDiscount,
|
|
261
268
|
displayText = tieredAmountResult.displayText,
|
|
262
|
-
promoRuleId = tieredAmountResult.promoRuleId
|
|
269
|
+
promoRuleId = tieredAmountResult.promoRuleId,
|
|
270
|
+
couponCategoryEnum = tieredAmountResult.couponCategoryEnum;
|
|
263
271
|
|
|
264
272
|
if ((0, _find3.default)(_this2.paymode.currentMode.djqs, function (djq) {
|
|
265
273
|
return djq.code == couponCode;
|
|
@@ -270,7 +278,8 @@ var SettlementStore = (_class = function () {
|
|
|
270
278
|
})) {
|
|
271
279
|
_message2.default.error(Differentiate.COUPON + '\uFF08' + result.SN + '\uFF09\u4E0D\u53EF\u4E0E\u79EF\u5206\u4E00\u8D77\u4F7F\u7528');
|
|
272
280
|
} else {
|
|
273
|
-
|
|
281
|
+
var IsEnable = couponCategoryEnum === 'RIGUP' || couponCategoryEnum === 'UN_MATCH' || couponCategoryEnum === "PREPARING" || couponCategoryEnum === 'PROMO_LIMITED' || couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
|
|
282
|
+
_this2.addDjq(couponCode, name, IsEnable, promoMethodEnum == "CASH_COUPON" ? nominalAmount : promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, true, 1);
|
|
274
283
|
}
|
|
275
284
|
});
|
|
276
285
|
if (promoVoucher.coupon_code) {
|
|
@@ -515,10 +524,10 @@ var SettlementStore = (_class = function () {
|
|
|
515
524
|
promoId = _ref5.promoId,
|
|
516
525
|
id = _ref5.id;
|
|
517
526
|
|
|
518
|
-
_this5.addDjq(djq.CouponCode, djq.CouponTitle, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this5.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, id, true);
|
|
527
|
+
_this5.addDjq(djq.CouponCode, djq.CouponTitle, true, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this5.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, null, id, true);
|
|
519
528
|
return;
|
|
520
529
|
}
|
|
521
|
-
_this5.addDjq(djq.CouponCode, djq.CouponTitle, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
|
|
530
|
+
_this5.addDjq(djq.CouponCode, djq.CouponTitle, true, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
|
|
522
531
|
});
|
|
523
532
|
}
|
|
524
533
|
_this5.paymode.thePaymodes.push(newmode);
|
|
@@ -621,100 +630,58 @@ var SettlementStore = (_class = function () {
|
|
|
621
630
|
|
|
622
631
|
var address = '';
|
|
623
632
|
if (isNewRetailBCPos) {
|
|
624
|
-
|
|
625
|
-
address = '/member/MeMemberWallet/FindByStorageCode';
|
|
626
|
-
return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function (result) {
|
|
627
|
-
var data = result.data;
|
|
628
|
-
var m = data;
|
|
629
|
-
|
|
630
|
-
var _ref8 = _mutantsUtil.platform || {},
|
|
631
|
-
isNewRetailBCPos = _ref8.isNewRetailBCPos;
|
|
632
|
-
|
|
633
|
-
if (isNewRetailBCPos) {
|
|
634
|
-
_this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
|
|
635
|
-
_this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
|
|
636
|
-
_this7.paymode && (_this7.paymode.currentMode.MeStorageCardId = m.MeStorageCardId);
|
|
637
|
-
_this7.paymode && (_this7.paymode.currentMode.StorageCardNo = m.StorageCardNo);
|
|
638
|
-
}
|
|
639
|
-
if (!m || !m.ID) {
|
|
640
|
-
(0, _mobx.runInAction)(function () {
|
|
641
|
-
_this7.paymode.currentMode.errinfo = "无效的会员卡号";
|
|
642
|
-
});
|
|
643
|
-
} else {
|
|
644
|
-
(0, _mobx.runInAction)(function () {
|
|
645
|
-
_this7.paymode.currentMode.errinfo = "";
|
|
646
|
-
_this7.paymode.currentMode.member = new Member(m);
|
|
647
|
-
_this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
|
|
648
|
-
_this7.updateEvent();
|
|
649
|
-
var message = '';
|
|
650
|
-
if (global.CheckMemberStorageProcessorBlock) {
|
|
651
|
-
message = CheckMemberStorageProcessorBlock.execute(m);
|
|
652
|
-
}
|
|
653
|
-
if (!String.isNullOrEmpty(message)) {
|
|
654
|
-
_this7.paymode.currentMode.errinfo = message;
|
|
655
|
-
} else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
|
|
656
|
-
_this7.paymode.currentMode.errinfo = "余额不足";
|
|
657
|
-
} else if (_this7.paymode.amount > 0 && _this7.paymode.currentMode.value == 0) {
|
|
658
|
-
_this7.paymode.currentMode.errinfo = "实收金额必须录入";
|
|
659
|
-
} else {
|
|
660
|
-
// 查询成功后将焦点移入下一个输入框
|
|
661
|
-
var nextInput = document.querySelector('.czk .received .input');
|
|
662
|
-
nextInput && nextInput.focus();
|
|
663
|
-
}
|
|
664
|
-
});
|
|
665
|
-
}
|
|
666
|
-
});
|
|
633
|
+
address = 'chanjet.AA.DR.INewRetailMember.SearchMember';
|
|
667
634
|
} else {
|
|
668
635
|
address = 'AA.DR.newRetailMember.SearchMember';
|
|
669
|
-
return (0, _tplusApi.tApi)({ SearchParams: { Key: v, IsSingleMember: true, IdStore: IdStore, StoreCode: StoreCode } }, address, false, false).then(function (result) {
|
|
670
|
-
var data = JSON.parse(result.Data);
|
|
671
|
-
var m = data && data.length > 0 && data[0];
|
|
672
|
-
|
|
673
|
-
var _ref9 = _mutantsUtil.platform || {},
|
|
674
|
-
isNewRetailBCPos = _ref9.isNewRetailBCPos;
|
|
675
|
-
|
|
676
|
-
if (isNewRetailBCPos) {
|
|
677
|
-
_this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
|
|
678
|
-
_this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
|
|
679
|
-
_this7.paymode && (_this7.paymode.currentMode.MeStorageCardId = m.MeStorageCardId);
|
|
680
|
-
_this7.paymode && (_this7.paymode.currentMode.StorageCardNo = m.StorageCardNo);
|
|
681
|
-
}
|
|
682
|
-
if (!m || !m.ID) {
|
|
683
|
-
(0, _mobx.runInAction)(function () {
|
|
684
|
-
_this7.paymode.currentMode.errinfo = "无效的会员卡号";
|
|
685
|
-
});
|
|
686
|
-
} else {
|
|
687
|
-
(0, _mobx.runInAction)(function () {
|
|
688
|
-
_this7.paymode.currentMode.errinfo = "";
|
|
689
|
-
_this7.paymode.currentMode.member = new Member(m);
|
|
690
|
-
_this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
|
|
691
|
-
_this7.updateEvent();
|
|
692
|
-
var message = '';
|
|
693
|
-
if (global.CheckMemberStorageProcessorBlock) {
|
|
694
|
-
message = CheckMemberStorageProcessorBlock.execute(data[0]);
|
|
695
|
-
}
|
|
696
|
-
if (!String.isNullOrEmpty(message)) {
|
|
697
|
-
_this7.paymode.currentMode.errinfo = message;
|
|
698
|
-
} else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
|
|
699
|
-
_this7.paymode.currentMode.errinfo = "余额不足";
|
|
700
|
-
} else if (_this7.paymode.amount > 0 && _this7.paymode.currentMode.value == 0) {
|
|
701
|
-
_this7.paymode.currentMode.errinfo = "实收金额必须录入";
|
|
702
|
-
} else {
|
|
703
|
-
// 查询成功后将焦点移入下一个输入框
|
|
704
|
-
var nextInput = document.querySelector('.czk .received .input');
|
|
705
|
-
nextInput && nextInput.focus();
|
|
706
|
-
}
|
|
707
|
-
});
|
|
708
|
-
}
|
|
709
|
-
});
|
|
710
636
|
}
|
|
637
|
+
return (0, _tplusApi.tApi)({ SearchParams: { Key: v, IsSingleMember: true, IdStore: IdStore, StoreCode: StoreCode } }, address, false, false).then(function (result) {
|
|
638
|
+
var data = JSON.parse(result.Data);
|
|
639
|
+
var m = data && data.length > 0 && data[0];
|
|
640
|
+
|
|
641
|
+
var _ref8 = _mutantsUtil.platform || {},
|
|
642
|
+
isNewRetailBCPos = _ref8.isNewRetailBCPos;
|
|
643
|
+
|
|
644
|
+
if (isNewRetailBCPos) {
|
|
645
|
+
_this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
|
|
646
|
+
_this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
|
|
647
|
+
}
|
|
648
|
+
if (!m || !m.ID) {
|
|
649
|
+
(0, _mobx.runInAction)(function () {
|
|
650
|
+
_this7.paymode.currentMode.errinfo = "无效的会员卡号";
|
|
651
|
+
});
|
|
652
|
+
} else {
|
|
653
|
+
(0, _mobx.runInAction)(function () {
|
|
654
|
+
_this7.paymode.currentMode.errinfo = "";
|
|
655
|
+
_this7.paymode.currentMode.member = new Member(m);
|
|
656
|
+
_this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
|
|
657
|
+
_this7.updateEvent();
|
|
658
|
+
var message = '';
|
|
659
|
+
if (global.CheckMemberStorageProcessorBlock) {
|
|
660
|
+
message = CheckMemberStorageProcessorBlock.execute(data[0]);
|
|
661
|
+
}
|
|
662
|
+
if (!String.isNullOrEmpty(message)) {
|
|
663
|
+
_this7.paymode.currentMode.errinfo = message;
|
|
664
|
+
} else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
|
|
665
|
+
_this7.paymode.currentMode.errinfo = "余额不足";
|
|
666
|
+
} else if (_this7.paymode.amount > 0 && _this7.paymode.currentMode.value == 0) {
|
|
667
|
+
_this7.paymode.currentMode.errinfo = "实收金额必须录入";
|
|
668
|
+
} else {
|
|
669
|
+
// 查询成功后将焦点移入下一个输入框
|
|
670
|
+
var nextInput = document.querySelector('.czk .received .input');
|
|
671
|
+
nextInput && nextInput.focus();
|
|
672
|
+
}
|
|
673
|
+
});
|
|
674
|
+
}
|
|
675
|
+
});
|
|
711
676
|
}
|
|
712
677
|
}, {
|
|
713
678
|
key: 'addDjq',
|
|
714
|
-
value: function addDjq(
|
|
679
|
+
value: function addDjq(promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, unCheck, count) {
|
|
715
680
|
var djq = {
|
|
716
|
-
code:
|
|
681
|
+
code: promoCouponCode,
|
|
682
|
+
promoCouponCode: promoCouponCode,
|
|
717
683
|
name: name,
|
|
684
|
+
IsEnable: IsEnable,
|
|
718
685
|
amount: amount,
|
|
719
686
|
doorsill: doorsill, //:"无门槛"
|
|
720
687
|
LastTS: LastTS,
|
|
@@ -727,9 +694,12 @@ var SettlementStore = (_class = function () {
|
|
|
727
694
|
discountPct: discountPct,
|
|
728
695
|
promoId: promoId,
|
|
729
696
|
promoRuleId: promoRuleId,
|
|
730
|
-
|
|
697
|
+
couponCategoryEnum: couponCategoryEnum,
|
|
698
|
+
id: id,
|
|
699
|
+
count: count === 1 && (couponCategoryEnum === 'RIGUP' || couponCategoryEnum === 'UN_MATCH' || couponCategoryEnum === "PREPARING" || couponCategoryEnum === 'PROMO_LIMITED' || couponCategoryEnum === 'COUPON_CONFLICT') ? 1 : null
|
|
731
700
|
};
|
|
732
701
|
this.paymode.currentMode.djqs.push(djq);
|
|
702
|
+
// let copyData = _clonedeep(this.data[targetIndex]);
|
|
733
703
|
!unCheck && !this.boriginReturn && this.paymode.calcDjqValue(djq);
|
|
734
704
|
}
|
|
735
705
|
}, {
|
|
@@ -957,7 +927,7 @@ var SettlementStore = (_class = function () {
|
|
|
957
927
|
}, {
|
|
958
928
|
key: 'commit',
|
|
959
929
|
value: function () {
|
|
960
|
-
var
|
|
930
|
+
var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
|
|
961
931
|
return _regenerator2.default.wrap(function _callee2$(_context2) {
|
|
962
932
|
while (1) {
|
|
963
933
|
switch (_context2.prev = _context2.next) {
|
|
@@ -1012,7 +982,7 @@ var SettlementStore = (_class = function () {
|
|
|
1012
982
|
}));
|
|
1013
983
|
|
|
1014
984
|
function commit(_x2) {
|
|
1015
|
-
return
|
|
985
|
+
return _ref9.apply(this, arguments);
|
|
1016
986
|
}
|
|
1017
987
|
|
|
1018
988
|
return commit;
|
|
@@ -1058,20 +1028,20 @@ var SettlementStore = (_class = function () {
|
|
|
1058
1028
|
IPMSG = JSON.parse(window.localStorage.IPMSG);
|
|
1059
1029
|
}
|
|
1060
1030
|
return (0, _tplusApi.tApi)({ dto: this.dto }, 'chanjet.ME.INewRetailMemberStorage.Save', false, false).then(function (resp) {
|
|
1061
|
-
var
|
|
1062
|
-
isHorizontalPad =
|
|
1063
|
-
isHorizontalSunMi =
|
|
1031
|
+
var _ref10 = _mutantsUtil.platform || {},
|
|
1032
|
+
isHorizontalPad = _ref10.isHorizontalPad,
|
|
1033
|
+
isHorizontalSunMi = _ref10.isHorizontalSunMi;
|
|
1064
1034
|
|
|
1065
1035
|
if (isHorizontalPad === true) {
|
|
1066
1036
|
// pad打印
|
|
1067
1037
|
//执行移动端云打印
|
|
1068
1038
|
if (_this10.cloudPrintArguments) {
|
|
1069
|
-
var
|
|
1070
|
-
Open =
|
|
1071
|
-
Key =
|
|
1072
|
-
Sign =
|
|
1073
|
-
Name =
|
|
1074
|
-
Card =
|
|
1039
|
+
var _ref11 = _this10.cloudPrintArguments || {},
|
|
1040
|
+
Open = _ref11.Open,
|
|
1041
|
+
Key = _ref11.Key,
|
|
1042
|
+
Sign = _ref11.Sign,
|
|
1043
|
+
Name = _ref11.Name,
|
|
1044
|
+
Card = _ref11.Card;
|
|
1075
1045
|
|
|
1076
1046
|
if (!Open) {
|
|
1077
1047
|
_message2.default.warn(t('云打印未启用，请设置。'));
|
|
@@ -1109,8 +1079,8 @@ var SettlementStore = (_class = function () {
|
|
|
1109
1079
|
return;
|
|
1110
1080
|
} else {
|
|
1111
1081
|
if (global.StoragePrintProcessBlock) {
|
|
1112
|
-
var
|
|
1113
|
-
isNewRetailBCPos =
|
|
1082
|
+
var _ref12 = _mutantsUtil.platform || {},
|
|
1083
|
+
isNewRetailBCPos = _ref12.isNewRetailBCPos;
|
|
1114
1084
|
|
|
1115
1085
|
if (isNewRetailBCPos) {
|
|
1116
1086
|
global.StoragePrintProcessBlock.execute(resp);
|
|
@@ -1128,10 +1098,10 @@ var SettlementStore = (_class = function () {
|
|
|
1128
1098
|
}, {
|
|
1129
1099
|
key: 'save',
|
|
1130
1100
|
value: function () {
|
|
1131
|
-
var
|
|
1101
|
+
var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
|
|
1132
1102
|
var _this11 = this;
|
|
1133
1103
|
|
|
1134
|
-
var _enumController$getEn13, PayStyle,
|
|
1104
|
+
var _enumController$getEn13, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
|
|
1135
1105
|
|
|
1136
1106
|
return _regenerator2.default.wrap(function _callee3$(_context3) {
|
|
1137
1107
|
while (1) {
|
|
@@ -1145,21 +1115,19 @@ var SettlementStore = (_class = function () {
|
|
|
1145
1115
|
_this11.dto.RetailCouponDetails = [];
|
|
1146
1116
|
var czkSum = 0;
|
|
1147
1117
|
var Idmember = _this11.dto.Idmember;
|
|
1148
|
-
var count = 0;
|
|
1149
1118
|
var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
|
|
1150
1119
|
return parseFloat(mode.value) != 0;
|
|
1151
1120
|
}) : _this11.paymode.thePaymodes;
|
|
1152
|
-
(0, _each3.default)(thePaymodes, function (mode
|
|
1121
|
+
(0, _each3.default)(thePaymodes, function (mode) {
|
|
1153
1122
|
var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
|
|
1154
1123
|
if (mode.paymentType == PayStyle.hyczk) {
|
|
1155
1124
|
if (!Idmember) {
|
|
1156
1125
|
Idmember = mode.member.id;
|
|
1157
1126
|
}
|
|
1158
1127
|
czkSum = Math.Add(czkSum, mode.value);
|
|
1159
|
-
|
|
1128
|
+
|
|
1160
1129
|
_this11.dto.RetailStorageDetails.push({
|
|
1161
1130
|
Code: mode.paymethodId,
|
|
1162
|
-
MeStorageCardId: MeStorageCardId,
|
|
1163
1131
|
StoragePaymentAmount: mode.value,
|
|
1164
1132
|
IsOrigReturn: false,
|
|
1165
1133
|
BalanceStorage: mode.balance,
|
|
@@ -1213,15 +1181,15 @@ var SettlementStore = (_class = function () {
|
|
|
1213
1181
|
}
|
|
1214
1182
|
});
|
|
1215
1183
|
|
|
1216
|
-
var
|
|
1217
|
-
isNewRetailBCPos =
|
|
1184
|
+
var _ref14 = _mutantsUtil.platform || {},
|
|
1185
|
+
isNewRetailBCPos = _ref14.isNewRetailBCPos;
|
|
1218
1186
|
|
|
1219
1187
|
if (_this11.dto.RetailStorageDetails.length > 0) {
|
|
1220
1188
|
var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
|
|
1221
1189
|
if (isNewRetailBCPos) {
|
|
1222
|
-
|
|
1223
|
-
|
|
1224
|
-
|
|
1190
|
+
_this11.dto.RetailStorageDetails && _this11.dto.RetailStorageDetails.forEach(function (value) {
|
|
1191
|
+
value.MeStorageCardId = _this11.member.MeStorageCardId;
|
|
1192
|
+
});
|
|
1225
1193
|
_this11.dto.RetailPaymentDetails.push({
|
|
1226
1194
|
Code: _this11.paymode.counter,
|
|
1227
1195
|
OrigAmount: czkSum,
|
|
@@ -1248,7 +1216,7 @@ var SettlementStore = (_class = function () {
|
|
|
1248
1216
|
_this11.dto.Idmember = Idmember;
|
|
1249
1217
|
}
|
|
1250
1218
|
});
|
|
1251
|
-
|
|
1219
|
+
_ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
|
|
1252
1220
|
|
|
1253
1221
|
console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
|
|
1254
1222
|
|
|
@@ -1317,7 +1285,7 @@ var SettlementStore = (_class = function () {
|
|
|
1317
1285
|
}));
|
|
1318
1286
|
|
|
1319
1287
|
function save() {
|
|
1320
|
-
return
|
|
1288
|
+
return _ref13.apply(this, arguments);
|
|
1321
1289
|
}
|
|
1322
1290
|
|
|
1323
1291
|
return save;
|
|
@@ -1330,7 +1298,7 @@ var SettlementStore = (_class = function () {
|
|
|
1330
1298
|
}, {
|
|
1331
1299
|
key: 'querySettleResult',
|
|
1332
1300
|
value: function () {
|
|
1333
|
-
var
|
|
1301
|
+
var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
|
|
1334
1302
|
return _regenerator2.default.wrap(function _callee4$(_context4) {
|
|
1335
1303
|
while (1) {
|
|
1336
1304
|
switch (_context4.prev = _context4.next) {
|
|
@@ -1358,7 +1326,7 @@ var SettlementStore = (_class = function () {
|
|
|
1358
1326
|
}));
|
|
1359
1327
|
|
|
1360
1328
|
function querySettleResult() {
|
|
1361
|
-
return
|
|
1329
|
+
return _ref16.apply(this, arguments);
|
|
1362
1330
|
}
|
|
1363
1331
|
|
|
1364
1332
|
return querySettleResult;
|
|
@@ -1384,14 +1352,14 @@ var SettlementStore = (_class = function () {
|
|
|
1384
1352
|
}, {
|
|
1385
1353
|
key: 'validePwd',
|
|
1386
1354
|
value: function () {
|
|
1387
|
-
var
|
|
1388
|
-
var
|
|
1355
|
+
var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
|
|
1356
|
+
var _ref18, isNewRetailBCPos, cook1, cook2, message, result, count, _result;
|
|
1389
1357
|
|
|
1390
1358
|
return _regenerator2.default.wrap(function _callee5$(_context5) {
|
|
1391
1359
|
while (1) {
|
|
1392
1360
|
switch (_context5.prev = _context5.next) {
|
|
1393
1361
|
case 0:
|
|
1394
|
-
|
|
1362
|
+
_ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
|
|
1395
1363
|
_context5.prev = 1;
|
|
1396
1364
|
|
|
1397
1365
|
if (!isNewRetailBCPos) {
|
|
@@ -1475,7 +1443,7 @@ var SettlementStore = (_class = function () {
|
|
|
1475
1443
|
}));
|
|
1476
1444
|
|
|
1477
1445
|
function validePwd(_x3) {
|
|
1478
|
-
return
|
|
1446
|
+
return _ref17.apply(this, arguments);
|
|
1479
1447
|
}
|
|
1480
1448
|
|
|
1481
1449
|
return validePwd;
|
|
@@ -1514,7 +1482,7 @@ var SettlementStore = (_class = function () {
|
|
|
1514
1482
|
var _this13 = this;
|
|
1515
1483
|
|
|
1516
1484
|
return function () {
|
|
1517
|
-
var
|
|
1485
|
+
var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
|
|
1518
1486
|
var _getLoginInfo, IdStore, StoreCode, resp;
|
|
1519
1487
|
|
|
1520
1488
|
return _regenerator2.default.wrap(function _callee6$(_context6) {
|
|
@@ -1541,13 +1509,14 @@ var SettlementStore = (_class = function () {
|
|
|
1541
1509
|
}));
|
|
1542
1510
|
|
|
1543
1511
|
return function (_x4) {
|
|
1544
|
-
return
|
|
1512
|
+
return _ref19.apply(this, arguments);
|
|
1545
1513
|
};
|
|
1546
1514
|
}();
|
|
1547
1515
|
}
|
|
1548
1516
|
}), _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);
|
|
1549
1517
|
exports.default = SettlementStore;
|
|
1550
1518
|
var PayMode = exports.PayMode = (_class3 = function () {
|
|
1519
|
+
// @observable store = null;
|
|
1551
1520
|
function PayMode() {
|
|
1552
1521
|
// this.amount=getFixedNumber(amount);
|
|
1553
1522
|
// this.calcReserved();
|
|
@@ -1573,6 +1542,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1573
1542
|
name: "复合结算",
|
|
1574
1543
|
hotKey: "Ctrl+M"
|
|
1575
1544
|
};
|
|
1545
|
+
|
|
1546
|
+
_initDefineProp(this, 'setCouponNum', _descriptor8, this);
|
|
1547
|
+
|
|
1548
|
+
_initDefineProp(this, 'addDjqs', _descriptor9, this);
|
|
1576
1549
|
} //应收
|
|
1577
1550
|
|
|
1578
1551
|
|
|
@@ -1608,14 +1581,24 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1608
1581
|
this.receivable = (0, _utils.getFixedNumber)(this.amount - sum);
|
|
1609
1582
|
}
|
|
1610
1583
|
}, {
|
|
1611
|
-
key: '
|
|
1612
|
-
value: function
|
|
1584
|
+
key: 'calcDjqCheckValue',
|
|
1585
|
+
value: function calcDjqCheckValue(q1, dto) {
|
|
1613
1586
|
var _this14 = this;
|
|
1614
1587
|
|
|
1615
|
-
var
|
|
1616
|
-
|
|
1588
|
+
var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
|
|
1589
|
+
var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
|
|
1590
|
+
return djq.checked;
|
|
1591
|
+
});
|
|
1592
|
+
if (qList.length === useLimitPerOrder && !q1.checked) {
|
|
1593
|
+
_message2.default.warn('本单最多可用' + useLimitPerOrder + '张');
|
|
1594
|
+
return;
|
|
1595
|
+
}
|
|
1596
|
+
|
|
1597
|
+
var _ref20 = _mutantsUtil.platform || {},
|
|
1598
|
+
isNewRetailBCPos = _ref20.isNewRetailBCPos;
|
|
1617
1599
|
|
|
1618
1600
|
var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
|
|
1601
|
+
PayStyle = _enumController$getEn14.PayStyle,
|
|
1619
1602
|
Differentiate = _enumController$getEn14.Differentiate;
|
|
1620
1603
|
|
|
1621
1604
|
if (q1) {
|
|
@@ -1624,22 +1607,169 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1624
1607
|
return;
|
|
1625
1608
|
}
|
|
1626
1609
|
var q = (0, _find3.default)(this.currentMode.djqs, function (djq) {
|
|
1627
|
-
return djq.
|
|
1610
|
+
return djq.promoCouponCode == q1.promoCouponCode;
|
|
1628
1611
|
});
|
|
1629
1612
|
if (q && !q.checked && parseFloat(this.amount) < parseFloat(q.doorsill)) {
|
|
1630
1613
|
_message2.default.error("本单金额低于使用门槛，该券不可使用。");
|
|
1631
1614
|
return;
|
|
1632
1615
|
}
|
|
1633
1616
|
//判断是否是选择优惠券 //CC优惠券只能使用一个
|
|
1634
|
-
if (q1 && !q1.checked && isNewRetailBCPos) {
|
|
1635
|
-
|
|
1636
|
-
|
|
1637
|
-
|
|
1617
|
+
// if (q1 && !q1.checked && isNewRetailBCPos) {
|
|
1618
|
+
// // 检查是否有已经选定优惠券 并且去除选定的优惠券
|
|
1619
|
+
// this.currentMode.djqs.forEach((djq, index) => {
|
|
1620
|
+
// if (djq.checked) this.currentMode.djqs[index].checked = false;
|
|
1621
|
+
// })
|
|
1622
|
+
// }
|
|
1623
|
+
q && (q.checked = !q.checked);
|
|
1624
|
+
}
|
|
1625
|
+
var sum = 0;
|
|
1626
|
+
// console.log(this.store, 'stores-------');
|
|
1627
|
+
(0, _each3.default)((0, _filter3.default)(this.currentMode.djqs, function (djq) {
|
|
1628
|
+
return djq.checked;
|
|
1629
|
+
}), function (q) {
|
|
1630
|
+
sum = Math.Add(sum, q.amount);
|
|
1631
|
+
});
|
|
1632
|
+
this.currentMode.value = (0, _utils.getFixedNumber)(Math.min(this.receivable, sum, this.currentMode.maxamount));
|
|
1633
|
+
this.currentMode.receivable = (0, _utils.getFixedNumber)(this.receivable - this.currentMode.value);
|
|
1634
|
+
this.currentMode.overchargesAmount = (0, _utils.getFixedNumber)(sum - this.currentMode.value);
|
|
1635
|
+
var promoVoucher = {};
|
|
1636
|
+
promoVoucher.boName = "Retail";
|
|
1637
|
+
promoVoucher.promoLinks = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
|
|
1638
|
+
return djq.checked;
|
|
1639
|
+
});
|
|
1640
|
+
promoVoucher.meMemberId = this.currentMode.member.id;
|
|
1641
|
+
promoVoucher.storeFactorId = (0, _tplusPoslogin.PosInitData)('storeID');
|
|
1642
|
+
promoVoucher.voucherDetailList = [];
|
|
1643
|
+
dto.RetailDetails.forEach(function (item) {
|
|
1644
|
+
var detailDTO = {};
|
|
1645
|
+
detailDTO.uuid = item.Code;
|
|
1646
|
+
detailDTO.detailBoName = "RetailDetail";
|
|
1647
|
+
detailDTO.voucherDetailId = item.ID;
|
|
1648
|
+
detailDTO.productId = item.Idinventory;
|
|
1649
|
+
detailDTO.uomId = item.Idunit;
|
|
1650
|
+
detailDTO.productSpecId = item.ProductSpecId;
|
|
1651
|
+
detailDTO.isManualFreeGift = item.IsPresent;
|
|
1652
|
+
detailDTO.isListPriceIncludingTax = item.TaxFlag || true;
|
|
1653
|
+
|
|
1654
|
+
if (detailDTO.IsManualChangePrice) //如果是手工改价
|
|
1655
|
+
{
|
|
1656
|
+
detailDTO.listPrice = item.TaxPrice;
|
|
1657
|
+
detailDTO.netAmountWithTax = item.TaxAmount;
|
|
1658
|
+
} else {
|
|
1659
|
+
var bookingQuantity = 0;
|
|
1660
|
+
if (item.BookingQuantity) {
|
|
1661
|
+
bookingQuantity = item.BookingQuantity;
|
|
1662
|
+
}
|
|
1663
|
+
detailDTO.listPrice = item.MemberPrice;
|
|
1664
|
+
detailDTO.netAmountWithTax = Math.Multiply(item.MemberPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
|
|
1665
|
+
}
|
|
1666
|
+
detailDTO.taxRate = item.TaxRate;
|
|
1667
|
+
detailDTO.quantity = item.Quantity;
|
|
1668
|
+
|
|
1669
|
+
detailDTO.amountWithTax = item.RetailAmount;
|
|
1670
|
+
// 促销 start
|
|
1671
|
+
if (item.PromotionDetails && item.PromotionDetails.length != 0) {
|
|
1672
|
+
var promoLinks = [];
|
|
1673
|
+
item.PromotionDetails.forEach(function (promotion) {
|
|
1674
|
+
promoLinks.push({
|
|
1675
|
+
promoId: promotion.IdSalesPromotionDTO,
|
|
1676
|
+
promoRuleId: promotion.PromotionRuleId
|
|
1677
|
+
});
|
|
1678
|
+
});
|
|
1679
|
+
if (promoLinks.length != 0) detailDTO.promoLinks = promoLinks;
|
|
1680
|
+
}
|
|
1681
|
+
// 促销 end
|
|
1682
|
+
promoVoucher.voucherDetailList.push(detailDTO);
|
|
1683
|
+
});
|
|
1684
|
+
return (0, _tplusApi.ccApi)((0, _extends3.default)({}, promoVoucher), 'promotion/PromoCalculate/findUsefulCouponPromoList', false, false, { method: 'post', timeout_skip: true }).then(function (result) {
|
|
1685
|
+
if (result && result.length != 0) {
|
|
1686
|
+
result.forEach(function (element) {
|
|
1687
|
+
var djq1 = (0, _filter3.default)(_this14.currentMode.djqs, function (djq) {
|
|
1688
|
+
return djq.id === element.id;
|
|
1689
|
+
});
|
|
1690
|
+
|
|
1691
|
+
var _ref21 = element || {},
|
|
1692
|
+
couponCode = _ref21.couponCode,
|
|
1693
|
+
name = _ref21.name,
|
|
1694
|
+
tieredAmountResult = _ref21.tieredAmountResult,
|
|
1695
|
+
fromDate = _ref21.fromDate,
|
|
1696
|
+
dateMount = _ref21.dateMount,
|
|
1697
|
+
promoMethodEnum = _ref21.promoMethodEnum,
|
|
1698
|
+
discountPct = _ref21.discountPct,
|
|
1699
|
+
nominalAmount = _ref21.nominalAmount,
|
|
1700
|
+
promoId = _ref21.promoId,
|
|
1701
|
+
id = _ref21.id,
|
|
1702
|
+
doorsill = _ref21.doorsill;
|
|
1703
|
+
|
|
1704
|
+
var condValue = tieredAmountResult.condValue,
|
|
1705
|
+
promoDiscount = tieredAmountResult.promoDiscount,
|
|
1706
|
+
displayText = tieredAmountResult.displayText,
|
|
1707
|
+
promoRuleId = tieredAmountResult.promoRuleId,
|
|
1708
|
+
couponCategoryEnum = tieredAmountResult.couponCategoryEnum;
|
|
1709
|
+
|
|
1710
|
+
if (!djq1.length) {
|
|
1711
|
+
// this.currentMode.djqs.push({
|
|
1712
|
+
// promoCouponCode: element.CouponCode,
|
|
1713
|
+
// name: element.CouponTitle,
|
|
1714
|
+
// IsEnable: true,
|
|
1715
|
+
// amount: element.ReductionAmount,
|
|
1716
|
+
// doorsill: element.EnableAmount,
|
|
1717
|
+
// LastTS: element.LastTS,
|
|
1718
|
+
// checked: false,
|
|
1719
|
+
// IsRepelWithPoints: true,
|
|
1720
|
+
// UMemberID: dto.Idmember,
|
|
1721
|
+
// expired: null,
|
|
1722
|
+
// displayText,
|
|
1723
|
+
// promoMethodEnum,
|
|
1724
|
+
// discountPct,
|
|
1725
|
+
// promoId,
|
|
1726
|
+
// promoRuleId,
|
|
1727
|
+
// couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
|
|
1728
|
+
// id
|
|
1729
|
+
// })
|
|
1730
|
+
_this14.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
|
|
1731
|
+
} else {
|
|
1732
|
+
_this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum);
|
|
1733
|
+
// this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
|
|
1734
|
+
// djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
|
|
1735
|
+
}
|
|
1638
1736
|
});
|
|
1639
1737
|
}
|
|
1738
|
+
});
|
|
1739
|
+
//this.receivable = getFixedNumber(this.receivable - sum);
|
|
1740
|
+
}
|
|
1741
|
+
}, {
|
|
1742
|
+
key: 'calcDjqValue',
|
|
1743
|
+
value: function calcDjqValue(q1) {
|
|
1744
|
+
var _ref22 = _mutantsUtil.platform || {},
|
|
1745
|
+
isNewRetailBCPos = _ref22.isNewRetailBCPos;
|
|
1746
|
+
|
|
1747
|
+
var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
|
|
1748
|
+
Differentiate = _enumController$getEn15.Differentiate;
|
|
1749
|
+
|
|
1750
|
+
if (q1) {
|
|
1751
|
+
if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
|
|
1752
|
+
_message2.default.error('\u672C\u5355\u6CA1\u6709' + Differentiate.COUPON + '\u53EF\u7528\u91D1\u989D\uFF0C\u8BE5\u5238\u4E0D\u53EF\u4F7F\u7528\u3002');
|
|
1753
|
+
return;
|
|
1754
|
+
}
|
|
1755
|
+
var q = (0, _find3.default)(this.currentMode.djqs, function (djq) {
|
|
1756
|
+
return djq.code == q1.code;
|
|
1757
|
+
});
|
|
1758
|
+
if (q && !q.checked && parseFloat(this.amount) < parseFloat(q.doorsill)) {
|
|
1759
|
+
_message2.default.error("本单金额低于使用门槛，该券不可使用。");
|
|
1760
|
+
return;
|
|
1761
|
+
}
|
|
1762
|
+
//判断是否是选择优惠券 //CC优惠券只能使用一个
|
|
1763
|
+
// if (q1 && !q1.checked && isNewRetailBCPos) {
|
|
1764
|
+
// // 检查是否有已经选定优惠券 并且去除选定的优惠券
|
|
1765
|
+
// this.currentMode.djqs.forEach((djq, index) => {
|
|
1766
|
+
// if (djq.checked) this.currentMode.djqs[index].checked = false;
|
|
1767
|
+
// })
|
|
1768
|
+
// }
|
|
1640
1769
|
q && (q.checked = !q.checked);
|
|
1641
1770
|
}
|
|
1642
1771
|
var sum = 0;
|
|
1772
|
+
// console.log(this.store, 'stores-------');
|
|
1643
1773
|
(0, _each3.default)((0, _filter3.default)(this.currentMode.djqs, function (djq) {
|
|
1644
1774
|
return djq.checked;
|
|
1645
1775
|
}), function (q) {
|
|
@@ -1648,6 +1778,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1648
1778
|
this.currentMode.value = (0, _utils.getFixedNumber)(Math.min(this.receivable, sum, this.currentMode.maxamount));
|
|
1649
1779
|
this.currentMode.receivable = (0, _utils.getFixedNumber)(this.receivable - this.currentMode.value);
|
|
1650
1780
|
this.currentMode.overchargesAmount = (0, _utils.getFixedNumber)(sum - this.currentMode.value);
|
|
1781
|
+
|
|
1651
1782
|
//this.receivable = getFixedNumber(this.receivable - sum);
|
|
1652
1783
|
}
|
|
1653
1784
|
}, {
|
|
@@ -1690,16 +1821,16 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1690
1821
|
}, {
|
|
1691
1822
|
key: 'setPaymodes',
|
|
1692
1823
|
value: function () {
|
|
1693
|
-
var
|
|
1824
|
+
var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
|
|
1694
1825
|
var _this15 = this;
|
|
1695
1826
|
|
|
1696
|
-
var _enumController$
|
|
1827
|
+
var _enumController$getEn16, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
|
|
1697
1828
|
|
|
1698
1829
|
return _regenerator2.default.wrap(function _callee7$(_context7) {
|
|
1699
1830
|
while (1) {
|
|
1700
1831
|
switch (_context7.prev = _context7.next) {
|
|
1701
1832
|
case 0:
|
|
1702
|
-
_enumController$
|
|
1833
|
+
_enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn16.settleStyleType, PayStyle = _enumController$getEn16.PayStyle;
|
|
1703
1834
|
memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
|
|
1704
1835
|
param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
|
|
1705
1836
|
_context7.next = 5;
|
|
@@ -1744,7 +1875,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1744
1875
|
}));
|
|
1745
1876
|
|
|
1746
1877
|
function setPaymodes(_x5, _x6) {
|
|
1747
|
-
return
|
|
1878
|
+
return _ref23.apply(this, arguments);
|
|
1748
1879
|
}
|
|
1749
1880
|
|
|
1750
1881
|
return setPaymodes;
|
|
@@ -1786,22 +1917,65 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1786
1917
|
initializer: function initializer() {
|
|
1787
1918
|
return [];
|
|
1788
1919
|
}
|
|
1789
|
-
}), _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), _applyDecoratedDescriptor(_class3.prototype, '
|
|
1920
|
+
}), _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), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
|
|
1921
|
+
enumerable: true,
|
|
1922
|
+
initializer: function initializer() {
|
|
1923
|
+
var _this16 = this;
|
|
1924
|
+
|
|
1925
|
+
return function (id, couponNum, code) {
|
|
1926
|
+
_this16.currentMode.djqs.forEach(function (ele) {
|
|
1927
|
+
if (ele.id === id) {
|
|
1928
|
+
ele.couponCategoryEnum = couponNum;
|
|
1929
|
+
var IsEnable = ele.couponCategoryEnum === 'RIGUP' || ele.couponCategoryEnum === 'UN_MATCH' || ele.couponCategoryEnum === "PREPARING" || ele.couponCategoryEnum === 'PROMO_LIMITED' || ele.couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
|
|
1930
|
+
ele.IsEnable = IsEnable;
|
|
1931
|
+
}
|
|
1932
|
+
});
|
|
1933
|
+
};
|
|
1934
|
+
}
|
|
1935
|
+
}), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
|
|
1936
|
+
enumerable: true,
|
|
1937
|
+
initializer: function initializer() {
|
|
1938
|
+
var _this17 = this;
|
|
1939
|
+
|
|
1940
|
+
return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
|
|
1941
|
+
var djq = {
|
|
1942
|
+
promoCouponCode: promoCouponCode,
|
|
1943
|
+
name: name,
|
|
1944
|
+
IsEnable: IsEnable,
|
|
1945
|
+
amount: amount,
|
|
1946
|
+
doorsill: doorsill,
|
|
1947
|
+
LastTS: LastTS,
|
|
1948
|
+
checked: checked,
|
|
1949
|
+
IsRepelWithPoints: IsRepelWithPoints,
|
|
1950
|
+
UMemberID: UMemberID,
|
|
1951
|
+
expired: expired,
|
|
1952
|
+
displayText: displayText,
|
|
1953
|
+
promoMethodEnum: promoMethodEnum,
|
|
1954
|
+
discountPct: discountPct,
|
|
1955
|
+
promoId: promoId,
|
|
1956
|
+
promoRuleId: promoRuleId,
|
|
1957
|
+
couponCategoryEnum: couponCategoryEnum,
|
|
1958
|
+
id: id
|
|
1959
|
+
};
|
|
1960
|
+
_this17.currentMode.djqs.push(djq);
|
|
1961
|
+
};
|
|
1962
|
+
}
|
|
1963
|
+
}), _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);
|
|
1790
1964
|
var Member = exports.Member = (_class5 = function () {
|
|
1791
1965
|
function Member(m) {
|
|
1792
|
-
var
|
|
1966
|
+
var _this18 = this;
|
|
1793
1967
|
|
|
1794
1968
|
(0, _classCallCheck3.default)(this, Member);
|
|
1795
1969
|
|
|
1796
|
-
_initDefineProp(this, 'cardNo',
|
|
1970
|
+
_initDefineProp(this, 'cardNo', _descriptor10, this);
|
|
1797
1971
|
|
|
1798
|
-
_initDefineProp(this, 'balance',
|
|
1972
|
+
_initDefineProp(this, 'balance', _descriptor11, this);
|
|
1799
1973
|
|
|
1800
|
-
_initDefineProp(this, 'exchangable',
|
|
1974
|
+
_initDefineProp(this, 'exchangable', _descriptor12, this);
|
|
1801
1975
|
|
|
1802
|
-
_initDefineProp(this, 'meStorageCardId',
|
|
1976
|
+
_initDefineProp(this, 'meStorageCardId', _descriptor13, this);
|
|
1803
1977
|
|
|
1804
|
-
_initDefineProp(this, 'StorageCardNo',
|
|
1978
|
+
_initDefineProp(this, 'StorageCardNo', _descriptor14, this);
|
|
1805
1979
|
|
|
1806
1980
|
if (m) {
|
|
1807
1981
|
this.id = m.ID;
|
|
@@ -1812,16 +1986,16 @@ var Member = exports.Member = (_class5 = function () {
|
|
|
1812
1986
|
return key == 'canusedbalancestorage';
|
|
1813
1987
|
});
|
|
1814
1988
|
|
|
1815
|
-
var
|
|
1816
|
-
isNewRetailBCPos =
|
|
1989
|
+
var _ref24 = _mutantsUtil.platform || {},
|
|
1990
|
+
isNewRetailBCPos = _ref24.isNewRetailBCPos;
|
|
1817
1991
|
|
|
1818
1992
|
m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
|
|
1819
1993
|
(0, _mobx.runInAction)(function () {
|
|
1820
|
-
|
|
1994
|
+
_this18.cardNo = m.CardCode;
|
|
1821
1995
|
if (index >= 0) {
|
|
1822
|
-
|
|
1996
|
+
_this18.balance = parseFloat(m.DynamicPropertyValues[index]);
|
|
1823
1997
|
} else {
|
|
1824
|
-
|
|
1998
|
+
_this18.balance = _this18.rawbalance;
|
|
1825
1999
|
}
|
|
1826
2000
|
});
|
|
1827
2001
|
this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
|
|
@@ -1853,19 +2027,19 @@ var Member = exports.Member = (_class5 = function () {
|
|
|
1853
2027
|
}
|
|
1854
2028
|
}]);
|
|
1855
2029
|
return Member;
|
|
1856
|
-
}(), (
|
|
2030
|
+
}(), (_descriptor10 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
|
|
1857
2031
|
enumerable: true,
|
|
1858
2032
|
initializer: null
|
|
1859
|
-
}),
|
|
2033
|
+
}), _descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
|
|
1860
2034
|
enumerable: true,
|
|
1861
2035
|
initializer: null
|
|
1862
|
-
}),
|
|
2036
|
+
}), _descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
|
|
1863
2037
|
enumerable: true,
|
|
1864
2038
|
initializer: null
|
|
1865
|
-
}),
|
|
2039
|
+
}), _descriptor13 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
|
|
1866
2040
|
enumerable: true,
|
|
1867
2041
|
initializer: null
|
|
1868
|
-
}),
|
|
2042
|
+
}), _descriptor14 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {
|
|
1869
2043
|
enumerable: true,
|
|
1870
2044
|
initializer: null
|
|
1871
2045
|
}), _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);
|