tplus-components-touch 3.27.6 → 3.28.0
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/presale/pickup.js +1 -0
- package/dist/components/presale/pickup.js.map +1 -1
- package/dist/components/settlement/settlement.js +40 -46
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlementStore.js +3 -3
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/package.json +1 -1
|
@@ -465,20 +465,20 @@ var SettlementStore = (_class = function () {
|
|
|
465
465
|
var value = this.dto.TotalTaxAmount;
|
|
466
466
|
|
|
467
467
|
var _getLoginInfo = this.getLoginInfo(),
|
|
468
|
-
|
|
468
|
+
PreSellOrBook = _getLoginInfo.PreSellOrBook,
|
|
469
469
|
PercentageWhenBook = _getLoginInfo.PercentageWhenBook;
|
|
470
470
|
|
|
471
471
|
var _ref5 = this.dto || {},
|
|
472
472
|
IdbusiType = _ref5.IdbusiType,
|
|
473
473
|
DistributionMode = _ref5.DistributionMode;
|
|
474
474
|
|
|
475
|
-
if (IdbusiType == 38 &&
|
|
475
|
+
if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
|
|
476
476
|
value = value * PercentageWhenBook / 100;
|
|
477
477
|
(0, _mobx.runInAction)(function () {
|
|
478
478
|
_this3.dto.PrepaidAmount = value;
|
|
479
479
|
});
|
|
480
480
|
}
|
|
481
|
-
if (IdbusiType == 38 &&
|
|
481
|
+
if (IdbusiType == 38 && PreSellOrBook != 'DISABLED' && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
|
|
482
482
|
value += this.dto.BuyerPayFreight || 0;
|
|
483
483
|
}
|
|
484
484
|
if (IdbusiType == 39) {
|