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

BusinessDocument: Update Address generation

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-09-29 12:59:00 +02:00
parent 34dcaf26d9
commit 8193bf483c
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Elwig/Documents/BusinessDocument.cshtml.cs
View File

@ -1,3 +1,4 @@
using Elwig.Helpers;
using Elwig.Models; using Elwig.Models;
namespace Elwig.Documents { namespace Elwig.Documents {
@ -26,14 +27,9 @@ namespace Elwig.Documents {
public string Address { public string Address {
get { get {
var b = Member.BillingAddress; IAddress addr = (Member.BillingAddress != null && UseBillingAddress) ? Member.BillingAddress : Member;
if (b != null && UseBillingAddress) { var plz = addr.PostalDest.AtPlz;
var plz = b.PostalDest.AtPlz; return (addr is BillingAddr ? $"{addr.Name}\n" : "") + $"{Member.AdministrativeName}\n{addr.Address}\n{plz?.Plz} {plz?.Ort.Name.Split(",")[0]}\n{addr.PostalDest.Country.Name}";
return $"{b.Name}\n{Member.AdministrativeName}\n{b.Address}\n{plz.Plz} {plz.Ort.Name}\n{b.Country.Name}";
} else {
var plz = Member.PostalDest.AtPlz;
return $"{Member.AdministrativeName}\n{Member.Address}\n{plz.Plz} {plz.Ort.Name}\n{Member.PostalDest.Country.Name}";
}
} }
} }
} }