evo/EvoCalculator.Client2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix preparedValues.tlmCost naming

Browse Source
This commit is contained in:
vchikalkin 2023-03-24 20:49:06 +03:00
parent a3f98c1e91
commit 1f1b3afd7b
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/api/core/types/calculate.ts
View File

@ -101,7 +101,7 @@ export const PreparedValuesSchema = z.object({
subsidyPaymentNumber: z.number(),
subsidySum: z.number(),
supplierFinancing: z.boolean(),
tLMCost: z.number(),
tlmCost: z.number(),
tlmCostPaymentSum: z.number(),
totalExpected: z.number(),
trackerCost: z.number(),

14
apps/web/trpc/routers/calculate/convert.ts
View File

@ -44,13 +44,13 @@ export function convertCalculateResults({ responseCalculate, calculateInput }: I
resultDopMPLLeasing: Math.abs(
(columns.extraBonusSumColumn.values[2] / (1 + preparedValues.salaryRate)) * (1 - NDFL)
),
resultDopProdSum: 0,
// resultDopProdSum: preparedValues.rats +
// preparedValues.registration +
// preparedValues.trackerCost +
// preparedValues.tLMCost +
// preparedValues.nsibBrutto +
// preparedValues.insuranceFinGAPNmper,
resultDopProdSum:
preparedValues.rats +
preparedValues.registration +
preparedValues.trackerCost +
preparedValues.tlmCost +
preparedValues.nsibBrutto +
preparedValues.insuranceFinGAPNmper,
resultFirstPayment: preparedValues.firstPaymentSum * (1 + VAT) - inputValues.subsidySum,
resultFirstPaymentRiskPolicy: preparedValues?.firstPayment * 100,
resultIRRGraphPerc: columns.sumColumn.irr * 100,

4
apps/web/trpc/routers/calculate/request.ts
View File

@ -825,7 +825,7 @@ export async function getRequestData({
const rats = await this.rats();
const registration = await this.registration();
const trackerCost = await this.trackerCost();
const tLMCost = await this.tLMCost();
const tLMCost = await this.tlmCost();
const transportTaxGr = await this.transportTaxGr();
const tlmCostPaymentSum = await this.tlmCostPaymentSum();
const gpsCostPaymentSum = await this.gpsCostPaymentSum();
@ -1121,7 +1121,7 @@ export async function getRequestData({
return false;
},
async tLMCost() {
async tlmCost() {
if (values.telematic) {
const {
data: { evo_addproduct_type },