From 6564073e54202a3bbdd2ccecce4d2205a8bd3b6a Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Thu, 3 Feb 2022 15:44:24 +0300
Subject: [PATCH] =?UTF-8?q?DYN-829:=20=D0=9D=D0=B5=D0=BE=D0=B1=D1=85=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B8=D0=BC=D0=BE=20=D0=B2=D0=BD=D0=B5=D1=81=D1=82=D0=B8?=
 =?UTF-8?q?=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=B2=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D1=83=20=D1=80=D0=B0?=
 =?UTF-8?q?=D1=81=D1=87=D0=B5=D1=82=D0=B0=20=D1=81=D1=82=D0=BE=D0=BB=D0=B1?=
 =?UTF-8?q?=D1=86=D0=B0=20SumColumn,=20=D0=B0=20=D0=B8=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82?=
 =?UTF-8?q?=D1=8C=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=B8=D0=B5=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D1=80=D0=B0=D1=81=D1=87=D0=B5=D1=82=D0=B0=20Val?=
 =?UTF-8?q?ues[^1]=20(=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B2=D1=8B=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=BE?=
 =?UTF-8?q?=20=D0=B7=D0=B5=D0=BB=D0=B5=D0=BD=D1=8B=D0=BC):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

         если PreparedValues.LastPaymentFix = True, то Values[^1] = _preparedValues.LastPaymentSum, иначе Values[^1] = Values[^2]
---
 EvoCalculator.Core.Calculation/v2/Columns/SumColumn.cs          | 2 +-
 .../Calculation/Models/Prepared/PreparedValues.cs               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/EvoCalculator.Core.Calculation/v2/Columns/SumColumn.cs b/EvoCalculator.Core.Calculation/v2/Columns/SumColumn.cs
index 0bf573e..b3989ca 100644
--- a/EvoCalculator.Core.Calculation/v2/Columns/SumColumn.cs
+++ b/EvoCalculator.Core.Calculation/v2/Columns/SumColumn.cs
@@ -21,6 +21,6 @@ public class SumColumn : v1.Columns.SumColumn
 
         for (var i = 2; i < Values.Length - 1; i++) Values[i] = x * (decimal) _percentPaymentColumn.Values[i] / 100;
 
-        Values[^1] = _preparedValues.LastPaymentSum;
+        Values[^1] = _preparedValues.LastPaymentFix ? _preparedValues.LastPaymentSum : Values[^2];
     }
 }
\ No newline at end of file
diff --git a/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedValues.cs b/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedValues.cs
index 6ee5415..e85d2e2 100644
--- a/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedValues.cs
+++ b/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedValues.cs
@@ -38,6 +38,7 @@ public class PreparedValues
     public decimal FirstPaymentWithNdsAbs { get; set; }
     public double LastPayment { get; set; }
     public decimal LastPaymentSum { get; set; }
+    public bool LastPaymentFix { get; set; }
     public int ScheduleOfPayments { get; set; }
     public decimal ComissionRub { get; set; }
     public decimal PlPrice { get; set; }