From b76c5ea87472cb777dabe5c8ec703b96dc0c3091 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Sun, 16 Jun 2024 23:54:53 +0200
Subject: [PATCH] [#46] CreditNote: Show number of added business shares

---
 Elwig/Documents/CreditNote.cs     | 6 ++++--
 Elwig/Documents/CreditNote.cshtml | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Elwig/Documents/CreditNote.cs b/Elwig/Documents/CreditNote.cs
index be5ef87..b53a29b 100644
--- a/Elwig/Documents/CreditNote.cs
+++ b/Elwig/Documents/CreditNote.cs
@@ -18,7 +18,8 @@ namespace Elwig.Documents {
         public string MemberModifier;
         public IEnumerable<(string Name, int Kg, decimal Amount)>? MemberUnderDeliveries;
         public decimal MemberTotalUnderDelivery;
-        public decimal MemberAutoBusinessShares;
+        public int MemberAutoBusinessShares;
+        public decimal MemberAutoBusinessSharesAmount;
 
         public CreditNote(
             AppDbContext ctx,
@@ -66,7 +67,8 @@ namespace Elwig.Documents {
                 MemberAutoBusinessShares = ctx.MemberHistory
                     .Where(h => h.MgNr == p.Member.MgNr && h.Type == "auto")
                     .Where(h => h.DateString.CompareTo(fromDate) >= 0 && h.DateString.CompareTo(toDate) <= 0)
-                    .Sum(h => h.BusinessShares) * (-season.BusinessShareValue ?? 0);
+                    .Sum(h => h.BusinessShares);
+                MemberAutoBusinessSharesAmount = MemberAutoBusinessShares * (-season.BusinessShareValue ?? 0);
             }
             if (considerContractPenalties) {
                 var varieties = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v);
diff --git a/Elwig/Documents/CreditNote.cshtml b/Elwig/Documents/CreditNote.cshtml
index fdcb36c..0a16de9 100644
--- a/Elwig/Documents/CreditNote.cshtml
+++ b/Elwig/Documents/CreditNote.cshtml
@@ -153,9 +153,9 @@
                 @Raw(FormatRow("Unterlieferung (GA)", Model.MemberTotalUnderDelivery, add: true));
                 penalty += Model.MemberTotalUnderDelivery;
             }
-            @if (Model.MemberAutoBusinessShares != 0) {
-                @Raw(FormatRow("Autom. Nachz. von GA", Model.MemberAutoBusinessShares, add: true));
-                penalty += Model.MemberAutoBusinessShares;
+            @if (Model.MemberAutoBusinessSharesAmount != 0) {
+                @Raw(FormatRow($"Autom. Nachz. von GA ({Model.MemberAutoBusinessShares})", Model.MemberAutoBusinessSharesAmount, add: true));
+                penalty += Model.MemberAutoBusinessSharesAmount;
             }
 
             @if (Model.Credit == null) {