Skip to content

Commit cb1462a

Browse files
committed
MAGETWO-57227: Payments configuration sections default setting are wrong
1 parent 29d72c0 commit cb1462a

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

app/code/Magento/Paypal/etc/adminhtml/system.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
<group id="other_paypal_payment_solutions" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
2929
<label>Other PayPal Payment Solutions:</label>
3030
<fieldset_css>paypal-top-section paypal-other-header</fieldset_css>
31-
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
31+
<frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
3232
</group>
3333
<group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
3434
<label>Other Payment Methods:</label>
3535
<fieldset_css>paypal-top-section payments-other-header</fieldset_css>
36-
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
36+
<frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
3737
</group>
3838
</section>
3939
<section id="payment_all_paypal" showInDefault="0" showInWebsite="0" showInStore="0">

app/code/Magento/Paypal/view/adminhtml/web/styles.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,6 @@
3030
.paypal-other-header > .admin__collapsible-block > a.open::before {content: "\25B2" !important;}
3131
.paypal-other-header > .admin__collapsible-block > a::before {color: #000; content: "\25BC" !important; font-size: 1rem; top: 2.2rem;}
3232
.paypal-other-header > .admin__collapsible-block > a {color: #007bdb !important; text-align: right;}
33-
.payments-other-header > .admin__collapsible-block > a::before {content: "" !important;}
33+
.payments-other-header > .admin__collapsible-block > a {display: inline-block;}
34+
.payments-other-header > .admin__collapsible-block > a::before {content: "\25BC" !important; font-size: 1rem;}
35+
.payments-other-header > .admin__collapsible-block > a.open::before {content: "\25B2" !important;}

dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
<group id="other_paypal_payment_solutions" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
2929
<label>Other PayPal Payment Solutions:</label>
3030
<fieldset_css>paypal-top-section paypal-other-header</fieldset_css>
31-
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
31+
<frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
3232
</group>
3333
<group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
3434
<label>Other Payment Methods:</label>
3535
<fieldset_css>paypal-top-section payments-other-header</fieldset_css>
36-
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
36+
<frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
3737
</group>
3838
</section>
3939
<section id="payment_all_paypal" showInDefault="0" showInWebsite="0" showInStore="0">

dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
<group id="other_paypal_payment_solutions" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
2929
<label>Other PayPal Payment Solutions:</label>
3030
<fieldset_css>paypal-top-section paypal-other-header</fieldset_css>
31-
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
31+
<frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
3232
</group>
3333
<group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
3434
<label>Other Payment Methods:</label>
3535
<fieldset_css>paypal-top-section payments-other-header</fieldset_css>
36-
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
36+
<frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
3737
</group>
3838
</section>
3939
<section id="payment_all_paypal" showInDefault="0" showInWebsite="0" showInStore="0">

0 commit comments

Comments
 (0)