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

MailWindow: Include all payment variants

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-02-29 18:02:44 +01:00
parent 55c447621b
commit 060acc56c3
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ namespace Elwig.Helpers.Billing {
Data = PaymentBillingData.FromJson(PaymentVariant.Data, Utils.GetVaributes(Context, Year, onlyDelivered: false)); Data = PaymentBillingData.FromJson(PaymentVariant.Data, Utils.GetVaributes(Context, Year, onlyDelivered: false));
} }
public async Task Calculate(bool? honorGebunden = null, bool ? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) { public async Task Calculate(bool? honorGebunden = null, bool? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) {
using var cnx = await AppDbContext.ConnectAsync(); using var cnx = await AppDbContext.ConnectAsync();
using var tx = await cnx.BeginTransactionAsync(); using var tx = await cnx.BeginTransactionAsync();
await CalculateBuckets(honorGebunden, allowAttrsIntoLower, avoidUnderDeliveries, cnx); await CalculateBuckets(honorGebunden, allowAttrsIntoLower, avoidUnderDeliveries, cnx);

2
Elwig/Windows/MailWindow.xaml.cs
View File

@ -129,7 +129,7 @@ namespace Elwig.Windows {
}; };
if (season != null) { if (season != null) {
l.Add($"{DeliveryConfirmation.Name} {Year}"); l.Add($"{DeliveryConfirmation.Name} {Year}");
l.AddRange(season.PaymentVariants.Where(v => !v.TestVariant).OrderBy(v => v.AvNr).Select(v => $"{CreditNote.Name} – {v.Name}")); l.AddRange(season.PaymentVariants.OrderBy(v => v.AvNr).Select(v => $"{CreditNote.Name} – {v.Name}"));
} }
AvaiableDocumentsList.ItemsSource = l; AvaiableDocumentsList.ItemsSource = l;

2
Elwig/Windows/PaymentVariantsWindow.xaml.cs
View File

@ -249,7 +249,7 @@ namespace Elwig.Windows {
if (PaymentVariantList.SelectedItem is not PaymentVar pv) if (PaymentVariantList.SelectedItem is not PaymentVar pv)
return; return;
var vars = await Context.PaymentVariants var vars = await Context.PaymentVariants
.Where(v => pv.Year == v.Year && !v.TestVariant) .Where(v => pv.Year == v.Year)
.OrderBy(v => v.AvNr) .OrderBy(v => v.AvNr)
.Select(v => v.AvNr) .Select(v => v.AvNr)
.ToArrayAsync(); .ToArrayAsync();