From 9a93fb521b66edc64bba574e1ffd683e528779ec Mon Sep 17 00:00:00 2001 From: Chika Date: Wed, 16 Dec 2020 20:13:19 +0300 Subject: [PATCH] formulas for results | titles --- .../Containers/Calculation/lib/elements/titles.ts | 6 +++--- .../Effects/actions/calculate/results.ts | 15 +++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/client/Containers/Calculation/lib/elements/titles.ts b/src/client/Containers/Calculation/lib/elements/titles.ts index 661f813..0159ebe 100644 --- a/src/client/Containers/Calculation/lib/elements/titles.ts +++ b/src/client/Containers/Calculation/lib/elements/titles.ts @@ -138,9 +138,9 @@ const resultsTitles: TElements = { labelResultTerm: 'Срок, мес.', labelResultAB_FL: 'АВ ФЛ, без НДФЛ, руб.', labelResultAB_UL: 'АВ ЮЛ, с НДС, руб.', - labelResultBonusMPL: 'Бонус МПЛ за лизинг', - labelResultDopMPLLeasing: 'Доп.бонус МПЛ за лизинг', - labelResultBonusDopProd: 'Бонус за доп.продукты', + labelResultBonusMPL: 'Бонус МПЛ за лизинг, без НДФЛ', + labelResultDopMPLLeasing: 'Доп.бонус МПЛ за лизинг, без НДФЛ', + labelResultBonusDopProd: 'Бонус МПЛ за доп.продукты, без НДФЛ', }; export const tablesTitles: StoreTables = { diff --git a/src/client/stores/CalculationStore/Effects/actions/calculate/results.ts b/src/client/stores/CalculationStore/Effects/actions/calculate/results.ts index ea69899..6e14e0f 100644 --- a/src/client/stores/CalculationStore/Effects/actions/calculate/results.ts +++ b/src/client/stores/CalculationStore/Effects/actions/calculate/results.ts @@ -102,22 +102,25 @@ export default { CalculationStore.setValue( 'resultBonusMPL', Math.abs( - (res?.columns?.npvBonusExpensesColumn?.values[2] || 0) / - (1 + (preparedData?.preparedValues?.salaryRate || 0)), + ((res?.columns?.npvBonusExpensesColumn?.values[2] || 0) / + (1 + (preparedData?.preparedValues?.salaryRate || 0))) * + (1 - valuesConstants.NDFL), ), ); CalculationStore.setValue( 'resultDopMPLLeasing', Math.abs( - (res?.columns?.extraBonusSumColumn?.values[2] || 0) / - (1 + (preparedData?.preparedValues?.salaryRate || 0)), + ((res?.columns?.extraBonusSumColumn?.values[2] || 0) / + (1 + (preparedData?.preparedValues?.salaryRate || 0))) * + (1 - valuesConstants.NDFL), ), ); CalculationStore.setValue( 'resultBonusDopProd', Math.abs( - (res?.columns?.npvBonusExpensesColumn?.values[1] || 0) / - (1 + (preparedData?.preparedValues?.salaryRate || 0)), + ((res?.columns?.npvBonusExpensesColumn?.values[1] || 0) / + (1 + (preparedData?.preparedValues?.salaryRate || 0))) * + (1 - valuesConstants.NDFL), ), ); },