PLGMAG2V2-30 Alphabetically order the payment gateways in the 'Paymen…

…t Gateways' tab and 'Default selected method' list (#74) * Alphabetically ordered the payment gateways * Make function non static
MultiSafepay · Feb 16, 2021 · 7d101b1 · 7d101b1
1 parent 25269e1
commit 7d101b1
Show file tree

Hide file tree

Showing 32 changed files with 36 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ 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).
 
 ## [Unreleased]
+### Fixed
+- Alphabetically ordered the payment gateways in the 'Payment Gateways' tab and 'Default selected method' list
 
 ## [1.3.0] - 2021-01-26
 ### Added

diff --git a/Model/Config/Source/Methods.php b/Model/Config/Source/Methods.php
@@ -64,6 +64,10 @@ public function getAllMethods(): array
             }
         }
 
+        usort($methods, function ($method1, $method2) {
+            return $method1['label'] <=> $method2['label'];
+        });
+
         return $methods;
     }
 }
diff --git a/etc/adminhtml/system/gateways/multisafepay_alipay.xml b/etc/adminhtml/system/gateways/multisafepay_alipay.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_alipay" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_alipay" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/wallet/alipay/" target="blank">Alipay</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_amex.xml b/etc/adminhtml/system/gateways/multisafepay_amex.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_amex" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_amex" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/credit-and-debit-cards/american-express/" target="blank">American Express</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_applepay.xml b/etc/adminhtml/system/gateways/multisafepay_applepay.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_applepay" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_applepay" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/wallet/applepay/" target="blank">Apple Pay</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_bancontact.xml b/etc/adminhtml/system/gateways/multisafepay_bancontact.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_bancontact" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_bancontact" translate="label" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/banks/bancontact/" target="blank">Bancontact</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_banktransfer.xml b/etc/adminhtml/system/gateways/multisafepay_banktransfer.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_banktransfer" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_banktransfer" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/banks/bank-transfer/" target="blank">Bank Transfer</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_belfius.xml b/etc/adminhtml/system/gateways/multisafepay_belfius.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_belfius" translate="label" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_belfius" translate="label" type="text" sortOrder="35" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/banks/belfius/" target="blank">Belfius</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_cbc.xml b/etc/adminhtml/system/gateways/multisafepay_cbc.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_cbc" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_cbc" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/banks/cbc/" target="blank">CBC</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_creditcard.xml b/etc/adminhtml/system/gateways/multisafepay_creditcard.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_creditcard" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_creditcard" translate="label" type="text" sortOrder="45" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/credit-and-debit-cards/" target="blank">Credit Card</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_directbanktransfer.xml b/etc/adminhtml/system/gateways/multisafepay_directbanktransfer.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_directbanktransfer" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_directbanktransfer" translate="label" type="text" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/banks/request-to-pay/" target="blank">Request To Pay</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_directdebit.xml b/etc/adminhtml/system/gateways/multisafepay_directdebit.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_directdebit" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_directdebit" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/banks/sepa-direct-debit/" target="blank">Direct Debit</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_dotpay.xml b/etc/adminhtml/system/gateways/multisafepay_dotpay.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_dotpay" translate="label" type="text" sortOrder="35" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_dotpay" translate="label" type="text" sortOrder="55" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/banks/dotpay/" target="blank">Dotpay</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_einvoicing.xml b/etc/adminhtml/system/gateways/multisafepay_einvoicing.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_einvoicing" translate="label" type="text" sortOrder="75" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_einvoicing" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/billing-suite/e-invoicing/" target="blank">E-invoicing</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_eps.xml b/etc/adminhtml/system/gateways/multisafepay_eps.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_eps" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_eps" translate="label" type="text" sortOrder="65" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/banks/eps/" target="blank">EPS Überweisung</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_giropay.xml b/etc/adminhtml/system/gateways/multisafepay_giropay.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_giropay" translate="label" type="text" sortOrder="45" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_giropay" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/banks/giropay/" target="blank">Giropay</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_ideal.xml b/etc/adminhtml/system/gateways/multisafepay_ideal.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_ideal" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_ideal" translate="label" type="text" sortOrder="75" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/banks/ideal/" target="blank">iDEAL</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_idealqr.xml b/etc/adminhtml/system/gateways/multisafepay_idealqr.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_idealqr" translate="label" type="text" sortOrder="55" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_idealqr" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/banks/idealqr/" target="blank">iDEAL QR</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_in3.xml b/etc/adminhtml/system/gateways/multisafepay_in3.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_in3" translate="label" type="text" sortOrder="55" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_in3" translate="label" type="text" sortOrder="85" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/billing-suite/in3/" target="blank">in3</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_inghomepay.xml b/etc/adminhtml/system/gateways/multisafepay_inghomepay.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_inghomepay" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_inghomepay" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/banks/ing-home-pay/" target="blank">ING Home'Pay</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_kbc.xml b/etc/adminhtml/system/gateways/multisafepay_kbc.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_kbc" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_kbc" translate="label" type="text" sortOrder="95" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/banks/kbc/" target="blank">KBC</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_klarna.xml b/etc/adminhtml/system/gateways/multisafepay_klarna.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_klarna" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_klarna" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/billing-suite/klarna/" target="blank">Klarna - buy now, pay later</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_maestro.xml b/etc/adminhtml/system/gateways/multisafepay_maestro.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_maestro" translate="label" type="text" sortOrder="65" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_maestro" translate="label" type="text" sortOrder="105" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/credit-and-debit-cards/maestro/" target="blank">Maestro</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_mastercard.xml b/etc/adminhtml/system/gateways/multisafepay_mastercard.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_mastercard" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_mastercard" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/credit-and-debit-cards/mastercard/" target="blank">Mastercard</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_payafter.xml b/etc/adminhtml/system/gateways/multisafepay_payafter.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_payafter" translate="label" type="text" sortOrder="75" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_payafter" translate="label" type="text" sortOrder="115" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/billing-suite/pay-after-delivery/" target="blank">Pay After Delivery</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_paypal.xml b/etc/adminhtml/system/gateways/multisafepay_paypal.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_paypal" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_paypal" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/wallet/paypal/" target="blank">Paypal</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>

diff --git a/etc/adminhtml/system/gateways/multisafepay_paysafecard.xml b/etc/adminhtml/system/gateways/multisafepay_paysafecard.xml
@@ -1,5 +1,5 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="multisafepay_paysafecard" translate="label" type="text" sortOrder="85" showInDefault="1" showInWebsite="1" showInStore="1">
+    <group id="multisafepay_paysafecard" translate="label" type="text" sortOrder="125" showInDefault="1" showInWebsite="1" showInStore="1">
         <label><![CDATA[<a href="https://docs.multisafepay.com/payment-methods/prepaid-cards/paysafecard/" target="blank">Paysafecard</a>]]></label>
         <frontend_model>MultiSafepay\ConnectAdminhtml\Block\Adminhtml\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>complex multisafepay-payment multisafepay-section</fieldset_css>