[#17] CreditNote: Overhaul CreditNote
This commit is contained in:
Elwig
Documents
Helpers
Models
Windows
@ -5,6 +5,7 @@ using Elwig.Models.Entities;
|
||||
namespace Elwig.Documents {
|
||||
public class CreditNote : BusinessDocument {
|
||||
|
||||
public PaymentMember? Payment;
|
||||
public Credit? Credit;
|
||||
public CreditNoteData Data;
|
||||
public string? Text;
|
||||
@ -16,6 +17,7 @@ namespace Elwig.Documents {
|
||||
UseBillingAddress = true;
|
||||
ShowDateAndLocation = true;
|
||||
Data = data;
|
||||
Payment = p;
|
||||
Credit = p.Credit;
|
||||
Aside = Aside.Replace("</table>", "") +
|
||||
$"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" +
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
@using Elwig.Helpers
|
||||
@using RazorLight
|
||||
@inherits TemplatePage<Elwig.Documents.CreditNote>
|
||||
@model Elwig.Documents.CreditNote
|
||||
@ -8,84 +9,89 @@
|
||||
<table class="credit">
|
||||
<colgroup>
|
||||
<col style="width: 25mm;"/>
|
||||
<col style="width: 5mm;"/>
|
||||
<col style="width: 5mm;"/>
|
||||
<col style="width: 20mm;"/>
|
||||
<col style="width: 20mm;"/>
|
||||
<col style="width: 18mm;"/>
|
||||
<col style="width: 10mm;"/>
|
||||
<col style="width: 10mm;"/>
|
||||
<col style="width: 15mm;"/>
|
||||
<col style="width: 12mm;"/>
|
||||
<col style="width: 15mm;"/>
|
||||
<col style="width: 10mm;"/>
|
||||
<col style="width: 10mm;"/>
|
||||
<col style="width: 15mm;"/>
|
||||
<col style="width: 17mm;"/>
|
||||
<col style="width: 16mm;"/>
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th rowspan="3" style="text-align: left;">Lieferschein-Nr.</th>
|
||||
<th rowspan="3">Pos.</th>
|
||||
<th rowspan="3" style="text-align: left;">Sorte</th>
|
||||
<th rowspan="3" style="text-align: left;">Attribut</th>
|
||||
<th rowspan="2" colspan="2">Gradation</th>
|
||||
<th rowspan="2" colspan="2">Flächenbindung</th>
|
||||
<th rowspan="2">Preis</th>
|
||||
<th colspan="2">Zu-/Abschläge</th>
|
||||
<th rowspan="2">Betrag</th>
|
||||
<th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
|
||||
<th rowspan="2" class="narrow">Pos.</th>
|
||||
<th rowspan="2" style="text-align: left;">Sorte</th>
|
||||
<th rowspan="2" style="text-align: left;">Attribut</th>
|
||||
<th colspan="2">Gradation</th>
|
||||
<th colspan="2">Flächenbindung</th>
|
||||
<th>Preis</th>
|
||||
<th class="narrow">Zu-/Abschläge</th>
|
||||
<th>Betrag</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Rel.</th>
|
||||
<th>Abs.</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>[°Oe]</th>
|
||||
<th>[°KMW]</th>
|
||||
<th colspan="2">[kg]</th>
|
||||
<th>[@Model.CurrencySymbol/kg]</th>
|
||||
<th>[%]</th>
|
||||
<th>[@Model.CurrencySymbol/kg]</th>
|
||||
<th>[@Model.CurrencySymbol]</th>
|
||||
<th class="unit">[°Oe]</th>
|
||||
<th class="unit narrow">[°KMW]</th>
|
||||
<th class="unit" colspan="2">[kg]</th>
|
||||
<th class="unit">[@Model.CurrencySymbol/kg]</th>
|
||||
<th class="unit">[@Model.CurrencySymbol]</th>
|
||||
<th class="unit">[@Model.CurrencySymbol]</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach (var p in Model.Data.Rows) {
|
||||
var rows = Math.Max(p.Buckets.Length, p.Modifiers.Length + 1);
|
||||
var first = true;
|
||||
//var pmt = p.Payment;
|
||||
var abs = 0; // pmt?.ModAbs == null || pmt?.ModAbs == 0 ? "-" : pmt?.ModAbs.ToString("0." + string.Concat(Enumerable.Repeat('0', Model.Precision)));
|
||||
var rel = 0; // pmt?.ModRel == null || pmt?.ModRel == 0 ? "-" : $"{pmt?.ModRel * 100:0.00##}";
|
||||
@for (int i = 0; i < rows; i++) {
|
||||
<tr class="@(first ? "first" : "") @(rows > i + 1 ? "trailing" : "")">
|
||||
<tr class="@(first ? "first" : "") @(rows > i + 1 ? "last" : "")">
|
||||
@if (first) {
|
||||
<td rowspan="@rows" class="lsnr">@p.LsNr</td>
|
||||
<td rowspan="@rows" class="dpnr">@p.DPNr</td>
|
||||
<td class="variant small">@p.Variant</td>
|
||||
<td class="attribute small">@p.Attribute</td>
|
||||
<td rowspan="@rows" class="oe">@($"{p.Gradation.Oe:N0}")</td>
|
||||
<td rowspan="@rows" class="kmw">@($"{p.Gradation.Kmw:N1}")</td>
|
||||
<td rowspan="@rows">@p.LsNr</td>
|
||||
<td rowspan="@rows">@p.DPNr</td>
|
||||
<td class="small">@p.Variant</td>
|
||||
<td class="small">@p.Attribute</td>
|
||||
<td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td>
|
||||
<td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td>
|
||||
}
|
||||
@if (i > 0 && i <= p.Modifiers.Length) {
|
||||
<td colspan="2" class="mod">@(p.Modifiers[i - 1])</td>
|
||||
<td colspan="2" class="small mod">@p.Modifiers[i - 1]</td>
|
||||
} else if (i > 0) {
|
||||
<td colspan="2"></td>
|
||||
}
|
||||
@if (i < p.Buckets.Length) {
|
||||
var bucket = p.Buckets[i];
|
||||
<td class="geb small">@bucket.Name:</td>
|
||||
<td class="weight">@($"{bucket.Value:N0}")</td>
|
||||
<td class="price">@($"{bucket.Price:N4}")</td>
|
||||
<td class="small">@bucket.Name:</td>
|
||||
<td class="number">@($"{bucket.Value:N0}")</td>
|
||||
<td class="number">@($"{bucket.Price:N4}")</td>
|
||||
} else {
|
||||
<td colspan="3"></td>
|
||||
}
|
||||
@if (first) {
|
||||
<td rowspan="@rows" class="rel">@rel</td>
|
||||
<td rowspan="@rows" class="abs">@abs</td>
|
||||
<!-- FIXME rel/abs mods -->
|
||||
<td rowspan="@rows" class="amount">@($"{p.Buckets.Sum(b => b.Amount):N2}")</td>
|
||||
first = false;
|
||||
@if (i == p.Buckets.Length - 1) {
|
||||
var totalMod = p.TotalModifiers ?? 0;
|
||||
<td class="number@(totalMod == 0 ? " center" : "")">@(totalMod == 0 ? "-" : Utils.GetSign(totalMod) + $"{Math.Abs(totalMod):N2}")</td>
|
||||
<td class="number">@($"{p.Amount:N2}")</td>
|
||||
} else {
|
||||
<td colspan="2"></td>
|
||||
}
|
||||
</tr>
|
||||
first = false;
|
||||
}
|
||||
}
|
||||
@if (Model.Payment == null) {
|
||||
<tr class="sum">
|
||||
<td colspan="7"></td>
|
||||
<td colspan="2">Gesamt:</td>
|
||||
<td colspan="2" class="number">@($"{Model.Data.Rows.Sum(p => p.Amount):N2}")</td>
|
||||
</tr>
|
||||
} else {
|
||||
<tr class="sum">
|
||||
<td colspan="7"></td>
|
||||
<td colspan="2">Gesamt:</td>
|
||||
<td colspan="2" class="number">@($"{Model.Payment.NetAmount:N2}")</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</main>
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
|
||||
table.credit .amount.sum {
|
||||
padding-bottom: 1mm;
|
||||
|
||||
table.credit .mod {
|
||||
padding-left: 5mm;
|
||||
}
|
||||
|
||||
table.credit tbody tr:not(.first):not(.last) {
|
||||
@ -8,10 +9,18 @@ table.credit tbody tr:not(.first):not(.last) {
|
||||
break-after: avoid;
|
||||
}
|
||||
|
||||
table.credit tbody tr.first td {
|
||||
padding-top: 1mm;
|
||||
table.credit tr:not(.first) td {
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
table.credit tbody tr.last td {
|
||||
padding-bottom: 1mm;
|
||||
table.credit tr.last td {
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
||||
table.credit tr.sum {
|
||||
font-size: 12pt;
|
||||
}
|
||||
|
||||
table.credit tr.sum td {
|
||||
padding-top: 1mm;
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<table class="delivery-confirmation">
|
||||
<colgroup>
|
||||
<col style="width: 25mm;"/>
|
||||
<col style="width: 5mm;"/>
|
||||
<col style="width: 5mm;"/>
|
||||
<col style="width: 20mm;"/>
|
||||
<col style="width: 21mm;"/>
|
||||
<col style="width: 19mm;"/>
|
||||
@ -35,7 +35,7 @@
|
||||
<tr>
|
||||
<th class="unit">[°Oe]</th>
|
||||
<th class="unit narrow">[°KMW]</th>
|
||||
<th class="unit"colspan="2">[kg]</th>
|
||||
<th class="unit" colspan="2">[kg]</th>
|
||||
<th class="unit">[kg]</th>
|
||||
<th class="unit">[kg]</th>
|
||||
</tr>
|
||||
@ -48,7 +48,7 @@
|
||||
var rows = Math.Max(p.Buckets.Length, p.Modifiers.Length + 1);
|
||||
var first = true;
|
||||
@for (int i = 0; i < rows; i++) {
|
||||
<tr class="@(first ? "first" : "") @(p.Variant != lastVariant && lastVariant != "" ? "new": "") @(rows > i + 1 ? "trailing" : "")">
|
||||
<tr class="@(first ? "first" : "") @(p.Variant != lastVariant && lastVariant != "" ? "new": "") @(rows > i + 1 ? "last" : "")">
|
||||
@if (first) {
|
||||
<td rowspan="@rows">@p.LsNr</td>
|
||||
<td rowspan="@rows">@p.DPNr</td>
|
||||
|
||||
@ -11,7 +11,7 @@ table.delivery-confirmation tr:not(.first) td {
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
table.delivery-confirmation tr.trailing td {
|
||||
table.delivery-confirmation tr.last td {
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user