diff --git a/FKGees/DocsDefinitions/Decrets/Przecena.cs b/FKGees/DocsDefinitions/Decrets/Przecena.cs index 20414e3..c847277 100644 --- a/FKGees/DocsDefinitions/Decrets/Przecena.cs +++ b/FKGees/DocsDefinitions/Decrets/Przecena.cs @@ -40,17 +40,12 @@ public class Przecena : IDecretsDefinition private decimal Processvalue(Dok doc, string expression) { - switch(expression) + return expression switch { - case "[snr]-[znr]": - return doc.Netto - doc.NettoDet; - case "[sbr]-[snr]": - return doc.Podatek - doc.PodatekDet; - case "[sbr]": - return doc.Razem; - - } - - return 0; + "[snr]-[znr]" => doc.Netto - doc.NettoDet, + "[sbr]-[snr]" => doc.Podatek - doc.PodatekDet, + "[sbr]" => doc.Razem, + _ => 0 + }; } } \ No newline at end of file diff --git a/FKGees/DocsDefinitions/Decrets/Rozb.cs b/FKGees/DocsDefinitions/Decrets/Rozb.cs index 44b7568..4bf00fc 100644 --- a/FKGees/DocsDefinitions/Decrets/Rozb.cs +++ b/FKGees/DocsDefinitions/Decrets/Rozb.cs @@ -53,24 +53,17 @@ public class Rozb : IDecretsDefinition return Task.FromResult(result); } - private decimal Processvalue(Dok doc, string expression) + private static decimal Processvalue(Dok doc, string expression) { - switch (expression) + return expression switch { - case "[znr]": - return -doc.Netto; - case "[zvr]": - return -doc.Podatek; - case "[zbr]": - return -(doc.Netto + doc.Podatek); - case "[sbr]": - return doc.NettoDet + doc.PodatekDet; - case "[svr]": - return doc.PodatekDet; - case "[sbr]-[snr]": - return doc.NettoDet + doc.PodatekDet - doc.Netto; - } - - return 0; + "[znr]" => doc.Netto, + "[zvr]" => doc.Podatek, + "[zbr]" => (doc.Netto + doc.Podatek), + "[sbr]" => doc.NettoDet + doc.PodatekDet, + "[svr]" => doc.PodatekDet, + "[sbr]-[znr]" => doc.NettoDet + doc.PodatekDet - doc.Netto, + _ => 0 + }; } } \ No newline at end of file diff --git a/FKGees/DocsDefinitions/Decrets/Zwroty.cs b/FKGees/DocsDefinitions/Decrets/Zwroty.cs index 593de7a..8b2e4d7 100644 --- a/FKGees/DocsDefinitions/Decrets/Zwroty.cs +++ b/FKGees/DocsDefinitions/Decrets/Zwroty.cs @@ -53,24 +53,17 @@ public class Zwroty : IDecretsDefinition return Task.FromResult(result); } - private decimal Processvalue(Dok doc, string expression) + private static decimal Processvalue(Dok doc, string expression) { - switch (expression) + return expression switch { - case "[znr]": - return -doc.Netto; - case "[zvr]": - return -doc.Podatek; - case "[zbr]": - return -(doc.Netto + doc.Podatek); - case "[sbr]": - return doc.NettoDet + doc.PodatekDet; - case "[svr]": - return doc.PodatekDet; - case "[sbr]-[snr]": - return doc.NettoDet + doc.PodatekDet - doc.Netto; - } - - return 0; + "[znr]" => doc.Netto, + "[zvr]" => doc.Podatek, + "[zbr]" => doc.Netto + doc.Podatek, + "[sbr]" => doc.NettoDet + doc.PodatekDet, + "[svr]" => doc.PodatekDet, + "[sbr]-[znr]" => doc.NettoDet + doc.PodatekDet - doc.Netto, + _ => 0 + }; } } \ No newline at end of file