Skip to content

Commit b866a06

Browse files
vpelipenkovpelipenko
committed
Merge pull request #421 from magento-mpi/develop
[MPI] BugFix
2 parents e1b0bb8 + 9d2a779 commit b866a06

File tree

14 files changed

+195
-10
lines changed

14 files changed

+195
-10
lines changed

‎app/code/Magento/Payment/view/frontend/web/template/payment/cc-form.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@
4444
<span><!-- ko text: $t('Credit Card Number')--><!-- /ko --></span>
4545
</label>
4646
<div class="control">
47-
<input type="text" name="payment[cc_number]" class="input-text" value=""
47+
<input type="number" name="payment[cc_number]" class="input-text" value=""
4848
data-bind="attr: {
49+
autocomplete: off,
4950
id: getCode() + '_cc_number',
5051
title: $t('Credit Card Number'),
5152
'data-container': getCode() + '-cc-number',
@@ -98,7 +99,7 @@
9899
<span><!-- ko text: $t('Card Verification Number')--><!-- /ko --></span>
99100
</label>
100101
<div class="control _with-tooltip">
101-
<input type="text" class="input-text cvv" name="payment[cc_cid]" value=""
102+
<input type="number" autocomplete="off" class="input-text cvv" name="payment[cc_cid]" value=""
102103
data-bind="attr: {id: getCode() + '_cc_cid', title: $t('Card Verification Number'), 'data-container': getCode() + '-cc-cvv', 'data-validate': JSON.stringify({'required-number':true, 'validate-card-cvv':'#' + getCode() + '_cc_type'})},
103104
enable: isActive($parents),
104105
value: creditCardVerificationNumber"/>
@@ -124,7 +125,7 @@
124125
<span><!-- ko text: $t('Issue Number')--><!-- /ko --></span>
125126
</label>
126127
<div class="control">
127-
<input type="text" name="payment[cc_ss_issue]"
128+
<input type="number" name="payment[cc_ss_issue]"
128129
value=""
129130
class="input-text cvv"
130131
data-bind="attr: {id: getCode() + '_cc_issue', title: $t('Issue Number'), 'data-container': getCode() + '-cc-issue', 'data-validate': JSON.stringify({'validate-cc-ukss':true})}, enable: isActive($parents)"/>

‎app/code/Magento/Payment/view/frontend/web/template/payment/iframe.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<!-- IFRAME for request to Payment Gateway -->
88
<iframe width="0" height="0" data-bind="src: getSource(), attr: {id: getCode() + '-transparent-iframe', 'data-container': getCode() + '-transparent-iframe'}" allowtransparency="true" frameborder="0" name="iframeTransparent" style="display:none;width:100%;background-color:transparent"></iframe>
9-
<form class="form" id="co-transparent-form" action="#" method="post" data-bind="mageInit: {
9+
<form class="form" id="co-transparent-form" autocomplete="off" action="#" method="post" data-bind="mageInit: {
1010
'transparent':{
1111
'controller': getControllerName(),
1212
'gateway': getCode(),

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434
<relation target=":self">
3535
<rule type="simple/mark-enable" event="activate"/>
3636
<rule type="simple/disable" event="deactivate"/>
37+
<rule type="conflict" event=":load">
38+
<argument name="paypal_payflowpro_au">paypal_payflowpro_au</argument>
39+
<argument name="payments_pro_hosted_solution_au">payments_pro_hosted_solution_au</argument>
40+
<argument name="express_checkout_other">express_checkout_other</argument>
41+
</rule>
3742
</relation>
3843
</payment>
3944
<!--PayPal Payflow Pro-->
@@ -56,10 +61,13 @@
5661
<relation target="payments_pro_hosted_solution_au">
5762
<rule type="disable" event="activate"/>
5863
</relation>
59-
6064
<relation target=":self">
6165
<rule type="simple/mark-enable" event="activate"/>
6266
<rule type="simple/disable" event="deactivate"/>
67+
<rule type="conflict" event=":load">
68+
<argument name="wps_other">wps_other</argument>
69+
<argument name="payments_pro_hosted_solution_au">payments_pro_hosted_solution_au</argument>
70+
</rule>
6371
</relation>
6472
</payment>
6573
<!--PayPal Website Payments Pro Hosted Solution-->
@@ -85,6 +93,10 @@
8593
<relation target=":self">
8694
<rule type="simple/mark-enable" event="activate"/>
8795
<rule type="simple/disable" event="deactivate"/>
96+
<rule type="conflict" event=":load">
97+
<argument name="wps_other">wps_other</argument>
98+
<argument name="paypal_payflowpro_au">paypal_payflowpro_au</argument>
99+
</rule>
88100
</relation>
89101
</payment>
90102
<!--PayPal Express Checkout-->
@@ -106,6 +118,9 @@
106118
<relation target=":self">
107119
<rule type="simple/mark-enable" event="activate"/>
108120
<rule type="simple/disable" event="deactivate"/>
121+
<rule type="conflict" event=":load">
122+
<argument name="wps_other">wps_other</argument>
123+
</rule>
109124
</relation>
110125
</payment>
111126
</rules>

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

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@
3838
<relation target=":self">
3939
<rule type="simple/mark-enable" event="activate"/>
4040
<rule type="simple/disable" event="deactivate"/>
41+
<rule type="conflict" event=":load">
42+
<argument name="wpp_ca">wpp_ca</argument>
43+
<argument name="paypal_payflowpro_ca">paypal_payflowpro_ca</argument>
44+
<argument name="payflow_link_ca">payflow_link_ca</argument>
45+
<argument name="express_checkout_other">express_checkout_other</argument>
46+
</rule>
4147
</relation>
4248
</payment>
4349
<!-- Website Payments Pro -->
@@ -67,6 +73,11 @@
6773
<relation target=":self">
6874
<rule type="simple/mark-enable" event="activate"/>
6975
<rule type="simple/disable" event="deactivate"/>
76+
<rule type="conflict" event=":load">
77+
<argument name="wps_other">wps_other</argument>
78+
<argument name="paypal_payflowpro_ca">paypal_payflowpro_ca</argument>
79+
<argument name="payflow_link_ca">payflow_link_ca</argument>
80+
</rule>
7081
</relation>
7182
</payment>
7283
<!-- Payflow Pro -->
@@ -96,6 +107,11 @@
96107
<relation target=":self">
97108
<rule type="simple/mark-enable" event="activate"/>
98109
<rule type="simple/disable" event="deactivate"/>
110+
<rule type="conflict" event=":load">
111+
<argument name="wps_other">wps_other</argument>
112+
<argument name="wpp_ca">wpp_ca</argument>
113+
<argument name="payflow_link_ca">payflow_link_ca</argument>
114+
</rule>
99115
</relation>
100116
</payment>
101117
<!-- Payflow Link (Includes Express Checkout) -->
@@ -132,7 +148,6 @@
132148
<rule type="paypal/express/unlock-configuration" event="deactivate">
133149
<argument name="payflow_link_ca">payflow_link_ca</argument>
134150
</rule>
135-
<rule type="paypal/express/mark-enable" event=":load"/>
136151
<rule type="paypal/express/lock-configuration-conditional" event=":load"/>
137152
</relation>
138153
<relation target=":self">
@@ -141,6 +156,12 @@
141156
<rule type="payflow/express/enable" event="activate"/>
142157
<rule type="payflow/express/disable" event="deactivate"/>
143158
<rule type="payflow/express/lock-conditional" event=":load"/>
159+
<rule type="conflict" event=":load">
160+
<argument name="wps_other">wps_other</argument>
161+
<argument name="wpp_ca">wpp_ca</argument>
162+
<argument name="paypal_payflowpro_ca">paypal_payflowpro_ca</argument>
163+
<argument name="express_checkout_other">express_checkout_other</argument>
164+
</rule>
144165
</relation>
145166
</payment>
146167
<!-- Express Checkout -->
@@ -165,6 +186,10 @@
165186
<argument name="wps_other">wps_other</argument>
166187
<argument name="payflow_link_ca">payflow_link_ca</argument>
167188
</rule>
189+
<rule type="conflict" event=":load">
190+
<argument name="wps_other">wps_other</argument>
191+
<argument name="payflow_link_ca">payflow_link_ca</argument>
192+
</rule>
168193
</relation>
169194
</payment>
170195
</rules>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
<relation target=":self">
2727
<rule type="simple/mark-enable" event="activate"/>
2828
<rule type="simple/disable" event="deactivate"/>
29+
<rule type="conflict" event=":load">
30+
<argument name="wps_other">wps_other</argument>
31+
</rule>
2932
</relation>
3033
</payment>
3134
<!-- Website Payments Standard -->
@@ -51,6 +54,10 @@
5154
<relation target=":self">
5255
<rule type="simple/mark-enable" event="activate"/>
5356
<rule type="simple/disable" event="deactivate"/>
57+
<rule type="conflict" event=":load">
58+
<argument name="payments_pro_hosted_solution_es">payments_pro_hosted_solution_es</argument>
59+
<argument name="express_checkout_other">express_checkout_other</argument>
60+
</rule>
5461
</relation>
5562
</payment>
5663
<!-- Express Checkout -->
@@ -74,6 +81,9 @@
7481
<rule type="paypal/express/mark-disable" event="deactivate">
7582
<argument name="wps_other">wps_other</argument>
7683
</rule>
84+
<rule type="conflict" event=":load">
85+
<argument name="wps_other">wps_other</argument>
86+
</rule>
7787
</relation>
7888
</payment>
7989
</rules>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
<relation target=":self">
2727
<rule type="simple/mark-enable" event="activate"/>
2828
<rule type="simple/disable" event="deactivate"/>
29+
<rule type="conflict" event=":load">
30+
<argument name="wps_other">wps_other</argument>
31+
</rule>
2932
</relation>
3033
</payment>
3134
<!-- Website Payments Standard -->
@@ -51,6 +54,10 @@
5154
<relation target=":self">
5255
<rule type="simple/mark-enable" event="activate"/>
5356
<rule type="simple/disable" event="deactivate"/>
57+
<rule type="conflict" event=":load">
58+
<argument name="payments_pro_hosted_solution_fr">payments_pro_hosted_solution_fr</argument>
59+
<argument name="express_checkout_other">express_checkout_other</argument>
60+
</rule>
5461
</relation>
5562
</payment>
5663
<!-- Express Checkout -->
@@ -74,6 +81,9 @@
7481
<rule type="paypal/express/mark-disable" event="deactivate">
7582
<argument name="wps_other">wps_other</argument>
7683
</rule>
84+
<rule type="conflict" event=":load">
85+
<argument name="wps_other">wps_other</argument>
86+
</rule>
7787
</relation>
7888
</payment>
7989
</rules>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
<relation target=":self">
2727
<rule type="simple/mark-enable" event="activate"/>
2828
<rule type="simple/disable" event="deactivate"/>
29+
<rule type="conflict" event=":load">
30+
<argument name="wps_express">wps_express</argument>
31+
</rule>
2932
</relation>
3033
</payment>
3134
<!-- Website Payments Standard -->
@@ -51,6 +54,10 @@
5154
<relation target=":self">
5255
<rule type="simple/mark-enable" event="activate"/>
5356
<rule type="simple/disable" event="deactivate"/>
57+
<rule type="conflict" event=":load">
58+
<argument name="payments_pro_hosted_solution_with_express_checkout">payments_pro_hosted_solution_with_express_checkout</argument>
59+
<argument name="express_checkout_us">express_checkout_us</argument>
60+
</rule>
5461
</relation>
5562
</payment>
5663
<!-- Express Checkout -->
@@ -74,6 +81,9 @@
7481
<rule type="paypal/express/mark-disable" event="deactivate">
7582
<argument name="wps_express">wps_express</argument>
7683
</rule>
84+
<rule type="conflict" event=":load">
85+
<argument name="wps_express">wps_express</argument>
86+
</rule>
7787
</relation>
7888
</payment>
7989
</rules>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
<relation target=":self">
2727
<rule type="simple/mark-enable" event="activate"/>
2828
<rule type="simple/disable" event="deactivate"/>
29+
<rule type="conflict" event=":load">
30+
<argument name="wps_other">wps_other</argument>
31+
</rule>
2932
</relation>
3033
</payment>
3134
<!-- Website Payments Standard -->
@@ -51,6 +54,10 @@
5154
<relation target=":self">
5255
<rule type="simple/mark-enable" event="activate"/>
5356
<rule type="simple/disable" event="deactivate"/>
57+
<rule type="conflict" event=":load">
58+
<argument name="payments_pro_hosted_solution_hk">payments_pro_hosted_solution_hk</argument>
59+
<argument name="express_checkout_other">express_checkout_other</argument>
60+
</rule>
5461
</relation>
5562
</payment>
5663
<!-- Express Checkout -->
@@ -74,6 +81,9 @@
7481
<rule type="paypal/express/mark-disable" event="deactivate">
7582
<argument name="wps_other">wps_other</argument>
7683
</rule>
84+
<rule type="conflict" event=":load">
85+
<argument name="wps_other">wps_other</argument>
86+
</rule>
7787
</relation>
7888
</payment>
7989
</rules>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
<relation target=":self">
2727
<rule type="simple/mark-enable" event="activate"/>
2828
<rule type="simple/disable" event="deactivate"/>
29+
<rule type="conflict" event=":load">
30+
<argument name="wps_other">wps_other</argument>
31+
</rule>
2932
</relation>
3033
</payment>
3134
<!-- Website Payments Standard -->
@@ -51,6 +54,10 @@
5154
<relation target=":self">
5255
<rule type="simple/mark-enable" event="activate"/>
5356
<rule type="simple/disable" event="deactivate"/>
57+
<rule type="conflict" event=":load">
58+
<argument name="payments_pro_hosted_solution_it">payments_pro_hosted_solution_it</argument>
59+
<argument name="express_checkout_other">express_checkout_other</argument>
60+
</rule>
5461
</relation>
5562
</payment>
5663
<!-- Express Checkout -->
@@ -74,6 +81,9 @@
7481
<rule type="paypal/express/mark-disable" event="deactivate">
7582
<argument name="wps_other">wps_other</argument>
7683
</rule>
84+
<rule type="conflict" event=":load">
85+
<argument name="wps_other">wps_other</argument>
86+
</rule>
7787
</relation>
7888
</payment>
7989
</rules>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
<relation target=":self">
2727
<rule type="simple/mark-enable" event="activate"/>
2828
<rule type="simple/disable" event="deactivate"/>
29+
<rule type="conflict" event=":load">
30+
<argument name="wps_other">wps_other</argument>
31+
</rule>
2932
</relation>
3033
</payment>
3134
<!-- Website Payments Standard -->
@@ -51,6 +54,10 @@
5154
<relation target=":self">
5255
<rule type="simple/mark-enable" event="activate"/>
5356
<rule type="simple/disable" event="deactivate"/>
57+
<rule type="conflict" event=":load">
58+
<argument name="payments_pro_hosted_solution_jp">payments_pro_hosted_solution_jp</argument>
59+
<argument name="express_checkout_other">express_checkout_other</argument>
60+
</rule>
5461
</relation>
5562
</payment>
5663
<!-- Express Checkout -->
@@ -74,6 +81,9 @@
7481
<rule type="paypal/express/mark-disable" event="deactivate">
7582
<argument name="wps_other">wps_other</argument>
7683
</rule>
84+
<rule type="conflict" event=":load">
85+
<argument name="wps_other">wps_other</argument>
86+
</rule>
7787
</relation>
7888
</payment>
7989
</rules>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
<relation target=":self">
2727
<rule type="simple/mark-enable" event="activate"/>
2828
<rule type="simple/disable" event="deactivate"/>
29+
<rule type="conflict" event=":load">
30+
<argument name="wps_other">wps_other</argument>
31+
</rule>
2932
</relation>
3033
</payment>
3134
<!-- Website Payments Standard -->
@@ -51,6 +54,10 @@
5154
<relation target=":self">
5255
<rule type="simple/mark-enable" event="activate"/>
5356
<rule type="simple/disable" event="deactivate"/>
57+
<rule type="conflict" event=":load">
58+
<argument name="paypal_payflowpro_nz">paypal_payflowpro_nz</argument>
59+
<argument name="express_checkout_other">express_checkout_other</argument>
60+
</rule>
5461
</relation>
5562
</payment>
5663
<!-- Express Checkout -->
@@ -74,6 +81,9 @@
7481
<rule type="paypal/express/mark-disable" event="deactivate">
7582
<argument name="wps_other">wps_other</argument>
7683
</rule>
84+
<rule type="conflict" event=":load">
85+
<argument name="wps_other">wps_other</argument>
86+
</rule>
7787
</relation>
7888
</payment>
7989
</rules>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
<relation target=":self">
2727
<rule type="simple/mark-enable" event="activate"/>
2828
<rule type="simple/disable" event="deactivate"/>
29+
<rule type="conflict" event=":load">
30+
<argument name="express_checkout_other">express_checkout_other</argument>
31+
</rule>
2932
</relation>
3033
</payment>
3134
<!-- Express Checkout -->
@@ -47,6 +50,9 @@
4750
<relation target=":self">
4851
<rule type="simple/mark-enable" event="activate"/>
4952
<rule type="simple/disable" event="deactivate"/>
53+
<rule type="conflict" event=":load">
54+
<argument name="wps_other">wps_other</argument>
55+
</rule>
5056
</relation>
5157
</payment>
5258
</rules>

0 commit comments

Comments
 (0)