Skip to content

Commit 007659a

Browse files
author
Yushkin, Dmytro
committed
MAGETWO-39777: [IE] PayPal Express Checkout is always displayed as disabled
- fix lock Paypal Express conditional rule
1 parent 39ffc7a commit 007659a

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,12 @@
371371
<argument name="paypal_payflowpro_with_express_checkout">paypal_payflowpro_with_express_checkout</argument>
372372
<argument name="payflow_link_us">payflow_link_us</argument>
373373
</rule>
374-
<rule type="paypal/express/mark-enable" event=":load"/>
375-
<rule type="paypal/express/lock-configuration-conditional" event=":load"/>
374+
<rule type="paypal/express/lock-configuration-conditional" event=":load">
375+
<argument name="payflow_advanced">payflow_advanced</argument>
376+
<argument name="wpp_usuk">wpp_usuk</argument>
377+
<argument name="paypal_payflowpro_with_express_checkout">paypal_payflowpro_with_express_checkout</argument>
378+
<argument name="payflow_link_us">payflow_link_us</argument>
379+
</rule>
376380
</relation>
377381
</payment>
378382
</rules>

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,19 @@ define([
77
], function (lockConfiguration) {
88
"use strict";
99
return function ($target, $owner, data) {
10-
if ($owner.find(data.enableButton).val() == 1) {
10+
var isDisabled = true;
11+
12+
_.every(data.argument, function (name) {
13+
if (data.solutionsElements[name]
14+
&& data.solutionsElements[name].find(data.enableButton).val() == 1
15+
) {
16+
isDisabled = false;
17+
return isDisabled;
18+
}
19+
return isDisabled;
20+
}, this);
21+
22+
if (!isDisabled) {
1123
lockConfiguration($target, $owner, data);
1224
}
1325
};

app/code/Magento/Paypal/view/adminhtml/web/js/rules/paypal/express/mark-enable.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)