From c34db3a384d22d8d5275f81708756e08758e9b26 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Tue, 7 Feb 2023 09:08:01 +0300 Subject: [PATCH] merge release/dyn-2289_redemption-payment --- .../Calculation/Components/Sections/sectionsList.ts | 2 +- .../Effects/reactions/loadKpReaction/index.ts | 4 +--- src/client/stores/CalculationStore/config/initialValues.ts | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/client/Containers/Calculation/Components/Sections/sectionsList.ts b/src/client/Containers/Calculation/Components/Sections/sectionsList.ts index 4b6bacc..772eb30 100644 --- a/src/client/Containers/Calculation/Components/Sections/sectionsList.ts +++ b/src/client/Containers/Calculation/Components/Sections/sectionsList.ts @@ -49,7 +49,7 @@ const sections: ISection[] = [ elements: ['tbxSaleBonus'], }, { - elements: ['tbxRedemptionPaymentSum'], + // elements: ['tbxRedemptionPaymentSum'], }, ], }, diff --git a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts index 304d34a..73459d3 100644 --- a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts +++ b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts @@ -744,9 +744,7 @@ const loadKpReaction: IReactionEffect = calculationStore => ({ } // redemptionPayment - let redemptionPaymentSum = - quote.evo_payment_redemption_sum || - initialValues.redemptionPaymentSum; + let redemptionPaymentSum = initialValues.redemptionPaymentSum; // redemptionPayment // engineHours diff --git a/src/client/stores/CalculationStore/config/initialValues.ts b/src/client/stores/CalculationStore/config/initialValues.ts index dfdc570..a219189 100644 --- a/src/client/stores/CalculationStore/config/initialValues.ts +++ b/src/client/stores/CalculationStore/config/initialValues.ts @@ -19,7 +19,7 @@ const initialValues: Partial> = { firstPaymentRub: 0, lastPaymentPerc: 1, lastPaymentRule: 100000001, - redemptionPaymentSum: 1000, + redemptionPaymentSum: undefined, balanceHolder: 100000001, graphType: 100000000, parmentsDecreasePercent: 94,