From e7113217e0907a88d783e987310b1ec760e330c7 Mon Sep 17 00:00:00 2001
From: woutse <wouter@pay.nl>
Date: Tue, 1 Nov 2022 12:34:43 +0100
Subject: [PATCH] Fixed merge issue

---
 etc/adminhtml/system.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index ed9d89dd..d3d48dc6 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -12,27 +12,22 @@
             <resource>Paynl_Payment::config</resource>
             <group id="paynl_general_settings" translate="label" type="text" sortOrder="11" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Pay. - Setup</label>
-                <field id="version" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="version" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Version</label>
                     <frontend_model>Paynl\Payment\Block\Adminhtml\Render\Version</frontend_model>
                 </field>
-                <field id="testmode" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Testmode</label>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/paynl/testmode</config_path>
-                </field>
-                <field id="status" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="status" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Status</label>
                     <frontend_model>Paynl\Payment\Block\Adminhtml\Render\Credentials</frontend_model>
                 </field>
-                <field id="tokencode" translate="label, comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="tokencode" translate="label, comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Tokencode</label>
                     <comment>
                         <![CDATA[Get your AT-code <a target='_blank' href='https://admin.pay.nl/company/tokens'>here</a>. Not registered at PAY? Sign up <a target='_blank' href='https://www.pay.nl/en?register'>here</a>!]]>
                     </comment>
-                    <config_path>payment/paynl/tokencode</config_path>     
+                    <config_path>payment/paynl/tokencode</config_path>
                 </field>
-                <field id="apitoken_encrypted" translate="label, comment" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="apitoken_encrypted" translate="label, comment" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>API-token</label>
                     <comment>
                         <![CDATA[Your API-token, you can find your tokens <a target='_blank' href='https://admin.pay.nl/company/tokens'>here</a>]]>
@@ -40,13 +35,18 @@
                     <config_path>payment/paynl/apitoken_encrypted</config_path>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
-                <field id="serviceid" translate="label, comment" type="text" sortOrder="51" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="serviceid" translate="label, comment" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>ServiceId</label>
                     <comment>
                         <![CDATA[The SL-code of your service, you can find your services <a target='_blank' href='https://admin.pay.nl/programs/programs'>here</a>]]>
                     </comment>
                     <config_path>payment/paynl/serviceid</config_path>
-                </field>          
+                </field>
+                <field id="testmode" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Testmode</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <config_path>payment/paynl/testmode</config_path>
+                </field>
             </group>
         </section>
         <section id="paynl_paymentmethods" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="15" translate="label">