From 060acc56c3229beaf23948f05dfe439047de7b57 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Thu, 29 Feb 2024 18:02:44 +0100 Subject: [PATCH] MailWindow: Include all payment variants --- Elwig/Helpers/Billing/BillingVariant.cs | 2 +- Elwig/Windows/MailWindow.xaml.cs | 2 +- Elwig/Windows/PaymentVariantsWindow.xaml.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Elwig/Helpers/Billing/BillingVariant.cs b/Elwig/Helpers/Billing/BillingVariant.cs index 531f25a..c4234a0 100644 --- a/Elwig/Helpers/Billing/BillingVariant.cs +++ b/Elwig/Helpers/Billing/BillingVariant.cs @@ -18,7 +18,7 @@ namespace Elwig.Helpers.Billing { 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 tx = await cnx.BeginTransactionAsync(); await CalculateBuckets(honorGebunden, allowAttrsIntoLower, avoidUnderDeliveries, cnx); diff --git a/Elwig/Windows/MailWindow.xaml.cs b/Elwig/Windows/MailWindow.xaml.cs index 90fe602..3f4047f 100644 --- a/Elwig/Windows/MailWindow.xaml.cs +++ b/Elwig/Windows/MailWindow.xaml.cs @@ -129,7 +129,7 @@ namespace Elwig.Windows { }; if (season != null) { 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; diff --git a/Elwig/Windows/PaymentVariantsWindow.xaml.cs b/Elwig/Windows/PaymentVariantsWindow.xaml.cs index 9a9b448..69600cd 100644 --- a/Elwig/Windows/PaymentVariantsWindow.xaml.cs +++ b/Elwig/Windows/PaymentVariantsWindow.xaml.cs @@ -249,7 +249,7 @@ namespace Elwig.Windows { if (PaymentVariantList.SelectedItem is not PaymentVar pv) return; var vars = await Context.PaymentVariants - .Where(v => pv.Year == v.Year && !v.TestVariant) + .Where(v => pv.Year == v.Year) .OrderBy(v => v.AvNr) .Select(v => v.AvNr) .ToArrayAsync();