Add payment methods group

etc/adminhtml/system.xml

@@ -37,6 +37,7 @@
                 <include path="Adyen_Payment::system/adyen_settings_ecommerce_payments.xml"/>
                 <include path="Adyen_Payment::system/adyen_settings_point_of_sale_payments.xml"/>
                 <include path="Adyen_Payment::system/adyen_magento_order_management.xml"/>
+                <include path="Adyen_Payment::system/adyen_payment_methods.xml"/>
                 <include path="Adyen_Payment::system/adyen_advanced_notifications.xml"/>
                 <include path="Adyen_Payment::system/adyen_billing_agreements.xml"/>
                 <include path="Adyen_Payment::system/adyen_checkout_experience.xml"/>

etc/adminhtml/system/adyen_billing_agreements.xml

@@ -27,25 +27,6 @@
     <group id="adyen_billing_agreements" translate="label" type="text" sortOrder="50" showInDefault="1"
            showInWebsite="1" showInStore="1">
         <label><![CDATA[Advanced: Billing Agreements]]></label>
-        <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-        <field id="enable_oneclick" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1"
-               showInStore="1">
-            <label>Enable OneClick</label>
-            <tooltip>The shopper opts in to storing their card details for future use. The shopper is present for the
-                subsequent transaction, for cards the security code (CVC/CVV) is required.
-            </tooltip>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-            <config_path>payment/adyen_abstract/enable_oneclick</config_path>
-        </field>
 
-        <field id="enable_recurring" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1"
-               showInStore="1">
-            <label>Enable Recurring</label>
-            <tooltip>Payment details are stored for future use. For cards, the security
-                code (CVC/CVV) is not required for subsequent payments.
-            </tooltip>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-            <config_path>payment/adyen_abstract/enable_recurring</config_path>
-        </field>
     </group>
 </include>
\ No newline at end of file

etc/adminhtml/system/adyen_cc.xml

@@ -30,29 +30,8 @@
         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
         <fieldset_css>adyen-method-adyen-cc</fieldset_css>
         <comment>Process creditcard payments inside your checkout.</comment>
-        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1"
-               showInStore="1">
-            <label>Enabled</label>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-            <config_path>payment/adyen_cc/active</config_path>
-        </field>
-        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1"
-               showInStore="1">
-            <label>Title</label>
-            <config_path>payment/adyen_cc/title</config_path>
-        </field>
-        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
-               showInStore="0">
-            <label>Sort Order</label>
-            <frontend_class>validate-number</frontend_class>
-            <config_path>payment/adyen_cc/sort_order</config_path>
-        </field>
-        <field id="cctypes" translate="label" type="multiselect" sortOrder="40" showInDefault="1" showInWebsite="1"
-               showInStore="0">
-            <label>Credit Card Types</label>
-            <source_model>Adyen\Payment\Model\Config\Source\CcType</source_model>
-            <config_path>payment/adyen_cc/cctypes</config_path>
-        </field>
+
+
         <field id="adyen_cc_vault" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1"
                showInStore="0">
             <label>Vault Enabled</label>
@@ -78,13 +57,7 @@
                 <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 <config_path>payment/adyen_cc/enable_moto</config_path>
             </field>
-            <field id="enable_installments" translate="label" type="select" sortOrder="219" showInDefault="1"
-                   showInWebsite="1" showInStore="1">
-                <label>Enable Installments</label>
-                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                <tooltip>Enable installments for each credit card type.</tooltip>
-                <config_path>payment/adyen_cc/enable_installments</config_path>
-            </field>
+
             <field id="installments" translate="label" sortOrder="220" showInDefault="1" showInWebsite="1"
                    showInStore="1">
                 <label>Installments</label>
@@ -104,20 +77,8 @@
 
         <group id="adyen_cc_country_specific" translate="label" showInDefault="1" showInWebsite="1" sortOrder="200">
             <label>Country Specific Settings</label>
-            <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-            <field id="allowspecific" translate="label" type="allowspecific" sortOrder="100" showInDefault="1"
-                   showInWebsite="1" showInStore="0">
-                <label>Payment from Applicable Countries</label>
-                <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                <config_path>payment/adyen_cc/allowspecific</config_path>
-            </field>
-            <field id="specificcountry" translate="label" type="multiselect" sortOrder="200" showInDefault="1"
-                   showInWebsite="1" showInStore="0">
-                <label>Payment from Specific Countries</label>
-                <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
-                <can_be_empty>1</can_be_empty>
-                <config_path>payment/adyen_cc/specificcountry</config_path>
-            </field>
+
+
         </group>
     </group>
 </include>
\ No newline at end of file

etc/config.xml

@@ -35,7 +35,7 @@
                 <sepa_flow>sale</sepa_flow>
                 <split_payments_refund_strategy>1</split_payments_refund_strategy>
                 <return_path>checkout/cart</return_path>
-                <enable_oneclick>1</enable_oneclick>
+                <enable_oneclick>0</enable_oneclick>
                 <enable_recurring>0</enable_recurring>
                 <payment_pre_authorized>pending</payment_pre_authorized>
                 <fraud_manual_review_accept_status>pending</fraud_manual_review_accept_status>
@@ -44,9 +44,9 @@
                 <group>adyen</group>
             </adyen_abstract>
             <adyen_cc>
-                <active>1</active>
+                <active>0</active>
                 <model>AdyenPaymentCcFacade</model>
-                <title>Credit Card</title>
+                <title>Adyen Credit Card</title>
                 <allowspecific>0</allowspecific>
                 <sort_order>2</sort_order>
                 <cctypes>AE,VI,MC,DI</cctypes>
@@ -86,7 +86,7 @@
                 </instant_purchase>
             </adyen_google_pay_vault>
             <adyen_oneclick>
-                <active>1</active>
+                <active>0</active>
                 <model>AdyenPaymentOneclickFacade</model>
                 <title>Adyen stored billing agreements</title>
                 <allowspecific>0</allowspecific>