From 1eda3e2b3aaaf99b9c8db39c9201ce2e2c53c41e Mon Sep 17 00:00:00 2001 From: Chika Date: Tue, 1 Nov 2022 18:56:55 +0300 Subject: [PATCH] =?UTF-8?q?EvoKasko:=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=D0=B8=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D1=8B=D0=B5=20=D1=84=D0=BE=D1=80=D0=BC=D1=83=D0=BB=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EvoCalculator.Core.Calculation/v3/PostValues.cs | 4 +--- EvoCalculator.Core.PostCalculation/v1/NextValues.cs | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/EvoCalculator.Core.Calculation/v3/PostValues.cs b/EvoCalculator.Core.Calculation/v3/PostValues.cs index 749d45b..4c92adf 100644 --- a/EvoCalculator.Core.Calculation/v3/PostValues.cs +++ b/EvoCalculator.Core.Calculation/v3/PostValues.cs @@ -26,9 +26,7 @@ public class PostValues : v2.PostValues + Math.Abs(tlmGrColumn.Values[0]) + Math.Abs(gpsGrColumn.Values[0]) + _preparedValues.Rats + _preparedValues.Registration + _preparedValues.TrackerCost + _preparedValues.TLMCost + _preparedValues.TransportTaxGr + - _preparedValues.InsuranceFinGAPNmper + - _preparedValues.InsuranceEvoKasko / 12 * _preparedValues.Nmper + - _preparedValues.InsuranceBonusLoss / 12 * _preparedValues.Nmper) * + _preparedValues.InsuranceFinGAPNmper) * (decimal) _preparedValues.Leasing0K + _preparedValues.NsibBrutto; } diff --git a/EvoCalculator.Core.PostCalculation/v1/NextValues.cs b/EvoCalculator.Core.PostCalculation/v1/NextValues.cs index 604a283..0be5ee9 100644 --- a/EvoCalculator.Core.PostCalculation/v1/NextValues.cs +++ b/EvoCalculator.Core.PostCalculation/v1/NextValues.cs @@ -113,8 +113,8 @@ public class NextValues var nextCostInsurance = 0m; if (nextTableInsurance != null) nextCostInsurance = nextTableInsurance - .Where(x => x.TypeRiskInsurance is "KASKO" or "OSAGO" or "GAP" or "EvoKASKO") - .Sum(x => x.CostInsurance + x.InsuranceBonusLoss); + .Where(x => x.TypeRiskInsurance is "KASKO" or "OSAGO" or "GAP") + .Sum(x => x.CostInsurance); BaseCost = (preparedValues.PlPrice.Next + nextCostInsurance