From 6017e0e8f810ef025cafb18e2fdaeed0cc7dc7a4 Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Thu, 13 Apr 2023 14:57:07 +0300
Subject: [PATCH] calculate: fix lastpayment

---
 apps/web/server/routers/calculate/lib/request.ts   | 2 +-
 apps/web/server/routers/calculate/lib/transform.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/server/routers/calculate/lib/request.ts b/apps/web/server/routers/calculate/lib/request.ts
index 13abbb4..5e66bf0 100644
--- a/apps/web/server/routers/calculate/lib/request.ts
+++ b/apps/web/server/routers/calculate/lib/request.ts
@@ -701,7 +701,7 @@ export async function createRequestData({
     },
 
     async lastPaymentFix() {
-      return values.lastPaymentRule === 100_000_002;
+      return values.lastPaymentRule !== 100_000_002;
     },
 
     async lastPaymentSum() {
diff --git a/apps/web/server/routers/calculate/lib/transform.ts b/apps/web/server/routers/calculate/lib/transform.ts
index c215b56..b9121ab 100644
--- a/apps/web/server/routers/calculate/lib/transform.ts
+++ b/apps/web/server/routers/calculate/lib/transform.ts
@@ -60,7 +60,7 @@ export function transformCalculateResults({
     resultIRRNominalPerc: columns.cashflowMsfoColumn.nominal * 100,
     resultInsKasko: preparedValues.insuranceKasko,
     resultInsOsago: preparedValues.insuranceOsago,
-    resultLastPayment: preparedValues.lastPaymentSum * (1 + VAT),
+    resultLastPayment: last(columns?.sumWithVatColumn?.values) || 0,
     resultParticipationAmount:
       preparedValues.niAtInception +
       (preparedValues.ratBonus + preparedValues.nsBonus + preparedValues.nsibBonus) *