Billing: fix calculation

2023-11-02 11:57:38 +01:00
parent 193b4688d3
commit 9f67448b72
20 changed files with 327 additions and 117 deletions
--- a/Elwig/Documents/DeliveryNote.cshtml
+++ b/Elwig/Documents/DeliveryNote.cshtml
@ -112,7 +112,11 @@
            }
            <tr>
                <th>Gesamtlieferung lt. gez. GA</th>
-                @Raw(FormatRow(Model.Member.DeliveryObligation, Model.Member.DeliveryRight, Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)))
+                @Raw(FormatRow(
+                    Model.Member.BusinessShares * Model.Delivery.Season.MinKgPerBusinessShare,
+                    Model.Member.BusinessShares * Model.Delivery.Season.MaxKgPerBusinessShare,
+                    Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)
+                ))
            </tr>
            @if (Model.DisplayStats > 1) {
                <tr class="subheading">