diff --git a/Elwig/Documents/PaymentVariantSummary.cshtml b/Elwig/Documents/PaymentVariantSummary.cshtml
index 972ba72..c3cfd3d 100644
--- a/Elwig/Documents/PaymentVariantSummary.cshtml
+++ b/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 @@
@($"{Model.MemberNum:N0}") |
- Zu-/Abschläge (Lieferungen): |
- @Utils.GetSign(modifiers) |
- @Model.CurrencySymbol@($"{Math.Abs(modifiers):N2}") |
+ Zu-/Abschläge (Mitglieder): |
+ @Utils.GetSign(memberModifiers) |
+ @Model.CurrencySymbol@($"{Math.Abs(memberModifiers):N2}") |
Lieferungen: |
@($"{Model.DeliveryNum:N0}") |
+
+ Zu-/Abschläge (Lieferungen): |
+ @Utils.GetSign(deliveryModifiers) |
+ @Model.CurrencySymbol@($"{Math.Abs(deliveryModifiers):N2}") |
+ Teillieferungen: |
+ @($"{Model.DeliveryPartNum:N0}") |
+
Gesamtsumme: |
|
@Model.CurrencySymbol@($"{sum2:N2}") |
- Teillieferungen: |
- @($"{Model.DeliveryPartNum:N0}") |
+ |
+ |
Bisher ausgezahlt: |
@Utils.GetSign(payed) |
@Model.CurrencySymbol@($"{Math.Abs(payed):N2}") |
- |
- |
-
-
- Nettosumme: |
- |
- @Model.CurrencySymbol@($"{netSum:N2}") |
@{
var weiRows = Model.Data.Rows.Where(r => r.QualityLevel == "Wein");
var minWei = weiRows.Min(r => r.Ungeb.Price);
@@ -117,9 +118,9 @@
@(minWei != maxWei ? $"{minWei:N4}–{maxWei:N4}" : $"{minWei:N4}") @Model.CurrencySymbol/kg |
- Mehrwertsteuer: |
- @Utils.GetSign(vat) |
- @Model.CurrencySymbol@($"{Math.Abs(vat):N2}") |
+ Nettosumme: |
+ |
+ @Model.CurrencySymbol@($"{netSum:N2}") |
@{
var quwRows = Model.Data.Rows.Where(r => r.QualityLevel != "Wein");
var minPrice = quwRows.Min(r => r.Ungeb.Price);
@@ -129,9 +130,9 @@
@(minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") @Model.CurrencySymbol/kg |
- Bruttosumme: |
- |
- @Model.CurrencySymbol@($"{grossSum:N2}") |
+ Mehrwertsteuer: |
+ @Utils.GetSign(vat) |
+ @Model.CurrencySymbol@($"{Math.Abs(vat):N2}") |
@{
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")
+
+ Bruttosumme: |
+ |
+ @Model.CurrencySymbol@($"{grossSum:N2}") |
+ |
+ |
+
Abzüge (Strafen/Pönalen, GA, ...): |
@Utils.GetSign(totalMods) |