From 30aaa64f59e601ec672f5a25ea00ddd77dc663f4 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Tue, 12 Sep 2023 13:49:11 +0200
Subject: [PATCH] BusinessDocument: Add UseBillingAddress flag

---
 Elwig/Documents/BusinessDocument.cshtml.cs | 10 ++++++----
 Elwig/Documents/DeliveryNote.cshtml.cs     |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Elwig/Documents/BusinessDocument.cshtml.cs b/Elwig/Documents/BusinessDocument.cshtml.cs
index b415bc3..0233606 100644
--- a/Elwig/Documents/BusinessDocument.cshtml.cs
+++ b/Elwig/Documents/BusinessDocument.cshtml.cs
@@ -5,8 +5,9 @@ namespace Elwig.Documents {
 
         public Member Member;
         public bool IncludeSender = false;
-        public string Aside { get; set; }
-        public string? Location { get; set; }
+        public bool UseBillingAddress = false;
+        public string Aside;
+        public string? Location;
 
         public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) {
             Member = m;
@@ -24,10 +25,11 @@ namespace Elwig.Documents {
         public string Address {
             get {
                 var b = Member.BillingAddress;
-                var plz = (b == null) ? Member.PostalDest.AtPlz : b.PostalDest.AtPlz;
-                if (b != null) {
+                if (b != null && UseBillingAddress) {
+                    var plz = b.PostalDest.AtPlz;
                     return $"{b.Name}\n{Member.AdministrativeName}\n{b.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich";
                 } else {
+                    var plz = Member.PostalDest.AtPlz;
                     return $"{Member.AdministrativeName}\n{Member.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich";
                 }
             }
diff --git a/Elwig/Documents/DeliveryNote.cshtml.cs b/Elwig/Documents/DeliveryNote.cshtml.cs
index cb06e73..0a72f3b 100644
--- a/Elwig/Documents/DeliveryNote.cshtml.cs
+++ b/Elwig/Documents/DeliveryNote.cshtml.cs
@@ -10,6 +10,7 @@ namespace Elwig.Documents {
         public IEnumerable<(string, string, int, int, int)> MemberBuckets;
 
         public DeliveryNote(Delivery d, AppDbContext ctx) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) {
+            UseBillingAddress = true;
             Delivery = d;
             Aside = Aside.Replace("</table>", "") +
                 $"<thead><tr><th colspan='2'>Lieferung</th></tr></thead><tbody>" +