diff --git a/apps/web/api/core/types/calculate.ts b/apps/web/api/core/types/calculate.ts index e880370..49deb33 100644 --- a/apps/web/api/core/types/calculate.ts +++ b/apps/web/api/core/types/calculate.ts @@ -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(), diff --git a/apps/web/trpc/routers/calculate/convert.ts b/apps/web/trpc/routers/calculate/convert.ts index 2ef5953..baba5ba 100644 --- a/apps/web/trpc/routers/calculate/convert.ts +++ b/apps/web/trpc/routers/calculate/convert.ts @@ -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, diff --git a/apps/web/trpc/routers/calculate/request.ts b/apps/web/trpc/routers/calculate/request.ts index 5d7c1ca..4e82c50 100644 --- a/apps/web/trpc/routers/calculate/request.ts +++ b/apps/web/trpc/routers/calculate/request.ts @@ -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 },