winzer/elwig
2
1
Fork 0
Code Issues 11 Pull Requests Actions Releases 59 Activity

MailWindow: Order members by billing address if applicable

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-03-09 15:08:51 +01:00
parent 58c7eec6f8
commit 746d0f10de
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -374,6 +374,9 @@ namespace Elwig.Windows {
DisposeDocs(); DisposeDocs();
await UpdateTextParameters(); await UpdateTextParameters();
var doublePaged = DoublePagedInput.IsChecked == true;
var docs = SelectedDocs.OrderByDescending(d => d.Type).ToList();
IEnumerable<Member> recipients = Recipients; IEnumerable<Member> recipients = Recipients;
if (OrderMgNrInput.IsChecked == true) { if (OrderMgNrInput.IsChecked == true) {
recipients = recipients recipients = recipients
@@ -386,18 +389,25 @@ namespace Elwig.Windows {
.ThenBy(m => m.MgNr) .ThenBy(m => m.MgNr)
.ToList(); .ToList();
} else if (OrderPlzInput.IsChecked == true) { } else if (OrderPlzInput.IsChecked == true) {
recipients = recipients if (docs.Any(d => d.Type == DocType.DeliveryConfirmation || d.Type == DocType.CreditNote)) {
.OrderBy(m => m.PostalDest.AtPlz.Plz) recipients = recipients
.ThenBy(m => m.PostalDest.AtPlz.Ort.Name) .OrderBy(m => m.BillingAddress?.PostalDest.AtPlz?.Plz ?? m.PostalDest.AtPlz?.Plz)
.ThenBy(m => m.FamilyName) .ThenBy(m => m.BillingAddress?.PostalDest.AtPlz?.Ort.Name ?? m.PostalDest.AtPlz?.Ort.Name)
.ThenBy(m => m.GivenName) .ThenBy(m => m.FamilyName)
.ThenBy(m => m.MgNr) .ThenBy(m => m.GivenName)
.ToList(); .ThenBy(m => m.MgNr)
.ToList();
} else {
recipients = recipients
.OrderBy(m => m.PostalDest.AtPlz?.Plz)
.ThenBy(m => m.PostalDest.AtPlz?.Ort.Name)
.ThenBy(m => m.FamilyName)
.ThenBy(m => m.GivenName)
.ThenBy(m => m.MgNr)
.ToList();
}
} }
var doublePaged = DoublePagedInput.IsChecked == true;
var docs = SelectedDocs.OrderByDescending(d => d.Type).ToList();
Dictionary<int, IDictionary<int, DeliveryConfirmationDeliveryData>> dcData = []; Dictionary<int, IDictionary<int, DeliveryConfirmationDeliveryData>> dcData = [];
Dictionary<(int, int), (IDictionary<int, CreditNoteDeliveryData>, IDictionary<int, PaymentMember>, BillingData)> cnData = []; Dictionary<(int, int), (IDictionary<int, CreditNoteDeliveryData>, IDictionary<int, PaymentMember>, BillingData)> cnData = [];
foreach (var doc in docs) { foreach (var doc in docs) {