diff --git a/EvoCalculator.Core.Calculation/Post/PostValues.cs b/EvoCalculator.Core.Calculation/Post/PostValues.cs index 13e1d42..2b6f22c 100644 --- a/EvoCalculator.Core.Calculation/Post/PostValues.cs +++ b/EvoCalculator.Core.Calculation/Post/PostValues.cs @@ -3,7 +3,6 @@ public class PostValues { public BaseCost BaseCost; - public BonusBase BonusBase; public PriceUP PriceUP; public PriceUP_PR PriceUP_PR; diff --git a/EvoCalculator.Core/Controllers/v1/CalculationController.cs b/EvoCalculator.Core/Controllers/v1/CalculationController.cs index 19b5ab1..bec2cbd 100644 --- a/EvoCalculator.Core/Controllers/v1/CalculationController.cs +++ b/EvoCalculator.Core/Controllers/v1/CalculationController.cs @@ -216,65 +216,65 @@ namespace EvoCalculator.Core.Controllers.V1 return new { - preparedValues, - preparedPayments, postValues, - - dateColumn, - dateTempColumn, - percentPaymentColumn, - kaskoNmperGrColumn, - tlmGrColumn, - gpsGrColumn, - sumColumn, - vatColumn, - sumWithVatColumn, - acceptSumColumn, - acceptKaskoColumn, - acceptOsagoColumn, - acceptInsuranceColumn, - deprecationLpColumn, - deprecationLdColumn, - deprecationColumn, - npvBonusExpensesColumn, - kaskoBonusGrSumColumn, - agentComissionExpensesColumn, - ratExpensesColumn, - transExprensesColumn, - nsibExpensesColumn, - tlmExpensesColumn, - gpsExpensesColumn, - registrExpensesColumn, - insuranceBonusExpensesColumn, - comissionBonusExpensesColumn, - expensesColumn, - negativeCashflowColumn, - nsibBruttoGrColumn, - taxColumn, - cashflowColumn, - cashflowLeasingColumn, - cashflowMsfoColumn, - cashflowNpvColumn, - npvWeightColumn, - npvColumn, - irrGrColumn, - niColumn, - interestColumn, - cashflowNsibColumn, - revenueColumn, - sumCurrentColumn, - sumCurrentNegativeColumn, - sumCurrentInterestColumn, - sumCurrentTlmColumn, - sumRepaymentColumn, - extraBonusSumColumn, - cashflowMsfoFinalColumn, - cashflowNpvFinalColumn, - npvFinalColumn, - directorBonusSumColumn, - cashflowMsfoFinal2Column, - cashflowNpvFinal2Column, - npvFinal2Column + columns = new + { + dateColumn, + dateTempColumn, + percentPaymentColumn, + kaskoNmperGrColumn, + tlmGrColumn, + gpsGrColumn, + sumColumn, + vatColumn, + sumWithVatColumn, + acceptSumColumn, + acceptKaskoColumn, + acceptOsagoColumn, + acceptInsuranceColumn, + deprecationLpColumn, + deprecationLdColumn, + deprecationColumn, + npvBonusExpensesColumn, + kaskoBonusGrSumColumn, + agentComissionExpensesColumn, + ratExpensesColumn, + transExprensesColumn, + nsibExpensesColumn, + tlmExpensesColumn, + gpsExpensesColumn, + registrExpensesColumn, + insuranceBonusExpensesColumn, + comissionBonusExpensesColumn, + expensesColumn, + negativeCashflowColumn, + nsibBruttoGrColumn, + taxColumn, + cashflowColumn, + cashflowLeasingColumn, + cashflowMsfoColumn, + cashflowNpvColumn, + npvWeightColumn, + npvColumn, + irrGrColumn, + niColumn, + interestColumn, + cashflowNsibColumn, + revenueColumn, + sumCurrentColumn, + sumCurrentNegativeColumn, + sumCurrentInterestColumn, + sumCurrentTlmColumn, + sumRepaymentColumn, + extraBonusSumColumn, + cashflowMsfoFinalColumn, + cashflowNpvFinalColumn, + npvFinalColumn, + directorBonusSumColumn, + cashflowMsfoFinal2Column, + cashflowNpvFinal2Column, + npvFinal2Column + } }; } }