[PW-1692]: Updating Payment methods > Payment Link (#624)

* Replaced group and field labels and comment.

etc/adminhtml/system/adyen_pay_by_mail.xml

@@ -24,10 +24,10 @@
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
     <group id="adyen_pay_by_mail" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label><![CDATA[Pay by Mail integration]]></label>
-        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
+        <label><![CDATA[Payment Link integration]]></label>
+        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>adyen-method-adyen-cc</fieldset_css>
-        <comment>Process Pay By Mail transactions</comment>
+        <comment>Create an order and send an Adyen payment link directly to the shopper.</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>
@@ -43,10 +43,27 @@
             <config_path>payment/adyen_pay_by_mail/sort_order</config_path>
         </field>
         <field id="session_validity" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Session Validity</label>
+            <label>Days until link expires</label>
             <tooltip>How many days do you want this payment page to be active</tooltip>
             <config_path>payment/adyen_pay_by_mail/session_validity</config_path>
         </field>
+        <field id="skin_code" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Skin Code</label>
+            <tooltip>The skin code you want to use</tooltip>
+            <config_path>payment/adyen_pay_by_mail/skin_code</config_path>
+        </field>
+        <field id="hmac_test" translate="label" type="obscure" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>HMAC Key for Test</label>
+            <tooltip>Should match with the HMAC test key in the Adyen Customer Area.</tooltip>
+            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+            <config_path>payment/adyen_pay_by_mail/hmac_test</config_path>
+        </field>
+        <field id="hmac_live" translate="label" type="obscure" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>HMAC Key for Live</label>
+            <tooltip>Should match with the HMAC live key in the Adyen Customer Area.</tooltip>
+            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+            <config_path>payment/adyen_pay_by_mail/hmac_live</config_path>
+        </field>
         <group id="adyen_pay_by_mail_country_specific" translate="label" showInDefault="1" showInWebsite="1" sortOrder="210">
             <label>Country Specific Settings</label>
             <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>

etc/adminhtml/system/adyen_settings_ecommerce_payments.xml

@@ -92,29 +92,5 @@
             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
             <config_path>payment/adyen_abstract/paypal_capture_mode</config_path>
         </field>
-        <field id="payment_link_settings" translate="label" sortOrder="130" showInDefault="1" showInWebsite="1">
-            <label>Payment link settings</label>
-            <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
-            <attribute type="shared">1</attribute>
-        </field>
-        <field id="payment_link_settings_subtitle" translate="label" sortOrder="130" showInDefault="1" showInWebsite="1">
-            <label>These settings are required if you want to use the Payment link payment method.</label>
-            <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
-            <attribute type="shared">0</attribute>
-        </field>
-        <field id="skin_code" translate="label" type="text" sortOrder="140" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Skin code</label>
-            <config_path>payment/adyen_pay_by_mail/skin_code</config_path>
-        </field>
-        <field id="hmac_test" translate="label" type="obscure" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>HMAC Key for Test</label>
-            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-            <config_path>payment/adyen_pay_by_mail/hmac_test</config_path>
-        </field>
-        <field id="hmac_live" translate="label" type="obscure" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>HMAC Key for Live</label>
-            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-            <config_path>payment/adyen_pay_by_mail/hmac_live</config_path>
-        </field>
     </group>
 </include>
\ No newline at end of file