From f3195ac3804dc8ec994c9ba1bdb97efcf58839d1 Mon Sep 17 00:00:00 2001 From: bYemma Date: Thu, 21 Aug 2025 15:54:00 +0200 Subject: [PATCH 1/9] Update module version in metadata.php --- metadata.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.php b/metadata.php index 0ef8fb5..16d75b9 100644 --- a/metadata.php +++ b/metadata.php @@ -16,7 +16,7 @@ ], 'thumbnail' => 'admin/unzer_payment.png', 'lang' => 'en', - 'version' => '1.0.1', + 'version' => '1.0.2', 'author' => 'Unzer GmbH', 'email' => 'info@unzer.com', 'url' => 'https://www.unzer.com/', From 2b932bfa72e10d8b0f7cd0643df3831d925d99bc Mon Sep 17 00:00:00 2001 From: bYemma Date: Thu, 21 Aug 2025 15:56:35 +0200 Subject: [PATCH 2/9] Update module version in composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 905e285..c77c929 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "homepage": "https://www.unzer.com" } ], - "version": "1.0.0", + "version": "1.0.2", "license": "Apache-2.0", "extra": { "oxideshop": { @@ -40,4 +40,4 @@ "Unzer\\UnzerPayment\\": "./src/" } } -} \ No newline at end of file +} From ccf056bcf32350f60d93879a6f64eae7f58d6ce2 Mon Sep 17 00:00:00 2001 From: bYemma Date: Thu, 21 Aug 2025 16:22:33 +0200 Subject: [PATCH 3/9] Add isUnzerPaymentMethod to PaymentController.php --- src/Controller/PaymentController.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Controller/PaymentController.php b/src/Controller/PaymentController.php index 5ffc6e8..5d2f75a 100644 --- a/src/Controller/PaymentController.php +++ b/src/Controller/PaymentController.php @@ -87,4 +87,15 @@ public function getPaymentList() return $paymentList; } -} \ No newline at end of file + + /** + * Checks if paymentId is an unzer payment + * + * @return bool + * + */ + public function isUnzerPaymentMethod(string $paymentId): bool + { + return UnzerpaymentHelper::getInstance()->isUnzerPaymentMethod($paymentId); + } +} From 39db53175f5bee05efc694b1de89cb881cd05ed3 Mon Sep 17 00:00:00 2001 From: bYemma Date: Thu, 21 Aug 2025 16:23:30 +0200 Subject: [PATCH 4/9] Overwrite select_payment block --- .../default/page/checkout/payment.html.twig | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 views/twig/extensions/themes/default/page/checkout/payment.html.twig diff --git a/views/twig/extensions/themes/default/page/checkout/payment.html.twig b/views/twig/extensions/themes/default/page/checkout/payment.html.twig new file mode 100644 index 0000000..a72e3a1 --- /dev/null +++ b/views/twig/extensions/themes/default/page/checkout/payment.html.twig @@ -0,0 +1,28 @@ +{% extends "page/checkout/payment.html.twig" %} + +{% block select_payment %} + + {% if oView.isUnzerPaymentMethod(sPaymentID) %} +
+
+ + +
+
+ {% block checkout_payment_longdesc %} + {% if paymentmethod.oxpayments__oxlongdesc.value|striptags|trim %} +
+ {{ paymentmethod.oxpayments__oxlongdesc.getRawValue() }} +
+ {% endif %} + {% endblock %} +
+
+ {% else %} + {{ parent() }} + {% endif %} + +{% endblock %} From 37195229632024a57e14eabff8f65a7dbc1768bd Mon Sep 17 00:00:00 2001 From: bYemma Date: Thu, 21 Aug 2025 16:24:42 +0200 Subject: [PATCH 5/9] Delete hard overwrite file payment_other.html.twig --- .../page/checkout/inc/payment_other.html.twig | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 views/twig/extensions/themes/default/page/checkout/inc/payment_other.html.twig diff --git a/views/twig/extensions/themes/default/page/checkout/inc/payment_other.html.twig b/views/twig/extensions/themes/default/page/checkout/inc/payment_other.html.twig deleted file mode 100644 index 39970c6..0000000 --- a/views/twig/extensions/themes/default/page/checkout/inc/payment_other.html.twig +++ /dev/null @@ -1,18 +0,0 @@ -
-
- - -
-
- {% block checkout_payment_longdesc %} - {% if paymentmethod.oxpayments__oxlongdesc.value|striptags|trim %} -
- {{ paymentmethod.oxpayments__oxlongdesc.getRawValue() }} -
- {% endif %} - {% endblock %} -
-
\ No newline at end of file From 99fb3364bb28c72c142989b2061bf7f660b12d1b Mon Sep 17 00:00:00 2001 From: bYemma Date: Thu, 21 Aug 2025 16:27:44 +0200 Subject: [PATCH 6/9] Remove change of other commit --- metadata.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.php b/metadata.php index 16d75b9..2b8596c 100644 --- a/metadata.php +++ b/metadata.php @@ -16,7 +16,7 @@ ], 'thumbnail' => 'admin/unzer_payment.png', 'lang' => 'en', - 'version' => '1.0.2', + 'version' => '1.0.0', 'author' => 'Unzer GmbH', 'email' => 'info@unzer.com', 'url' => 'https://www.unzer.com/', From 962e3708bd65d9a1c7066794a7e402af2cc08073 Mon Sep 17 00:00:00 2001 From: bYemma Date: Thu, 21 Aug 2025 16:27:54 +0200 Subject: [PATCH 7/9] Remove change of other commit --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c77c929..0a883e8 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "homepage": "https://www.unzer.com" } ], - "version": "1.0.2", + "version": "1.0.0", "license": "Apache-2.0", "extra": { "oxideshop": { From 42173b3d45631a50e3216987b8c90293bd07f833 Mon Sep 17 00:00:00 2001 From: bYemma Date: Thu, 21 Aug 2025 16:28:52 +0200 Subject: [PATCH 8/9] Remove change of other commit --- metadata.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.php b/metadata.php index 2b8596c..0ef8fb5 100644 --- a/metadata.php +++ b/metadata.php @@ -16,7 +16,7 @@ ], 'thumbnail' => 'admin/unzer_payment.png', 'lang' => 'en', - 'version' => '1.0.0', + 'version' => '1.0.1', 'author' => 'Unzer GmbH', 'email' => 'info@unzer.com', 'url' => 'https://www.unzer.com/', From 9040c2548a7cffdc18bcc134056b1f5ee65b5f7d Mon Sep 17 00:00:00 2001 From: bYemma Date: Thu, 21 Aug 2025 17:05:48 +0200 Subject: [PATCH 9/9] Update payment.html.twig --- .../themes/default/page/checkout/payment.html.twig | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/views/twig/extensions/themes/default/page/checkout/payment.html.twig b/views/twig/extensions/themes/default/page/checkout/payment.html.twig index a72e3a1..649a2c8 100644 --- a/views/twig/extensions/themes/default/page/checkout/payment.html.twig +++ b/views/twig/extensions/themes/default/page/checkout/payment.html.twig @@ -12,13 +12,11 @@
- {% block checkout_payment_longdesc %} - {% if paymentmethod.oxpayments__oxlongdesc.value|striptags|trim %} -
- {{ paymentmethod.oxpayments__oxlongdesc.getRawValue() }} -
- {% endif %} - {% endblock %} + {% if paymentmethod.oxpayments__oxlongdesc.value|striptags|trim %} +
+ {{ paymentmethod.oxpayments__oxlongdesc.getRawValue() }} +
+ {% endif %}
{% else %}