winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

CreditNote: Small fixes

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-12-23 00:36:48 +01:00
parent 83f9b58d4d
commit 2301251420
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Elwig/Documents/CreditNote.cshtml
View File

@ -125,7 +125,7 @@
totalLine = true;
} else {
var hasPrev = Model.Credit.PrevNetAmount != null;
<tr class="@(!hasPrev ? "large" : "") @(!totalLine ? "sum" : "")">
<tr class="bold @(!hasPrev ? "large" : "") @(!totalLine ? "sum" : "")">
<td colspan="4"></td>
<td colspan="4" class="@(totalLine ? "sum" : "")">@(hasPrev ? "Gesamtbetrag" : "Nettobetrag"):</td>
<td class="@(totalLine ? "sum" : "")"></td>
@ -136,28 +136,28 @@
</tr>
totalLine = true;
if (hasPrev) {
<tr class="large">
<tr>
<td colspan="4"></td>
<td colspan="4">Bereits berücksichtigt:</td>
<td>–</td>
<td colspan="2" class="number">
<td colspan="4">Bisher ausgezahlt:</td>
<td class="number large">–</td>
<td colspan="2" class="number large">
<span class="fleft">@Model.CurrencySymbol</span>
@($"{Model.Credit.PrevNetAmount:N2}")
</td>
</tr>
<tr class="large bold">
<tr class="large">
<td colspan="4"></td>
<td colspan="4" class="sum">Nettobetrag:</td>
<td class="sum"></td>
<td colspan="2" class="number sum">
<span class="fleft">@Model.CurrencySymbol</span>
@($"{Model.Credit.NetAmount:N2}")
@($"{Model.Credit.NetAmount - (Model.Credit.PrevNetAmount ?? 0):N2}")
</td>
</tr>
}
<tr>
<td colspan="4"></td>
<td colspan="4">Mehrwertsteuer (@($"{Model.Credit.Vat * 100:N0} %")):</td>
<td colspan="4">Mehrwertsteuer (@($"{Model.Credit.Vat * 100} %")):</td>
<td class="number large">+</td>
<td colspan="2" class="number large">
<span class="fleft">@Model.CurrencySymbol</span>

1
Elwig/Helpers/Billing/BillingVariant.cs
View File

@ -151,6 +151,7 @@ namespace Elwig.Helpers.Billing {
var inserts = new List<(int Year, int DId, int DPNr, int BktNr, long Price, long Amount)>();
foreach (var part in parts) {
var price = !part.MinQuw ? 0.5m : ((part.BktNr == 2 ? 0.8m : (part.BktNr == 1 ? 0.7m : 0.6m)) + ((decimal)(part.Oe - 73) * 0.005m)); // TODO
price += (AvNr - 1) * 0.2m;
var priceL = Utils.DecToDb(price, 4);
var amount = Utils.DecToDb(price * part.Value, 4);
inserts.Add((part.Year, part.DId, part.DPNr, part.BktNr, priceL, amount));