tplus-components-touch 3.22.4 → 3.22.8
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.
|
@@ -287,7 +287,7 @@ var SettlementStore = (_class = function () {
|
|
|
287
287
|
}
|
|
288
288
|
});
|
|
289
289
|
if (promoVoucher.coupon_code) {
|
|
290
|
-
_this2.paymode.
|
|
290
|
+
_this2.paymode.calcDjqCheckValue(_this2.paymode.currentMode.djqs[0], _this2.dto, 'single');
|
|
291
291
|
}
|
|
292
292
|
} else {
|
|
293
293
|
if (promoVoucher.coupon_code) {
|
|
@@ -321,7 +321,7 @@ var SettlementStore = (_class = function () {
|
|
|
321
321
|
}
|
|
322
322
|
|
|
323
323
|
_context.next = 4;
|
|
324
|
-
return _this2.getCouponList(sn);
|
|
324
|
+
return _this2.getCouponList(sn, 'sinlge');
|
|
325
325
|
|
|
326
326
|
case 4:
|
|
327
327
|
return _context.abrupt('return', _context.sent);
|
|
@@ -965,12 +965,10 @@ var SettlementStore = (_class = function () {
|
|
|
965
965
|
}, {
|
|
966
966
|
key: 'delPay',
|
|
967
967
|
value: function delPay(index) {
|
|
968
|
-
var
|
|
968
|
+
var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
|
|
969
|
+
PayStyle = _enumController$getEn12.PayStyle;
|
|
969
970
|
|
|
970
971
|
(0, _remove3.default)(this.paymode.thePaymodes, function (mode) {
|
|
971
|
-
if (mode.paymethodId === index) {
|
|
972
|
-
_this10.paymode.amount = _this10.paymode.amount + mode.value;
|
|
973
|
-
}
|
|
974
972
|
return mode.paymethodId === index;
|
|
975
973
|
});
|
|
976
974
|
this.paymode.currentFocus = -1;
|
|
@@ -1061,31 +1059,31 @@ var SettlementStore = (_class = function () {
|
|
|
1061
1059
|
key: 'handlePrint',
|
|
1062
1060
|
value: function handlePrint(resp) {
|
|
1063
1061
|
// 储值打印
|
|
1064
|
-
return (0, _tplusComponentsTouch.printDispatch)(_tplusComponentsTouch.DoNameList.DO_STORAGE_PRINT, resp
|
|
1062
|
+
return (0, _tplusComponentsTouch.printDispatch)(_tplusComponentsTouch.DoNameList.DO_STORAGE_PRINT, resp, {});
|
|
1065
1063
|
}
|
|
1066
1064
|
}, {
|
|
1067
1065
|
key: 'saveMember',
|
|
1068
1066
|
value: function saveMember() {
|
|
1069
|
-
var
|
|
1067
|
+
var _this10 = this;
|
|
1070
1068
|
|
|
1071
|
-
var _enumController$
|
|
1072
|
-
PayStyle = _enumController$
|
|
1069
|
+
var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
|
|
1070
|
+
PayStyle = _enumController$getEn13.PayStyle;
|
|
1073
1071
|
|
|
1074
1072
|
(0, _mobx.runInAction)(function () {
|
|
1075
|
-
|
|
1076
|
-
var thePaymodes =
|
|
1073
|
+
_this10.dto.StorageMutiSettleDetails = [];
|
|
1074
|
+
var thePaymodes = _this10.newStyle ? (0, _filter3.default)(_this10.paymode.thePaymodes, function (mode) {
|
|
1077
1075
|
return parseFloat(mode.value) != 0;
|
|
1078
|
-
}) :
|
|
1076
|
+
}) : _this10.paymode.thePaymodes;
|
|
1079
1077
|
(0, _each3.default)(thePaymodes, function (mode) {
|
|
1080
|
-
var themode = (0, _find3.default)(
|
|
1078
|
+
var themode = (0, _find3.default)(_this10.paymode.paymodes, { 'paymentType': mode.paymentType });
|
|
1081
1079
|
|
|
1082
1080
|
var value = parseFloat(mode.value);
|
|
1083
1081
|
var giveChange = null;
|
|
1084
|
-
if (mode.paymentType == PayStyle.xianjin &&
|
|
1085
|
-
value = Math.Add(value,
|
|
1086
|
-
giveChange = Math.abs(
|
|
1082
|
+
if (mode.paymentType == PayStyle.xianjin && _this10.paymode.receivable < 0 && value > Math.abs(_this10.paymode.receivable)) {
|
|
1083
|
+
value = Math.Add(value, _this10.paymode.receivable);
|
|
1084
|
+
giveChange = Math.abs(_this10.paymode.receivable);
|
|
1087
1085
|
}
|
|
1088
|
-
|
|
1086
|
+
_this10.dto.StorageMutiSettleDetails.push({
|
|
1089
1087
|
Code: mode.paymethodId,
|
|
1090
1088
|
StorageAmount: value,
|
|
1091
1089
|
GiveChange: giveChange,
|
|
@@ -1094,7 +1092,7 @@ var SettlementStore = (_class = function () {
|
|
|
1094
1092
|
PaymentCode: mode.authCode,
|
|
1095
1093
|
DynamicPropertyKeys: [],
|
|
1096
1094
|
DynamicPropertyValues: [],
|
|
1097
|
-
DataSource: { Id:
|
|
1095
|
+
DataSource: { Id: _this10.dataSource }
|
|
1098
1096
|
});
|
|
1099
1097
|
});
|
|
1100
1098
|
});
|
|
@@ -1104,42 +1102,42 @@ var SettlementStore = (_class = function () {
|
|
|
1104
1102
|
IPMSG = JSON.parse(window.localStorage.IPMSG);
|
|
1105
1103
|
}
|
|
1106
1104
|
return (0, _tplusApi.tApi)({ dto: this.dto }, 'chanjet.ME.INewRetailMemberStorage.Save', false, false).then(function (resp) {
|
|
1107
|
-
|
|
1105
|
+
_this10.handlePrint(resp);
|
|
1108
1106
|
});
|
|
1109
1107
|
}
|
|
1110
1108
|
}, {
|
|
1111
1109
|
key: 'save',
|
|
1112
1110
|
value: function () {
|
|
1113
1111
|
var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
|
|
1114
|
-
var
|
|
1112
|
+
var _this11 = this;
|
|
1115
1113
|
|
|
1116
|
-
var _enumController$
|
|
1114
|
+
var _enumController$getEn14, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
|
|
1117
1115
|
|
|
1118
1116
|
return _regenerator2.default.wrap(function _callee3$(_context3) {
|
|
1119
1117
|
while (1) {
|
|
1120
1118
|
switch (_context3.prev = _context3.next) {
|
|
1121
1119
|
case 0:
|
|
1122
|
-
_enumController$
|
|
1120
|
+
_enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn14.PayStyle;
|
|
1123
1121
|
|
|
1124
1122
|
(0, _mobx.runInAction)(function () {
|
|
1125
|
-
|
|
1126
|
-
|
|
1127
|
-
|
|
1123
|
+
_this11.dto.RetailPaymentDetails = [];
|
|
1124
|
+
_this11.dto.RetailStorageDetails = [];
|
|
1125
|
+
_this11.dto.RetailCouponDetails = [];
|
|
1128
1126
|
var czkSum = 0;
|
|
1129
|
-
var Idmember =
|
|
1127
|
+
var Idmember = _this11.dto.Idmember;
|
|
1130
1128
|
var count = 0;
|
|
1131
|
-
var thePaymodes =
|
|
1129
|
+
var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
|
|
1132
1130
|
return parseFloat(mode.value) != 0;
|
|
1133
|
-
}) :
|
|
1131
|
+
}) : _this11.paymode.thePaymodes;
|
|
1134
1132
|
(0, _each3.default)(thePaymodes, function (mode, index) {
|
|
1135
|
-
var themode = (0, _find3.default)(
|
|
1133
|
+
var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
|
|
1136
1134
|
if (mode.paymentType == PayStyle.hyczk) {
|
|
1137
1135
|
if (!Idmember) {
|
|
1138
1136
|
Idmember = mode.member.id;
|
|
1139
1137
|
}
|
|
1140
1138
|
czkSum = Math.Add(czkSum, mode.value);
|
|
1141
|
-
var MeStorageCardId = mode.member.MeStorageCardId ? mode.member.MeStorageCardId :
|
|
1142
|
-
|
|
1139
|
+
var MeStorageCardId = mode.member.MeStorageCardId ? mode.member.MeStorageCardId : _this11.member.MeStorageCardId;
|
|
1140
|
+
_this11.dto.RetailStorageDetails.push({
|
|
1143
1141
|
Code: mode.paymethodId,
|
|
1144
1142
|
MeStorageCardId: MeStorageCardId,
|
|
1145
1143
|
StoragePaymentAmount: mode.value,
|
|
@@ -1148,17 +1146,17 @@ var SettlementStore = (_class = function () {
|
|
|
1148
1146
|
Idmember: mode.member.id,
|
|
1149
1147
|
DynamicPropertyKeys: [],
|
|
1150
1148
|
DynamicPropertyValues: [],
|
|
1151
|
-
DataSource: { Id:
|
|
1149
|
+
DataSource: { Id: _this11.dataSource },
|
|
1152
1150
|
Password: mode.authCode
|
|
1153
1151
|
});
|
|
1154
1152
|
} else {
|
|
1155
1153
|
var value = parseFloat(mode.value);
|
|
1156
1154
|
var giveChange = null;
|
|
1157
|
-
if (mode.paymentType == PayStyle.xianjin &&
|
|
1158
|
-
value = Math.Add(value,
|
|
1159
|
-
giveChange = Math.abs(
|
|
1155
|
+
if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
|
|
1156
|
+
value = Math.Add(value, _this11.paymode.receivable);
|
|
1157
|
+
giveChange = Math.abs(_this11.paymode.receivable);
|
|
1160
1158
|
}
|
|
1161
|
-
|
|
1159
|
+
_this11.dto.RetailPaymentDetails.push({
|
|
1162
1160
|
Code: mode.paymethodId,
|
|
1163
1161
|
OrigAmount: mode.exchangeRate != 1 ? mode.value2 : value,
|
|
1164
1162
|
Amount: value,
|
|
@@ -1172,12 +1170,12 @@ var SettlementStore = (_class = function () {
|
|
|
1172
1170
|
OverchargesAmount: mode.overchargesAmount,
|
|
1173
1171
|
DynamicPropertyKeys: [],
|
|
1174
1172
|
DynamicPropertyValues: [],
|
|
1175
|
-
DataSource: { Id:
|
|
1173
|
+
DataSource: { Id: _this11.dataSource }
|
|
1176
1174
|
});
|
|
1177
1175
|
if (mode.paymentType == PayStyle.djq) {
|
|
1178
1176
|
(0, _each3.default)(mode.djqs, function (djq) {
|
|
1179
1177
|
if (djq.checked) {
|
|
1180
|
-
|
|
1178
|
+
_this11.dto.RetailCouponDetails.push({
|
|
1181
1179
|
CouponCode: djq.code,
|
|
1182
1180
|
ReductionAmount: djq.amount,
|
|
1183
1181
|
EnableAmount: djq.doorsill,
|
|
@@ -1187,7 +1185,7 @@ var SettlementStore = (_class = function () {
|
|
|
1187
1185
|
PromotionId: djq.promoId,
|
|
1188
1186
|
PromotionRuleId: djq.promoRuleId,
|
|
1189
1187
|
PromoCouponAllocatedId: djq.id,
|
|
1190
|
-
DataSource: { Id:
|
|
1188
|
+
DataSource: { Id: _this11.dataSource }
|
|
1191
1189
|
});
|
|
1192
1190
|
}
|
|
1193
1191
|
});
|
|
@@ -1198,36 +1196,36 @@ var SettlementStore = (_class = function () {
|
|
|
1198
1196
|
var _ref14 = _mutantsUtil.platform || {},
|
|
1199
1197
|
isNewRetailBCPos = _ref14.isNewRetailBCPos;
|
|
1200
1198
|
|
|
1201
|
-
if (
|
|
1202
|
-
var themode = (0, _find3.default)(
|
|
1199
|
+
if (_this11.dto.RetailStorageDetails.length > 0) {
|
|
1200
|
+
var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
|
|
1203
1201
|
if (isNewRetailBCPos) {
|
|
1204
1202
|
// this.dto.RetailStorageDetails && this.dto.RetailStorageDetails.forEach((value, index) => {
|
|
1205
1203
|
// value.MeStorageCardId = (mode.MeStorageCardId ? mode.MeStorageCardId : this.member.MeStorageCardId);
|
|
1206
1204
|
// })
|
|
1207
|
-
|
|
1208
|
-
Code:
|
|
1205
|
+
_this11.dto.RetailPaymentDetails.push({
|
|
1206
|
+
Code: _this11.paymode.counter,
|
|
1209
1207
|
OrigAmount: czkSum,
|
|
1210
1208
|
Amount: czkSum,
|
|
1211
1209
|
IdsettleStyle: themode.idSettleStyle,
|
|
1212
1210
|
IdbankAccount: themode.idBankAccount,
|
|
1213
1211
|
DynamicPropertyKeys: [],
|
|
1214
1212
|
DynamicPropertyValues: [],
|
|
1215
|
-
DataSource: { Id:
|
|
1216
|
-
RetailStorageDetails:
|
|
1213
|
+
DataSource: { Id: _this11.dataSource },
|
|
1214
|
+
RetailStorageDetails: _this11.dto.RetailStorageDetails
|
|
1217
1215
|
});
|
|
1218
1216
|
} else {
|
|
1219
|
-
|
|
1220
|
-
Code:
|
|
1217
|
+
_this11.dto.RetailPaymentDetails.push({
|
|
1218
|
+
Code: _this11.paymode.counter,
|
|
1221
1219
|
OrigAmount: czkSum,
|
|
1222
1220
|
Amount: czkSum,
|
|
1223
1221
|
IdsettleStyle: themode.idSettleStyle,
|
|
1224
1222
|
IdbankAccount: themode.idBankAccount,
|
|
1225
1223
|
DynamicPropertyKeys: [],
|
|
1226
1224
|
DynamicPropertyValues: [],
|
|
1227
|
-
DataSource: { Id:
|
|
1225
|
+
DataSource: { Id: _this11.dataSource }
|
|
1228
1226
|
});
|
|
1229
1227
|
}
|
|
1230
|
-
|
|
1228
|
+
_this11.dto.Idmember = Idmember;
|
|
1231
1229
|
}
|
|
1232
1230
|
});
|
|
1233
1231
|
_ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
|
|
@@ -1276,8 +1274,8 @@ var SettlementStore = (_class = function () {
|
|
|
1276
1274
|
}
|
|
1277
1275
|
|
|
1278
1276
|
return _context3.abrupt('return', (0, _tplusApi.ccApi)({ dto: (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } }), cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
|
|
1279
|
-
|
|
1280
|
-
|
|
1277
|
+
_this11.setDtoID(resp.ID);
|
|
1278
|
+
_this11.billID = resp.ID;
|
|
1281
1279
|
}));
|
|
1282
1280
|
|
|
1283
1281
|
case 18:
|
|
@@ -1286,8 +1284,8 @@ var SettlementStore = (_class = function () {
|
|
|
1286
1284
|
|
|
1287
1285
|
case 20:
|
|
1288
1286
|
return _context3.abrupt('return', (0, _tplusApi.tApi)({ dto: this.dto.cut() }, 'chanjet.RE.newRetail.Settle', false, false, { timeout_skip: true }).then(function (resp) {
|
|
1289
|
-
|
|
1290
|
-
|
|
1287
|
+
_this11.setDtoID(resp.ID);
|
|
1288
|
+
_this11.billID = resp.ID;
|
|
1291
1289
|
}));
|
|
1292
1290
|
|
|
1293
1291
|
case 21:
|
|
@@ -1467,7 +1465,7 @@ var SettlementStore = (_class = function () {
|
|
|
1467
1465
|
}(), (_descriptor = _applyDecoratedDescriptor(_class.prototype, 'queryPwd', [_mobx.action], {
|
|
1468
1466
|
enumerable: true,
|
|
1469
1467
|
initializer: function initializer() {
|
|
1470
|
-
var
|
|
1468
|
+
var _this12 = this;
|
|
1471
1469
|
|
|
1472
1470
|
return function (newPass, newPassConfirm) {
|
|
1473
1471
|
if (!newPass || !newPassConfirm) {
|
|
@@ -1479,7 +1477,7 @@ var SettlementStore = (_class = function () {
|
|
|
1479
1477
|
var idstore = (0, _tplusPoslogin.PosInitData)('storeID');
|
|
1480
1478
|
return (0, _tplusApi.ccApi)({
|
|
1481
1479
|
Idstore: idstore,
|
|
1482
|
-
meMemberId:
|
|
1480
|
+
meMemberId: _this12.member.ID,
|
|
1483
1481
|
oldPassword: null,
|
|
1484
1482
|
newPassword: _tplusApi.User.pwdEncrypt(newPassConfirm),
|
|
1485
1483
|
dataSource: "POS"
|
|
@@ -1493,7 +1491,7 @@ var SettlementStore = (_class = function () {
|
|
|
1493
1491
|
}), _applyDecoratedDescriptor(_class.prototype, 'initByOriginReturn', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'initByOriginReturn'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'quickSettle', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'quickSettle'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusAndAddPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusAndAddPay'), _class.prototype), _descriptor2 = _applyDecoratedDescriptor(_class.prototype, 'updateMemberInfo', [_mobx.action], {
|
|
1494
1492
|
enumerable: true,
|
|
1495
1493
|
initializer: function initializer() {
|
|
1496
|
-
var
|
|
1494
|
+
var _this13 = this;
|
|
1497
1495
|
|
|
1498
1496
|
return function () {
|
|
1499
1497
|
var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
|
|
@@ -1503,9 +1501,9 @@ var SettlementStore = (_class = function () {
|
|
|
1503
1501
|
while (1) {
|
|
1504
1502
|
switch (_context6.prev = _context6.next) {
|
|
1505
1503
|
case 0:
|
|
1506
|
-
_getLoginInfo =
|
|
1504
|
+
_getLoginInfo = _this13.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
|
|
1507
1505
|
_context6.next = 3;
|
|
1508
|
-
return (0, _tplusApi.tApi)({ Idmember:
|
|
1506
|
+
return (0, _tplusApi.tApi)({ Idmember: _this13.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
|
|
1509
1507
|
|
|
1510
1508
|
case 3:
|
|
1511
1509
|
resp = _context6.sent;
|
|
@@ -1519,7 +1517,7 @@ var SettlementStore = (_class = function () {
|
|
|
1519
1517
|
return _context6.stop();
|
|
1520
1518
|
}
|
|
1521
1519
|
}
|
|
1522
|
-
}, _callee6,
|
|
1520
|
+
}, _callee6, _this13);
|
|
1523
1521
|
}));
|
|
1524
1522
|
|
|
1525
1523
|
return function (_x4) {
|
|
@@ -1600,8 +1598,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1600
1598
|
}
|
|
1601
1599
|
}, {
|
|
1602
1600
|
key: 'calcDjqCheckValue',
|
|
1603
|
-
value: function calcDjqCheckValue(q1, dto) {
|
|
1604
|
-
var
|
|
1601
|
+
value: function calcDjqCheckValue(q1, dto, params) {
|
|
1602
|
+
var _this14 = this;
|
|
1605
1603
|
|
|
1606
1604
|
var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
|
|
1607
1605
|
var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
|
|
@@ -1611,13 +1609,16 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1611
1609
|
_message2.default.warn('本单最多可用' + useLimitPerOrder + '张');
|
|
1612
1610
|
return;
|
|
1613
1611
|
}
|
|
1612
|
+
if (params === 'single') {
|
|
1613
|
+
this.checkList = [];
|
|
1614
|
+
}
|
|
1614
1615
|
|
|
1615
1616
|
var _ref20 = _mutantsUtil.platform || {},
|
|
1616
1617
|
isNewRetailBCPos = _ref20.isNewRetailBCPos;
|
|
1617
1618
|
|
|
1618
|
-
var _enumController$
|
|
1619
|
-
PayStyle = _enumController$
|
|
1620
|
-
Differentiate = _enumController$
|
|
1619
|
+
var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
|
|
1620
|
+
PayStyle = _enumController$getEn15.PayStyle,
|
|
1621
|
+
Differentiate = _enumController$getEn15.Differentiate;
|
|
1621
1622
|
|
|
1622
1623
|
if (q1) {
|
|
1623
1624
|
if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
|
|
@@ -1645,7 +1646,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1645
1646
|
if (!q1.checked) {
|
|
1646
1647
|
this.checkList.forEach(function (ele, i) {
|
|
1647
1648
|
if (ele.id === q1.id) {
|
|
1648
|
-
|
|
1649
|
+
_this14.checkList.splice(i, 1);
|
|
1649
1650
|
}
|
|
1650
1651
|
});
|
|
1651
1652
|
} else {
|
|
@@ -1657,7 +1658,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1657
1658
|
this.checkList.forEach(function (ele, i) {
|
|
1658
1659
|
if (ele.discountPct > 0) {
|
|
1659
1660
|
if (ele.amount === 0) {
|
|
1660
|
-
ele.amount = (1 - ele.discountPct) *
|
|
1661
|
+
ele.amount = (1 - ele.discountPct) * _this14.currentMode.receivable;
|
|
1661
1662
|
}
|
|
1662
1663
|
}
|
|
1663
1664
|
sum = Math.Add(sum, ele.amount);
|
|
@@ -1665,6 +1666,9 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1665
1666
|
this.currentMode.value = (0, _utils.getFixedNumber)(Math.min(this.receivable, sum, this.currentMode.maxamount));
|
|
1666
1667
|
this.currentMode.receivable = (0, _utils.getFixedNumber)(this.receivable - this.currentMode.value);
|
|
1667
1668
|
this.currentMode.overchargesAmount = (0, _utils.getFixedNumber)(sum - this.currentMode.value);
|
|
1669
|
+
if (params === 'single') {
|
|
1670
|
+
return;
|
|
1671
|
+
}
|
|
1668
1672
|
var promoVoucher = {};
|
|
1669
1673
|
promoVoucher.boName = "Retail";
|
|
1670
1674
|
// promoVoucher.promoLinks = _filter(this.currentMode.djqs,djq=>djq.checked);
|
|
@@ -1716,7 +1720,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1716
1720
|
return (0, _tplusApi.ccApi)((0, _extends3.default)({}, promoVoucher), 'promotion/PromoCalculate/findUsefulCouponPromoList', false, false, { method: 'post', timeout_skip: true }).then(function (result) {
|
|
1717
1721
|
if (result && result.length != 0) {
|
|
1718
1722
|
result.forEach(function (element) {
|
|
1719
|
-
var djq1 = (0, _filter3.default)(
|
|
1723
|
+
var djq1 = (0, _filter3.default)(_this14.currentMode.djqs, function (djq) {
|
|
1720
1724
|
return djq.id === element.id;
|
|
1721
1725
|
});
|
|
1722
1726
|
|
|
@@ -1759,9 +1763,9 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1759
1763
|
// couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
|
|
1760
1764
|
// id
|
|
1761
1765
|
// })
|
|
1762
|
-
|
|
1766
|
+
_this14.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
|
|
1763
1767
|
} else {
|
|
1764
|
-
|
|
1768
|
+
_this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum);
|
|
1765
1769
|
// this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
|
|
1766
1770
|
// djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
|
|
1767
1771
|
}
|
|
@@ -1776,8 +1780,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1776
1780
|
var _ref22 = _mutantsUtil.platform || {},
|
|
1777
1781
|
isNewRetailBCPos = _ref22.isNewRetailBCPos;
|
|
1778
1782
|
|
|
1779
|
-
var _enumController$
|
|
1780
|
-
Differentiate = _enumController$
|
|
1783
|
+
var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
|
|
1784
|
+
Differentiate = _enumController$getEn16.Differentiate;
|
|
1781
1785
|
|
|
1782
1786
|
if (q1) {
|
|
1783
1787
|
if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
|
|
@@ -1839,8 +1843,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1839
1843
|
this.currentMode.errinfo = '';
|
|
1840
1844
|
var sum = this.amount;
|
|
1841
1845
|
|
|
1842
|
-
var _enumController$
|
|
1843
|
-
PayStyle = _enumController$
|
|
1846
|
+
var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
|
|
1847
|
+
PayStyle = _enumController$getEn17.PayStyle;
|
|
1844
1848
|
|
|
1845
1849
|
this.paymodes.thePaymodes && this.paymodes.thePaymodes.forEach(function (mode) {
|
|
1846
1850
|
if (mode.paymentType === PayStyle.hyczk) {
|
|
@@ -1865,15 +1869,15 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1865
1869
|
key: 'setPaymodes',
|
|
1866
1870
|
value: function () {
|
|
1867
1871
|
var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
|
|
1868
|
-
var
|
|
1872
|
+
var _this15 = this;
|
|
1869
1873
|
|
|
1870
|
-
var _enumController$
|
|
1874
|
+
var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
|
|
1871
1875
|
|
|
1872
1876
|
return _regenerator2.default.wrap(function _callee7$(_context7) {
|
|
1873
1877
|
while (1) {
|
|
1874
1878
|
switch (_context7.prev = _context7.next) {
|
|
1875
1879
|
case 0:
|
|
1876
|
-
_enumController$
|
|
1880
|
+
_enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn18.settleStyleType, PayStyle = _enumController$getEn18.PayStyle;
|
|
1877
1881
|
memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
|
|
1878
1882
|
param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
|
|
1879
1883
|
_context7.next = 5;
|
|
@@ -1905,7 +1909,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1905
1909
|
calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88"
|
|
1906
1910
|
});
|
|
1907
1911
|
});
|
|
1908
|
-
|
|
1912
|
+
_this15.paymodes = paymodes;
|
|
1909
1913
|
//modes.QuickSettleStyles
|
|
1910
1914
|
});
|
|
1911
1915
|
}
|
|
@@ -1964,19 +1968,19 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1964
1968
|
}), _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], {
|
|
1965
1969
|
enumerable: true,
|
|
1966
1970
|
initializer: function initializer() {
|
|
1967
|
-
var
|
|
1971
|
+
var _this16 = this;
|
|
1968
1972
|
|
|
1969
1973
|
return function () {
|
|
1970
|
-
|
|
1974
|
+
_this16.checkList = [];
|
|
1971
1975
|
};
|
|
1972
1976
|
}
|
|
1973
1977
|
}), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
|
|
1974
1978
|
enumerable: true,
|
|
1975
1979
|
initializer: function initializer() {
|
|
1976
|
-
var
|
|
1980
|
+
var _this17 = this;
|
|
1977
1981
|
|
|
1978
1982
|
return function (id, couponNum, code) {
|
|
1979
|
-
|
|
1983
|
+
_this17.currentMode.djqs.forEach(function (ele) {
|
|
1980
1984
|
if (ele.id === id) {
|
|
1981
1985
|
ele.couponCategoryEnum = couponNum;
|
|
1982
1986
|
var IsEnable = ele.couponCategoryEnum === 'RIGUP' || ele.couponCategoryEnum === 'UN_MATCH' || ele.couponCategoryEnum === "PREPARING" || ele.couponCategoryEnum === 'PROMO_LIMITED' || ele.couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
|
|
@@ -1988,7 +1992,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1988
1992
|
}), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
|
|
1989
1993
|
enumerable: true,
|
|
1990
1994
|
initializer: function initializer() {
|
|
1991
|
-
var
|
|
1995
|
+
var _this18 = this;
|
|
1992
1996
|
|
|
1993
1997
|
return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
|
|
1994
1998
|
var djq = {
|
|
@@ -2010,13 +2014,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
2010
2014
|
couponCategoryEnum: couponCategoryEnum,
|
|
2011
2015
|
id: id
|
|
2012
2016
|
};
|
|
2013
|
-
|
|
2017
|
+
_this18.currentMode.djqs.push(djq);
|
|
2014
2018
|
};
|
|
2015
2019
|
}
|
|
2016
2020
|
}), _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);
|
|
2017
2021
|
var Member = exports.Member = (_class5 = function () {
|
|
2018
2022
|
function Member(m) {
|
|
2019
|
-
var
|
|
2023
|
+
var _this19 = this;
|
|
2020
2024
|
|
|
2021
2025
|
(0, _classCallCheck3.default)(this, Member);
|
|
2022
2026
|
|
|
@@ -2045,11 +2049,11 @@ var Member = exports.Member = (_class5 = function () {
|
|
|
2045
2049
|
m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
|
|
2046
2050
|
m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);
|
|
2047
2051
|
(0, _mobx.runInAction)(function () {
|
|
2048
|
-
|
|
2052
|
+
_this19.cardNo = m.CardCode;
|
|
2049
2053
|
if (index >= 0) {
|
|
2050
|
-
|
|
2054
|
+
_this19.balance = parseFloat(m.DynamicPropertyValues[index]);
|
|
2051
2055
|
} else {
|
|
2052
|
-
|
|
2056
|
+
_this19.balance = _this19.rawbalance;
|
|
2053
2057
|
}
|
|
2054
2058
|
});
|
|
2055
2059
|
this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
|