Merge branch 'MAGETWO-42411' of github.corp.ebay.com:magento-mpi/magento2ce into MAGETWO-43005

Ievgen Sentiabov · Ievgen Sentiabov · commit 2a200eab1e06 · 2015-09-17T17:47:18.000+03:00
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
@@ -37,7 +37,7 @@
                 <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
                 <requires>
-                    <group id="pphs_required_settings"/>
+                    <group id="pphs_required_settings_pphs"/>
                 </requires>
                 <frontend_class>paypal-enabler paypal-ec-separate</frontend_class>
             </field>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution_with_express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution_with_express_checkout.xml
@@ -16,6 +16,9 @@
                 <label>Website Payments Pro Hosted Solution and Express Checkout</label>
             </group>
             <field id="pphs_enable">
+                <requires>
+                    <group id="pphs_required_settings_pphs"/>
+                </requires>
                 <frontend_class>paypal-enabler</frontend_class>
             </field>
         </group>
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
@@ -1164,7 +1164,7 @@
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
                         <requires>
-                            <group id="pphs_required_settings"/>
+                            <group id="pphs_required_settings_pphs"/>
                         </requires>
                         <frontend_class>paypal-enabler paypal-ec-separate</frontend_class>
                     </field>
@@ -1967,6 +1967,9 @@
                             <label>Website Payments Pro Hosted Solution and Express Checkout</label>
                         </group>
                         <field id="pphs_enable">
+                            <requires>
+                                <group id="pphs_required_settings_pphs"/>
+                            </requires>
                             <frontend_class>paypal-enabler</frontend_class>
                         </field>
                     </group>
