From f60c2dff8ac843960822aed48244c224450ef943 Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Tue, 31 May 2022 11:57:24 +0300
Subject: [PATCH] fixes

---
 .../Effects/actions/calculate/prepareData.ts             | 9 ++++++---
 .../services/CoreService/types/Calculation/prepared.ts   | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts b/src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts
index bf1f0be..848a9f3 100644
--- a/src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts
+++ b/src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts
@@ -232,6 +232,7 @@ export default function (this: ICalculationStore): PreparedData {
 
   //@ts-ignore
   const importProgramSum = this.importProgramSum();
+  preparedValues.importProgramSum = importProgramSum;
 
   preparedValues.discount =
     convertPrice(
@@ -245,7 +246,7 @@ export default function (this: ICalculationStore): PreparedData {
   const firstPaymentPercWthtVAT =
     values.firstPaymentRub /
     (1 + valuesConstants.VAT) /
-    (preparedValues.plPrice || 0);
+    ((preparedValues.plPrice || 0) - (preparedValues.importProgramSum || 0));
   if (firstPaymentPercWthtVAT * 100 < 30) {
     const evo_coefficient_season = this.getStaticData('evo_coefficient').filter(
       x =>
@@ -301,7 +302,8 @@ export default function (this: ICalculationStore): PreparedData {
     (preparedValues.plPrice || 0) - (preparedValues.discount || 0);
 
   preparedValues.firstPaymentSum =
-    (preparedValues.firstPayment || 0) * (preparedValues.plPrice || 0);
+    (preparedValues.firstPayment || 0) *
+    ((preparedValues.plPrice || 0) - (preparedValues.importProgramSum || 0));
 
   preparedValues.agentsSum =
     (values.indAgentRewardSumm / 100) *
@@ -635,7 +637,8 @@ export default function (this: ICalculationStore): PreparedData {
   //
 
   const nsibBaseValue =
-    ((preparedValues.plPrice || 0) +
+    ((preparedValues.plPrice || 0) -
+      (preparedValues.importProgramSum || 0) +
       (preparedValues.insuranceContract +
         (preparedValues.rats || 0) +
         (preparedValues.registration || 0) +
diff --git a/src/core/services/CoreService/types/Calculation/prepared.ts b/src/core/services/CoreService/types/Calculation/prepared.ts
index 389d44d..a395917 100644
--- a/src/core/services/CoreService/types/Calculation/prepared.ts
+++ b/src/core/services/CoreService/types/Calculation/prepared.ts
@@ -1,4 +1,5 @@
 export interface PreparedValues {
+  importProgramSum?: number;
   calcDate?: Date;
   calcType?: number;
   irrExpected?: number;