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

BusinessDocument: Add UseBillingAddress flag

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-09-12 13:49:11 +02:00
parent 352bf840c3
commit 30aaa64f59
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,9 @@ namespace Elwig.Documents {
public Member Member; public Member Member;
public bool IncludeSender = false; public bool IncludeSender = false;
public string Aside { get; set; } public bool UseBillingAddress = false;
public string? Location { get; set; } public string Aside;
public string? Location;
public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) { public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) {
Member = m; Member = m;
@ -24,10 +25,11 @@ namespace Elwig.Documents {
public string Address { public string Address {
get { get {
var b = Member.BillingAddress; var b = Member.BillingAddress;
var plz = (b == null) ? Member.PostalDest.AtPlz : b.PostalDest.AtPlz; if (b != null && UseBillingAddress) {
if (b != null) { var plz = b.PostalDest.AtPlz;
return $"{b.Name}\n{Member.AdministrativeName}\n{b.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich"; return $"{b.Name}\n{Member.AdministrativeName}\n{b.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich";
} else { } else {
var plz = Member.PostalDest.AtPlz;
return $"{Member.AdministrativeName}\n{Member.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich"; return $"{Member.AdministrativeName}\n{Member.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich";
} }
} }

1
Elwig/Documents/DeliveryNote.cshtml.cs
View File

@ -10,6 +10,7 @@ namespace Elwig.Documents {
public IEnumerable<(string, string, int, int, int)> MemberBuckets; public IEnumerable<(string, string, int, int, int)> MemberBuckets;
public DeliveryNote(Delivery d, AppDbContext ctx) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) { public DeliveryNote(Delivery d, AppDbContext ctx) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) {
UseBillingAddress = true;
Delivery = d; Delivery = d;
Aside = Aside.Replace("</table>", "") + Aside = Aside.Replace("</table>", "") +
$"<thead><tr><th colspan='2'>Lieferung</th></tr></thead><tbody>" + $"<thead><tr><th colspan='2'>Lieferung</th></tr></thead><tbody>" +