Split the files and added Boleto to payment methods

efe17a80 · alexandros · f7188ecc · efe17a80 · efe17a80 · efe17a80
Commit efe17a80 authored Nov 15, 2019 by alexandros
5 changed files
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -43,11 +43,9 @@
                <include path="Adyen_Payment::system/adyen_checkout_experience.xml"/>
                <include path="Adyen_Payment::system/adyen_manual_review.xml"/>
                <include path="Adyen_Payment::system/adyen_split_payment.xml"/>
-                <include path="Adyen_Payment::system/adyen_cc.xml"/>
                <include path="Adyen_Payment::system/adyen_oneclick.xml"/>
                <include path="Adyen_Payment::system/adyen_hpp.xml"/>
                <include path="Adyen_Payment::system/adyen_pay_by_mail.xml"/>
-                <include path="Adyen_Payment::system/adyen_boleto.xml"/>
                <include path="Adyen_Payment::system/adyen_apple_pay.xml"/>
                <include path="Adyen_Payment::system/adyen_google_pay.xml"/>
            </group>

--- a/etc/adminhtml/system/adyen_boleto.xml
+++ b/etc/adminhtml/system/adyen_boleto.xml
@@ -24,10 +24,9 @@
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
    <group id="adyen_boleto" translate="label" type="text" sortOrder="450" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label><![CDATA[Boleto integration]]></label>
+        <label><![CDATA[Boleto]]></label>
        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
        <fieldset_css>adyen-method-adyen-cc</fieldset_css>
-        <comment>Process Boleto transactions</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>
@@ -37,39 +36,28 @@
            <label>Title</label>
            <config_path>payment/adyen_boleto/title</config_path>
        </field>
-        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Sort Order</label>
+            <label>Sort order</label>
            <frontend_class>validate-number</frontend_class>
            <config_path>payment/adyen_boleto/sort_order</config_path>
        </field>
-        <field id="cctypes" translate="label" type="multiselect" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
+        <field id="delivery_days" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Boleto Types</label>
+            <label>Days for deliveryadn payment</label>
-            <depends><field id="active">1</field></depends>
-            <validate>validate-no-empty</validate>
-            <source_model>Adyen\Payment\Model\Config\Source\BoletoType</source_model>
-            <config_path>payment/adyen_boleto/boletotypes</config_path>
-        </field>
-        <field id="delivery_days" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>Days for Delivery</label>
-            <tooltip>How many days to be added to the current date for delivery. Only numbers allowed.</tooltip>
            <frontend_class>validate-number</frontend_class>
            <config_path>payment/adyen_boleto/delivery_days</config_path>
        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="40" showInDefault="1"
-        <group id="adyen_boleto_country_specific" translate="label" showInDefault="1" showInWebsite="1" sortOrder="210">
+               showInWebsite="1" showInStore="1">
-            <label>Country Specific Settings</label>
+            <label>Payment from applicable countries</label>
-            <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-            <field id="allowspecific" translate="label" type="allowspecific" sortOrder="40" 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_boleto/allowspecific</config_path>
        </field>
-            <field id="specificcountry" translate="label" type="multiselect" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="50" showInDefault="1"
-                <label>Payment from Specific Countries</label>
+               showInWebsite="1" showInStore="1">
+            <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_boleto/specificcountry</config_path>
        </field>
    </group>
-    </group>
 </include>
\ No newline at end of file
--- a/etc/adminhtml/system/adyen_cc.xml
+++ b/etc/adminhtml/system/adyen_cc.xml
@@ -24,61 +24,81 @@
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="adyen_cc" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1"
+    <group id="credit_cards" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label><![CDATA[Credit cards]]></label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1"
               showInStore="1">
-        <label><![CDATA[CreditCard API integration]]></label>
+            <label>Enabled</label>
-        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-        <fieldset_css>adyen-method-adyen-cc</fieldset_css>
+            <config_path>payment/adyen_cc/active</config_path>
-        <comment>Process creditcard payments inside your checkout.</comment>
+        </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>
-        <field id="adyen_cc_vault" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1"
+        <group id="store_shopper_details_options" translate="label" type="text" sortOrder="50" showInDefault="1"
-               showInStore="0">
+               showInWebsite="1" showInStore="1">
-            <label>Vault Enabled</label>
+            <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_cc_vault/active</config_path>
+                <config_path>payment/adyen_abstract/enable_oneclick</config_path>
            </field>
-        <field id="adyen_cc_threeds2" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1"
+            <field id="store_recurring" translate="label" type="select" sortOrder="20" showInDefault="1"
+                   showInWebsite="1"
                   showInStore="1">
-            <label>3DS2.0 Enabled</label>
+                <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_cc/threeds2_enabled</config_path>
+                <config_path>payment/adyen_abstract/enable_recurring</config_path>
            </field>
+        </group>
-        <group id="adyen_cc_advanced_settings" translate="label" showInDefault="1" showInWebsite="1" showInStore="1"
+        <group id="advanced_options" translate="label" showInDefault="1" showInWebsite="1" sortOrder="60">
-               sortOrder="150">
+            <label>Advanced options</label>
-            <label>Advanced Settings</label>
+            <field id="enable_installments" translate="label" type="select" sortOrder="10" showInDefault="1"
-            <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
+                   showInWebsite="1" showInStore="1">
-            <field id="enable_moto" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1"
+                <label>Enable installments</label>
-                   showInStore="1">
-                <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>
-                <config_path>payment/adyen_cc/enable_moto</config_path>
+                <config_path>payment/adyen_cc/enable_installments</config_path>
            </field>
+            <field id="allowspecific" translate="label" type="allowspecific" sortOrder="20" showInDefault="1"
-            <field id="installments" translate="label" sortOrder="220" showInDefault="1" showInWebsite="1"
+                   showInWebsite="1" showInStore="0">
-                   showInStore="1">
+                <label>Payment from applicable countries</label>
-                <label>Installments</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="enable_installments">1</field>
+                    <field id="allowspecific">1</field>
                </depends>
-                <tooltip>Configure your installment for each credit card type: Insert the minimum amount required to
+                <can_be_empty>1</can_be_empty>
-                    make the configured installment available in the amount range column.
+                <config_path>payment/adyen_cc/specificcountry</config_path>
-                    Example: if the amount range is configured to 100 and the number of installments to 4x, the shopper
-                    will see the 4x option only if the payment total is higher or equal than 100.
-                </tooltip>
-                <frontend_model>Adyen\Payment\Block\Adminhtml\System\Config\Field\Installments</frontend_model>
-                <backend_model>Adyen\Payment\Model\Config\Backend\Installments</backend_model>
-                <config_path>payment/adyen_cc/installments</config_path>
            </field>
        </group>
-        <group id="adyen_cc_country_specific" translate="label" showInDefault="1" showInWebsite="1" sortOrder="200">
-            <label>Country Specific Settings</label>
-        </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
@@ -25,84 +25,8 @@
 <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>
+        <include path="Adyen_Payment::system/adyen_cc.xml"/>
-        <group id="credit_cards" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+        <include path="Adyen_Payment::system/adyen_boleto.xml"/>
-           <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>

--- a/etc/config.xml
+++ b/etc/config.xml
@@ -177,11 +177,11 @@
            <adyen_boleto>
                <active>0</active>
                <model>AdyenPaymentBoletoFacade</model>
-                <title>Boleto</title>
+                <title></title>
                <allowspecific>0</allowspecific>
-                <sort_order>8</sort_order>
+                <sort_order></sort_order>
                <payment_action>authorize</payment_action>
-                <delivery_days>5</delivery_days>
+                <delivery_days></delivery_days>
                <is_gateway>1</is_gateway>
                <can_use_checkout>1</can_use_checkout>
                <can_authorize>1</can_authorize>