From 32d81c26897dd5d4168a35883b7b4cd3f5aefd41 Mon Sep 17 00:00:00 2001
From: "Gurzhyi, Andrii" <agurzhyi@ebay.com>
Date: Mon, 19 Oct 2015 17:30:24 +0300
Subject: [PATCH] MAGETWO-44098: Enable PayPal Credit dropdown is active when
Enable Express Checkout set to No in PayPal Payflow Link
- CR
---
app/code/Magento/Paypal/Model/Config/Rules/Converter.php | 1 -
app/code/Magento/Paypal/view/adminhtml/web/js/rules/conflict.js | 2 +-
.../adminhtml/web/js/rules/payflow/bml/enable-conditional.js | 2 +-
.../web/js/rules/paypal/express/unlock-configuration.js | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/code/Magento/Paypal/Model/Config/Rules/Converter.php b/app/code/Magento/Paypal/Model/Config/Rules/Converter.php
index b2dad4af6f4..5528f79b385 100644
--- a/app/code/Magento/Paypal/Model/Config/Rules/Converter.php
+++ b/app/code/Magento/Paypal/Model/Config/Rules/Converter.php
@@ -58,7 +58,6 @@ class Converter implements ConverterInterface
protected function createEvents(\DOMElement $node)
{
$result = [];
- /** @var \DOMElement $child */
foreach ($node->childNodes as $child) {
/** @var \DOMElement $child */
if ($this->hasNodeElement($child)) {
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/rules/conflict.js b/app/code/Magento/Paypal/view/adminhtml/web/js/rules/conflict.js
index ab0ca8b9f60..54b263be642 100644
--- a/app/code/Magento/Paypal/view/adminhtml/web/js/rules/conflict.js
+++ b/app/code/Magento/Paypal/view/adminhtml/web/js/rules/conflict.js
@@ -33,7 +33,7 @@
if (!isDisabled && !executed) {
executed = true;
alert({
- content: 'The following error(s) occurred:\n\r' +
+ content: 'The following error(s) occurred:' +
newLine +
'Some PayPal solutions conflict.' +
newLine +
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/bml/enable-conditional.js b/app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/bml/enable-conditional.js
index 77d3e28aa72..9770d463f45 100644
--- a/app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/bml/enable-conditional.js
+++ b/app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/bml/enable-conditional.js
@@ -10,7 +10,7 @@ define(['underscore'], function (_) {
_.every(data.argument, function (name) {
if (data.solutionsElements[name] &&
- data.solutionsElements[name].find(data.enableButton).val() == 1
+ data.solutionsElements[name].find(data.enableButton).val() === '1'
) {
isDisabled = false;
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/rules/paypal/express/unlock-configuration.js b/app/code/Magento/Paypal/view/adminhtml/web/js/rules/paypal/express/unlock-configuration.js
index a13142e359e..fda160c6d94 100644
--- a/app/code/Magento/Paypal/view/adminhtml/web/js/rules/paypal/express/unlock-configuration.js
+++ b/app/code/Magento/Paypal/view/adminhtml/web/js/rules/paypal/express/unlock-configuration.js
@@ -10,7 +10,7 @@ define(['underscore'], function (_) {
_.every(data.argument, function (name) {
if (data.solutionsElements[name] &&
- data.solutionsElements[name].find(data.enableButton).val() == 1
+ data.solutionsElements[name].find(data.enableButton).val() === '1'
) {
isUnlock = false;
--
GitLab