addresstyp kombiniert

Wenn man PstCd und TwnNm leer lässt geht es.
This commit is contained in:
Michael Stapelberg
2020-06-25 18:59:45 +02:00
parent 22b000594c
commit 548f92ed08

View File

@@ -32,13 +32,12 @@ func qrchFromRequest(r *http.Request) *qrbill.QRCH {
CdtrInf: qrbill.QRCHCdtrInf{ CdtrInf: qrbill.QRCHCdtrInf{
IBAN: ifEmpty(r.FormValue("criban"), "CH0209000000870913543"), IBAN: ifEmpty(r.FormValue("criban"), "CH0209000000870913543"),
Cdtr: qrbill.Address{ Cdtr: qrbill.Address{
// Must be structured address e.g. for ZKB mobile banking app AdrTp: qrbill.AddressTypeCombined,
AdrTp: qrbill.AddressTypeStructured,
Name: ifEmpty(r.FormValue("crname"), "Legalize it!"), Name: ifEmpty(r.FormValue("crname"), "Legalize it!"),
StrtNmOrAdrLine1: ifEmpty(r.FormValue("craddr1"), "Quellenstrasse 25"), StrtNmOrAdrLine1: ifEmpty(r.FormValue("craddr1"), "Quellenstrasse 25"),
BldgNbOrAdrLine2: ifEmpty(r.FormValue("craddr2"), ""), BldgNbOrAdrLine2: ifEmpty(r.FormValue("craddr2"), "8005 Zürich"),
PstCd: ifEmpty(r.FormValue("crpost"), "8005"), PstCd: ifEmpty(r.FormValue("crpost"), ""),
TwnNm: ifEmpty(r.FormValue("crcity"), "Zürich"), TwnNm: ifEmpty(r.FormValue("crcity"), ""),
Ctry: ifEmpty(r.FormValue("crcountry"), "CH"), Ctry: ifEmpty(r.FormValue("crcountry"), "CH"),
}, },
}, },
@@ -47,13 +46,12 @@ func qrchFromRequest(r *http.Request) *qrbill.QRCH {
Ccy: "CHF", Ccy: "CHF",
}, },
UltmtDbtr: qrbill.Address{ UltmtDbtr: qrbill.Address{
// Must be structured address e.g. for ZKB mobile banking app AdrTp: qrbill.AddressTypeCombined,
AdrTp: qrbill.AddressTypeStructured,
Name: ifEmpty(r.FormValue("udname"), "Michael Stapelberg"), Name: ifEmpty(r.FormValue("udname"), "Michael Stapelberg"),
StrtNmOrAdrLine1: ifEmpty(r.FormValue("udaddr1"), "Stauffacherstr 42"), StrtNmOrAdrLine1: ifEmpty(r.FormValue("udaddr1"), "Stauffacherstr 42"),
BldgNbOrAdrLine2: ifEmpty(r.FormValue("udaddr2"), ""), BldgNbOrAdrLine2: ifEmpty(r.FormValue("udaddr2"), "8004 Zürich"),
PstCd: ifEmpty(r.FormValue("udpost"), "8003"), PstCd: ifEmpty(r.FormValue("udpost"), ""),
TwnNm: ifEmpty(r.FormValue("udcity"), "Zürich"), TwnNm: ifEmpty(r.FormValue("udcity"), ""),
Ctry: ifEmpty(r.FormValue("udcountry"), "CH"), Ctry: ifEmpty(r.FormValue("udcountry"), "CH"),
}, },
RmtInf: qrbill.QRCHRmtInf{ RmtInf: qrbill.QRCHRmtInf{