Skip to content

Commit 32d81c2

Browse files
committed
MAGETWO-44098: Enable PayPal Credit dropdown is active when Enable Express Checkout set to No in PayPal Payflow Link
- CR
1 parent cad3b13 commit 32d81c2

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

app/code/Magento/Paypal/Model/Config/Rules/Converter.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public function convert($source)
5858
protected function createEvents(\DOMElement $node)
5959
{
6060
$result = [];
61-
/** @var \DOMElement $child */
6261
foreach ($node->childNodes as $child) {
6362
/** @var \DOMElement $child */
6463
if ($this->hasNodeElement($child)) {

app/code/Magento/Paypal/view/adminhtml/web/js/rules/conflict.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
if (!isDisabled && !executed) {
3434
executed = true;
3535
alert({
36-
content: 'The following error(s) occurred:\n\r' +
36+
content: 'The following error(s) occurred:' +
3737
newLine +
3838
'Some PayPal solutions conflict.' +
3939
newLine +

app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/bml/enable-conditional.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ define(['underscore'], function (_) {
1010

1111
_.every(data.argument, function (name) {
1212
if (data.solutionsElements[name] &&
13-
data.solutionsElements[name].find(data.enableButton).val() == 1
13+
data.solutionsElements[name].find(data.enableButton).val() === '1'
1414
) {
1515
isDisabled = false;
1616

app/code/Magento/Paypal/view/adminhtml/web/js/rules/paypal/express/unlock-configuration.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ define(['underscore'], function (_) {
1010

1111
_.every(data.argument, function (name) {
1212
if (data.solutionsElements[name] &&
13-
data.solutionsElements[name].find(data.enableButton).val() == 1
13+
data.solutionsElements[name].find(data.enableButton).val() === '1'
1414
) {
1515
isUnlock = false;
1616

0 commit comments

Comments
 (0)