From f2d12761e80a29f4687d5ea9fbc21b482f39404d Mon Sep 17 00:00:00 2001 From: Manuel Reinhard Date: Tue, 24 Oct 2023 11:56:34 +0200 Subject: [PATCH 1/3] Replace tabs with spaces --- .../Template/PaymentPartTemplate.php | 128 +++++++++--------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/src/PaymentPart/Output/HtmlOutput/Template/PaymentPartTemplate.php b/src/PaymentPart/Output/HtmlOutput/Template/PaymentPartTemplate.php index 8ae82fdf..b17e96ce 100644 --- a/src/PaymentPart/Output/HtmlOutput/Template/PaymentPartTemplate.php +++ b/src/PaymentPart/Output/HtmlOutput/Template/PaymentPartTemplate.php @@ -7,13 +7,13 @@ class PaymentPartTemplate public const TEMPLATE = << #qr-bill { - box-sizing: border-box; - border-collapse: collapse; - color: #000 !important; + box-sizing: border-box; + border-collapse: collapse; + color: #000 !important; } #qr-bill * { - font-family: Arial, Frutiger, Helvetica, "Liberation Sans" !important; + font-family: Arial, Frutiger, Helvetica, "Liberation Sans" !important; } #qr-bill img.qr-bill-placeholder { @@ -24,92 +24,92 @@ class PaymentPartTemplate text-align: center; font-size: 8pt !important; line-height: 9pt; - border-bottom: 0.75pt solid black; - height: 5mm; - vertical-align: middle; + border-bottom: 0.75pt solid black; + height: 5mm; + vertical-align: middle; } /* h1 / h2 */ #qr-bill h1 { - font-size: 11pt !important; - font-weight: bold !important; - margin: 0; - padding: 0; - height: 7mm; - color: #000 !important; + font-size: 11pt !important; + font-weight: bold !important; + margin: 0; + padding: 0; + height: 7mm; + color: #000 !important; } #qr-bill h2 { - font-weight: bold !important; - margin: 0; - padding: 0; - color: #000 !important; + font-weight: bold !important; + margin: 0; + padding: 0; + color: #000 !important; } #qr-bill-payment-part h2 { - font-size: 8pt !important; - line-height: 11pt !important; + font-size: 8pt !important; + line-height: 11pt !important; margin-top: 11pt; - color: #000 !important; + color: #000 !important; } #qr-bill-receipt h2 { - font-size: 6pt !important; - line-height: 8pt !important; + font-size: 6pt !important; + line-height: 8pt !important; margin-top: 8pt; - color: #000 !important; + color: #000 !important; } #qr-bill-payment-part h2:first-child, #qr-bill-receipt h2:first-child { - margin-top: 0; - color: #000 !important; + margin-top: 0; + color: #000 !important; } /* p */ #qr-bill p { - font-weight: normal !important; - margin: 0; - padding: 0; - color: #000 !important; + font-weight: normal !important; + margin: 0; + padding: 0; + color: #000 !important; } #qr-bill-receipt p { - font-size: 8pt !important; - line-height: 9pt !important; - color: #000 !important; + font-size: 8pt !important; + line-height: 9pt !important; + color: #000 !important; } #qr-bill-payment-part p { - font-size: 10pt !important; - line-height: 11pt !important; - color: #000 !important; + font-size: 10pt !important; + line-height: 11pt !important; + color: #000 !important; } #qr-bill-amount-area-receipt p{ line-height: 11pt !important; - color: #000 !important; + color: #000 !important; } #qr-bill-amount-area p{ line-height: 13pt !important; - color: #000 !important; + color: #000 !important; } #qr-bill-payment-further-information p { font-size: 7pt !important; line-height: 9pt !important; - color: #000 !important; + color: #000 !important; } /* Receipt */ #qr-bill-receipt { box-sizing: border-box; width: 62mm; - border-right: 0.2mm solid black; - padding-left: 5mm; - padding-top: 5mm; - vertical-align: top; + border-right: 0.2mm solid black; + padding-left: 5mm; + padding-top: 5mm; + vertical-align: top; } #qr-bill-information-receipt { @@ -121,8 +121,8 @@ class PaymentPartTemplate } #qr-bill-currency-receipt { - float: left; - margin-right: 2mm; + float: left; + margin-right: 2mm; } #qr-bill-acceptance-point { @@ -141,10 +141,10 @@ class PaymentPartTemplate #qr-bill-payment-part { box-sizing: border-box; width: 148mm; - padding-left: 5mm; - padding-top: 5mm; - padding-right: 5mm; - vertical-align: top; + padding-left: 5mm; + padding-top: 5mm; + padding-right: 5mm; + vertical-align: top; } #qr-bill-payment-part-left { @@ -154,10 +154,10 @@ class PaymentPartTemplate } #qr-bill-swiss-qr-image { - width: 46mm; - height: 46mm; - margin: 5mm; - margin-left: 0; + width: 46mm; + height: 46mm; + margin: 5mm; + margin-left: 0; } #qr-bill-amount-area { @@ -165,8 +165,8 @@ class PaymentPartTemplate } #qr-bill-currency { - float: left; - margin-right: 2mm; + float: left; + margin-right: 2mm; } #qr-bill-payment-further-information { @@ -185,10 +185,10 @@ class PaymentPartTemplate {{ text.separate }} - - -

{{ text.receipt }}

-
+ + +

{{ text.receipt }}

+
{{ information-content-receipt }}
@@ -216,17 +216,17 @@ class PaymentPartTemplate {{ amount-content }}
- -
+
+
{{ information-content }}
-
-
- {{ further-information-content }} +
+
+ {{ further-information-content }}
- + EOT; } From bdbadc1d6e2dee5417098ad717c12f888083f28c Mon Sep 17 00:00:00 2001 From: Manuel Reinhard Date: Tue, 24 Oct 2023 12:19:32 +0200 Subject: [PATCH 2/3] Improve html style overwritings --- .../Template/PaymentPartTemplate.php | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/PaymentPart/Output/HtmlOutput/Template/PaymentPartTemplate.php b/src/PaymentPart/Output/HtmlOutput/Template/PaymentPartTemplate.php index b17e96ce..1063d6a0 100644 --- a/src/PaymentPart/Output/HtmlOutput/Template/PaymentPartTemplate.php +++ b/src/PaymentPart/Output/HtmlOutput/Template/PaymentPartTemplate.php @@ -32,45 +32,46 @@ class PaymentPartTemplate /* h1 / h2 */ #qr-bill h1 { font-size: 11pt !important; + line-height: 13pt !important; font-weight: bold !important; - margin: 0; - padding: 0; - height: 7mm; + margin: 0 !important; + padding: 0 !important; + height: 7mm !important; color: #000 !important; } #qr-bill h2 { font-weight: bold !important; - margin: 0; - padding: 0; + margin: 0 !important; + padding: 0 !important; color: #000 !important; } #qr-bill-payment-part h2 { font-size: 8pt !important; line-height: 11pt !important; - margin-top: 11pt; + margin-top: 11pt !important; color: #000 !important; } #qr-bill-receipt h2 { font-size: 6pt !important; line-height: 8pt !important; - margin-top: 8pt; + margin-top: 8pt !important; color: #000 !important; } #qr-bill-payment-part h2:first-child, #qr-bill-receipt h2:first-child { - margin-top: 0; + margin-top: 0 !important; color: #000 !important; } /* p */ #qr-bill p { font-weight: normal !important; - margin: 0; - padding: 0; + margin: 0 !important; + padding: 0 !important; color: #000 !important; } From 67b704b530365c4eb0a70c8f6a8356e4b8974e5d Mon Sep 17 00:00:00 2001 From: Manuel Reinhard Date: Tue, 24 Oct 2023 12:19:50 +0200 Subject: [PATCH 3/3] Regenerate html test data --- .../qr-additional-information.svg.html | 133 +++++++++--------- .../qr-additional-information.svg.print.html | 133 +++++++++--------- .../qr-alternative-schemes.svg.html | 133 +++++++++--------- .../qr-alternative-schemes.svg.print.html | 133 +++++++++--------- .../TestData/HtmlOutput/qr-full-set.svg.html | 133 +++++++++--------- .../HtmlOutput/qr-full-set.svg.print.html | 133 +++++++++--------- .../qr-international-ultimate-debtor.svg.html | 133 +++++++++--------- ...ternational-ultimate-debtor.svg.print.html | 133 +++++++++--------- .../HtmlOutput/qr-minimal-setup.svg.html | 133 +++++++++--------- .../qr-minimal-setup.svg.print.html | 133 +++++++++--------- ...mlong-creditor-and-unknown-debtor.svg.html | 133 +++++++++--------- ...creditor-and-unknown-debtor.svg.print.html | 133 +++++++++--------- ...without-amount-and-long-addresses.svg.html | 133 +++++++++--------- ...t-amount-and-long-addresses.svg.print.html | 133 +++++++++--------- ...rmation-without-amount-but-debtor.svg.html | 133 +++++++++--------- ...n-without-amount-but-debtor.svg.print.html | 133 +++++++++--------- ...ayment-information-without-amount.svg.html | 133 +++++++++--------- ...-information-without-amount.svg.print.html | 133 +++++++++--------- ...r-payment-information-zero-amount.svg.html | 133 +++++++++--------- ...ent-information-zero-amount.svg.print.html | 133 +++++++++--------- .../qr-payment-reference-non.svg.html | 133 +++++++++--------- .../qr-payment-reference-non.svg.print.html | 133 +++++++++--------- .../qr-payment-reference-scor.svg.html | 133 +++++++++--------- .../qr-payment-reference-scor.svg.print.html | 133 +++++++++--------- .../HtmlOutput/qr-ultimate-debtor.svg.html | 133 +++++++++--------- .../qr-ultimate-debtor.svg.print.html | 133 +++++++++--------- 26 files changed, 1742 insertions(+), 1716 deletions(-) diff --git a/tests/TestData/HtmlOutput/qr-additional-information.svg.html b/tests/TestData/HtmlOutput/qr-additional-information.svg.html index a1ba1a40..0f011b8e 100644 --- a/tests/TestData/HtmlOutput/qr-additional-information.svg.html +++ b/tests/TestData/HtmlOutput/qr-additional-information.svg.html @@ -1,12 +1,12 @@