Skip to content

Commit 60644fd

Browse files
viktymviktym
committed
MAGETWO-58282: [PR] Bugfixes delivery for 2.2
2 parents 61ac47d + f2d2bb5 commit 60644fd

File tree

11 files changed

+23
-25
lines changed

11 files changed

+23
-25
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</requires>
3434
</field>
3535
<field id="braintree_cc_vault_active" translate="label" type="select" sortOrder="12" showInDefault="1" showInWebsite="1" showInStore="0">
36-
<label>Vault enabled</label>
36+
<label>Vault Enabled</label>
3737
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
3838
<config_path>payment/braintree_cc_vault/active</config_path>
3939
<requires>
@@ -155,7 +155,7 @@
155155
<comment>It is recommended to set this value to "PayPal" per store views.</comment>
156156
</field>
157157
<field id="braintree_paypal_vault_active" translate="label" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="0">
158-
<label>Vault enabled</label>
158+
<label>Vault Enabled</label>
159159
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
160160
<config_path>payment/braintree_paypal_vault/active</config_path>
161161
<requires>

‎app/code/Magento/Braintree/view/adminhtml/web/styles.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
* See COPYING.txt for license details.
44
*/
55

6-
.braintree-section .heading {display: inline-block; background: url("images/braintree_logo.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
7-
.braintree-section .button-container {display: inline-block; float: right;}
6+
.braintree-section .heading {background: url("images/braintree_logo.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
7+
.braintree-section .button-container {float: right;}
88
.braintree-section .config-alt {background: url("images/braintree_allinone.png") no-repeat scroll 0 0 / 100% auto; height: 28px; margin: 0.5rem 0 0; width: 230px;}

‎app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,10 @@ protected function _isPaymentEnabled($element)
7878
*/
7979
protected function _getHeaderTitleHtml($element)
8080
{
81-
$html = '<div class="config-heading" ><div class="heading"><strong>' . $element->getLegend();
81+
$html = '<div class="config-heading" >';
8282

8383
$groupConfig = $element->getGroup();
8484

85-
$html .= '</strong>';
86-
87-
if ($element->getComment()) {
88-
$html .= '<span class="heading-intro">' . $element->getComment() . '</span>';
89-
}
90-
$html .= '<div class="config-alt"></div>';
91-
$html .= '</div>';
92-
9385
$disabledAttributeString = $this->_isPaymentEnabled($element) ? '' : ' disabled="disabled"';
9486
$disabledClassString = $this->_isPaymentEnabled($element) ? '' : ' disabled';
9587
$htmlId = $element->getHtmlId();
@@ -122,6 +114,13 @@ protected function _getHeaderTitleHtml($element)
122114
) . '</a>';
123115
}
124116

117+
$html .= '</div>';
118+
$html .= '<div class="heading"><strong>' . $element->getLegend() . '</strong>';
119+
120+
if ($element->getComment()) {
121+
$html .= '<span class="heading-intro">' . $element->getComment() . '</span>';
122+
}
123+
$html .= '<div class="config-alt"></div>';
125124
$html .= '</div></div>';
126125

127126
return $html;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</requires>
8585
</field>
8686
<field id="payflowpro_cc_vault_active" translate="label" type="select" sortOrder="22" showInDefault="1" showInWebsite="1" showInStore="0">
87-
<label>Vault enabled</label>
87+
<label>Vault Enabled</label>
8888
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
8989
<config_path>payment/payflowpro_cc_vault/active</config_path>
9090
<attribute type="shared">1</attribute>

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
.payflow-settings-notice { border:1px solid #d1d0ce;padding:0 10px;margin: 0;}
1515
.payflow-settings-notice .important-label {color:#f00;}
1616
.payflow-settings-notice ul.options-list {list-style:disc;padding:0 2em;}
17-
.paypal-express-section .heading {display: inline-block; background: url("images/pp-logo-200px.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
18-
.paypal-express-section .button-container {display: inline-block; float: right;}
19-
.paypal-express-section .config-alt {background: url("images/pp-alt.png") no-repeat; height: 26px; margin: .5rem 0 0; width: 158px;}
17+
.paypal-express-section .heading {background: url("images/pp-logo-200px.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
18+
.paypal-express-section .button-container {float: right;}
19+
.paypal-express-section .config-alt {background: url("images/pp-alt.png") no-repeat; height: 26px; margin: 0.5rem 0 0; width: 158px;}
2020
.paypal-express-section .link-more {margin-left: 5px;}
21-
.paypal-other-section .heading {display: inline-block;}
22-
.paypal-other-section .button-container {display: inline-block; float: right; margin: 1rem 0 0 !important;}
21+
.paypal-other-section .button-container {float: right; margin: 1rem 0 0 !important;}
2322
.paypal-other-section > .entry-edit-head > a::before {left: auto !important; right: 1.3rem !important;}
2423
.paypal-all-in-one-section > .entry-edit-head {background: url("images/AM_mc_vs_dc_ae.jpg") no-repeat scroll 0 50% / 18rem auto; padding-left: 18rem;}
2524
.paypal-gateways-section > .entry-edit-head {background: url("images/pp-payflow-mark.png") no-repeat scroll 0 50% / 18rem auto; padding-left: 18rem;}

‎dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Braintree extends Block
3333
private $enablers = [
3434
'Enable this Solution' => "#payment_us_braintree_section_braintree_active",
3535
'Enable PayPal through Braintree' => '#payment_us_braintree_section_braintree_active_braintree_paypal',
36-
'Vault enabled' => '#payment_us_braintree_section_braintree_braintree_cc_vault_active'
36+
'Vault Enabled' => '#payment_us_braintree_section_braintree_braintree_cc_vault_active'
3737
];
3838

3939
/**

‎dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class PayflowPro extends Block
4242
'_payflow_required_enable_paypal_payflow',
4343
'Enable PayPal Credit' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal' .
4444
'_payflow_required_enable_express_checkout_bml_payflow',
45-
'Vault enabled' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_' .
45+
'Vault Enabled' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_' .
4646
'payflow_required_payflowpro_cc_vault_active'
4747
];
4848

‎dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class PaymentsPro extends Block
4242
'_payflow',
4343
'Enable PayPal Credit' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_enable_' .
4444
'express_checkout_bml_payflow',
45-
'Vault enabled' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_payflowpro_cc_vault' .
45+
'Vault Enabled' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_payflowpro_cc_vault' .
4646
'_active'
4747
];
4848

‎dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private function enablePayflowPro()
130130
$this->payflowProConfigBlock->enablePayflowPro();
131131
$this->assertFieldsAreActive->processAssert(
132132
$this->systemConfigEditSectionPayment,
133-
[$enablers['Enable this Solution'], $enablers['Enable PayPal Credit'], $enablers['Vault enabled']]
133+
[$enablers['Enable this Solution'], $enablers['Enable PayPal Credit'], $enablers['Vault Enabled']]
134134
);
135135
$this->assertFieldsAreEnabled->processAssert(
136136
$this->systemConfigEditSectionPayment,

‎dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private function enablePaymentsPro()
130130
$this->paymentsProConfigBlock->enablePaymentsPro();
131131
$this->assertFieldsAreActive->processAssert(
132132
$this->systemConfigEditSectionPayment,
133-
[$enablers['Enable this Solution'], $enablers['Enable PayPal Credit'], $enablers['Vault enabled']]
133+
[$enablers['Enable this Solution'], $enablers['Enable PayPal Credit'], $enablers['Vault Enabled']]
134134
);
135135
$this->assertFieldsAreEnabled->processAssert(
136136
$this->systemConfigEditSectionPayment,

0 commit comments

Comments
 (0)