From 5dba3e13b474b16d25d191ef93a0cdf1a0203900 Mon Sep 17 00:00:00 2001 From: Chika Date: Fri, 29 Oct 2021 12:50:42 +0300 Subject: [PATCH] results table: redemption display changes --- .../Effects/actions/calculate/results.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/client/stores/CalculationStore/Effects/actions/calculate/results.ts b/src/client/stores/CalculationStore/Effects/actions/calculate/results.ts index 2aa1046..a70f485 100644 --- a/src/client/stores/CalculationStore/Effects/actions/calculate/results.ts +++ b/src/client/stores/CalculationStore/Effects/actions/calculate/results.ts @@ -15,12 +15,20 @@ export default { const results: TableProps[] = []; for (let i = 0; i < preparedData.preparedValues.nmper; i++) { + const balanceHolder = this.getValue('balanceHolder'); + let redemptionAmount = { + value: sumRepaymentColumn?.values[i + 1], + }; + if (balanceHolder === 100000001 && i < 12) { + redemptionAmount = { + value: 0, + }; + } + results.push({ paymentSum: { value: sumWithVatColumn?.values[i + 1] }, ndsCompensation: { value: vatColumn?.values[i + 1] }, - redemptionAmount: { - value: sumRepaymentColumn?.values[i + 1], - }, + redemptionAmount, }); } @@ -31,7 +39,6 @@ export default { results[0].ndsCompensation.value -= subdidySum - subdidySum / 1.2; } - //TODO: speed up table render this.setTableRows('tableResults', 0)(results); } },