Skip to content

Commit 39ffc7a

Browse files
Dell-Dell-
committed
MAGETWO-39777: [IE] PayPal Express Checkout is always displayed as disabled
- resolved naming conflict in dispatch events
1 parent 1ea9173 commit 39ffc7a

File tree

15 files changed

+332
-335
lines changed

15 files changed

+332
-335
lines changed

‎app/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<!--PayPal Website Payments Standard-->
1111
<payment id="wps_other">
1212
<events selector="[data-enable='payment']">
13-
<event value="0" name="deactivate"/>
14-
<event value="1" name="activate">
13+
<event value="0" name="deactivate-rule"/>
14+
<event value="1" name="activate-rule">
1515
<predicate name="confirm"
1616
message="There is already another PayPal solution enabled. Enable this solution instead?"
17-
event="deactivate"
17+
event="deactivate-rule"
1818
>
1919
<argument name="paypal_payflowpro_au">paypal_payflowpro_au</argument>
2020
<argument name="payments_pro_hosted_solution_au">payments_pro_hosted_solution_au</argument>
@@ -23,17 +23,17 @@
2323
</event>
2424
</events>
2525
<relation target="paypal_payflowpro_au">
26-
<rule type="disable" event="activate"/>
26+
<rule type="disable" event="activate-rule"/>
2727
</relation>
2828
<relation target="payments_pro_hosted_solution_au">
29-
<rule type="disable" event="activate"/>
29+
<rule type="disable" event="activate-rule"/>
3030
</relation>
3131
<relation target="express_checkout_other">
32-
<rule type="disable" event="activate"/>
32+
<rule type="disable" event="activate-rule"/>
3333
</relation>
3434
<relation target=":self">
35-
<rule type="simple/mark-enable" event="activate"/>
36-
<rule type="simple/disable" event="deactivate"/>
35+
<rule type="simple/mark-enable" event="activate-rule"/>
36+
<rule type="simple/disable" event="deactivate-rule"/>
3737
<rule type="conflict" event=":load">
3838
<argument name="paypal_payflowpro_au">paypal_payflowpro_au</argument>
3939
<argument name="payments_pro_hosted_solution_au">payments_pro_hosted_solution_au</argument>
@@ -44,26 +44,26 @@
4444
<!--PayPal Payflow Pro-->
4545
<payment id="paypal_payflowpro_au">
4646
<events selector="[data-enable='payment']">
47-
<event value="0" name="deactivate"/>
48-
<event value="1" name="activate">
47+
<event value="0" name="deactivate-rule"/>
48+
<event value="1" name="activate-rule">
4949
<predicate name="confirm"
5050
message="There is already another PayPal solution enabled. Enable this solution instead?"
51-
event="deactivate"
51+
event="deactivate-rule"
5252
>
5353
<argument name="payments_pro_hosted_solution_au">payments_pro_hosted_solution_au</argument>
5454
<argument name="wps_other">wps_other</argument>
5555
</predicate>
5656
</event>
5757
</events>
5858
<relation target="wps_other">
59-
<rule type="disable" event="activate"/>
59+
<rule type="disable" event="activate-rule"/>
6060
</relation>
6161
<relation target="payments_pro_hosted_solution_au">
62-
<rule type="disable" event="activate"/>
62+
<rule type="disable" event="activate-rule"/>
6363
</relation>
6464
<relation target=":self">
65-
<rule type="simple/mark-enable" event="activate"/>
66-
<rule type="simple/disable" event="deactivate"/>
65+
<rule type="simple/mark-enable" event="activate-rule"/>
66+
<rule type="simple/disable" event="deactivate-rule"/>
6767
<rule type="conflict" event=":load">
6868
<argument name="wps_other">wps_other</argument>
6969
<argument name="payments_pro_hosted_solution_au">payments_pro_hosted_solution_au</argument>
@@ -73,26 +73,26 @@
7373
<!--PayPal Website Payments Pro Hosted Solution-->
7474
<payment id="payments_pro_hosted_solution_au">
7575
<events selector="[data-enable='payment']">
76-
<event value="0" name="deactivate"/>
77-
<event value="1" name="activate">
76+
<event value="0" name="deactivate-rule"/>
77+
<event value="1" name="activate-rule">
7878
<predicate name="confirm"
7979
message="There is already another PayPal solution enabled. Enable this solution instead?"
80-
event="deactivate"
80+
event="deactivate-rule"
8181
>
8282
<argument name="paypal_payflowpro_au">paypal_payflowpro_au</argument>
8383
<argument name="wps_other">wps_other</argument>
8484
</predicate>
8585
</event>
8686
</events>
8787
<relation target="paypal_payflowpro_au">
88-
<rule type="disable" event="activate"/>
88+
<rule type="disable" event="activate-rule"/>
8989
</relation>
9090
<relation target="wps_other">
91-
<rule type="disable" event="activate"/>
91+
<rule type="disable" event="activate-rule"/>
9292
</relation>
9393
<relation target=":self">
94-
<rule type="simple/mark-enable" event="activate"/>
95-
<rule type="simple/disable" event="deactivate"/>
94+
<rule type="simple/mark-enable" event="activate-rule"/>
95+
<rule type="simple/disable" event="deactivate-rule"/>
9696
<rule type="conflict" event=":load">
9797
<argument name="wps_other">wps_other</argument>
9898
<argument name="paypal_payflowpro_au">paypal_payflowpro_au</argument>
@@ -102,22 +102,22 @@
102102
<!--PayPal Express Checkout-->
103103
<payment id="express_checkout_other">
104104
<events selector="[data-enable='payment']">
105-
<event value="0" name="deactivate"/>
106-
<event value="1" name="activate">
105+
<event value="0" name="deactivate-rule"/>
106+
<event value="1" name="activate-rule">
107107
<predicate name="confirm"
108108
message="There is already another PayPal solution enabled. Enable this solution instead?"
109-
event="deactivate"
109+
event="deactivate-rule"
110110
>
111111
<argument name="wps_other">wps_other</argument>
112112
</predicate>
113113
</event>
114114
</events>
115115
<relation target="wps_other">
116-
<rule type="disable" event="activate"/>
116+
<rule type="disable" event="activate-rule"/>
117117
</relation>
118118
<relation target=":self">
119-
<rule type="simple/mark-enable" event="activate"/>
120-
<rule type="simple/disable" event="deactivate"/>
119+
<rule type="simple/mark-enable" event="activate-rule"/>
120+
<rule type="simple/disable" event="deactivate-rule"/>
121121
<rule type="conflict" event=":load">
122122
<argument name="wps_other">wps_other</argument>
123123
</rule>

‎app/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<!-- Website Payments Standard -->
1111
<payment id="wps_other">
1212
<events selector="[data-enable='payment']">
13-
<event value="0" name="deactivate"/>
14-
<event value="1" name="activate">
13+
<event value="0" name="deactivate-rule"/>
14+
<event value="1" name="activate-rule">
1515
<predicate name="confirm"
1616
message="There is already another PayPal solution enabled. Enable this solution instead?"
17-
event="deactivate"
17+
event="deactivate-rule"
1818
>
1919
<argument name="wpp_ca">wpp_ca</argument>
2020
<argument name="paypal_payflowpro_ca">paypal_payflowpro_ca</argument>
@@ -24,20 +24,20 @@
2424
</event>
2525
</events>
2626
<relation target="wpp_ca">
27-
<rule type="disable" event="activate"/>
27+
<rule type="disable" event="activate-rule"/>
2828
</relation>
2929
<relation target="paypal_payflowpro_ca">
30-
<rule type="disable" event="activate"/>
30+
<rule type="disable" event="activate-rule"/>
3131
</relation>
3232
<relation target="payflow_link_ca">
33-
<rule type="disable" event="activate"/>
33+
<rule type="disable" event="activate-rule"/>
3434
</relation>
3535
<relation target="express_checkout_other">
36-
<rule type="disable" event="activate"/>
36+
<rule type="disable" event="activate-rule"/>
3737
</relation>
3838
<relation target=":self">
39-
<rule type="simple/mark-enable" event="activate"/>
40-
<rule type="simple/disable" event="deactivate"/>
39+
<rule type="simple/mark-enable" event="activate-rule"/>
40+
<rule type="simple/disable" event="deactivate-rule"/>
4141
<rule type="conflict" event=":load">
4242
<argument name="wpp_ca">wpp_ca</argument>
4343
<argument name="paypal_payflowpro_ca">paypal_payflowpro_ca</argument>
@@ -49,11 +49,11 @@
4949
<!-- Website Payments Pro -->
5050
<payment id="wpp_ca">
5151
<events selector="[data-enable='payment']">
52-
<event value="0" name="deactivate"/>
53-
<event value="1" name="activate">
52+
<event value="0" name="deactivate-rule"/>
53+
<event value="1" name="activate-rule">
5454
<predicate name="confirm"
5555
message="There is already another PayPal solution enabled. Enable this solution instead?"
56-
event="deactivate"
56+
event="deactivate-rule"
5757
>
5858
<argument name="wps_other">wps_other</argument>
5959
<argument name="paypal_payflowpro_ca">paypal_payflowpro_ca</argument>
@@ -62,17 +62,17 @@
6262
</event>
6363
</events>
6464
<relation target="wps_other">
65-
<rule type="disable" event="activate"/>
65+
<rule type="disable" event="activate-rule"/>
6666
</relation>
6767
<relation target="paypal_payflowpro_ca">
68-
<rule type="disable" event="activate"/>
68+
<rule type="disable" event="activate-rule"/>
6969
</relation>
7070
<relation target="payflow_link_ca">
71-
<rule type="disable" event="activate"/>
71+
<rule type="disable" event="activate-rule"/>
7272
</relation>
7373
<relation target=":self">
74-
<rule type="simple/mark-enable" event="activate"/>
75-
<rule type="simple/disable" event="deactivate"/>
74+
<rule type="simple/mark-enable" event="activate-rule"/>
75+
<rule type="simple/disable" event="deactivate-rule"/>
7676
<rule type="conflict" event=":load">
7777
<argument name="wps_other">wps_other</argument>
7878
<argument name="paypal_payflowpro_ca">paypal_payflowpro_ca</argument>
@@ -83,11 +83,11 @@
8383
<!-- Payflow Pro -->
8484
<payment id="paypal_payflowpro_ca">
8585
<events selector="[data-enable='payment']">
86-
<event value="0" name="deactivate"/>
87-
<event value="1" name="activate">
86+
<event value="0" name="deactivate-rule"/>
87+
<event value="1" name="activate-rule">
8888
<predicate name="confirm"
8989
message="There is already another PayPal solution enabled. Enable this solution instead?"
90-
event="deactivate"
90+
event="deactivate-rule"
9191
>
9292
<argument name="wps_other">wps_other</argument>
9393
<argument name="wpp_ca">wpp_ca</argument>
@@ -96,17 +96,17 @@
9696
</event>
9797
</events>
9898
<relation target="wps_other">
99-
<rule type="disable" event="activate"/>
99+
<rule type="disable" event="activate-rule"/>
100100
</relation>
101101
<relation target="wpp_ca">
102-
<rule type="disable" event="activate"/>
102+
<rule type="disable" event="activate-rule"/>
103103
</relation>
104104
<relation target="payflow_link_ca">
105-
<rule type="disable" event="activate"/>
105+
<rule type="disable" event="activate-rule"/>
106106
</relation>
107107
<relation target=":self">
108-
<rule type="simple/mark-enable" event="activate"/>
109-
<rule type="simple/disable" event="deactivate"/>
108+
<rule type="simple/mark-enable" event="activate-rule"/>
109+
<rule type="simple/disable" event="deactivate-rule"/>
110110
<rule type="conflict" event=":load">
111111
<argument name="wps_other">wps_other</argument>
112112
<argument name="wpp_ca">wpp_ca</argument>
@@ -117,11 +117,11 @@
117117
<!-- Payflow Link (Includes Express Checkout) -->
118118
<payment id="payflow_link_ca">
119119
<events selector="[data-enable='payment']">
120-
<event value="0" name="deactivate"/>
121-
<event value="1" name="activate">
120+
<event value="0" name="deactivate-rule"/>
121+
<event value="1" name="activate-rule">
122122
<predicate name="confirm"
123123
message="There is already another PayPal solution enabled. Enable this solution instead?"
124-
event="deactivate"
124+
event="deactivate-rule"
125125
>
126126
<argument name="wps_other">wps_other</argument>
127127
<argument name="wpp_ca">wpp_ca</argument>
@@ -130,31 +130,31 @@
130130
</event>
131131
</events>
132132
<relation target="wps_other">
133-
<rule type="disable" event="activate"/>
133+
<rule type="disable" event="activate-rule"/>
134134
</relation>
135135
<relation target="wpp_ca">
136-
<rule type="disable" event="activate"/>
136+
<rule type="disable" event="activate-rule"/>
137137
</relation>
138138
<relation target="paypal_payflowpro_ca">
139-
<rule type="disable" event="activate"/>
139+
<rule type="disable" event="activate-rule"/>
140140
</relation>
141141
<relation target="express_checkout_other">
142-
<rule type="simple/mark-enable" event="activate"/>
143-
<rule type="paypal/express/disable" event="activate"/>
144-
<rule type="paypal/express/lock-configuration" event="activate"/>
145-
<rule type="paypal/express/mark-disable" event="deactivate">
142+
<rule type="simple/mark-enable" event="activate-rule"/>
143+
<rule type="paypal/express/disable" event="activate-rule"/>
144+
<rule type="paypal/express/lock-configuration" event="activate-rule"/>
145+
<rule type="paypal/express/mark-disable" event="deactivate-rule">
146146
<argument name="payflow_link_ca">payflow_link_ca</argument>
147147
</rule>
148-
<rule type="paypal/express/unlock-configuration" event="deactivate">
148+
<rule type="paypal/express/unlock-configuration" event="deactivate-rule">
149149
<argument name="payflow_link_ca">payflow_link_ca</argument>
150150
</rule>
151151
<rule type="paypal/express/lock-configuration-conditional" event=":load"/>
152152
</relation>
153153
<relation target=":self">
154-
<rule type="simple/mark-enable" event="activate"/>
155-
<rule type="simple/disable" event="deactivate"/>
156-
<rule type="payflow/express/enable" event="activate"/>
157-
<rule type="payflow/express/disable" event="deactivate"/>
154+
<rule type="simple/mark-enable" event="activate-rule"/>
155+
<rule type="simple/disable" event="deactivate-rule"/>
156+
<rule type="payflow/express/enable" event="activate-rule"/>
157+
<rule type="payflow/express/disable" event="deactivate-rule"/>
158158
<rule type="payflow/express/lock-conditional" event=":load"/>
159159
<rule type="conflict" event=":load">
160160
<argument name="wps_other">wps_other</argument>
@@ -167,22 +167,22 @@
167167
<!-- Express Checkout -->
168168
<payment id="express_checkout_other">
169169
<events selector="[data-enable='payment']">
170-
<event value="0" name="deactivate"/>
171-
<event value="1" name="activate">
170+
<event value="0" name="deactivate-rule"/>
171+
<event value="1" name="activate-rule">
172172
<predicate name="confirm"
173173
message="There is already another PayPal solution enabled. Enable this solution instead?"
174-
event="deactivate"
174+
event="deactivate-rule"
175175
>
176176
<argument name="wps_other">wps_other</argument>
177177
</predicate>
178178
</event>
179179
</events>
180180
<relation target="wps_other">
181-
<rule type="disable" event="activate"/>
181+
<rule type="disable" event="activate-rule"/>
182182
</relation>
183183
<relation target=":self">
184-
<rule type="simple/mark-enable" event="activate"/>
185-
<rule type="paypal/express/mark-disable" event="deactivate">
184+
<rule type="simple/mark-enable" event="activate-rule"/>
185+
<rule type="paypal/express/mark-disable" event="deactivate-rule">
186186
<argument name="wps_other">wps_other</argument>
187187
<argument name="payflow_link_ca">payflow_link_ca</argument>
188188
</rule>

‎app/code/Magento/Paypal/etc/adminhtml/rules/payment_de.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
xsi:noNamespaceSchemaLocation="../../../../../../../app/code/Magento/Paypal/etc/rules.xsd">
1010
<payment id="express_checkout_de">
1111
<events selector="[data-enable='payment']">
12-
<event value="0" name="deactivate"/>
13-
<event value="1" name="activate"/>
12+
<event value="0" name="deactivate-rule"/>
13+
<event value="1" name="activate-rule"/>
1414
</events>
1515
<relation target=":self">
16-
<rule type="simple/mark-enable" event="activate"/>
17-
<rule type="simple/disable" event="deactivate"/>
16+
<rule type="simple/mark-enable" event="activate-rule"/>
17+
<rule type="simple/disable" event="deactivate-rule"/>
1818
</relation>
1919
</payment>
2020
</rules>

0 commit comments

Comments
 (0)