From cd470c5c13303053bb00a7d51974cf62b1132dc4 Mon Sep 17 00:00:00 2001 From: Anne Date: Wed, 7 Feb 2024 12:44:34 +0100 Subject: [PATCH 1/7] Remove classic icon option --- upload/Pay/Controller/Admin.php | 3 --- upload/Pay/Model.php | 4 +--- .../de-de/extension/payment/paynl3.php | 5 ----- .../en-gb/extension/payment/paynl3.php | 5 ----- .../fr-fr/extension/payment/paynl3.php | 5 ----- .../nl-nl/extension/payment/paynl3.php | 5 ----- .../template/extension/payment/paynl3.twig | 11 ----------- upload/image/Pay/14.png | Bin 3008 -> 2447 bytes upload/image/Pay/149.png | Bin 0 -> 2079 bytes upload/image/Pay/176.png | Bin 2619 -> 1809 bytes upload/image/Pay/20.png | Bin 4495 -> 2785 bytes upload/image/Pay/255.png | Bin 0 -> 1749 bytes upload/image/Pay/291.png | Bin 0 -> 3698 bytes upload/image/Pay/4.png | Bin 3835 -> 11467 bytes 14 files changed, 1 insertion(+), 37 deletions(-) create mode 100644 upload/image/Pay/149.png create mode 100644 upload/image/Pay/255.png create mode 100644 upload/image/Pay/291.png diff --git a/upload/Pay/Controller/Admin.php b/upload/Pay/Controller/Admin.php index be904e3..5fab837 100755 --- a/upload/Pay/Controller/Admin.php +++ b/upload/Pay/Controller/Admin.php @@ -81,7 +81,6 @@ public function index() 'payment_paynl_general_prefix' => $settings['payment_paynl_general_prefix'], 'payment_paynl_general_refund_processing' => $settings['payment_paynl_general_refund_processing'], 'payment_paynl_general_display_icon' => $settings['payment_paynl_general_display_icon'], - 'payment_paynl_general_icon_style' => $settings['payment_paynl_general_icon_style'], 'payment_paynl_general_custom_exchange_url' => $settings['payment_paynl_general_custom_exchange_url'], 'payment_paynl_general_test_ip' => $settings['payment_paynl_general_test_ip'], 'payment_paynl_general_logging' => $settings['payment_paynl_general_logging'], @@ -114,7 +113,6 @@ public function index() $data['gateway'] = $this->configGet('gateway'); $data['prefix'] = $this->configGet('prefix'); $data['refund_processing'] = $this->configGet('refund_processing'); - $data['icon_style'] = $this->configGet('icon_style'); $data['custom_exchange_url'] = $this->configGet('custom_exchange_url'); $data['test_ip'] = $this->configGet('test_ip'); $data['logging'] = $this->configGet('logging'); @@ -278,7 +276,6 @@ public function install() 'payment_paynl_general_prefix' => 'Order ', 'payment_paynl_general_refund_processing' => $this->config->get('payment_paynl_general_refund_processing'), 'payment_paynl_general_display_icon' => $this->config->get('payment_paynl_general_display_icon'), - 'payment_paynl_general_icon_style' => $this->config->get('payment_paynl_general_icon_style'), 'payment_paynl_general_custom_exchange_url' => $this->config->get('payment_paynl_general_custom_exchange_url'), 'payment_paynl_general_test_ip' => $this->config->get('payment_paynl_general_test_ip'), 'payment_paynl_general_logging' => $this->config->get('payment_paynl_general_logging') diff --git a/upload/Pay/Model.php b/upload/Pay/Model.php index 7afa4a1..90cc699 100755 --- a/upload/Pay/Model.php +++ b/upload/Pay/Model.php @@ -332,10 +332,8 @@ public function getMethod($address = false, $orderAmount = false) $icon = ""; if ($this->config->get('payment_paynl_general_display_icon') != '') { $iconSize = $this->config->get('payment_paynl_general_display_icon') ; - $iconStyle = $this->config->get('payment_paynl_general_icon_style') ; - $icon = "_paymentOptionId.png\"> "; - if ($iconStyle == 'newest' && !empty($paymentOptions['brand_id'])) { + if (!empty($paymentOptions['brand_id'])) { $style = ' style="width:50px; height:50px;"'; switch ($iconSize) { case '20x20': diff --git a/upload/admin/language/de-de/extension/payment/paynl3.php b/upload/admin/language/de-de/extension/payment/paynl3.php index 102f116..4eb2752 100644 --- a/upload/admin/language/de-de/extension/payment/paynl3.php +++ b/upload/admin/language/de-de/extension/payment/paynl3.php @@ -62,11 +62,6 @@ $_['text_display_icon'] = 'Symbol anzeigen'; $_['text_display_icon_tooltip'] = 'Wählen Sie hier aus, ob und in welcher Größe ein Symbol angezeigt werden soll.'; -$_['text_icon_style'] = 'Symbolstil'; -$_['text_icon_style_tooltip'] = 'Wählen Sie hier aus, ob Sie die klassischen oder die neuesten Bilder verwenden möchten.'; -$_['text_classic'] = 'Klassisch'; -$_['text_newest'] = 'Neueste'; - $_['text_testmode'] = 'Testmodus'; $_['text_testmode_tooltip'] = 'Schalten Sie den Testmodus ein oder aus, um den Austausch zwischen Pay. und Ihrem Webshop zu testen'; diff --git a/upload/admin/language/en-gb/extension/payment/paynl3.php b/upload/admin/language/en-gb/extension/payment/paynl3.php index dd75c96..018baa6 100755 --- a/upload/admin/language/en-gb/extension/payment/paynl3.php +++ b/upload/admin/language/en-gb/extension/payment/paynl3.php @@ -65,11 +65,6 @@ $_['text_display_icon'] = 'Display icon'; $_['text_display_icon_tooltip'] = 'Select if you want to display an icon and the size'; -$_['text_icon_style'] = 'Icon style'; -$_['text_icon_style_tooltip'] = 'Select whether you want to use the classic or newest images during checkout.'; -$_['text_classic'] = 'Classic'; -$_['text_newest'] = 'Newest'; - $_['text_custom_exchange_url'] = 'Alternatieve Exchange URL'; $_['text_custom_exchange_url_tooltip'] = 'Use your own exchange-handler. Requests will be send as GET.
Example: https://www.yourdomain.nl/exchange_handler?action=#action#&order_id=#order_id#'; diff --git a/upload/admin/language/fr-fr/extension/payment/paynl3.php b/upload/admin/language/fr-fr/extension/payment/paynl3.php index acb9b77..9d0669a 100644 --- a/upload/admin/language/fr-fr/extension/payment/paynl3.php +++ b/upload/admin/language/fr-fr/extension/payment/paynl3.php @@ -62,11 +62,6 @@ $_['text_display_icon'] = 'Icône d\'affichage'; $_['text_display_icon_tooltip'] = 'Sélectionnez si vous souhaitez afficher une icône et la taille'; -$_['text_icon_style'] = 'Style d\'icône'; -$_['text_icon_style_tooltip'] = 'Choisissez si vous souhaitez utiliser les images classiques ou les plus récentes lors du paiement.'; -$_['text_classic'] = 'Classique'; -$_['text_newest'] = 'Le plus récent'; - $_['text_custom_exchange_url'] = 'URL d\'échange alternative'; $_['text_custom_exchange_url_tooltip'] = 'Utilisez votre propre gestionnaire d\'échange. Les demandes seront envoyées sous forme de GET.
Exemple: https://www.yourdomain.nl/exchange_handler?action=#action#&order_id=#order_id#'; diff --git a/upload/admin/language/nl-nl/extension/payment/paynl3.php b/upload/admin/language/nl-nl/extension/payment/paynl3.php index 43a1493..dde372a 100755 --- a/upload/admin/language/nl-nl/extension/payment/paynl3.php +++ b/upload/admin/language/nl-nl/extension/payment/paynl3.php @@ -65,11 +65,6 @@ $_['text_display_icon'] = 'Icoon weergeven'; $_['text_display_icon_tooltip'] = 'Selecteer hier of je een icoon wilt weergeven en welke grootte.'; -$_['text_icon_style'] = 'Icoon stijl'; -$_['text_icon_style_tooltip'] = 'Selecteer hier of u de klassieke of de nieuwste afbeeldingen wilt gebruiken.'; -$_['text_classic'] = 'Klassiek'; -$_['text_newest'] = 'Nieuwste'; - $_['text_custom_exchange_url'] = 'Alternatieve Exchange URL'; $_['text_custom_exchange_url_tooltip'] = 'Gebruik je eigen exchange-handler. Requests zullen verzonden worden al een GET.
Voorbeeld: https://www.yourdomain.nl/exchange_handler?action=#action#&order_id=#order_id#'; diff --git a/upload/admin/view/template/extension/payment/paynl3.twig b/upload/admin/view/template/extension/payment/paynl3.twig index eb314f0..9ce9ebc 100755 --- a/upload/admin/view/template/extension/payment/paynl3.twig +++ b/upload/admin/view/template/extension/payment/paynl3.twig @@ -144,17 +144,6 @@ -
- -
- -
-
+
+ +
+ +
+