Change "Opis" to NrDok

FKGees/DocsDefinitions/Decrets/KpInne.cs

@@ -6,7 +6,7 @@ public class KpInne : IDecretsDefinition
     public string Type => nameof(KpInne);
     public List<Definition> Definitions { get; } =
     [
-        new Definition("139-1-24", "WN", "[sbr]"), 
+        new Definition("139-1-24", "WN", "[sbr]"),
         new Definition("100-1-24", "WN", "[sbr]")
     ];
 
@@ -28,7 +28,7 @@ public class KpInne : IDecretsDefinition
                     Data = dok.DataPom,
                     DataWplywu = dok.Data,
                     Nr = dok.NrDok,
-                    Opis = dok.TekstZaCo(),
+                    Opis = dok.NrDok,
                     StronaKonta = d.AccountSide,
                     KontoFk = d.Account,
                     Kwota = Math.Abs(dok.Zaplacono).AsString()

FKGees/DocsDefinitions/Decrets/KpKaucjaZaOpakowania.cs

@@ -5,7 +5,7 @@ public class KpKaucjaZaOpakowania : IDecretsDefinition
     public int DocType => 51;
     public string Type => nameof(KpKaucjaZaOpakowania);
     public List<Definition> Definitions { get; } = [
-        new Definition("100-1-24", "WN", "[sbr]"), 
+        new Definition("100-1-24", "WN", "[sbr]"),
         new Definition("139-1-24", "MA", "[sbr]")
     ];
 
@@ -26,7 +26,7 @@ public class KpKaucjaZaOpakowania : IDecretsDefinition
                 item.Data = dok.DataPom;
                 item.DataWplywu = dok.Data;
                 item.Nr = dok.NrDok;
-                item.Opis = dok.TekstZaCo();
+                item.Opis = dok.NrDok;
                 item.StronaKonta = d.AccountSide;
                 item.KontoFk = d.Account;
                 item.Kwota = Math.Abs(dok.Zaplacono).AsString();

FKGees/DocsDefinitions/Decrets/KpLotto.cs

@@ -6,7 +6,7 @@ public class KpLotto : IDecretsDefinition
     public string Type => nameof(KpLotto);
     public List<Definition> Definitions { get; } =
     [
-        new Definition("100-1-24", "WN", "[sbr]"), 
+        new Definition("100-1-24", "WN", "[sbr]"),
         new Definition("249-0-22", "MA", "[sbr]")
     ];
 
@@ -28,7 +28,7 @@ public class KpLotto : IDecretsDefinition
                     Data = dok.DataPom,
                     DataWplywu = dok.Data,
                     Nr = dok.NrDok,
-                    Opis = dok.TekstZaCo(),
+                    Opis = dok.NrDok,
                     StronaKonta = d.AccountSide,
                     KontoFk = d.Account,
                     Kwota = Math.Abs(dok.Zaplacono).AsString()

FKGees/DocsDefinitions/Decrets/KpPaysafe.cs

@@ -6,7 +6,7 @@ public class KpPaysafe : IDecretsDefinition
     public string Type => nameof(KpPaysafe);
     public List<Definition> Definitions { get; } =
     [
-        new Definition("139-1-24", "WN", "[sbr]"), 
+        new Definition("139-1-24", "WN", "[sbr]"),
         new Definition("100-1-24", "MA", "[sbr]")
     ];
 
@@ -28,7 +28,7 @@ public class KpPaysafe : IDecretsDefinition
                     Data = dok.DataPom,
                     DataWplywu = dok.Data,
                     Nr = dok.NrDok,
-                    Opis = dok.TekstZaCo(),
+                    Opis = dok.NrDok,
                     StronaKonta = d.AccountSide,
                     KontoFk = d.Account,
                     Kwota = Math.Abs(dok.Zaplacono).AsString()

FKGees/DocsDefinitions/Decrets/KpRachunki.cs

@@ -6,7 +6,7 @@ public class KpRachunki : IDecretsDefinition
     public string Type => nameof(KpRachunki);
     public List<Definition> Definitions { get; } =
     [
-        new Definition("100-1-24", "WN", "[sbr]"), 
+        new Definition("100-1-24", "WN", "[sbr]"),
         new Definition("249-0-24", "MA", "[sbr]")
     ];
 
@@ -28,7 +28,7 @@ public class KpRachunki : IDecretsDefinition
                     Data = dok.DataPom,
                     DataWplywu = dok.Data,
                     Nr = dok.NrDok,
-                    Opis = dok.TekstZaCo(),
+                    Opis = dok.NrDok,
                     StronaKonta = d.AccountSide,
                     KontoFk = d.Account,
                     Kwota = Math.Abs(dok.Zaplacono).AsString()

FKGees/DocsDefinitions/Decrets/KwBony.cs

@@ -6,10 +6,10 @@ public class KwBony : IDecretsDefinition
     public string Type => nameof(KwBony);
     public List<Definition> Definitions { get; } =
     [
-        new Definition("100-1-24", "MA", "[sbr]"), 
+        new Definition("100-1-24", "MA", "[sbr]"),
         new Definition("234-0-01", "WN", "[sbr]")
     ];
-    
+
     public Task<List<DecretsResult>> Process(IReadOnlyList<Dok> documents)
     {
         var result = new List<DecretsResult>();
@@ -26,7 +26,7 @@ public class KwBony : IDecretsDefinition
                 item.Data = dok.DataPom;
                 item.DataWplywu = dok.Data;
                 item.Nr = dok.NrDok;
-                item.Opis = dok.TekstZaCo();
+                item.Opis = dok.NrDok;
                 item.StronaKonta = d.AccountSide;
                 item.KontoFk = d.Account;
                 item.Kwota = Math.Abs(dok.Zaplacono).AsString();

FKGees/DocsDefinitions/Decrets/KwInne.cs

@@ -6,15 +6,15 @@ public class KwInne : IDecretsDefinition
     public string Type => nameof(KwInne);
     public List<Definition> Definitions { get; } =
     [
-        new Definition("305-60-24", "WN", "[sbr]"), 
+        new Definition("305-60-24", "WN", "[sbr]"),
         new Definition("100-1-24", "MA", "[sbr]")
     ];
-    
+
     public Task<List<DecretsResult>> Process(IReadOnlyList<Dok> documents)
     {
         var result = new List<DecretsResult>();
 
-        var toProcess = documents.Where(x => x.TypDok == DocType 
+        var toProcess = documents.Where(x => x.TypDok == DocType
                                              && x.NrDok.StartsWith("KW")
                                              && x.Tekst1() == Constants.KwTekstyDod[nameof(KwInne)]);
 
@@ -26,7 +26,7 @@ public class KwInne : IDecretsDefinition
                 item.Data = dok.DataPom;
                 item.DataWplywu = dok.Data;
                 item.Nr = dok.NrDok;
-                item.Opis = dok.TekstZaCo();
+                item.Opis = dok.NrDok;
                 item.StronaKonta = d.AccountSide;
                 item.KontoFk = d.Account;
                 item.Kwota = Math.Abs(dok.Zaplacono).AsString();

FKGees/DocsDefinitions/Decrets/KwLotto.cs

@@ -6,10 +6,10 @@ public class KwLotto : IDecretsDefinition
     public string Type => nameof(KwLotto);
     public List<Definition> Definitions { get; } =
     [
-        new Definition("249-0-22", "WN", "[sbr]"), 
+        new Definition("249-0-22", "WN", "[sbr]"),
         new Definition("100-1-24", "MA", "[sbr]")
     ];
-    
+
     public Task<List<DecretsResult>> Process(IReadOnlyList<Dok> documents)
     {
         var result = new List<DecretsResult>();
@@ -26,7 +26,7 @@ public class KwLotto : IDecretsDefinition
                 item.Data = dok.DataPom;
                 item.DataWplywu = dok.Data;
                 item.Nr = dok.NrDok;
-                item.Opis = dok.TekstZaCo();
+                item.Opis = dok.NrDok;
                 item.StronaKonta = d.AccountSide;
                 item.KontoFk = d.Account;
                 item.Kwota = Math.Abs(dok.Zaplacono).AsString();

FKGees/DocsDefinitions/Decrets/KwOpakowania.cs

@@ -5,7 +5,7 @@ public class KwOpakowania : IDecretsDefinition
     public int DocType => 51;
     public string Type => nameof(KwOpakowania);
     public List<Definition> Definitions { get; } = [
-        new Definition("139-1-24", "WN", "[sbr]"), 
+        new Definition("139-1-24", "WN", "[sbr]"),
         new Definition("100-1-24", "MA", "[sbr]")
     ];
 
@@ -25,7 +25,7 @@ public class KwOpakowania : IDecretsDefinition
                 item.Data = dok.DataPom;
                 item.DataWplywu = dok.Data;
                 item.Nr = dok.NrDok;
-                item.Opis = dok.TekstZaCo();
+                item.Opis = dok.NrDok;
                 item.StronaKonta = d.AccountSide;
                 item.KontoFk = d.Account;
                 item.Kwota = Math.Abs(dok.Zaplacono).AsString();

FKGees/DocsDefinitions/Decrets/KwPomylkaKasjera.cs

@@ -6,15 +6,15 @@ public class KwPomylkaKasjera : IDecretsDefinition
     public string Type => nameof(KwPomylkaKasjera);
     public List<Definition> Definitions { get; } =
     [
-        new Definition("305-60-24", "WN", "[sbr]"), 
+        new Definition("305-60-24", "WN", "[sbr]"),
         new Definition("100-1-24", "MA", "[sbr]")
     ];
-    
+
     public Task<List<DecretsResult>> Process(IReadOnlyList<Dok> documents)
     {
         var result = new List<DecretsResult>();
 
-        var toProcess = documents.Where(x => x.TypDok == DocType 
+        var toProcess = documents.Where(x => x.TypDok == DocType
                                              && x.NrDok.StartsWith("KW")
                                              && x.Tekst1() == Constants.KwTekstyDod[nameof(KwPomylkaKasjera)]);
 
@@ -26,7 +26,7 @@ public class KwPomylkaKasjera : IDecretsDefinition
                 item.Data = dok.DataPom;
                 item.DataWplywu = dok.Data;
                 item.Nr = dok.NrDok;
-                item.Opis = dok.TekstZaCo();
+                item.Opis = dok.NrDok;
                 item.StronaKonta = d.AccountSide;
                 item.KontoFk = d.Account;
                 item.Kwota = Math.Abs(dok.Zaplacono).AsString();

FKGees/DocsDefinitions/Decrets/KwUtarg.cs

@@ -6,15 +6,15 @@ public class KwUtarg : IDecretsDefinition
     public string Type => nameof(KwUtarg);
     public List<Definition> Definitions { get; } =
     [
-        new Definition("139-0-01", "WN", "[sbr]"), 
+        new Definition("139-0-01", "WN", "[sbr]"),
         new Definition("100-1-24", "MA", "[sbr]")
     ];
-    
+
     public Task<List<DecretsResult>> Process(IReadOnlyList<Dok> documents)
     {
         var result = new List<DecretsResult>();
 
-        var toProcess = documents.Where(x => x.TypDok == DocType 
+        var toProcess = documents.Where(x => x.TypDok == DocType
                                              && x.NrDok.StartsWith("KW")
                                              && x.Tekst1() == Constants.KwTekstyDod[nameof(KwUtarg)]);
 
@@ -26,7 +26,7 @@ public class KwUtarg : IDecretsDefinition
                 item.Data = dok.DataPom;
                 item.DataWplywu = dok.Data;
                 item.Nr = dok.NrDok;
-                item.Opis = dok.TekstZaCo();
+                item.Opis = dok.NrDok;
                 item.StronaKonta = d.AccountSide;
                 item.KontoFk = d.Account;
                 item.Kwota = Math.Abs(dok.Zaplacono).AsString();

FKGees/DocsDefinitions/Decrets/ObrotOpakowaniami.cs

@@ -0,0 +1,38 @@
+namespace FKGees.DocsDefinitions.Decrets;
+
+public class ObrotOpakowaniami : IDecretsDefinition
+{
+    public int DocType => 1;
+    public string Type => "Opak";
+    public List<Definition> Definitions { get; } =
+    [ 
+        new Definition("307-0-24", "MA", "[sbr]"),
+        new Definition("332-0-24", "WN", "[sbr]")
+    ];
+
+    public Task<List<DecretsResult>> Process(IReadOnlyList<Dok> documents)
+    {
+        var result = new List<DecretsResult>();
+
+        var toProcess = documents
+            .Where(x => x.TypDok == DocType);
+
+        foreach (var dok in toProcess)
+        {
+            Definitions.ForEach(d =>
+            {
+                var item = dok.DecretKontr();
+                item.Data = dok.DataPom;
+                item.DataWplywu = dok.Data;
+                item.Nr = dok.NrDok;
+                item.StronaKonta = d.AccountSide;
+                item.KontoFk = d.Account;
+                item.Kwota = dok.NettoDet.AsString();
+                
+                result.Add(item);
+            });
+        }
+
+        return Task.FromResult(result);
+    }
+}

FKGees/DocsDefinitions/Decrets/Przecena.cs

@@ -5,9 +5,9 @@ public class Przecena : IDecretsDefinition
     public int DocType => 18;
     public string Type => "Pc";
     public List<Definition> Definitions { get; } =
-    [ 
+    [
         new Definition("342-0-24", "MA", "[snr]-[znr]"),
-        new Definition("343-0-24", "MA", "[sbr]-[snr]"), 
+        new Definition("343-0-24", "MA", "[sbr]-[snr]"),
         new Definition("332-0-24", "WN", "[sbr]")
     ];
 
@@ -26,11 +26,11 @@ public class Przecena : IDecretsDefinition
                 item.Data = dok.DataPom;
                 item.DataWplywu = dok.Data;
                 item.Nr = dok.NrDok;
-                item.Opis = dok.TekstZaCo();
+                item.Opis = dok.NrDok;
                 item.StronaKonta = d.AccountSide;
                 item.KontoFk = d.Account;
                 item.Kwota = Processvalue(dok, d.Expression).AsString();
-                
+
                 result.Add(item);
             });
         }

FKGees/Extensions/ServiceCollectionExtensions.cs

@@ -6,14 +6,15 @@ namespace FKGees.Extensions;
 internal static class ServiceCollectionExtensions
 {
     internal static IServiceCollection AddDecretsDefinitions(this IServiceCollection services)
-    { 
+    {
+        services.AddSingleton<IDecretsDefinition, RapFisk>();
+        services.AddSingleton<IDecretsDefinition, ObrotOpakowaniami>();
         services.AddSingleton<IDecretsDefinition, Przecena>();
         services.AddSingleton<IDecretsDefinition, MmPlus>();
         services.AddSingleton<IDecretsDefinition, MmMinus>();
         services.AddSingleton<IDecretsDefinition, Pz>();
         services.AddSingleton<IDecretsDefinition, Wz>();
         services.AddSingleton<IDecretsDefinition, PzFaktura>();
-        services.AddSingleton<IDecretsDefinition, RapFisk>();
         services.AddSingleton<IDecretsDefinition, KorDetal>();
         services.AddSingleton<IDecretsDefinition, FaktSprz>();
         services.AddSingleton<IDecretsDefinition, KwBony>();