diff --git a/README.md b/README.md index 033bd545..c308147d 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ The beauty of open source software lies in the fact that everybody can benefit f ## Official resources The repository contains the official specifications the library is based on: -- [Swiss Implementation Guidelines QR-bill](docs/specs/ig-qr-bill-en-v2.1.pdf) +- [Swiss Implementation Guidelines QR-bill](docs/specs/ig-qr-bill-en-v2.2.pdf) - [Technical information about the QR-IID and QR-IBAN](docs/specs/qr-iid_qr-iban-en.pdf) - [Style Guide QR-bill](docs/specs/style-guide-en.pdf) - [Validation Tool](https://validation.iso-payments.ch) diff --git a/docs/specs/ig-qr-bill-en-v2.1.pdf b/docs/specs/ig-qr-bill-en-v2.1.pdf deleted file mode 100644 index ab6df8df..00000000 Binary files a/docs/specs/ig-qr-bill-en-v2.1.pdf and /dev/null differ diff --git a/docs/specs/ig-qr-bill-en-v2.2.pdf b/docs/specs/ig-qr-bill-en-v2.2.pdf new file mode 100644 index 00000000..597c6ed8 Binary files /dev/null and b/docs/specs/ig-qr-bill-en-v2.2.pdf differ diff --git a/src/DataGroup/Element/AdditionalInformation.php b/src/DataGroup/Element/AdditionalInformation.php index 8745af8d..ae95588c 100644 --- a/src/DataGroup/Element/AdditionalInformation.php +++ b/src/DataGroup/Element/AdditionalInformation.php @@ -63,11 +63,16 @@ public function getFormattedString(): ?string public function getQrCodeData(): array { - return [ + $qrCodeData = [ $this->getMessage(), self::TRAILER_EPD, - $this->getBillInformation() ]; + + if ($this->getBillInformation()) { + $qrCodeData[]= $this->getBillInformation(); + } + + return $qrCodeData; } public static function loadValidatorMetadata(ClassMetadata $metadata): void diff --git a/src/DataGroup/EmptyElement/EmptyAdditionalInformation.php b/src/DataGroup/EmptyElement/EmptyAdditionalInformation.php index a9cbd3d2..3005960b 100644 --- a/src/DataGroup/EmptyElement/EmptyAdditionalInformation.php +++ b/src/DataGroup/EmptyElement/EmptyAdditionalInformation.php @@ -15,8 +15,7 @@ public function getQrCodeData(): array { return [ null, - self::TRAILER_EPD, - null + self::TRAILER_EPD ]; } } diff --git a/tests/TestData/FpdfOutput/qr-additional-information.pdf b/tests/TestData/FpdfOutput/qr-additional-information.pdf index a117d2ab..5cdc4234 100644 Binary files a/tests/TestData/FpdfOutput/qr-additional-information.pdf and b/tests/TestData/FpdfOutput/qr-additional-information.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-additional-information.print.pdf b/tests/TestData/FpdfOutput/qr-additional-information.print.pdf index 276ed043..c7bc44dc 100644 Binary files a/tests/TestData/FpdfOutput/qr-additional-information.print.pdf and b/tests/TestData/FpdfOutput/qr-additional-information.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-alternative-schemes.pdf b/tests/TestData/FpdfOutput/qr-alternative-schemes.pdf index a4795bc4..e0503fa7 100644 Binary files a/tests/TestData/FpdfOutput/qr-alternative-schemes.pdf and b/tests/TestData/FpdfOutput/qr-alternative-schemes.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-alternative-schemes.print.pdf b/tests/TestData/FpdfOutput/qr-alternative-schemes.print.pdf index 905ed1fa..f766d346 100644 Binary files a/tests/TestData/FpdfOutput/qr-alternative-schemes.print.pdf and b/tests/TestData/FpdfOutput/qr-alternative-schemes.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-full-set.pdf b/tests/TestData/FpdfOutput/qr-full-set.pdf index d4393db7..dcc6ab44 100644 Binary files a/tests/TestData/FpdfOutput/qr-full-set.pdf and b/tests/TestData/FpdfOutput/qr-full-set.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-full-set.print.pdf b/tests/TestData/FpdfOutput/qr-full-set.print.pdf index 6119af8e..fedf4b5a 100644 Binary files a/tests/TestData/FpdfOutput/qr-full-set.print.pdf and b/tests/TestData/FpdfOutput/qr-full-set.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.pdf b/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.pdf index 32c4d4ea..4713d3b3 100644 Binary files a/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.pdf and b/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.print.pdf b/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.print.pdf index fa58ed07..53fce267 100644 Binary files a/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.print.pdf and b/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-minimal-setup.pdf b/tests/TestData/FpdfOutput/qr-minimal-setup.pdf index 732b10bc..6406b001 100644 Binary files a/tests/TestData/FpdfOutput/qr-minimal-setup.pdf and b/tests/TestData/FpdfOutput/qr-minimal-setup.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-minimal-setup.print.pdf b/tests/TestData/FpdfOutput/qr-minimal-setup.print.pdf index 425ee36b..79ef4f40 100644 Binary files a/tests/TestData/FpdfOutput/qr-minimal-setup.print.pdf and b/tests/TestData/FpdfOutput/qr-minimal-setup.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.pdf b/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.pdf index 1b33f1bb..57e07b37 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.print.pdf b/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.print.pdf index 0badb3a8..acbf53a9 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.print.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-without-amount.pdf b/tests/TestData/FpdfOutput/qr-payment-information-without-amount.pdf index ebadf666..0807e7ce 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-without-amount.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-without-amount.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-without-amount.print.pdf b/tests/TestData/FpdfOutput/qr-payment-information-without-amount.print.pdf index b4bfb008..7d80c442 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-without-amount.print.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-without-amount.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.pdf b/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.pdf index 2eb57ac9..a48adea3 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.print.pdf b/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.print.pdf index de911d74..288088d7 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.print.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-reference-non.pdf b/tests/TestData/FpdfOutput/qr-payment-reference-non.pdf index b573164c..d301869d 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-reference-non.pdf and b/tests/TestData/FpdfOutput/qr-payment-reference-non.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-reference-non.print.pdf b/tests/TestData/FpdfOutput/qr-payment-reference-non.print.pdf index f7f1545b..a02159d4 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-reference-non.print.pdf and b/tests/TestData/FpdfOutput/qr-payment-reference-non.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-reference-scor.pdf b/tests/TestData/FpdfOutput/qr-payment-reference-scor.pdf index 58f997b8..0e600c25 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-reference-scor.pdf and b/tests/TestData/FpdfOutput/qr-payment-reference-scor.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-reference-scor.print.pdf b/tests/TestData/FpdfOutput/qr-payment-reference-scor.print.pdf index ab7fea92..42707737 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-reference-scor.print.pdf and b/tests/TestData/FpdfOutput/qr-payment-reference-scor.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-ultimate-debtor.pdf b/tests/TestData/FpdfOutput/qr-ultimate-debtor.pdf index 586d136f..caa413c3 100644 Binary files a/tests/TestData/FpdfOutput/qr-ultimate-debtor.pdf and b/tests/TestData/FpdfOutput/qr-ultimate-debtor.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-ultimate-debtor.print.pdf b/tests/TestData/FpdfOutput/qr-ultimate-debtor.print.pdf index 88381d55..7660bd44 100644 Binary files a/tests/TestData/FpdfOutput/qr-ultimate-debtor.print.pdf and b/tests/TestData/FpdfOutput/qr-ultimate-debtor.print.pdf differ diff --git a/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.html b/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.html index 53fd28a9..14b93334 100644 --- a/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.html +++ b/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.html @@ -192,7 +192,7 @@

Acceptance point

Payment part

- +

Currency

CHF

diff --git a/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.print.html b/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.print.html index c62bca6b..1753071b 100644 --- a/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.print.html +++ b/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.print.html @@ -202,7 +202,7 @@

Acceptance point

Payment part

- +

Currency

CHF

diff --git a/tests/TestData/HtmlOutput/qr-international-ultimate-debtor.svg.html b/tests/TestData/HtmlOutput/qr-international-ultimate-debtor.svg.html index 71a48493..720bad87 100644 --- a/tests/TestData/HtmlOutput/qr-international-ultimate-debtor.svg.html +++ b/tests/TestData/HtmlOutput/qr-international-ultimate-debtor.svg.html @@ -194,7 +194,7 @@

Acceptance point

Payment part

- +

Currency

CHF

diff --git a/tests/TestData/HtmlOutput/qr-international-ultimate-debtor.svg.print.html b/tests/TestData/HtmlOutput/qr-international-ultimate-debtor.svg.print.html index 75810ecc..1db0a461 100644 --- a/tests/TestData/HtmlOutput/qr-international-ultimate-debtor.svg.print.html +++ b/tests/TestData/HtmlOutput/qr-international-ultimate-debtor.svg.print.html @@ -204,7 +204,7 @@

Acceptance point

Payment part

- +

Currency

CHF

diff --git a/tests/TestData/HtmlOutput/qr-minimal-setup.svg.html b/tests/TestData/HtmlOutput/qr-minimal-setup.svg.html index 2228e8e3..839395cf 100644 --- a/tests/TestData/HtmlOutput/qr-minimal-setup.svg.html +++ b/tests/TestData/HtmlOutput/qr-minimal-setup.svg.html @@ -192,7 +192,7 @@

Acceptance point

Payment part

- +

Currency

CHF

diff --git a/tests/TestData/HtmlOutput/qr-minimal-setup.svg.print.html b/tests/TestData/HtmlOutput/qr-minimal-setup.svg.print.html index 6c6a5de1..3afd6619 100644 --- a/tests/TestData/HtmlOutput/qr-minimal-setup.svg.print.html +++ b/tests/TestData/HtmlOutput/qr-minimal-setup.svg.print.html @@ -202,7 +202,7 @@

Acceptance point

Payment part

- +

Currency

CHF

diff --git a/tests/TestData/HtmlOutput/qr-payment-information-without-amount-but-debtor.svg.html b/tests/TestData/HtmlOutput/qr-payment-information-without-amount-but-debtor.svg.html index e479919a..b219ec27 100644 --- a/tests/TestData/HtmlOutput/qr-payment-information-without-amount-but-debtor.svg.html +++ b/tests/TestData/HtmlOutput/qr-payment-information-without-amount-but-debtor.svg.html @@ -194,7 +194,7 @@

Acceptance point

Payment part

- +

Currency

EUR

diff --git a/tests/TestData/HtmlOutput/qr-payment-information-without-amount-but-debtor.svg.print.html b/tests/TestData/HtmlOutput/qr-payment-information-without-amount-but-debtor.svg.print.html index 14a26216..470b512d 100644 --- a/tests/TestData/HtmlOutput/qr-payment-information-without-amount-but-debtor.svg.print.html +++ b/tests/TestData/HtmlOutput/qr-payment-information-without-amount-but-debtor.svg.print.html @@ -204,7 +204,7 @@

Acceptance point

Payment part

- +

Currency

EUR

diff --git a/tests/TestData/HtmlOutput/qr-payment-information-without-amount.svg.html b/tests/TestData/HtmlOutput/qr-payment-information-without-amount.svg.html index 70a02070..2c805350 100644 --- a/tests/TestData/HtmlOutput/qr-payment-information-without-amount.svg.html +++ b/tests/TestData/HtmlOutput/qr-payment-information-without-amount.svg.html @@ -192,7 +192,7 @@

Acceptance point

Payment part

- +

Currency

EUR

diff --git a/tests/TestData/HtmlOutput/qr-payment-information-without-amount.svg.print.html b/tests/TestData/HtmlOutput/qr-payment-information-without-amount.svg.print.html index e1687eb2..a53a08f4 100644 --- a/tests/TestData/HtmlOutput/qr-payment-information-without-amount.svg.print.html +++ b/tests/TestData/HtmlOutput/qr-payment-information-without-amount.svg.print.html @@ -202,7 +202,7 @@

Acceptance point

Payment part

- +

Currency

EUR

diff --git a/tests/TestData/HtmlOutput/qr-payment-information-zero-amount.svg.html b/tests/TestData/HtmlOutput/qr-payment-information-zero-amount.svg.html index ae5d1a0f..2c8bc8c8 100644 --- a/tests/TestData/HtmlOutput/qr-payment-information-zero-amount.svg.html +++ b/tests/TestData/HtmlOutput/qr-payment-information-zero-amount.svg.html @@ -192,7 +192,7 @@

Acceptance point

Payment part

- +

Currency

EUR

@@ -207,7 +207,7 @@

Amount

0.00

Account / Payable to

CH44 3199 9123 0008 8901 2
Thomas LeClaire
Rue examplaire 22a
-1000 Lausanne

Reference

12 34567 89012 34567 89012 34567

Payable by (name/address)

+1000 Lausanne

Reference

12 34567 89012 34567 89012 34567

Additional information

DO NOT USE FOR PAYMENT

Payable by (name/address)

diff --git a/tests/TestData/HtmlOutput/qr-payment-information-zero-amount.svg.print.html b/tests/TestData/HtmlOutput/qr-payment-information-zero-amount.svg.print.html index fa17e6cb..f6d8b484 100644 --- a/tests/TestData/HtmlOutput/qr-payment-information-zero-amount.svg.print.html +++ b/tests/TestData/HtmlOutput/qr-payment-information-zero-amount.svg.print.html @@ -202,7 +202,7 @@

Acceptance point

Payment part

- +

Currency

EUR

@@ -217,7 +217,7 @@

Amount

0.00

Account / Payable to

CH44 3199 9123 0008 8901 2
Thomas LeClaire
Rue examplaire 22a
-1000 Lausanne

Reference

12 34567 89012 34567 89012 34567

Payable by (name/address)

+1000 Lausanne

Reference

12 34567 89012 34567 89012 34567

Additional information

DO NOT USE FOR PAYMENT

Payable by (name/address)

diff --git a/tests/TestData/HtmlOutput/qr-payment-reference-non.svg.html b/tests/TestData/HtmlOutput/qr-payment-reference-non.svg.html index 423981a1..9c5fb6c3 100644 --- a/tests/TestData/HtmlOutput/qr-payment-reference-non.svg.html +++ b/tests/TestData/HtmlOutput/qr-payment-reference-non.svg.html @@ -192,7 +192,7 @@

Acceptance point

Payment part

- +

Currency

CHF

diff --git a/tests/TestData/HtmlOutput/qr-payment-reference-non.svg.print.html b/tests/TestData/HtmlOutput/qr-payment-reference-non.svg.print.html index 450b1906..06019d24 100644 --- a/tests/TestData/HtmlOutput/qr-payment-reference-non.svg.print.html +++ b/tests/TestData/HtmlOutput/qr-payment-reference-non.svg.print.html @@ -202,7 +202,7 @@

Acceptance point

Payment part

- +

Currency

CHF

diff --git a/tests/TestData/HtmlOutput/qr-payment-reference-scor.svg.html b/tests/TestData/HtmlOutput/qr-payment-reference-scor.svg.html index 39389895..5c2b6b30 100644 --- a/tests/TestData/HtmlOutput/qr-payment-reference-scor.svg.html +++ b/tests/TestData/HtmlOutput/qr-payment-reference-scor.svg.html @@ -192,7 +192,7 @@

Acceptance point

Payment part

- +

Currency

CHF

diff --git a/tests/TestData/HtmlOutput/qr-payment-reference-scor.svg.print.html b/tests/TestData/HtmlOutput/qr-payment-reference-scor.svg.print.html index 4e1a7642..c6bb0030 100644 --- a/tests/TestData/HtmlOutput/qr-payment-reference-scor.svg.print.html +++ b/tests/TestData/HtmlOutput/qr-payment-reference-scor.svg.print.html @@ -202,7 +202,7 @@

Acceptance point

Payment part

- +

Currency

CHF

diff --git a/tests/TestData/HtmlOutput/qr-ultimate-debtor.svg.html b/tests/TestData/HtmlOutput/qr-ultimate-debtor.svg.html index 0233fa22..2c42504a 100644 --- a/tests/TestData/HtmlOutput/qr-ultimate-debtor.svg.html +++ b/tests/TestData/HtmlOutput/qr-ultimate-debtor.svg.html @@ -194,7 +194,7 @@

Acceptance point

Payment part

- +

Currency

CHF

diff --git a/tests/TestData/HtmlOutput/qr-ultimate-debtor.svg.print.html b/tests/TestData/HtmlOutput/qr-ultimate-debtor.svg.print.html index d08c4cfe..5642f01e 100644 --- a/tests/TestData/HtmlOutput/qr-ultimate-debtor.svg.print.html +++ b/tests/TestData/HtmlOutput/qr-ultimate-debtor.svg.print.html @@ -204,7 +204,7 @@

Acceptance point

Payment part

- +

Currency

CHF

diff --git a/tests/TestData/QrCodes/TestDataTest.php b/tests/TestData/QrCodes/TestDataTest.php index 30f1c9c3..9e1bd835 100644 --- a/tests/TestData/QrCodes/TestDataTest.php +++ b/tests/TestData/QrCodes/TestDataTest.php @@ -23,19 +23,19 @@ public function testQrFile(string $file, string $hash): void public function qrFileProvider(): array { return [ - [__DIR__ . '/qr-additional-information.png', '3a23f70cc8cf519f66d27b73f002d828'], - [__DIR__ . '/qr-alternative-schemes.png', '5bba5e41336c8e22fa50bea7627da41c'], - [__DIR__ . '/qr-full-set.png', '766de4a121a49a7e88dacce508f1588f'], - [__DIR__ . '/qr-international-ultimate-debtor.png', 'fc074aaf23921f9e262c0cf101ba07bb'], - [__DIR__ . '/qr-minimal-setup.png', '069e274f22816fcdd799acb1c0cc1dd9'], - [__DIR__ . '/qr-payment-information-without-amount.png', '5705acaab9b9219884fdb2bc99c2cfce'], - [__DIR__ . '/qr-payment-information-without-amount-but-debtor.png', '281316342f09a85af4ad137dc4d30998'], - [__DIR__ . '/qr-payment-information-zero-amount.png', 'aac0aef35bd36e9b79e903998db4756f'], - [__DIR__ . '/qr-payment-reference-non.png', '2e1ebe0623baf0f52922c2e6b988bcc6'], - [__DIR__ . '/qr-payment-reference-scor.png', '03daab8e7c66094bbef308236882c739'], - [__DIR__ . '/qr-ultimate-debtor.png', '5c359ee3333833a54a2076e5e83d2d20'], + [__DIR__ . '/qr-additional-information.png', 'c690b3c552cb31057a34d1bbe1e3a158'], + [__DIR__ . '/qr-alternative-schemes.png', 'ca22587f45609486ec9128f8bfb9ef83'], + [__DIR__ . '/qr-full-set.png', 'ae3aa21373bb4b6ad61a8df96995f06b'], + [__DIR__ . '/qr-international-ultimate-debtor.png', '3178b54237dbbf43df99ea98bba82aaa'], + [__DIR__ . '/qr-minimal-setup.png', '246e856c5c75e92ad9e70298e870d957'], + [__DIR__ . '/qr-payment-information-without-amount.png', 'd21e7106158945a52c7b2be00fbd5369'], + [__DIR__ . '/qr-payment-information-without-amount-but-debtor.png', '67b382fdaa8cd69eb328862d8393fb9f'], + [__DIR__ . '/qr-payment-information-zero-amount.png', '66c1373bac50b98705d94b33462a72c6'], + [__DIR__ . '/qr-payment-reference-non.png', '5843f882b1883f8202c43c17fa07ae86'], + [__DIR__ . '/qr-payment-reference-scor.png', '4ef959e7b428650ec4198491a6d91f1c'], + [__DIR__ . '/qr-ultimate-debtor.png', '9d1d257c2b65d9d04d4d7a20ced6ef1a'], - [__DIR__ . '/proof-of-validation.png', '655b00b5181eef2c01c550fdc3465db5'], + [__DIR__ . '/proof-of-validation.png', '3fbef2c8e8554fe16276c4ce89a09cda'], ]; } } \ No newline at end of file diff --git a/tests/TestData/QrCodes/proof-of-validation.png b/tests/TestData/QrCodes/proof-of-validation.png index 3246f95e..10ec365f 100644 Binary files a/tests/TestData/QrCodes/proof-of-validation.png and b/tests/TestData/QrCodes/proof-of-validation.png differ diff --git a/tests/TestData/QrCodes/qr-additional-information.png b/tests/TestData/QrCodes/qr-additional-information.png index 6b5c146f..ad88fc41 100644 Binary files a/tests/TestData/QrCodes/qr-additional-information.png and b/tests/TestData/QrCodes/qr-additional-information.png differ diff --git a/tests/TestData/QrCodes/qr-alternative-schemes.png b/tests/TestData/QrCodes/qr-alternative-schemes.png index 16c8b89a..d3f47531 100644 Binary files a/tests/TestData/QrCodes/qr-alternative-schemes.png and b/tests/TestData/QrCodes/qr-alternative-schemes.png differ diff --git a/tests/TestData/QrCodes/qr-alternative-schemes.txt b/tests/TestData/QrCodes/qr-alternative-schemes.txt index 69595bb3..925323ab 100644 --- a/tests/TestData/QrCodes/qr-alternative-schemes.txt +++ b/tests/TestData/QrCodes/qr-alternative-schemes.txt @@ -29,6 +29,5 @@ QRR 123456789012345678901234567 EPD - foo foo \ No newline at end of file diff --git a/tests/TestData/QrCodes/qr-full-set.png b/tests/TestData/QrCodes/qr-full-set.png index 04d0781f..6def4199 100644 Binary files a/tests/TestData/QrCodes/qr-full-set.png and b/tests/TestData/QrCodes/qr-full-set.png differ diff --git a/tests/TestData/QrCodes/qr-international-ultimate-debtor.png b/tests/TestData/QrCodes/qr-international-ultimate-debtor.png index d976cbff..b5782783 100644 Binary files a/tests/TestData/QrCodes/qr-international-ultimate-debtor.png and b/tests/TestData/QrCodes/qr-international-ultimate-debtor.png differ diff --git a/tests/TestData/QrCodes/qr-international-ultimate-debtor.txt b/tests/TestData/QrCodes/qr-international-ultimate-debtor.txt index a1c80277..3891d222 100644 --- a/tests/TestData/QrCodes/qr-international-ultimate-debtor.txt +++ b/tests/TestData/QrCodes/qr-international-ultimate-debtor.txt @@ -28,4 +28,4 @@ DE QRR 123456789012345678901234567 -EPD +EPD \ No newline at end of file diff --git a/tests/TestData/QrCodes/qr-minimal-setup.png b/tests/TestData/QrCodes/qr-minimal-setup.png index f19ade02..efb2ebc7 100644 Binary files a/tests/TestData/QrCodes/qr-minimal-setup.png and b/tests/TestData/QrCodes/qr-minimal-setup.png differ diff --git a/tests/TestData/QrCodes/qr-minimal-setup.txt b/tests/TestData/QrCodes/qr-minimal-setup.txt index c5ccf247..74f2791f 100644 --- a/tests/TestData/QrCodes/qr-minimal-setup.txt +++ b/tests/TestData/QrCodes/qr-minimal-setup.txt @@ -28,4 +28,4 @@ CHF QRR 123456789012345678901234567 -EPD +EPD \ No newline at end of file diff --git a/tests/TestData/QrCodes/qr-payment-information-without-amount-but-debtor.png b/tests/TestData/QrCodes/qr-payment-information-without-amount-but-debtor.png index ab9bdf59..f4afface 100644 Binary files a/tests/TestData/QrCodes/qr-payment-information-without-amount-but-debtor.png and b/tests/TestData/QrCodes/qr-payment-information-without-amount-but-debtor.png differ diff --git a/tests/TestData/QrCodes/qr-payment-information-without-amount-but-debtor.txt b/tests/TestData/QrCodes/qr-payment-information-without-amount-but-debtor.txt index b9c35a4c..b80318e0 100644 --- a/tests/TestData/QrCodes/qr-payment-information-without-amount-but-debtor.txt +++ b/tests/TestData/QrCodes/qr-payment-information-without-amount-but-debtor.txt @@ -28,4 +28,4 @@ CH QRR 123456789012345678901234567 -EPD +EPD \ No newline at end of file diff --git a/tests/TestData/QrCodes/qr-payment-information-without-amount.png b/tests/TestData/QrCodes/qr-payment-information-without-amount.png index 8d7a609d..3849a48c 100644 Binary files a/tests/TestData/QrCodes/qr-payment-information-without-amount.png and b/tests/TestData/QrCodes/qr-payment-information-without-amount.png differ diff --git a/tests/TestData/QrCodes/qr-payment-information-without-amount.txt b/tests/TestData/QrCodes/qr-payment-information-without-amount.txt index 4c0c6968..1df4a669 100644 --- a/tests/TestData/QrCodes/qr-payment-information-without-amount.txt +++ b/tests/TestData/QrCodes/qr-payment-information-without-amount.txt @@ -28,4 +28,4 @@ EUR QRR 123456789012345678901234567 -EPD +EPD \ No newline at end of file diff --git a/tests/TestData/QrCodes/qr-payment-information-zero-amount.png b/tests/TestData/QrCodes/qr-payment-information-zero-amount.png index ad9c8f8d..569692dd 100644 Binary files a/tests/TestData/QrCodes/qr-payment-information-zero-amount.png and b/tests/TestData/QrCodes/qr-payment-information-zero-amount.png differ diff --git a/tests/TestData/QrCodes/qr-payment-information-zero-amount.txt b/tests/TestData/QrCodes/qr-payment-information-zero-amount.txt index 3e814a4b..c95b4352 100644 --- a/tests/TestData/QrCodes/qr-payment-information-zero-amount.txt +++ b/tests/TestData/QrCodes/qr-payment-information-zero-amount.txt @@ -27,5 +27,5 @@ EUR QRR 123456789012345678901234567 - -EPD +DO NOT USE FOR PAYMENT +EPD \ No newline at end of file diff --git a/tests/TestData/QrCodes/qr-payment-reference-non.png b/tests/TestData/QrCodes/qr-payment-reference-non.png index 74b1b39f..d06c6520 100644 Binary files a/tests/TestData/QrCodes/qr-payment-reference-non.png and b/tests/TestData/QrCodes/qr-payment-reference-non.png differ diff --git a/tests/TestData/QrCodes/qr-payment-reference-non.txt b/tests/TestData/QrCodes/qr-payment-reference-non.txt index 72578de1..c5f57ae3 100644 --- a/tests/TestData/QrCodes/qr-payment-reference-non.txt +++ b/tests/TestData/QrCodes/qr-payment-reference-non.txt @@ -28,4 +28,4 @@ CHF NON -EPD +EPD \ No newline at end of file diff --git a/tests/TestData/QrCodes/qr-payment-reference-scor.png b/tests/TestData/QrCodes/qr-payment-reference-scor.png index 8d3d07ee..b6df4dce 100644 Binary files a/tests/TestData/QrCodes/qr-payment-reference-scor.png and b/tests/TestData/QrCodes/qr-payment-reference-scor.png differ diff --git a/tests/TestData/QrCodes/qr-payment-reference-scor.txt b/tests/TestData/QrCodes/qr-payment-reference-scor.txt index fc73a537..c95f68a1 100644 --- a/tests/TestData/QrCodes/qr-payment-reference-scor.txt +++ b/tests/TestData/QrCodes/qr-payment-reference-scor.txt @@ -28,4 +28,4 @@ CHF SCOR RF18539007547034 -EPD +EPD \ No newline at end of file diff --git a/tests/TestData/QrCodes/qr-ultimate-debtor.png b/tests/TestData/QrCodes/qr-ultimate-debtor.png index 6bcf7bbc..dfade632 100644 Binary files a/tests/TestData/QrCodes/qr-ultimate-debtor.png and b/tests/TestData/QrCodes/qr-ultimate-debtor.png differ diff --git a/tests/TestData/QrCodes/qr-ultimate-debtor.txt b/tests/TestData/QrCodes/qr-ultimate-debtor.txt index 990135fd..c537a567 100644 --- a/tests/TestData/QrCodes/qr-ultimate-debtor.txt +++ b/tests/TestData/QrCodes/qr-ultimate-debtor.txt @@ -28,4 +28,4 @@ CH QRR 123456789012345678901234567 -EPD +EPD \ No newline at end of file diff --git a/tests/TestData/TcPdfOutput/qr-additional-information.svg.pdf b/tests/TestData/TcPdfOutput/qr-additional-information.svg.pdf index 2d50c299..fa2d95b8 100644 Binary files a/tests/TestData/TcPdfOutput/qr-additional-information.svg.pdf and b/tests/TestData/TcPdfOutput/qr-additional-information.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-additional-information.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-additional-information.svg.print.pdf index 1a95ee4c..7df7e697 100644 Binary files a/tests/TestData/TcPdfOutput/qr-additional-information.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-additional-information.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.pdf b/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.pdf index 2af1066c..c0dfa968 100644 Binary files a/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.pdf and b/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.print.pdf index 322bea5e..e85d5e40 100644 Binary files a/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-full-set.svg.pdf b/tests/TestData/TcPdfOutput/qr-full-set.svg.pdf index 7d897ec5..fd12ef62 100644 Binary files a/tests/TestData/TcPdfOutput/qr-full-set.svg.pdf and b/tests/TestData/TcPdfOutput/qr-full-set.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-full-set.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-full-set.svg.print.pdf index c24a2998..4f37e57e 100644 Binary files a/tests/TestData/TcPdfOutput/qr-full-set.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-full-set.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.pdf b/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.pdf index 42a1e0ea..1bd52d8e 100644 Binary files a/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.pdf and b/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.print.pdf index 8886adf3..662e1e45 100644 Binary files a/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.pdf b/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.pdf index 3affe3c1..1bccb0ac 100644 Binary files a/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.pdf and b/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.print.pdf index 26ce3992..2e7bba9a 100644 Binary files a/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.pdf index 51845d73..9db9b130 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.print.pdf index d0c55fa2..609426b9 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.pdf index ae54256f..c1454267 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.print.pdf index b04799db..7868f9c8 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.pdf index ea8f40fc..1d9f0cd7 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.print.pdf index 12a6a325..da7ac1ae 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.pdf b/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.pdf index af2fe7c5..10d660a0 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.pdf and b/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.print.pdf index 5bbaf292..4dd0a510 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.pdf b/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.pdf index 9eeb95df..8979484b 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.pdf and b/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.print.pdf index ec977632..a69b7ed7 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.pdf b/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.pdf index 7e027b88..9769bb7d 100644 Binary files a/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.pdf and b/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.print.pdf index 2a50460d..d00eed78 100644 Binary files a/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.print.pdf differ diff --git a/tests/TestQrBillCreatorTrait.php b/tests/TestQrBillCreatorTrait.php index 92fda065..c087b62a 100644 --- a/tests/TestQrBillCreatorTrait.php +++ b/tests/TestQrBillCreatorTrait.php @@ -10,6 +10,7 @@ use Sprain\SwissQrBill\DataGroup\Element\Header; use Sprain\SwissQrBill\DataGroup\Element\PaymentAmountInformation; use Sprain\SwissQrBill\DataGroup\Element\PaymentReference; +use Sprain\SwissQrBill\PaymentPart\Translation\Translation; use Sprain\SwissQrBill\QrBill; trait TestQrBillCreatorTrait @@ -53,7 +54,8 @@ public function validQrBillsProvider() 'creditorInformationQrIban', 'creditor', 'paymentAmountInformationZeroAmount', - 'paymentReferenceQr' + 'paymentReferenceQr', + 'additionalInformationZeroPayment' ]) ], ['qr-payment-reference-scor', @@ -308,6 +310,12 @@ public function additionalInformation(QrBill &$qrBill) $qrBill->setAdditionalInformation($additionalInformation); } + public function additionalInformationZeroPayment(QrBill &$qrBill) + { + $additionalInformation = AdditionalInformation::create(Translation::get('doNotUseForPayment', 'en')); + $qrBill->setAdditionalInformation($additionalInformation); + } + public function structuredAddress() { return StructuredAddress::createWithStreet(