PaymentVariantSummary: Subtract member modifiers from sum

Elwig/Documents/PaymentVariantSummary.cshtml

@@ -20,9 +20,10 @@
         @{
             //var sum1 = Model.Variant.DeliveryPartPayments.Sum(p => p.NetAmount);
             //var sum2 = Model.Variant.Credits.Sum(p => p.);  //Model.Variant.MemberPayments.Sum(p => p.Amount);
-            var modifiers = Model.Variant.DeliveryPartPayments.Sum(p => p.Amount - p.NetAmount);
+            var deliveryModifiers = Model.Variant.DeliveryPartPayments.Sum(p => p.Amount - p.NetAmount);
+            var memberModifiers = Model.Variant.Credits.Sum(c => c.Payment.Amount - c.Payment.NetAmount);
             var sum2 = Model.Variant.Credits.Sum(p => p.NetAmount);
-            var sum1 = sum2 - modifiers;
+            var sum1 = sum2 - deliveryModifiers - memberModifiers;
             var payed = -Model.Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
             var netSum = Model.Variant.Credits.Sum(p => p.NetAmount) - Model.Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
             var vat = Model.Variant.Credits.Sum(p => p.VatAmount);
@@ -84,30 +85,30 @@
                 <td colspan="2" class="number">@($"{Model.MemberNum:N0}")</td>
             </tr>
             <tr>
-                <th colspan="2">Zu-/Abschläge (Lieferungen):</th>
+                <th colspan="2">Zu-/Abschläge (Mitglieder):</th>
-                <td class="number">@Utils.GetSign(modifiers)</td>
+                <td class="number">@Utils.GetSign(memberModifiers)</td>
-                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(modifiers):N2}")</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(memberModifiers):N2}")</td>
                 <th class="lborder">Lieferungen:</th>
                 <td colspan="2" class="number">@($"{Model.DeliveryNum:N0}")</td>
             </tr>
+            <tr>
+                <th colspan="2">Zu-/Abschläge (Lieferungen):</th>
+                <td class="number">@Utils.GetSign(deliveryModifiers)</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(deliveryModifiers):N2}")</td>
+                <th class="lborder">Teillieferungen:</th>
+                <td colspan="2" class="number">@($"{Model.DeliveryPartNum:N0}")</td>
+            </tr>
             <tr>
                 <th colspan="2">Gesamtsumme:</th>
                 <td class="number tborder"></td>
                 <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{sum2:N2}")</td>
-                <th class="lborder">Teillieferungen:</th>
+                <th class="lborder"></th>
-                <td colspan="2" class="number">@($"{Model.DeliveryPartNum:N0}")</td>
+                <td colspan="2"></td>
             </tr>
             <tr>
                 <th colspan="2">Bisher ausgezahlt:</th>
                 <td class="number">@Utils.GetSign(payed)</td>
                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(payed):N2}")</td>
-                <th class="lborder"></th>
-                <td colspan="2"></td>
-            </tr>
-            <tr>
-                <th colspan="2">Nettosumme:</th>
-                <td class="number tborder"></td>
-                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{netSum:N2}")</td>
                 @{
                     var weiRows = Model.Data.Rows.Where(r => r.QualityLevel == "Wein");
                     var minWei = weiRows.Min(r => r.Ungeb.Price);
@@ -117,9 +118,9 @@
                 <td colspan="2" class="center tborder">@(minWei != maxWei ? $"{minWei:N4}–{maxWei:N4}" : $"{minWei:N4}") @Model.CurrencySymbol/kg</td>
             </tr>
             <tr>
-                <th colspan="2">Mehrwertsteuer:</th>
+                <th colspan="2">Nettosumme:</th>
-                <td class="number">@Utils.GetSign(vat)</td>
+                <td class="number tborder"></td>
-                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(vat):N2}")</td>
+                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{netSum:N2}")</td>
                 @{
                     var quwRows = Model.Data.Rows.Where(r => r.QualityLevel != "Wein");
                     var minPrice = quwRows.Min(r => r.Ungeb.Price);
@@ -129,9 +130,9 @@
                 <td colspan="2" class="center">@(minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") @Model.CurrencySymbol/kg</td>
             </tr>
             <tr>
-                <th colspan="2">Bruttosumme:</th>
+                <th colspan="2">Mehrwertsteuer:</th>
-                <td class="number tborder"></td>
+                <td class="number">@Utils.GetSign(vat)</td>
-                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{grossSum:N2}")</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(vat):N2}")</td>
                 @{
                     var gebRows = Model.Data.Rows
                     .Where(r => r.Geb.Price != null && r.Ungeb.Price != null)
@@ -144,6 +145,13 @@
                     @(minGeb != maxGeb ? $"{minGeb:N4}–{maxGeb:N4} {Model.CurrencySymbol}/kg" : minGeb == 0 ? "-" : $"{minGeb:N4} {Model.CurrencySymbol}/kg")
                 </td>
             </tr>
+            <tr>
+                <th colspan="2">Bruttosumme:</th>
+                <td class="number tborder"></td>
+                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{grossSum:N2}")</td>
+                <th class="lborder"></th>
+                <td colspan="2"></td>
+            </tr>
             <tr>
                 <th colspan="2">Abzüge (Strafen/Pönalen, GA, ...):</th>
                 <td class="number">@Utils.GetSign(totalMods)</td>