Skip to content

Commit ab2c789

Browse files
irenelagnoirenelagno
committed
MC-13730: PayPal Smart button settings are displayed for "Payments Standard" payment method also.
- revert PayPal credit settings for PayFlow Link, Payment Standards and Payments Advanced - update Smart buttons config labels, tooltip
1 parent aa8f955 commit ab2c789

File tree

9 files changed

+52
-38
lines changed

9 files changed

+52
-38
lines changed

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,23 @@
106106
<field id="enable_express_checkout">
107107
<config_path>payment/wps_express/active</config_path>
108108
</field>
109-
<field id="enable_express_checkout_bml">
109+
<field id="enable_express_checkout_bml" showInDefault="1" showInWebsite="1">
110110
<config_path>payment/wps_express_bml/active</config_path>
111111
</field>
112+
<field id="express_checkout_bml_sort_order" showInDefault="1" showInWebsite="1"/>
112113
</group>
113114
<group id="settings_ec" translate="label">
114115
<label>Basic Settings - PayPal Website Payments Standard</label>
116+
<group id="settings_ec_advanced">
117+
<group id="express_checkout_frontend">
118+
<field id="checkout_display" showInDefault="0" showInWebsite="0" showInStore="0"/>
119+
<group id="checkout_page_button" showInDefault="0" showInWebsite="0" showInStore="0"/>
120+
<group id="product_page_button" showInDefault="0" showInWebsite="0" showInStore="0"/>
121+
<group id="cart_page_button" showInDefault="0" showInWebsite="0" showInStore="0"/>
122+
<group id="mini_cart_page_button" showInDefault="0" showInWebsite="0" showInStore="0"/>
123+
<group id="features" showInDefault="0" showInWebsite="0" showInStore="0"/>
124+
</group>
125+
</group>
115126
</group>
116127
</group>
117128
</group>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -646,15 +646,14 @@
646646
<attribute type="shared">1</attribute>
647647
</field>
648648
<field id="checkout_display" translate="label" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
649-
<label>Checkout Display</label>
649+
<label>Customize Smart Buttons</label>
650650
<frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
651651
<attribute type="shared">1</attribute>
652652
</field>
653653
<group id="checkout_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
654-
<label>PayPal Button - Checkout Page</label>
655-
<field id="checkout_page_button_customize" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
654+
<label>Checkout Page</label>
655+
<field id="checkout_page_button_customize" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
656656
<label>Customize Button</label>
657-
<comment><![CDATA[Customize the display of the PayPal button in the Checkout.]]></comment>
658657
<config_path>paypal/style/checkout_page_button_customize</config_path>
659658
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
660659
<attribute type="shared">1</attribute>
@@ -699,10 +698,11 @@
699698
</depends>
700699
<attribute type="shared">1</attribute>
701700
</field>
702-
<field id="checkout_page_button_size" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
701+
<field id="checkout_page_button_size" translate="label tooltip" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
703702
<label>Size</label>
704703
<config_path>paypal/style/checkout_page_button_size</config_path>
705704
<source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getSize</source_model>
705+
<tooltip>Select Responsive to ensure the PayPal button renders correctly on mobile devices.</tooltip>
706706
<depends>
707707
<field id="checkout_page_button_customize">1</field>
708708
</depends>
@@ -728,8 +728,8 @@
728728
<attribute type="shared">1</attribute>
729729
</field>
730730
</group>
731-
<group id="product_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
732-
<label>PayPal Button - Product Page</label>
731+
<group id="product_page_button" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
732+
<label>Product Pages</label>
733733
<field id="product_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
734734
<comment/>
735735
<config_path>paypal/style/product_page_button_customize</config_path>
@@ -782,7 +782,7 @@
782782
</field>
783783
</group>
784784
<group id="cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="110">
785-
<label>PayPal Button - Cart Page</label>
785+
<label>Cart Page</label>
786786
<field id="cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
787787
<comment/>
788788
<config_path>paypal/style/cart_page_button_customize</config_path>
@@ -835,7 +835,7 @@
835835
</field>
836836
</group>
837837
<group id="mini_cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
838-
<label>PayPal Button - Mini Cart</label>
838+
<label>Mini Cart</label>
839839
<field id="mini_cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
840840
<comment/>
841841
<config_path>paypal/style/mini_cart_page_button_customize</config_path>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<field id="enable_payflow_advanced"/>
9898
</requires>
9999
</field>
100-
<field id="enable_express_checkout_bml" sortOrder="42" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml">
100+
<field id="enable_express_checkout_bml" sortOrder="42" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" showInDefault="1" showInWebsite="1">
101101
<comment><![CDATA[PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
102102
You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
103103
<a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
@@ -108,7 +108,7 @@
108108
<field id="enable_payflow_advanced"/>
109109
</requires>
110110
</field>
111-
<field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
111+
<field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order" showInDefault="1" showInWebsite="1">
112112
<config_path>payment/payflow_express_bml/sort_order</config_path>
113113
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
114114
<depends>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<field id="enable_payflow_link"/>
107107
</requires>
108108
</field>
109-
<field id="enable_express_checkout_bml" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="41">
109+
<field id="enable_express_checkout_bml" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="41" showInDefault="1" showInWebsite="1">
110110
<comment><![CDATA[Payflow Link lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
111111
You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
112112
<a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
@@ -117,7 +117,7 @@
117117
<field id="enable_express_checkout"/>
118118
</requires>
119119
</field>
120-
<field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
120+
<field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order" showInDefault="1" showInWebsite="1">
121121
<config_path>payment/payflow_express_bml/sort_order</config_path>
122122
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
123123
<depends>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<frontend_class>paypal-enabler paypal-ec-separate</frontend_class>
4747
</field>
4848

49-
<field id="enable_express_checkout_bml" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="21">
49+
<field id="enable_express_checkout_bml" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="21" showInDefault="1" showInWebsite="1">
5050
<comment><![CDATA[Payments Pro Hosted Solution lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
5151
You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
5252
<a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<field id="enable_paypal_payflow"/>
4444
</requires>
4545
</field>
46-
<field id="express_checkout_bml_sort_order" sortOrder="30" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
46+
<field id="express_checkout_bml_sort_order" sortOrder="30" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order" showInDefault="1" showInWebsite="1">
4747
<config_path>payment/payflow_express_bml/sort_order</config_path>
4848
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
4949
<depends>

‎app/code/Magento/Paypal/i18n/en_US.csv

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -697,9 +697,8 @@ User,User
697697
The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
698698
or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
699699
"
700-
"Checkout Display","Checkout Display"
701-
"PayPal Button - Checkout Page","PayPal Button - Checkout Page"
702-
"Customize the display of the PayPal button in the Checkout.","Customize the display of the PayPal button in the Checkout."
700+
"Customize Smart Buttons","Customize Smart Buttons"
701+
"Checkout Page","Checkout Page"
703702
"Label","Label"
704703
"The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.","The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR."
705704
"Checkout","Checkout"
@@ -725,9 +724,9 @@ User,User
725724
"Blue","Blue"
726725
"Silver","Silver"
727726
"Black","Black"
728-
"PayPal Button - Product Page","PayPal Button - Product Page"
729-
"PayPal Button - Cart Page","PayPal Button - Cart Page"
730-
"PayPal Button - Mini Cart","PayPal Button - Mini Cart"
727+
"Product Pages","Product Pages"
728+
"Cart Page","Cart Page"
729+
"Mini Cart","Mini Cart"
731730
"Features","Features"
732731
"PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD.","PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD."
733732
"PayPal Credit","PayPal Credit"

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,8 @@
492492
width: 44%;
493493

494494
&.with-tooltip {
495+
font-size: 0;
496+
495497
.tooltip {
496498
bottom: 0;
497499
float: right;

0 commit comments

Comments
 (0)