[PW-1686] Payment methods > Credit cards (#586)

* Add payment methods group * Add payment methods xml file * Added depends tag for specific country * Added depends tag for specific country, Correct capitalization

[PW-1686] Payment methods > Credit cards (#586)
* Add payment methods group * Add payment methods xml file * Added depends tag for specific country * Added depends tag for specific country, Correct capitalization
ad5b6133 · Alexandros Moraitis · acampos1916 · f7b1ab1e · ad5b6133 · ad5b6133
Commit ad5b6133 authored Nov 15, 2019 by Alexandros Moraitis Committed by acampos1916 Jan 09, 2020
5 changed files
--- a/etc/adminhtml/system.xml
+++ b/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"/>

--- a/etc/adminhtml/system/adyen_billing_agreements.xml
+++ b/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
--- a/etc/adminhtml/system/adyen_cc.xml
+++ b/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>
@@ -70,13 +49,15 @@
               sortOrder="150">
            <label>Advanced Settings</label>
            <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-            <field id="enable_installments" translate="label" type="select" sortOrder="219" showInDefault="1"
+            <field id="enable_moto" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1"
-                   showInWebsite="1" showInStore="1">
+                   showInStore="1">
-                <label>Enable Installments</label>
+                <label>Enable MOTO</label>
+                <tooltip>
+                    <![CDATA[Important you have to activate MOTO for your account contact magento@adyen.com.]]></tooltip>
                <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_moto</config_path>
-                <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>
@@ -96,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
--- a/etc/adminhtml/system/adyen_payment_methods.xml
+++ b/etc/adminhtml/system/adyen_payment_methods.xml
+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="payment_methods" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Payment methods</label>
+        <group id="credit_cards" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+           <label>Credit cards</label>
+            <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>Enabled credit card types</label>
+                <source_model>Adyen\Payment\Model\Config\Source\CcType</source_model>
+                <config_path>payment/adyen_cc/cctypes</config_path>
+            </field>
+        <group id="store_shopper_details_options" translate="label" type="text" sortOrder="50" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Store shopper details options</label>
+            <comment><![CDATA[Adyen can securely store the credit card payment details of your shoppers, allowing you to offer recurring payments.
+            For more information please visit our <a target="_blank" href="https://docs.adyen.com/">docs.</a>]]></comment>
+            <field id="store_oneclick" translate="label" type="select" sortOrder="10" showInDefault="1"
+                   showInWebsite="1"
+                   showInStore="1">
+                <label>Store one-click contracts</label>
+                <tooltip>"To complete the transaction, the shopper needs to enter their CVC/CVV"</tooltip>
+                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                <config_path>payment/adyen_abstract/enable_oneclick</config_path>
+            </field>
+            <field id="store_recurring" translate="label" type="select" sortOrder="20" showInDefault="1"
+                   showInWebsite="1"
+                   showInStore="1">
+                <label>Store recurring contracts</label>
+                <tooltip>"You can complete the transaction without the shopper being present"</tooltip>
+                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                <config_path>payment/adyen_abstract/enable_recurring</config_path>
+            </field>
+        </group>
+        <group id="advanced_options" translate="label" showInDefault="1" showInWebsite="1" sortOrder="60">
+            <label>Advanced options</label>
+            <field id="enable_installments" translate="label" type="select" sortOrder="10" showInDefault="1"
+                   showInWebsite="1" showInStore="1">
+                <label>Enable installments</label>
+                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                <config_path>payment/adyen_cc/enable_installments</config_path>
+            </field>
+            <field id="allowspecific" translate="label" type="allowspecific" sortOrder="20" 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="30" showInDefault="1"
+                   showInWebsite="1" showInStore="0">
+                <label>Payment from specific countries</label>
+                <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+                <depends>
+                    <field id="allowspecific">1</field>
+                </depends>
+                <can_be_empty>1</can_be_empty>
+                <config_path>payment/adyen_cc/specificcountry</config_path>
+            </field>
+        </group>
+        </group>
+    </group>
+</include>
--- a/etc/config.xml
+++ b/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>
@@ -85,7 +85,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>