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; }