From ab89ca34751f8683d90229cf5980061b965efdb2 Mon Sep 17 00:00:00 2001 From: Chika Date: Thu, 13 Oct 2022 14:37:10 +0300 Subject: [PATCH] process/payments: fix payments shifting --- process/payments/reactions.ts | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/process/payments/reactions.ts b/process/payments/reactions.ts index 98fe113..4ee4d7e 100644 --- a/process/payments/reactions.ts +++ b/process/payments/reactions.ts @@ -404,7 +404,11 @@ export default function paymentsReactions( } const seasons = seasonsTools.generateSeasons(seasonType, defaultSeasonsValues); - const payments = seasonsTools.generateSeasonsPayments(leasingPeriod, seasons); + const shiftNumber = Number.parseInt(highSeasonStartOption.label, 10) - 2; + const payments = seasonsTools.generateSeasonsPayments( + leasingPeriod, + shift(seasons, shiftNumber) + ); const rows: Row[] = payments.map((value) => ({ value, status: 'Default', @@ -413,14 +417,12 @@ export default function paymentsReactions( const firstPaymentPerc = $calculation.getElementValue('tbxFirstPaymentPerc'); const lastPaymentPerc = $calculation.getElementValue('tbxLastPaymentPerc'); - const shiftNumber = Number.parseInt(highSeasonStartOption.label, 10) - 2; - $tables.payments.setRows([ { value: firstPaymentPerc, status: 'Disabled', }, - ...shift(rows, shiftNumber), + ...rows, { value: lastPaymentPerc, status: 'Disabled', @@ -462,7 +464,10 @@ export default function paymentsReactions( const seasons = seasonsTools.generateSeasons(seasonType, values); const leasingPeriod = $calculation.getElementValue('tbxLeasingPeriod'); - const payments = seasonsTools.generateSeasonsPayments(leasingPeriod, seasons); + const payments = seasonsTools.generateSeasonsPayments( + leasingPeriod, + shift(seasons, shiftNumber) + ); const rows: Row[] = payments.map((value) => ({ value, status: 'Default', @@ -476,7 +481,7 @@ export default function paymentsReactions( value: firstPaymentPerc, status: 'Disabled', }, - ...shift(rows, shiftNumber), + ...rows, { value: lastPaymentPerc, status: 'Disabled',