From 9f83463568b00ac9da027595e8fb3b21fee7a7c9 Mon Sep 17 00:00:00 2001
From: kGablo <krzysztof.gablo@tpay.com>
Date: Fri, 2 Aug 2024 10:14:29 +0200
Subject: [PATCH 1/9] Add custom order for banks and generic payments

---
 CHANGELOG.MD                                  |   6 +
 .../admin/TpayConfigurationController.php     |  69 ++++++++--
 src/Service/PaymentOptions/Transfer.php       |  23 +++-
 tpay.php                                      |   2 +-
 translations/pl.php                           |   4 +-
 views/templates/_admin/configuration.tpl      | 123 +++++++++++++++++-
 6 files changed, 206 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 1e242ed..1948ace 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.9.5]
+
+### Added
+
+- Added custom order for banks and generic payments
+
 ## [1.9.4]
 
 ### Fixed
diff --git a/controllers/admin/TpayConfigurationController.php b/controllers/admin/TpayConfigurationController.php
index a4add41..2d1c924 100644
--- a/controllers/admin/TpayConfigurationController.php
+++ b/controllers/admin/TpayConfigurationController.php
@@ -27,6 +27,7 @@ class TpayConfigurationController extends ModuleAdminController
     public const SEPARATE_PAYMENT_INFO = 'Show the method as a separate payment';
     public $errors = [];
     public $configuration = [];
+    public $channels = [];
 
     /** @var Tpay */
     public $module;
@@ -58,6 +59,10 @@ public function getValuesFormFields(): array
                 $value = json_decode(Cfg::get('TPAY_GENERIC_PAYMENTS'), true);
             }
 
+            if ($field == 'TPAY_CUSTOM_ORDER[]') {
+                $value = json_decode(Cfg::get('TPAY_CUSTOM_ORDER'), true);
+            }
+
             $fields[$field] = $value;
         }
 
@@ -97,7 +102,6 @@ public function getOrderStates(): array
         return OrderState::getOrderStates(Context::getContext()->language->id);
     }
 
-
     protected function getWarningMultishopHtml()
     {
         if (Shop::getContext() == Shop::CONTEXT_GROUP) {
@@ -127,6 +131,7 @@ protected function contextIsGroup(): bool
 
     public function createForm(): array
     {
+        $this->getChannels();
         $form[] = $this->formBasicOptions();
         $form[] = $this->formPaymentOptions();
         $form[] = $this->formCardOptions();
@@ -463,6 +468,21 @@ public function formPaymentOptions(): array
                     ],
                 ],
 
+                [
+                    'type' => 'select',
+                    'label' => $this->module->l('Custom order'),
+                    'name' => 'TPAY_CUSTOM_ORDER[]',
+                    'multiple' => true,
+                    'class' => 'child',
+                    'desc' => $this->module->l('Custom order of displayed banks. Drag to change order'),
+                    'size' => 20,
+                    'options' => [
+                        'query' => $this->sortPayment('TPAY_CUSTOM_ORDER'),
+                        'id' => 'id',
+                        'name' => 'name'
+                    ],
+                ],
+
                 [
                     'type' => 'switch',
                     'label' => $this->module->l('GooglePay'),
@@ -706,15 +726,7 @@ public function formStatusesOptions(): array
 
     private function formGenericPaymentOptions(): array
     {
-        $result = [];
-
-        if ($this->module->api()) {
-            try {
-                $result = $this->module->api()->transactions()->getChannels();
-            } catch (Exception $exception) {
-                PrestaShopLogger::addLog($exception->getMessage(), 3);
-            }
-        }
+        $result = $this->sortPayment('TPAY_GENERIC_PAYMENTS');
 
         return [
             'form' => [
@@ -724,10 +736,11 @@ private function formGenericPaymentOptions(): array
                         'type' => 'select',
                         'label' => $this->module->l('Select payments to Easy on-site mechanism to'),
                         'name' => 'TPAY_GENERIC_PAYMENTS[]',
+                        'desc' => $this->module->l('Custom order of displayed payment methods. Drag to change order'),
                         'multiple' => true,
                         'size' => $result ? 20 : 1,
                         'options' => [
-                            'query' => $result['channels'] ?? [],
+                            'query' => $result,
                             'id' => 'id',
                             'name' => 'name'
                         ],
@@ -737,4 +750,38 @@ private function formGenericPaymentOptions(): array
             ]
         ];
     }
+
+    private function getChannels()
+    {
+        if ($this->module->api()) {
+            try {
+                $this->channels = $this->module->api()->transactions()->getChannels()['channels'] ?? [];
+            } catch (Exception $exception) {
+                PrestaShopLogger::addLog($exception->getMessage(), 3);
+            }
+        }
+    }
+
+    private function sortPayment(string $field): array
+    {
+        $channels = $this->channels;
+        $chosenPayments = json_decode(Cfg::get($field), true);
+
+        if (count($chosenPayments) > 0) {
+            $orderedList = [];
+
+            foreach ($chosenPayments as $chosenPayment) {
+                foreach ($channels as $key => $channel) {
+                    if ($channel['id'] == $chosenPayment) {
+                        $orderedList[$key] = $channel;
+                        unset($channels[$key]);
+                    }
+                }
+            }
+
+            return array_merge($orderedList, $channels);
+        }
+
+        return $channels;
+    }
 }
diff --git a/src/Service/PaymentOptions/Transfer.php b/src/Service/PaymentOptions/Transfer.php
index 7c13a6b..1078c72 100644
--- a/src/Service/PaymentOptions/Transfer.php
+++ b/src/Service/PaymentOptions/Transfer.php
@@ -36,7 +36,7 @@ public function getPaymentOption(
             'transfer_type' => Helper::getMultistoreConfigurationValue('TPAY_TRANSFER_WIDGET') ? 'widget' : 'redirect',
             'transfer_gateway' => $data['id'],
             'transfer_moduleLink' => $moduleLink,
-            'gateways' => $data['gateways'],
+            'gateways' => $this->sortGateways($data['gateways']),
             'isDirect' => (bool) Configuration::get('TPAY_REDIRECT_TO_CHANNEL'),
         ]);
 
@@ -60,4 +60,25 @@ protected function generateForm()
 
         return Context::getContext()->smarty->fetch('module:tpay/views/templates/hook/payment.tpl');
     }
+
+    private function sortGateways(array $gateways)
+    {
+        if ((bool)Configuration::get('TPAY_REDIRECT_TO_CHANNEL') && !empty(Configuration::get('TPAY_CUSTOM_ORDER'))) {
+            $orderedList = [];
+            $customOrder = json_decode(Configuration::get('TPAY_CUSTOM_ORDER'), true);
+
+            foreach ($customOrder as $orderNumber) {
+                foreach ($gateways as $gateway) {
+                    if ($gateway['mainChannel'] == $orderNumber) {
+                        $orderedList[$gateway['mainChannel']] = $gateway;
+                        unset($gateways[$gateway['mainChannel']]);
+                    }
+                }
+            }
+
+            return array_merge($orderedList, $gateways);
+        }
+
+        return $gateways;
+    }
 }
diff --git a/tpay.php b/tpay.php
index c9a0317..4f97648 100644
--- a/tpay.php
+++ b/tpay.php
@@ -141,7 +141,7 @@ public function __construct()
     {
         $this->name = 'tpay';
         $this->tab = 'payments_gateways';
-        $this->version = '1.9.4';
+        $this->version = '1.9.5';
         $this->author = 'Krajowy Integrator Płatności S.A.';
         $this->need_instance = 0;
         $this->ps_versions_compliancy = [
diff --git a/translations/pl.php b/translations/pl.php
index c12742a..c39d914 100644
--- a/translations/pl.php
+++ b/translations/pl.php
@@ -146,7 +146,9 @@
 $_MODULE['<{tpay}prestashop>tpay_a2436f156896e30797fae5cb4625ff06'] = 'Kod bezpieczeństwa (w powiadomieniach)';
 $_MODULE['<{tpay}prestashop>tpay_321d4f2bb69eb9edd173cfd0c02500f2'] = 'Forma pola CRC';
 $_MODULE['<{tpay}prestashop>tpay_542b1d933b6142f66e3cfb215ffa2f70'] = 'Widget przelewów';
-$_MODULE['<{tpay}prestashop>tpay_483fd2351d43804a57ac0f4406c2112a'] = 'Widget kart';
+$_MODULE['<{tpay}prestashop>tpay_9291570afa178cc68f9fa711153822bd'] = 'Własna kolejność';
+$_MODULE['<{tpay}prestashop>tpay_550cbbbc14019038a72c2b4aacd23061'] = 'Własna kolejność wyświetlanych banków. Przeciągnij, żeby zmienić kolejność';
+$_MODULE['<{tpay}prestashop>tpay_0e4929b5127c6468265b817bad986f8b'] = 'Własna kolejność wyświetlanych metod płatności. Przeciągnij, żeby zmienić kolejność';$_MODULE['<{tpay}prestashop>tpay_483fd2351d43804a57ac0f4406c2112a'] = 'Widget kart';
 $_MODULE['<{tpay}prestashop>tpay_5add32cd1f3d800e55157999a7470db3'] = 'Wyświetl metodę płatności w widgecie';
 $_MODULE['<{tpay}prestashop>tpay_30b95da4d0c97cd63150d7115f161d5c'] = 'Wyświetl metodę płatności w widgecie';
 $_MODULE['<{tpay}prestashop>tpay_18059342ab22f4ce9dcb766714593cf1'] = 'Używaj konta Sandbox';
diff --git a/views/templates/_admin/configuration.tpl b/views/templates/_admin/configuration.tpl
index 1b74220..51ae5bd 100644
--- a/views/templates/_admin/configuration.tpl
+++ b/views/templates/_admin/configuration.tpl
@@ -11,11 +11,13 @@
 *  @copyright 2010-2022 tpay.com
 *  @license   LICENSE.txt
 *}
+<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script>
 <script type="text/javascript">
-
 	$(document).ready(function () {
-
 		let tpaySurcharge = $('input[name=TPAY_SURCHARGE_ACTIVE]');
+		let tpayTransfer = $('input[name=TPAY_TRANSFER_WIDGET]');
+		var selectElementOrder = $('#TPAY_CUSTOM_ORDER\\[\\]');
+		var selectElement = $('#TPAY_GENERIC_PAYMENTS\\[\\]');
 
 		function checkTpaySurcharge(state) {
 			const tpaySurchargeType = $('input[name=TPAY_SURCHARGE_TYPE]').parents('.form-group');
@@ -30,17 +32,124 @@
 			}
 		}
 
+		function initializeSortableOrder() {
+			selectElementOrder.find('option').prop('selected', true);
+			selectElementOrder.hide();
+
+			var listElementOrder = $('<ul id="sortable-order-list" class="sortable-list"></ul>').insertAfter(selectElementOrder);
+
+			selectElementOrder.find('option').each(function () {
+				var listItem = $('<li class="ui-state-default" id="option-' + $(this).val() + '" title="Przesuń, żeby zmienić kolejność">' +
+						$(this).text() + '</li>');
+				listElementOrder.append(listItem);
+			});
+
+			listElementOrder.sortable({
+				placeholder: "ui-state-highlight",
+				stop: function (event, ui) {
+					var sortedIDs = $(this).sortable('toArray', { attribute: 'id' });
+
+					selectElementOrder.empty();
+					$.each(sortedIDs, function (index, value) {
+						var optionValue = value.replace('option-', '');
+						var optionText = $('#sortable-order-list li#' + value).text();
+						selectElementOrder.append('<option value="' + optionValue + '" selected>' + optionText + '</option>');
+					});
+				}
+			}).disableSelection();
+
+			listElementOrder.find('li').attr('title', 'Przesuń, żeby zmienić kolejność');
+		}
+
+		function checkTpayTransfer(state) {
+			const tpayCustomOrder = selectElementOrder.parents('.form-group');
+
+			if (state === '1') {
+				tpayCustomOrder.show();
+			} else {
+				tpayCustomOrder.hide();
+			}
+		}
+
+		function initializeSortableGenericPayments() {
+			selectElement.hide();
+
+			var listElement = $('<ul id="sortable-list" class="sortable-list"></ul>').insertAfter(selectElement);
+
+			selectElement.find('option').each(function () {
+				var isChecked = $(this).is(':selected');
+				var listItem = $('<li class="ui-state-default" id="option-' + $(this).val() + '" title="Przesuń, żeby zmienić kolejność">' +
+						'<input type="checkbox" class="select-checkbox" value="' + $(this).val() + '"' + (isChecked ? ' checked' : '') + '>' +
+						$(this).text() + '</li>');
+				listElement.append(listItem);
+			});
+
+			listElement.sortable({
+				placeholder: "ui-state-highlight",
+				stop: function (event, ui) {
+					var sortedIDs = $(this).sortable('toArray', { attribute: 'id' });
+
+					selectElement.empty();
+					$.each(sortedIDs, function (index, value) {
+						var optionValue = value.replace('option-', '');
+						var optionText = $('#sortable-list li#' + value).text();
+						var isChecked = $('#sortable-list li#' + value).find('.select-checkbox').is(':checked');
+						selectElement.append('<option value="' + optionValue + '" ' + (isChecked ? 'selected' : '') + '>' + optionText + '</option>');
+					});
+				}
+			}).disableSelection();
+
+			$(document).on('change', '.select-checkbox', function () {
+				var checkboxValue = $(this).val();
+				if ($(this).is(':checked')) {
+					selectElement.find('option[value="' + checkboxValue + '"]').prop('selected', true);
+				} else {
+					selectElement.find('option[value="' + checkboxValue + '"]').prop('selected', false);
+				}
+			});
+		}
+
 		checkTpaySurcharge($('input[name=TPAY_SURCHARGE_ACTIVE]:checked').val());
+		checkTpayTransfer($('input[name=TPAY_TRANSFER_WIDGET]:checked').val());
+		initializeSortableOrder();
+		initializeSortableGenericPayments();
 
 		tpaySurcharge.change(function () {
 			checkTpaySurcharge($(this).val());
-		})
+		});
 
+		tpayTransfer.change(function () {
+			checkTpayTransfer($(this).val());
+		});
 	});
-
 </script>
 <style>
-    #content > .bootstrap > .alert {
-	    display: none
-    }
+	#content > .bootstrap > .alert {
+		display: none
+	}
+
+	.sortable-list {
+		list-style-type: none;
+		margin: 0;
+		border: 1px solid;
+		max-width: 300px;
+		padding: 10px;
+		max-height: 400px;
+		overflow-y: auto;
+	}
+
+	.sortable-list li {
+		display: flex;
+		align-items: center;
+		padding: 5px;
+		border-bottom: 1px solid #eee;
+	}
+
+	#sortable-list .select-checkbox {
+		margin: 5px;
+	}
+
+	.sortable-list li:last-child {
+		border-bottom: none;
+	}
 </style>

From 9a622b418f4ef9fe07b86c28887e205f1e461b72 Mon Sep 17 00:00:00 2001
From: kGablo <krzysztof.gablo@tpay.com>
Date: Fri, 2 Aug 2024 12:23:58 +0200
Subject: [PATCH 2/9] Add custom order for banks and generic payments

---
 controllers/admin/TpayConfigurationController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/admin/TpayConfigurationController.php b/controllers/admin/TpayConfigurationController.php
index 2d1c924..e168451 100644
--- a/controllers/admin/TpayConfigurationController.php
+++ b/controllers/admin/TpayConfigurationController.php
@@ -765,7 +765,7 @@ private function getChannels()
     private function sortPayment(string $field): array
     {
         $channels = $this->channels;
-        $chosenPayments = json_decode(Cfg::get($field), true);
+        $chosenPayments = json_decode(Cfg::get($field), true) ?? [];
 
         if (count($chosenPayments) > 0) {
             $orderedList = [];

From 251a50473513401f15dc9da1af03c642f1175827 Mon Sep 17 00:00:00 2001
From: kGablo <krzysztof.gablo@tpay.com>
Date: Fri, 2 Aug 2024 12:42:51 +0200
Subject: [PATCH 3/9] Add custom order for banks and generic payments

---
 src/Util/Helper.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Util/Helper.php b/src/Util/Helper.php
index 98f9c7e..c00bfa3 100644
--- a/src/Util/Helper.php
+++ b/src/Util/Helper.php
@@ -45,6 +45,8 @@ public static function getFields(): array
             'TPAY_BLIK_ACTIVE',
             'TPAY_BLIK_WIDGET',
             'TPAY_TRANSFER_WIDGET',
+            'TPAY_CUSTOM_ORDER[]',
+            'TPAY_CUSTOM_ORDER',
             'TPAY_CARD_WIDGET',
             'TPAY_INSTALLMENTS_ACTIVE',
             'TPAY_PEKAO_INSTALLMENTS_ACTIVE',

From d294575505a3c578c2c35ee8db222a119ddad2b4 Mon Sep 17 00:00:00 2001
From: kGablo <krzysztof.gablo@tpay.com>
Date: Mon, 5 Aug 2024 08:18:04 +0200
Subject: [PATCH 4/9] Add custom order for banks and generic payments

---
 controllers/admin/TpayConfigurationController.php |  2 +-
 translations/pl.php                               |  5 +++--
 views/templates/_admin/configuration.tpl          | 12 ++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/controllers/admin/TpayConfigurationController.php b/controllers/admin/TpayConfigurationController.php
index e168451..36c8b0e 100644
--- a/controllers/admin/TpayConfigurationController.php
+++ b/controllers/admin/TpayConfigurationController.php
@@ -474,7 +474,7 @@ public function formPaymentOptions(): array
                     'name' => 'TPAY_CUSTOM_ORDER[]',
                     'multiple' => true,
                     'class' => 'child',
-                    'desc' => $this->module->l('Custom order of displayed banks. Drag to change order'),
+                    'desc' => $this->module->l('Custom order of displayed banks. Drag to change order. The ability to change the order of payment methods is possible when the "Direct bank redirect" option is enabled.'),
                     'size' => 20,
                     'options' => [
                         'query' => $this->sortPayment('TPAY_CUSTOM_ORDER'),
diff --git a/translations/pl.php b/translations/pl.php
index c39d914..fb39274 100644
--- a/translations/pl.php
+++ b/translations/pl.php
@@ -147,8 +147,9 @@
 $_MODULE['<{tpay}prestashop>tpay_321d4f2bb69eb9edd173cfd0c02500f2'] = 'Forma pola CRC';
 $_MODULE['<{tpay}prestashop>tpay_542b1d933b6142f66e3cfb215ffa2f70'] = 'Widget przelewów';
 $_MODULE['<{tpay}prestashop>tpay_9291570afa178cc68f9fa711153822bd'] = 'Własna kolejność';
-$_MODULE['<{tpay}prestashop>tpay_550cbbbc14019038a72c2b4aacd23061'] = 'Własna kolejność wyświetlanych banków. Przeciągnij, żeby zmienić kolejność';
-$_MODULE['<{tpay}prestashop>tpay_0e4929b5127c6468265b817bad986f8b'] = 'Własna kolejność wyświetlanych metod płatności. Przeciągnij, żeby zmienić kolejność';$_MODULE['<{tpay}prestashop>tpay_483fd2351d43804a57ac0f4406c2112a'] = 'Widget kart';
+$_MODULE['<{tpay}prestashop>tpay_520132326c61928684fbd55983f0ac64'] = 'Własna kolejność wyświetlanych banków. Przeciągnij, żeby zmienić kolejność.  Możliwość zmiany kolejności metod płatności jest możliwa przy uruchomionej opcji "Bezpośrednie przekierowanie do banku".';
+$_MODULE['<{tpay}prestashop>tpay_0e4929b5127c6468265b817bad986f8b'] = 'Własna kolejność wyświetlanych metod płatności. Przeciągnij, żeby zmienić kolejność';
+$_MODULE['<{tpay}prestashop>tpay_483fd2351d43804a57ac0f4406c2112a'] = 'Widget kart';
 $_MODULE['<{tpay}prestashop>tpay_5add32cd1f3d800e55157999a7470db3'] = 'Wyświetl metodę płatności w widgecie';
 $_MODULE['<{tpay}prestashop>tpay_30b95da4d0c97cd63150d7115f161d5c'] = 'Wyświetl metodę płatności w widgecie';
 $_MODULE['<{tpay}prestashop>tpay_18059342ab22f4ce9dcb766714593cf1'] = 'Używaj konta Sandbox';
diff --git a/views/templates/_admin/configuration.tpl b/views/templates/_admin/configuration.tpl
index 51ae5bd..99b57fa 100644
--- a/views/templates/_admin/configuration.tpl
+++ b/views/templates/_admin/configuration.tpl
@@ -15,7 +15,7 @@
 <script type="text/javascript">
 	$(document).ready(function () {
 		let tpaySurcharge = $('input[name=TPAY_SURCHARGE_ACTIVE]');
-		let tpayTransfer = $('input[name=TPAY_TRANSFER_WIDGET]');
+		let tpayTransfer = $('input[name=TPAY_REDIRECT_TO_CHANNEL]');
 		var selectElementOrder = $('#TPAY_CUSTOM_ORDER\\[\\]');
 		var selectElement = $('#TPAY_GENERIC_PAYMENTS\\[\\]');
 
@@ -39,7 +39,7 @@
 			var listElementOrder = $('<ul id="sortable-order-list" class="sortable-list"></ul>').insertAfter(selectElementOrder);
 
 			selectElementOrder.find('option').each(function () {
-				var listItem = $('<li class="ui-state-default" id="option-' + $(this).val() + '" title="Przesuń, żeby zmienić kolejność">' +
+				var listItem = $('<li class="ui-state-default" id="option-' + $(this).val() + '" title="Drag to reorder">' +
 						$(this).text() + '</li>');
 				listElementOrder.append(listItem);
 			});
@@ -58,11 +58,11 @@
 				}
 			}).disableSelection();
 
-			listElementOrder.find('li').attr('title', 'Przesuń, żeby zmienić kolejność');
+			listElementOrder.find('li').attr('title', 'Drag to reorder');
 		}
 
 		function checkTpayTransfer(state) {
-			const tpayCustomOrder = selectElementOrder.parents('.form-group');
+			const tpayCustomOrder = $('#sortable-order-list');
 
 			if (state === '1') {
 				tpayCustomOrder.show();
@@ -78,7 +78,7 @@
 
 			selectElement.find('option').each(function () {
 				var isChecked = $(this).is(':selected');
-				var listItem = $('<li class="ui-state-default" id="option-' + $(this).val() + '" title="Przesuń, żeby zmienić kolejność">' +
+				var listItem = $('<li class="ui-state-default" id="option-' + $(this).val() + '" title="Drag to reorder">' +
 						'<input type="checkbox" class="select-checkbox" value="' + $(this).val() + '"' + (isChecked ? ' checked' : '') + '>' +
 						$(this).text() + '</li>');
 				listElement.append(listItem);
@@ -110,8 +110,8 @@
 		}
 
 		checkTpaySurcharge($('input[name=TPAY_SURCHARGE_ACTIVE]:checked').val());
-		checkTpayTransfer($('input[name=TPAY_TRANSFER_WIDGET]:checked').val());
 		initializeSortableOrder();
+		checkTpayTransfer($('input[name=TPAY_REDIRECT_TO_CHANNEL]:checked').val());
 		initializeSortableGenericPayments();
 
 		tpaySurcharge.change(function () {

From 0565e1c3274d18892b5f7d760d4bccf64a15d01f Mon Sep 17 00:00:00 2001
From: kGablo <krzysztof.gablo@tpay.com>
Date: Mon, 5 Aug 2024 11:59:14 +0200
Subject: [PATCH 5/9] Add custom order for banks and generic payments

---
 src/Service/ConstraintValidator.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Service/ConstraintValidator.php b/src/Service/ConstraintValidator.php
index 0c9243c..6f7eb53 100644
--- a/src/Service/ConstraintValidator.php
+++ b/src/Service/ConstraintValidator.php
@@ -26,6 +26,8 @@ public function validate(array $constraints, string $browser): bool
                     if (!$this->validateMaximalTotal((float) $constraint['value'])) {
                         return false;
                     }
+
+                    break;
                 case 'supported':
                     return $this->isApplePayPossible($constraint['field'], $browser);
                 default:

From 2f502b8b0226dc769b779de0114dbcd7a0cdaa54 Mon Sep 17 00:00:00 2001
From: kGablo <krzysztof.gablo@tpay.com>
Date: Mon, 5 Aug 2024 14:38:37 +0200
Subject: [PATCH 6/9] Add custom order for banks and generic payments

---
 .../admin/TpayConfigurationController.php     | 88 +------------------
 src/Config/Config.php                         | 32 -------
 src/Factory/PaymentFactory.php                |  1 -
 src/Factory/PaymentOptionsFactory.php         | 20 -----
 .../PaymentOptions/AliorInstallment.php       | 64 --------------
 src/Service/PaymentOptions/ApplePay.php       | 57 ------------
 src/Service/PaymentOptions/GooglePay.php      | 63 -------------
 .../PaymentOptions/PaymentOptionsService.php  | 85 +-----------------
 .../PaymentOptions/PekaoInstallment.php       | 56 ------------
 src/Service/PaymentOptions/Twisto.php         | 64 --------------
 src/Util/Helper.php                           |  8 --
 translations/pl.php                           |  1 +
 views/templates/hook/applePay.tpl             | 30 -------
 views/templates/hook/gpay.tpl                 | 17 ----
 views/templates/hook/installments.tpl         | 17 ----
 views/templates/hook/pekao_installments.tpl   | 46 ----------
 16 files changed, 6 insertions(+), 643 deletions(-)
 delete mode 100644 src/Service/PaymentOptions/AliorInstallment.php
 delete mode 100644 src/Service/PaymentOptions/ApplePay.php
 delete mode 100644 src/Service/PaymentOptions/GooglePay.php
 delete mode 100644 src/Service/PaymentOptions/PekaoInstallment.php
 delete mode 100644 src/Service/PaymentOptions/Twisto.php
 delete mode 100644 views/templates/hook/applePay.tpl
 delete mode 100644 views/templates/hook/gpay.tpl
 delete mode 100644 views/templates/hook/installments.tpl
 delete mode 100644 views/templates/hook/pekao_installments.tpl

diff --git a/controllers/admin/TpayConfigurationController.php b/controllers/admin/TpayConfigurationController.php
index 36c8b0e..5f99194 100644
--- a/controllers/admin/TpayConfigurationController.php
+++ b/controllers/admin/TpayConfigurationController.php
@@ -479,91 +479,7 @@ public function formPaymentOptions(): array
                     'options' => [
                         'query' => $this->sortPayment('TPAY_CUSTOM_ORDER'),
                         'id' => 'id',
-                        'name' => 'name'
-                    ],
-                ],
-
-                [
-                    'type' => 'switch',
-                    'label' => $this->module->l('GooglePay'),
-                    'name' => 'TPAY_GPAY_ACTIVE',
-                    'desc' => $this->module->l('Show the method as a separate payment'),
-                    'is_bool' => true,
-                    'class' => 't',
-                    'values' => [
-                        [
-                            'id' => 'tpay_active_on',
-                            'value' => 1,
-                            'label' => $this->module->l('Yes'),
-                        ],
-                        [
-                            'id' => 'tpay_active_off',
-                            'value' => 0,
-                            'label' => $this->module->l('No'),
-                        ],
-                    ],
-                ],
-
-                [
-                    'type' => 'switch',
-                    'label' => $this->module->l('Alior Installment (from 300 PLN to 13 888,00 PLN)'),
-                    'name' => 'TPAY_INSTALLMENTS_ACTIVE',
-                    'desc' => $this->module->l('Show the method as a separate payment'),
-                    'is_bool' => true,
-                    'class' => 't',
-                    'values' => [
-                        [
-                            'id' => 'tpay_installments_on',
-                            'value' => 1,
-                            'label' => $this->module->l('Yes'),
-                        ],
-                        [
-                            'id' => 'tpay_installments_off',
-                            'value' => 0,
-                            'label' => $this->module->l('No'),
-                        ],
-                    ],
-                ],
-
-                [
-                    'type' => 'switch',
-                    'label' => $this->module->l('Pekao Installment (from 100 PLN to 20 000 PLN)'),
-                    'name' => 'TPAY_PEKAO_INSTALLMENTS_ACTIVE',
-                    'desc' => $this->module->l('Show the method as a separate payment'),
-                    'is_bool' => true,
-                    'class' => 't',
-                    'values' => [
-                        [
-                            'id' => 'tpay_pekao_installments_on',
-                            'value' => 1,
-                            'label' => $this->module->l('Yes'),
-                        ],
-                        [
-                            'id' => 'tpay_pekao_installments_off',
-                            'value' => 0,
-                            'label' => $this->module->l('No'),
-                        ],
-                    ],
-                ],
-
-                [
-                    'type' => 'switch',
-                    'label' => sprintf($this->module->l('Twisto - Buy now, pay later (from 1 PLN to 1 500 PLN)')),
-                    'name' => 'TPAY_TWISTO_ACTIVE',
-                    'desc' => $this->module->l('Show the method as a separate payment'),
-                    'is_bool' => true,
-                    'class' => 't',
-                    'values' => [
-                        [
-                            'id' => 'tpay_installments_on',
-                            'value' => 1,
-                            'label' => $this->module->l('Yes'),
-                        ],
-                        [
-                            'id' => 'tpay_installments_off',
-                            'value' => 0,
-                            'label' => $this->module->l('No'),
-                        ],
+                        'name' => 'fullName'
                     ],
                 ],
             ],
@@ -742,7 +658,7 @@ private function formGenericPaymentOptions(): array
                         'options' => [
                             'query' => $result,
                             'id' => 'id',
-                            'name' => 'name'
+                            'name' => 'fullName'
                         ],
                     ]
                 ],
diff --git a/src/Config/Config.php b/src/Config/Config.php
index 018431d..cbf97dc 100644
--- a/src/Config/Config.php
+++ b/src/Config/Config.php
@@ -22,50 +22,18 @@ class Config
     public const TPAY_PAYMENT_CARDS = 'cards';
     public const TPAY_PAYMENT_BLIK = 'blik';
     public const TPAY_PAYMENT_GPAY = 'gpay';
-    public const TPAY_PAYMENT_INSTALLMENTS = 'installments';
     public const TPAY_PAYMENT_GENERIC = 'generic';
 
-    public const TPAY_GATEWAY_ALIOR_RATY = 109;
-    public const TPAY_GATEWAY_PEKAO_RATY = 169;
-    public const TPAY_GATEWAY_TWISTO = 167;
-    public const TPAY_GATEWAY_PAYPO = 172;
-    public const TPAY_GATEWAY_GOOGLE_PAY = 166;
-
-    /// IDS to get bank channels
-    public const GATEWAY_TWISTO = 71; //71
-
-    public const GATEWAY_PAYPO = 83;
-    public const GATEWAY_ALIOR_RATY = 49; // 49
     public const GATEWAY_CARD = 53;
     public const GATEWAY_BLIK = 64;
     public const GATEWAY_BLIK_0 = 150;
-    public const GATEWAY_GOOGLE_PAY = 68;
 
     public const GATEWAY_TRANSFER = 999;
 
-    public const GATEWAY_APPLE_PAY = 9999;
-    public const GATEWAYS_PEKAO_RATY_3x0 = 78;
-    public const GATEWAYS_PEKAO_RATY_10x0 = 80;
-
-    public const GATEWAYS_PEKAO_RATY_50 = 81;
-    public const GATEWAYS_PEKAO_RATY = 77;
-
     public const CARD_GROUP_ID = 103;
 
     public const TPAY_VIEW_REDIRECT = 0;
     public const TPAY_SURCHARGE_AMOUNT = 0;
     public const TPAY_SURCHARGE_PERCENT = 1;
     public const TPAY_PATH = 'module:tpay/views/templates/front';
-
-    public const TWISTO_MIN = 1.00;
-    public const TWISTO_MAX = 1500;
-    public const ALIOR_RATY_MIN = 300;
-    public const ALIOR_RATY_MAX = 13888.00;
-
-    public const PEKAO_RATY_MIN = 100;
-    public const PEKAO_RATY_MAX = 20000;
-
-    public const PAYPO_MIN = 40;
-
-    public const PAYPO_MAX = 3000;
 }
diff --git a/src/Factory/PaymentFactory.php b/src/Factory/PaymentFactory.php
index 18711f5..8477b9c 100644
--- a/src/Factory/PaymentFactory.php
+++ b/src/Factory/PaymentFactory.php
@@ -37,7 +37,6 @@ public static function getPaymentMethod(string $type)
     {
         switch ($type) {
             case Config::TPAY_PAYMENT_BASIC:
-            case Config::TPAY_PAYMENT_INSTALLMENTS:
             case Config::TPAY_PAYMENT_GPAY:
             case Config::TPAY_PAYMENT_BLIK:
                 return new BasicPaymentHandler();
diff --git a/src/Factory/PaymentOptionsFactory.php b/src/Factory/PaymentOptionsFactory.php
index b4972fb..c9b36e9 100644
--- a/src/Factory/PaymentOptionsFactory.php
+++ b/src/Factory/PaymentOptionsFactory.php
@@ -20,12 +20,7 @@
 use Tpay\Service\PaymentOptions\Blik;
 use Tpay\Service\PaymentOptions\Card;
 use Tpay\Service\PaymentOptions\GatewayType;
-use Tpay\Service\PaymentOptions\Generic;
-use Tpay\Service\PaymentOptions\GooglePay;
-use Tpay\Service\PaymentOptions\AliorInstallment;
-use Tpay\Service\PaymentOptions\PekaoInstallment;
 use Tpay\Service\PaymentOptions\Transfer;
-use Tpay\Service\PaymentOptions\Twisto;
 
 class PaymentOptionsFactory
 {
@@ -40,27 +35,12 @@ public static function getOptionById(int $id)
             case Config::GATEWAY_TRANSFER:
                 $paymentMethod = new Transfer();
                 break;
-            case Config::GATEWAY_ALIOR_RATY:
-                $paymentMethod = new AliorInstallment();
-                break;
             case Config::GATEWAY_CARD:
                 $paymentMethod = new Card();
                 break;
-            case Config::GATEWAY_TWISTO:
-                $paymentMethod = new Twisto();
-                break;
             case Config::GATEWAY_BLIK:
                 $paymentMethod = new Blik();
                 break;
-            case Config::GATEWAY_GOOGLE_PAY:
-                $paymentMethod = new GooglePay();
-                break;
-            case Config::GATEWAYS_PEKAO_RATY:
-            case Config::GATEWAYS_PEKAO_RATY_50:
-            case Config::GATEWAYS_PEKAO_RATY_10x0:
-            case Config::GATEWAYS_PEKAO_RATY_3x0:
-                $paymentMethod = new PekaoInstallment();
-                break;
             default:
                 $paymentMethod = '';
         }
diff --git a/src/Service/PaymentOptions/AliorInstallment.php b/src/Service/PaymentOptions/AliorInstallment.php
deleted file mode 100644
index 63444bf..0000000
--- a/src/Service/PaymentOptions/AliorInstallment.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * NOTICE OF LICENSE
- * This file is licenced under the Software License Agreement.
- * With the purchase or the installation of the software in your application
- * you accept the licence agreement.
- * You must not modify, adapt or create derivative works of this source code
- *
- * @author    Tpay
- * @copyright 2010-2022 tpay.com
- * @license   LICENSE.txt
- */
-
-declare(strict_types=1);
-
-namespace Tpay\Service\PaymentOptions;
-
-use Tpay\Config\Config;
-use Context;
-use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
-
-class AliorInstallment implements GatewayType
-{
-    private $method = 'payment';
-
-    public function getPaymentOption(
-        \Tpay $module,
-        PaymentOption $paymentOption,
-        array $data = []
-    ): PaymentOption {
-
-        $moduleLink = Context::getContext()->link->getModuleLink('tpay', $this->method, [], true);
-        Context::getContext()->smarty->assign([
-            'installments_moduleLink' => $moduleLink,
-        ]);
-
-        $paymentOption->setCallToActionText($module->l('Alior Raty'))
-            ->setAction($moduleLink)
-            ->setInputs([
-                [
-                    'type' => 'hidden',
-                    'name' => 'tpay',
-                    'value' => true,
-                ],
-                [
-                    'type' => 'hidden',
-                    'name' => 'type',
-                    'value' => Config::TPAY_PAYMENT_INSTALLMENTS,
-                ],
-                [
-                    'type' => 'hidden',
-                    'name' => 'tpay_transfer_id',
-                    'value' => Config::TPAY_GATEWAY_ALIOR_RATY,
-                ],
-           ])
-            ->setLogo($data['img'])
-            ->setAdditionalInformation(
-                $module->fetch('module:tpay/views/templates/hook/installments.tpl')
-            );
-
-        return $paymentOption;
-    }
-}
diff --git a/src/Service/PaymentOptions/ApplePay.php b/src/Service/PaymentOptions/ApplePay.php
deleted file mode 100644
index 1811d2f..0000000
--- a/src/Service/PaymentOptions/ApplePay.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * NOTICE OF LICENSE
- * This file is licenced under the Software License Agreement.
- * With the purchase or the installation of the software in your application
- * you accept the licence agreement.
- * You must not modify, adapt or create derivative works of this source code
- *
- * @author    Tpay
- * @copyright 2010-2022 tpay.com
- * @license   LICENSE.txt
- */
-
-declare(strict_types=1);
-
-namespace Tpay\Service\PaymentOptions;
-
-use Context;
-use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
-
-class ApplePay implements GatewayType
-{
-    private $method = 'payment';
-
-    public function getPaymentOption(
-        \Tpay $module,
-        PaymentOption $paymentOption,
-        array $data = []
-    ): PaymentOption {
-        $moduleLink = Context::getContext()->link->getModuleLink('tpay', $this->method, [], true);
-        Context::getContext()->smarty->assign([
-            'applePay_moduleLink' => $moduleLink,
-        ]);
-
-        $paymentOption->setCallToActionText($module->l('Apple Pay'))
-            ->setAction($moduleLink)
-            ->setLogo($data['img'])
-            ->setInputs([
-                [
-                    'type' => 'hidden',
-                    'name' => 'tpay',
-                    'value' => true,
-                ],
-                [
-                    'type' => 'hidden',
-                    'name' => 'type',
-                    'value' => 999,
-                ],
-            ])
-            ->setAdditionalInformation(
-                $module->fetch('module:tpay/views/templates/hook/applePay.tpl')
-            );
-
-        return $paymentOption;
-    }
-}
diff --git a/src/Service/PaymentOptions/GooglePay.php b/src/Service/PaymentOptions/GooglePay.php
deleted file mode 100644
index b00787e..0000000
--- a/src/Service/PaymentOptions/GooglePay.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * NOTICE OF LICENSE
- * This file is licenced under the Software License Agreement.
- * With the purchase or the installation of the software in your application
- * you accept the licence agreement.
- * You must not modify, adapt or create derivative works of this source code
- *
- * @author    Tpay
- * @copyright 2010-2022 tpay.com
- * @license   LICENSE.txt
- */
-
-declare(strict_types=1);
-
-namespace Tpay\Service\PaymentOptions;
-
-use Tpay\Config\Config;
-use Context;
-use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
-
-class GooglePay implements GatewayType
-{
-    private $method = 'payment';
-
-    public function getPaymentOption(
-        \Tpay $module,
-        PaymentOption $paymentOption,
-        array $data = []
-    ): PaymentOption {
-        $moduleLink = Context::getContext()->link->getModuleLink('tpay', $this->method, [], true);
-        Context::getContext()->smarty->assign([
-            'gpay_moduleLink' => $moduleLink,
-        ]);
-
-        $paymentOption->setCallToActionText($module->l('Google Pay'))
-            ->setAction($moduleLink)
-            ->setLogo($data['img'])
-            ->setInputs([
-                [
-                    'type' => 'hidden',
-                    'name' => 'tpay',
-                    'value' => true,
-                ],
-                [
-                    'type' => 'hidden',
-                    'name' => 'type',
-                    'value' => Config::TPAY_PAYMENT_GPAY,
-                ],
-                [
-                    'type' => 'hidden',
-                    'name' => 'tpay_transfer_id',
-                    'value' => Config::TPAY_GATEWAY_GOOGLE_PAY,
-                ],
-            ])
-            ->setAdditionalInformation(
-                $module->fetch('module:tpay/views/templates/hook/gpay.tpl')
-            );
-
-        return $paymentOption;
-    }
-}
diff --git a/src/Service/PaymentOptions/PaymentOptionsService.php b/src/Service/PaymentOptions/PaymentOptionsService.php
index 3812306..35cc782 100644
--- a/src/Service/PaymentOptions/PaymentOptionsService.php
+++ b/src/Service/PaymentOptions/PaymentOptionsService.php
@@ -51,7 +51,6 @@ public function getGroup(): void
     {
         try {
             $this->getPaymentGroups();
-            $this->getInstallmentChannels();
         } catch (\PrestaShopException $e) {
             \PrestaShopLogger::addLog('Error getGroup ' . $e->getMessage(), 4);
             throw new \PrestaShopException($e->getMessage());
@@ -74,20 +73,6 @@ public function createTransferPaymentChannel(): void
         $this->createGateway($payment);
     }
 
-    /**
-     * Create Apple Pay channel
-     * @return void
-     */
-    public function createApplePayPaymentChannel(): void
-    {
-        $payment = [
-            'img' => \Context::getContext()->shop->getBaseURL(true) . 'modules/tpay/views/img/tpay.svg',
-            'id' => Config::GATEWAY_APPLE_PAY,
-            'mainChannel' => Config::GATEWAY_APPLE_PAY,
-        ];
-        $this->createGateway($payment);
-    }
-
     /**
      * @return array
      */
@@ -95,8 +80,6 @@ public function getActivePayments(): array
     {
         // Adding transfer group
         $this->createTransferPaymentChannel();
-        // Adding Apple pay
-        $this->createApplePayPaymentChannel();
 
         $payments = array_filter(array_map(function (array $paymentData) {
             $optionClass = PaymentOptionsFactory::getOptionById((int)$paymentData['mainChannel']);
@@ -139,32 +122,7 @@ private function createGateway(array $array = []): void
      */
     private function getSeparatePayments(array $channels): array
     {
-        $paymentsMethods = [
-            Config::GATEWAY_BLIK => (bool)Helper::getMultistoreConfigurationValue('TPAY_BLIK_ACTIVE'),
-            Config::GATEWAY_GOOGLE_PAY => (bool)Helper::getMultistoreConfigurationValue('TPAY_GPAY_ACTIVE'),
-            Config::GATEWAY_APPLE_PAY => (bool)Helper::getMultistoreConfigurationValue('TPAY_APPLEPAY_ACTIVE'),
-        ];
-
-        if (isset($channels[Config::GATEWAY_ALIOR_RATY])) {
-            $paymentsMethods[Config::GATEWAY_ALIOR_RATY] = (bool)Helper::getMultistoreConfigurationValue(
-                'TPAY_INSTALLMENTS_ACTIVE'
-            );
-        }
-
-        if (isset($channels[Config::GATEWAY_TWISTO])) {
-            $paymentsMethods[Config::GATEWAY_TWISTO] = (bool)Helper::getMultistoreConfigurationValue(
-                'TPAY_TWISTO_ACTIVE'
-            );
-        }
-
-        if (isset($channels[Config::GATEWAYS_PEKAO_RATY])) {
-            $paymentsMethods[Config::GATEWAYS_PEKAO_RATY] =
-            $paymentsMethods[Config::GATEWAYS_PEKAO_RATY_3x0] =
-            $paymentsMethods[Config::GATEWAYS_PEKAO_RATY_50] =
-            $paymentsMethods[Config::GATEWAYS_PEKAO_RATY_10x0] = (bool)Helper::getMultistoreConfigurationValue(
-                'TPAY_PEKAO_INSTALLMENTS_ACTIVE'
-            );
-        }
+        $paymentsMethods = [];
 
         if ($this->hasActiveCard()) {
             $paymentsMethods[Config::GATEWAY_CARD] = (bool)Helper::getMultistoreConfigurationValue(
@@ -226,11 +184,11 @@ private function updateTransfers(array $transfers): void
     private function buildChannelsData(array $channels): array
     {
         $bankChannels = [];
-
         foreach ($channels as $channel) {
             if (!empty($channel['constraints']) && !$this->constraintValidator->validate($channel['constraints'], $this->getBrowser())) {
                 continue;
             }
+
             $bankChannels[$channel['id']] = [
                 'id' => $channel['groups'][0]['id'],
                 'name' => $channel['fullName'],
@@ -243,17 +201,6 @@ private function buildChannelsData(array $channels): array
         return $bankChannels;
     }
 
-    private function getInstallmentChannels(): void
-    {
-        $installmentIds = [Config::GATEWAY_ALIOR_RATY, Config::GATEWAY_PAYPO, Config::GATEWAY_TWISTO, Config::GATEWAYS_PEKAO_RATY];
-
-        foreach ($this->bankChannels as $channel) {
-            if (in_array($channel['id'], $installmentIds)) {
-                $this->installmentChannels[$channel['id']] = $channel;
-            }
-        }
-    }
-
     /**
      * Grouping of payments delivered from api
      * @param array $channels
@@ -262,14 +209,8 @@ private function getInstallmentChannels(): void
      */
     private function groupChannel(array $channels, array $compareArray): array
     {
-        if (isset($this->bankChannels[Config::GATEWAYS_PEKAO_RATY])) {
-            $availableChannels = [(string)Config::GATEWAYS_PEKAO_RATY, (string)Config::GATEWAYS_PEKAO_RATY_3x0, (string)Config::GATEWAYS_PEKAO_RATY_10x0];
-            $channels[Config::GATEWAYS_PEKAO_RATY]['availablePaymentChannels'] = $availableChannels;
-            $channels[Config::GATEWAYS_PEKAO_RATY]['mainChannel'] = reset($availableChannels);
-        }
-
         return array_filter($channels, function ($val) use ($compareArray) {
-            return in_array($val['mainChannel'], $compareArray) && !in_array($val['mainChannel'], [(string)Config::GATEWAYS_PEKAO_RATY_3x0, (string)Config::GATEWAYS_PEKAO_RATY_10x0]);
+            return in_array($val['mainChannel'], $compareArray);
         });
     }
 
@@ -284,25 +225,6 @@ private function groupChannel(array $channels, array $compareArray): array
      */
     private function groupTransfer(array $channels, array $compareArray): array
     {
-        if (Helper::getMultistoreConfigurationValue('TPAY_INSTALLMENTS_ACTIVE') || !isset($channels[Config::GATEWAY_ALIOR_RATY])) {
-            $compareArray[] = Config::GATEWAY_ALIOR_RATY;
-        }
-
-        if (Helper::getMultistoreConfigurationValue('TPAY_TWISTO_ACTIVE') || !isset($channels[Config::GATEWAY_TWISTO])) {
-            $compareArray[] = Config::GATEWAY_TWISTO;
-        }
-
-        if (Helper::getMultistoreConfigurationValue('TPAY_PEKAO_INSTALLMENTS_ACTIVE') || !isset($channels[Config::GATEWAYS_PEKAO_RATY])) {
-            $compareArray[] = Config::TPAY_GATEWAY_PEKAO_RATY;
-            $compareArray[] = Config::GATEWAYS_PEKAO_RATY_3x0;
-            $compareArray[] = Config::GATEWAYS_PEKAO_RATY;
-            $compareArray[] = Config::GATEWAYS_PEKAO_RATY_10x0;
-            $compareArray[] = Config::GATEWAYS_PEKAO_RATY_50;
-        }
-
-        if (!isset($channels[Config::GATEWAY_PAYPO])) {
-            $compareArray[] = Config::GATEWAY_PAYPO;
-        }
         $generics = Helper::getMultistoreConfigurationValue('TPAY_GENERIC_PAYMENTS') ? json_decode(Helper::getMultistoreConfigurationValue('TPAY_GENERIC_PAYMENTS')) : [];
         $compareChannels = array_merge($compareArray, $generics);
 
@@ -337,7 +259,6 @@ private function genericPayments(): array
             if ($channel === null) {
                 return null;
             }
-
             if (!empty($channel['constraints']) && !$this->constraintValidator->validate($channel['constraints'], $this->getBrowser())) {
                 return null;
             }
diff --git a/src/Service/PaymentOptions/PekaoInstallment.php b/src/Service/PaymentOptions/PekaoInstallment.php
deleted file mode 100644
index b0775fe..0000000
--- a/src/Service/PaymentOptions/PekaoInstallment.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * NOTICE OF LICENSE
- * This file is licenced under the Software License Agreement.
- * With the purchase or the installation of the software in your application
- * you accept the licence agreement.
- * You must not modify, adapt or create derivative works of this source code
- *
- * @author    Tpay
- * @copyright 2010-2022 tpay.com
- * @license   LICENSE.txt
- */
-
-declare(strict_types=1);
-
-namespace Tpay\Service\PaymentOptions;
-
-use Tpay\Config\Config;
-use Context;
-use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
-
-class PekaoInstallment implements GatewayType
-{
-    private $method = 'payment';
-
-    public function getPaymentOption(
-        \Tpay $module,
-        PaymentOption $paymentOption,
-        array $data = []
-    ): PaymentOption {
-
-        $moduleLink = Context::getContext()->link->getModuleLink('tpay', $this->method, [], true);
-        Context::getContext()->smarty->assign([
-            'installments_moduleLink' => $moduleLink,
-            'available_channels' => $data['availablePaymentChannels']
-        ]);
-        $paymentOption->setCallToActionText($module->l('Raty Pekao'))
-            ->setAction($moduleLink)
-            ->setLogo($data['img'])
-            ->setForm($this->generateForm());
-
-        return $paymentOption;
-    }
-    protected function generateForm()
-    {
-        Context::getContext()->smarty->assign([
-            'action' => Context::getContext()->link->getModuleLink('tpay', $this->method, [], true),
-            'tpay' => true,
-            'type' => Config::TPAY_PAYMENT_INSTALLMENTS,
-            'tpay_channel_id' => 0,
-        ]);
-
-        return Context::getContext()->smarty->fetch('module:tpay/views/templates/hook/pekao_installments.tpl');
-    }
-}
diff --git a/src/Service/PaymentOptions/Twisto.php b/src/Service/PaymentOptions/Twisto.php
deleted file mode 100644
index 475452f..0000000
--- a/src/Service/PaymentOptions/Twisto.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * NOTICE OF LICENSE
- * This file is licenced under the Software License Agreement.
- * With the purchase or the installation of the software in your application
- * you accept the licence agreement.
- * You must not modify, adapt or create derivative works of this source code
- *
- * @author    Tpay
- * @copyright 2010-2022 tpay.com
- * @license   LICENSE.txt
- */
-
-declare(strict_types=1);
-
-namespace Tpay\Service\PaymentOptions;
-
-use Tpay\Config\Config;
-use Context;
-use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
-
-class Twisto implements GatewayType
-{
-    private $method = 'payment';
-
-    public function getPaymentOption(
-        \Tpay $module,
-        PaymentOption $paymentOption,
-        array $data = []
-    ): PaymentOption {
-
-        $moduleLink = Context::getContext()->link->getModuleLink('tpay', $this->method, [], true);
-        Context::getContext()->smarty->assign([
-            'installments_moduleLink' => $moduleLink,
-        ]);
-
-        $paymentOption->setCallToActionText($module->l('Buy now, pay later'))
-            ->setAction($moduleLink)
-            ->setInputs([
-                [
-                    'type' => 'hidden',
-                    'name' => 'tpay',
-                    'value' => true,
-                ],
-                [
-                    'type' => 'hidden',
-                    'name' => 'type',
-                    'value' => Config::TPAY_PAYMENT_INSTALLMENTS,
-                ],
-                [
-                    'type' => 'hidden',
-                    'name' => 'tpay_transfer_id',
-                    'value' => Config::TPAY_GATEWAY_TWISTO,
-                ],
-            ])
-            ->setLogo($data['img'])
-            ->setAdditionalInformation(
-                $module->fetch('module:tpay/views/templates/hook/installments.tpl')
-            );
-
-        return $paymentOption;
-    }
-}
diff --git a/src/Util/Helper.php b/src/Util/Helper.php
index c00bfa3..334a8e2 100644
--- a/src/Util/Helper.php
+++ b/src/Util/Helper.php
@@ -48,14 +48,10 @@ public static function getFields(): array
             'TPAY_CUSTOM_ORDER[]',
             'TPAY_CUSTOM_ORDER',
             'TPAY_CARD_WIDGET',
-            'TPAY_INSTALLMENTS_ACTIVE',
-            'TPAY_PEKAO_INSTALLMENTS_ACTIVE',
-            'TPAY_TWISTO_ACTIVE',
             'TPAY_CARD_ACTIVE',
             'TPAY_CARD_RSA',
             'TPAY_MERCHANT_SECRET',
             'TPAY_CRC_FORM',
-            'TPAY_GPAY_ACTIVE',
             'TPAY_APPLEPAY_ACTIVE',
             'TPAY_SANDBOX',
             'TPAY_REDIRECT_TO_CHANNEL',
@@ -83,11 +79,7 @@ public static function getFieldsDefaultValues(): array
             'TPAY_BLIK_WIDGET' => '1',
             'TPAY_TRANSFER_WIDGET' => '1',
             'TPAY_CARD_WIDGET' => '1',
-            'TPAY_INSTALLMENTS_ACTIVE' => '0',
-            'TPAY_PEKAO_INSTALLMENTS_ACTIVE' => '0',
-            'TPAY_TWISTO_ACTIVE' => '0',
             'TPAY_CARD_ACTIVE' => '0',
-            'TPAY_GPAY_ACTIVE' => '0',
             'TPAY_APPLEPAY_ACTIVE' => '0',
             'TPAY_SANDBOX' => '0',
             'TPAY_REDIRECT_TO_CHANNEL' => '0',
diff --git a/translations/pl.php b/translations/pl.php
index fb39274..a329b79 100644
--- a/translations/pl.php
+++ b/translations/pl.php
@@ -184,6 +184,7 @@
 $_MODULE['<{tpay}prestashop>tpay_0bca037451ac432ae9fae53a78387a6e'] = 'Status transakcji opłaconej';
 $_MODULE['<{tpay}prestashop>tpay_f69d7a9f87546d78e76e0ee400dabeac'] = 'Status opłaconej transakcji, wyłącznie z produktami wirtualnymi';
 $_MODULE['<{tpay}prestashop>tpay_0af709feff4fe0f53053a235f7678645'] = 'Status transakcji zakończonej błędem';
+$_MODULE['<{tpay}prestashop>tpay_8fb5aa4295ce81b72ee77bfcfc016d1f'] = 'Płatności generyczne';
 $_MODULE['<{tpay}prestashop>tpay_f01cd1b2fc01de83f97ebfec55d0a986'] = 'Wybierz płatności do mechanizmu Easy on-site';
 $_MODULE['<{tpay}prestashop>tpay_2ddfca98ad03eb144c17e30df230fdf2'] = 'Wyświetl metodę płatności w widgecie. W przypadku posiadania innych wtyczek, które modyfikują konfigurację koszyka zakupowego, należy wyłączyć tę opcję.';
 $_MODULE['<{tpay}prestashop>invoicesurcharge_bb8278c756e2855300ee104481ad7d27'] = 'Opłata za płatność online';
diff --git a/views/templates/hook/applePay.tpl b/views/templates/hook/applePay.tpl
deleted file mode 100644
index 569c520..0000000
--- a/views/templates/hook/applePay.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{*
-* NOTICE OF LICENSE
-*
-* This file is licenced under the Software License Agreement.
-* With the purchase or the installation of the software in your application
-* you accept the licence agreement.
-*
-* You must not modify, adapt or create derivative works of this source code
-*
-*  @author    tpay.com
-*  @copyright 2010-2020 tpay.com
-*  @license   LICENSE.txt
-*}
-<div class="tpay-wrapper tpay-widget-wrap" data-payment-type="applePay">
-
-	<script src="https://applepay.cdn-apple.com/jsapi/v1/apple-pay-sdk.js"></script>
-
-	<style>
-        apple-pay-button {
-            --apple-pay-button-width: 260px;
-            --apple-pay-button-height: 38px;
-            --apple-pay-button-border-radius: 3px;
-            --apple-pay-button-padding: 0px 0px;
-            --apple-pay-button-box-sizing: border-box;
-        }
-	</style>
-	<apple-pay-button buttonstyle="black" type="buy" locale="pl-PL"></apple-pay-button>
-
-    {include file="module:tpay/views/templates/hook/regulations.tpl"}
-</div>
diff --git a/views/templates/hook/gpay.tpl b/views/templates/hook/gpay.tpl
deleted file mode 100644
index b7621de..0000000
--- a/views/templates/hook/gpay.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{*
-* NOTICE OF LICENSE
-*
-* This file is licenced under the Software License Agreement.
-* With the purchase or the installation of the software in your application
-* you accept the licence agreement.
-*
-* You must not modify, adapt or create derivative works of this source code
-*
-*  @author    tpay.com
-*  @copyright 2010-2020 tpay.com
-*  @license   LICENSE.txt
-*}
-<div class="tpay-wrapper tpay-widget-wrap" data-payment-type="gpay">
-    {l s='You will be redirected to the payment gateway.' mod='tpay'}
-    {include file="module:tpay/views/templates/hook/regulations.tpl"}
-</div>
diff --git a/views/templates/hook/installments.tpl b/views/templates/hook/installments.tpl
deleted file mode 100644
index fca18a5..0000000
--- a/views/templates/hook/installments.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{*
-* NOTICE OF LICENSE
-*
-* This file is licenced under the Software License Agreement.
-* With the purchase or the installation of the software in your application
-* you accept the licence agreement.
-*
-* You must not modify, adapt or create derivative works of this source code
-*
-*  @author    tpay.com
-*  @copyright 2010-2020 tpay.com
-*  @license   LICENSE.txt
-*}
-<div class="tpay-wrapper" data-payment-type="installments">
-    {l s='You will be redirected to the payment gateway.' mod='tpay'}
-    {include file="module:tpay/views/templates/hook/regulations.tpl"}
-</div>
diff --git a/views/templates/hook/pekao_installments.tpl b/views/templates/hook/pekao_installments.tpl
deleted file mode 100644
index 4547675..0000000
--- a/views/templates/hook/pekao_installments.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-{*
-* NOTICE OF LICENSE
-*
-* This file is licenced under the Software License Agreement.
-* With the purchase or the installation of the software in your application
-* you accept the licence agreement.
-*
-* You must not modify, adapt or create derivative works of this source code
-*
-*  @author    tpay.com
-*  @copyright 2010-2020 tpay.com
-*  @license   LICENSE.txt
-*}
-
-<div class="tpay-wrapper" style="width: 100%;" data-payment-type="transfer">
-    {if isset($available_channels) && $available_channels}
-
-      <form action="{$action}" id="installment-payment-form" class="transferForm">
-        <input type="hidden" name="tpay" value="{$tpay}">
-        <input type="hidden" name="type" value="{$type}">
-        <ul class="tpay-payment-gateways tpay-payment-gateways--grid">
-            {foreach $available_channels as $id}
-              <label for="transfer_{$id}" class="tpay-payment-gateways__item installments">
-                <input
-                  id="transfer_{$id}"
-                  type="radio" name="tpay_channel_id"
-                  value="{$id}" required="required" style="display: none"/>
-                <div class="tpay-payment-gateways__item-inner">
-                  <img class="img-fluid col-xs-12" src="https://secure.sandbox.tpay.com/_/banks/b{$id}e.png"/>
-                </div>
-              </label>
-            {/foreach}
-        </ul>
-      </form>
-
-      <div class="transfer-error" style="display: none">
-		<span class="tpay-error">
-			{l s='Please choose payment gateway' mod='tpay'}
-		</span>
-      </div>
-
-        {include file="module:tpay/views/templates/hook/regulations.tpl"}
-    {else}
-        {l s='No active installment gateways' mod='tpay'}
-    {/if}
-</div>

From 1d52285d2b61c9917e86de6fff51ef72f1faf552 Mon Sep 17 00:00:00 2001
From: kGablo <krzysztof.gablo@tpay.com>
Date: Tue, 6 Aug 2024 09:36:20 +0200
Subject: [PATCH 7/9] Add custom order for banks and generic payments

---
 controllers/admin/TpayConfigurationController.php    | 7 +++++--
 src/Service/PaymentOptions/PaymentOptionsService.php | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/controllers/admin/TpayConfigurationController.php b/controllers/admin/TpayConfigurationController.php
index 5f99194..4f0101c 100644
--- a/controllers/admin/TpayConfigurationController.php
+++ b/controllers/admin/TpayConfigurationController.php
@@ -134,9 +134,9 @@ public function createForm(): array
         $this->getChannels();
         $form[] = $this->formBasicOptions();
         $form[] = $this->formPaymentOptions();
+        $form[] = $this->formGenericPaymentOptions();
         $form[] = $this->formCardOptions();
         $form[] = $this->formStatusesOptions();
-        $form[] = $this->formGenericPaymentOptions();
 
         return $form;
     }
@@ -646,7 +646,10 @@ private function formGenericPaymentOptions(): array
 
         return [
             'form' => [
-                'legend' => ['title' => 'Generic payments', 'icon' => 'icon-cogs'],
+                'legend' => [
+                    'title' => $this->module->l('Generic payments'),
+                    'icon' => 'icon-cogs'
+                ],
                 'input' => [
                     [
                         'type' => 'select',
diff --git a/src/Service/PaymentOptions/PaymentOptionsService.php b/src/Service/PaymentOptions/PaymentOptionsService.php
index 35cc782..2de27f5 100644
--- a/src/Service/PaymentOptions/PaymentOptionsService.php
+++ b/src/Service/PaymentOptions/PaymentOptionsService.php
@@ -122,7 +122,9 @@ private function createGateway(array $array = []): void
      */
     private function getSeparatePayments(array $channels): array
     {
-        $paymentsMethods = [];
+        $paymentsMethods = [
+            Config::GATEWAY_BLIK => (bool)Helper::getMultistoreConfigurationValue('TPAY_BLIK_ACTIVE'),
+        ];
 
         if ($this->hasActiveCard()) {
             $paymentsMethods[Config::GATEWAY_CARD] = (bool)Helper::getMultistoreConfigurationValue(

From f0aab40bd4d097ec081df5eb977383f89fda58aa Mon Sep 17 00:00:00 2001
From: kGablo <krzysztof.gablo@tpay.com>
Date: Tue, 6 Aug 2024 13:50:40 +0200
Subject: [PATCH 8/9] Add custom order for banks and generic payments

---
 controllers/front/confirmation.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/controllers/front/confirmation.php b/controllers/front/confirmation.php
index 043a9e9..ab6fb55 100644
--- a/controllers/front/confirmation.php
+++ b/controllers/front/confirmation.php
@@ -23,7 +23,6 @@ public function initContent()
         $type = Tools::getValue('type');
 
         switch ($type) {
-            case Config::TPAY_PAYMENT_INSTALLMENTS:
             case Config::TPAY_PAYMENT_BASIC:
             case Config::TPAY_PAYMENT_BLIK:
             case Config::TPAY_PAYMENT_CARDS:

From 6f74ffc363ada82e7f520ef1c0996baade0514e0 Mon Sep 17 00:00:00 2001
From: kGablo <krzysztof.gablo@tpay.com>
Date: Wed, 7 Aug 2024 11:18:08 +0200
Subject: [PATCH 9/9] Add custom order for banks and generic payments

---
 src/Hook/Payment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Hook/Payment.php b/src/Hook/Payment.php
index e725f34..0426f6f 100644
--- a/src/Hook/Payment.php
+++ b/src/Hook/Payment.php
@@ -49,7 +49,7 @@ public function paymentOptions($params)
             'clause_url' => 'https://tpay.com/user/assets/files_for_download/information-clause-payer.pdf'
         ];
 
-        if ($this->context->language->getIsoCode() == 'pl') {
+        if (substr($this->context->currentLocale->getCode(), 0, 2) == 'pl') {
             $langData = [
                 'regulation_url' => 'https://secure.tpay.com/regulamin.pdf',
                 'clause_url' => 'https://tpay.com/user/assets/files_for_download/klauzula-informacyjna-platnik.pdf'