diff --git a/apps/web/Components/Output/Results/config.ts b/apps/web/Components/Output/Results/config.ts index a0f7848..12f92e9 100644 --- a/apps/web/Components/Output/Results/config.ts +++ b/apps/web/Components/Output/Results/config.ts @@ -53,7 +53,7 @@ export const formatters = { resultLastPayment: moneyFormatter, resultParticipationAmount: moneyFormatter, resultPlPrice: moneyFormatter, - resultPriceUpPr: moneyFormatter, + resultPriceUpPr: percentFormatter, resultTerm: Intl.NumberFormat('ru').format, resultTotalGraphwithNDS: moneyFormatter, }; diff --git a/apps/web/server/routers/calculate/lib/transform.ts b/apps/web/server/routers/calculate/lib/transform.ts index c20f0a5..e82bcd2 100644 --- a/apps/web/server/routers/calculate/lib/transform.ts +++ b/apps/web/server/routers/calculate/lib/transform.ts @@ -59,9 +59,9 @@ export function transformCalculateResults({ preparedValues.nsibBrutto + preparedValues.insuranceFinGAPNmper, resultFirstPayment: preparedValues.firstPaymentSum * (1 + VAT) - inputValues.subsidySum, - resultFirstPaymentRiskPolicy: preparedValues?.firstPayment * 100, - resultIRRGraphPerc: columns.sumColumn.irr * 100, - resultIRRNominalPerc: columns.cashflowMsfoColumn.nominal * 100, + resultFirstPaymentRiskPolicy: preparedValues?.firstPayment, + resultIRRGraphPerc: columns.sumColumn.irr, + resultIRRNominalPerc: columns.cashflowMsfoColumn.nominal, resultInsKasko: preparedValues.insuranceKasko, resultInsOsago: preparedValues.insuranceOsago, resultLastPayment: last(columns?.sumWithVatColumn?.values) || 0, @@ -84,7 +84,7 @@ export function transformCalculateResults({ preparedValues.plPriceWithVAT - inputValues.supplierDiscountRub - inputValues.importProgramSum, - resultPriceUpPr: postValues.priceUP_Year_PR * 100, + resultPriceUpPr: postValues.priceUP_Year_PR, resultTerm: preparedValues.nmper, resultTotalGraphwithNDS: columns.sumWithVatColumn.values[0] - inputValues.subsidySum, };