ipng/qrbill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch to structured address throughout (for QR-bill 2.3)

Browse Source
This commit is contained in:
Michael Stapelberg
2025-10-25 10:46:35 +02:00
parent c9cd171d6f
commit 4b488515eb
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/qrbill-api/api.go
View File

@@ -59,12 +59,12 @@ func qrchFromRequest(r *http.Request) *qrbill.QRCH {
Ccy: "CHF", Ccy: "CHF",
}, },
UltmtDbtr: qrbill.Address{ UltmtDbtr: qrbill.Address{
AdrTp: qrbill.AddressType(ifEmpty(r.Form, "udaddrtype", string(qrbill.AddressTypeCombined))), AdrTp: qrbill.AddressType(ifEmpty(r.Form, "udaddrtype", string(qrbill.AddressTypeStructured))),
Name: ifEmpty(r.Form, "udname", "Michael Stapelberg"), Name: ifEmpty(r.Form, "udname", "Michael Stapelberg"),
StrtNmOrAdrLine1: ifEmpty(r.Form, "udaddr1", "Stauffacherstr 42"), StrtNmOrAdrLine1: ifEmpty(r.Form, "udaddr1", "Stauffacherstr"),
BldgNbOrAdrLine2: ifEmpty(r.Form, "udaddr2", "8004 Zürich"), BldgNbOrAdrLine2: ifEmpty(r.Form, "udaddr2", "42"),
PstCd: ifEmpty(r.Form, "udpost", ""), PstCd: ifEmpty(r.Form, "udpost", "8004"),
TwnNm: ifEmpty(r.Form, "udcity", ""), TwnNm: ifEmpty(r.Form, "udcity", "Zürich"),
Ctry: ifEmpty(r.Form, "udcountry", "CH"), Ctry: ifEmpty(r.Form, "udcountry", "CH"),
}, },
RmtInf: qrbill.QRCHRmtInf{ RmtInf: qrbill.QRCHRmtInf{

16
qrbill_test.go
View File

@@ -84,10 +84,12 @@ func TestAmountValidation(t *testing.T) {
CdtrInf: qrbill.QRCHCdtrInf{ CdtrInf: qrbill.QRCHCdtrInf{
IBAN: "CH0209000000870913543", IBAN: "CH0209000000870913543",
Cdtr: qrbill.Address{ Cdtr: qrbill.Address{
AdrTp: qrbill.AddressTypeCombined, AdrTp: qrbill.AddressTypeStructured,
Name: "Legalize it", Name: "Legalize it",
StrtNmOrAdrLine1: "Quellenstrasse 25", StrtNmOrAdrLine1: "Quellenstrasse",
BldgNbOrAdrLine2: "8005 Zürich", BldgNbOrAdrLine2: "25",
PstCd: "8005",
TwnNm: "Zürich",
Ctry: "CH", Ctry: "CH",
}, },
}, },
@@ -96,10 +98,12 @@ func TestAmountValidation(t *testing.T) {
Ccy: "CHF", Ccy: "CHF",
}, },
UltmtDbtr: qrbill.Address{ UltmtDbtr: qrbill.Address{
AdrTp: qrbill.AddressTypeCombined, AdrTp: qrbill.AddressTypeStructured,
Name: "Michael Stapelberg", Name: "Michael Stapelberg",
StrtNmOrAdrLine1: "Stauffacherstr 42", StrtNmOrAdrLine1: "Stauffacherstr",
BldgNbOrAdrLine2: "8004 Zürich", BldgNbOrAdrLine2: "42",
PstCd: "8004",
TwnNm: "Zürich",
Ctry: "CH", Ctry: "CH",
}, },
RmtInf: qrbill.QRCHRmtInf{ RmtInf: qrbill.QRCHRmtInf{