Skip to content

Commit 261e087

Browse files
admanesachinadmanesachin
committed
Merge branch 'MC-38985' of github.com:magento-cia/magento2ce into cia-2.4.3-3172021
2 parents f5a0da9 + f287c60 commit 261e087

File tree

7 files changed

+165
-1
lines changed

7 files changed

+165
-1
lines changed

‎app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,21 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
4040
title="<?= $block->escapeHtml(__('Credit Card Number')) ?>"
4141
class="admin__control-text validate-cc-number"
4242
value="<?= /* @noEscape */ $block->getInfoData('cc_number') ?>"/>
43+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
44+
'oncopy',
45+
"event.preventDefault();",
46+
'#' . $code . '_cc_number'
47+
) ?>
48+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
49+
'oncut',
50+
"event.preventDefault();",
51+
'#' . $code . '_cc_number'
52+
) ?>
53+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
54+
'onpaste',
55+
"event.preventDefault();",
56+
'#' . $code . '_cc_number'
57+
) ?>
4358
</div>
4459
</div>
4560
<div class="field-date admin__field _required">
@@ -78,6 +93,21 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
7893
class="required-entry validate-cc-cvn admin__control-cvn admin__control-text"
7994
id="<?= /* @noEscape */ $code ?>_cc_cid"
8095
name="payment[cc_cid]" value="<?= /* @noEscape */ $block->getInfoData('cc_cid') ?>"/>
96+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
97+
'oncopy',
98+
"event.preventDefault();",
99+
'#' . $code . '_cc_cid'
100+
) ?>
101+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
102+
'oncut',
103+
"event.preventDefault();",
104+
'#' . $code . '_cc_cid'
105+
) ?>
106+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
107+
'onpaste',
108+
"event.preventDefault();",
109+
'#' . $code . '_cc_cid'
110+
) ?>
81111
</div>
82112
</div>
83113
<?php endif; ?>

‎app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,21 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
8080
"validate-cc-type":"#<?= /* @noEscape */ $code ?>_cc_type"
8181
}'
8282
autocomplete="off"/>
83+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
84+
'oncopy',
85+
"event.preventDefault();",
86+
'#' . $code . '_cc_number'
87+
) ?>
88+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
89+
'oncut',
90+
"event.preventDefault();",
91+
'#' . $code . '_cc_number'
92+
) ?>
93+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
94+
'onpaste',
95+
"event.preventDefault();",
96+
'#' . $code . '_cc_number'
97+
) ?>
8398
</div>
8499
</div>
85100

@@ -129,6 +144,21 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
129144
value=""
130145
data-validate='{"required-number":true, "validate-cc-cvn":"#<?=/* @noEscape */ $code?>_cc_type"}'
131146
autocomplete="off"/>
147+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
148+
'oncopy',
149+
"event.preventDefault();",
150+
'#' . $code . '_cc_cid'
151+
) ?>
152+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
153+
'oncut',
154+
"event.preventDefault();",
155+
'#' . $code . '_cc_cid'
156+
) ?>
157+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
158+
'onpaste',
159+
"event.preventDefault();",
160+
'#' . $code . '_cc_cid'
161+
) ?>
132162
</div>
133163
</div>
134164
<?php endif; ?>

‎app/code/Magento/Payment/view/frontend/templates/form/cc.phtml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,21 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
5151
"validate-cc-number":"#<?= /* @noEscape */ $code ?>_cc_type",
5252
"validate-cc-type":"#<?= /* @noEscape */ $code ?>_cc_type"
5353
}'/>
54+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
55+
'oncopy',
56+
"event.preventDefault();",
57+
'#' . $code . '_cc_number'
58+
) ?>
59+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
60+
'oncut',
61+
"event.preventDefault();",
62+
'#' . $code . '_cc_number'
63+
) ?>
64+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
65+
'onpaste',
66+
"event.preventDefault();",
67+
'#' . $code . '_cc_number'
68+
) ?>
5469
</div>
5570
</div>
5671
<div class="field date required" id="<?= /* @noEscape */ $code ?>_cc_type_exp_div">
@@ -100,6 +115,21 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
100115
<input type="number" title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
101116
class="input-text cvv" id="<?= /* @noEscape */ $code ?>_cc_cid" name="payment[cc_cid]" value=""
102117
data-validate='{"required-number":true, "validate-cc-cvn":"#<?= /* @noEscape */ $code ?>_cc_type"}'/>
118+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
119+
'oncopy',
120+
"event.preventDefault();",
121+
'#' . $code . '_cc_cid'
122+
) ?>
123+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
124+
'oncut',
125+
"event.preventDefault();",
126+
'#' . $code . '_cc_cid'
127+
) ?>
128+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
129+
'onpaste',
130+
"event.preventDefault();",
131+
'#' . $code . '_cc_cid'
132+
) ?>
103133
<?php $content = '<img src=\"' . $block->getViewFileUrl('Magento_Checkout::cvv.png') . '\" alt=\"' .
104134
$block->escapeHtml(__('Card Verification Number Visual Reference')) .
105135
'\" title=\"' . $block->escapeHtml(__('Card Verification Number Visual Reference')) . '\" />'; ?>

‎app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,21 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
7575
"validate-cc-type":"#<?= /* @noEscape */ $code ?>_cc_type"
7676
}'
7777
autocomplete="off"/>
78+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
79+
'oncopy',
80+
"event.preventDefault();",
81+
'#' . $code . '_cc_number'
82+
) ?>
83+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
84+
'oncut',
85+
"event.preventDefault();",
86+
'#' . $code . '_cc_number'
87+
) ?>
88+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
89+
'onpaste',
90+
"event.preventDefault();",
91+
'#' . $code . '_cc_number'
92+
) ?>
7893
</div>
7994
</div>
8095
<div class="field required date" id="<?= /* @noEscape */ $code ?>_cc_type_exp_div">
@@ -130,6 +145,21 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
130145
"required-number":true,
131146
"validate-cc-cvn":"#<?= /* @noEscape */ $code ?>_cc_type"
132147
}' autocomplete="off"/>
148+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
149+
'oncopy',
150+
"event.preventDefault();",
151+
'#' . $code . '_cc_cid'
152+
) ?>
153+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
154+
'oncut',
155+
"event.preventDefault();",
156+
'#' . $code . '_cc_cid'
157+
) ?>
158+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
159+
'onpaste',
160+
"event.preventDefault();",
161+
'#' . $code . '_cc_cid'
162+
) ?>
133163
<div class="note">
134164
<a href="#" id="<?= /* @noEscape */ $code ?>-cvv-what-is-this" class="action cvv"
135165
title="<?= $block->escapeHtml(__('What is this?')) ?>" data-mage-init='{

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,14 @@ define([
192192
'" />';
193193
},
194194

195+
/**
196+
* Get unsanitized html for image for CVV
197+
* @returns {String}
198+
*/
199+
getCvvImageUnsanitizedHtml: function () {
200+
return this.getCvvImageHtml();
201+
},
202+
195203
/**
196204
* @deprecated
197205
* @returns {Object}

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@
4545
</label>
4646
<div class="control">
4747
<input type="number" name="payment[cc_number]" class="input-text" value=""
48+
oncopy="return false;"
49+
oncut="return false;"
50+
onpaste="return false;"
4851
data-bind="attr: {
4952
autocomplete: off,
5053
id: getCode() + '_cc_number',
@@ -104,6 +107,9 @@
104107
class="input-text cvv"
105108
name="payment[cc_cid]"
106109
value=""
110+
oncopy="return false;"
111+
oncut="return false;"
112+
onpaste="return false;"
107113
data-bind="attr: {id: getCode() + '_cc_cid',
108114
title: $t('Card Verification Number'),
109115
'data-container': getCode() + '-cc-cvv',
@@ -119,7 +125,7 @@
119125
</span>
120126
<div class="field-tooltip-content"
121127
data-target="dropdown"
122-
data-bind="html: getCvvImageHtml()"></div>
128+
data-bind="html: getCvvImageUnsanitizedHtml()"></div>
123129
</div>
124130
</div>
125131
</div>

‎app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,21 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
8181
"validate-cc-type":"#<?= /* @noEscape */ $code ?>_cc_type"
8282
}'
8383
autocomplete="off"/>
84+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
85+
'oncopy',
86+
"event.preventDefault();",
87+
'#' . $code . '_cc_number'
88+
) ?>
89+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
90+
'oncut',
91+
"event.preventDefault();",
92+
'#' . $code . '_cc_number'
93+
) ?>
94+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
95+
'onpaste',
96+
"event.preventDefault();",
97+
'#' . $code . '_cc_number'
98+
) ?>
8499
</div>
85100
</div>
86101

@@ -130,6 +145,21 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
130145
value=""
131146
data-validate='{"required-number":true, "validate-cc-cvn":"#<?=/* @noEscape */ $code?>_cc_type"}'
132147
autocomplete="off"/>
148+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
149+
'oncopy',
150+
"event.preventDefault();",
151+
'#' . $code . '_cc_cid'
152+
) ?>
153+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
154+
'oncut',
155+
"event.preventDefault();",
156+
'#' . $code . '_cc_cid'
157+
) ?>
158+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
159+
'onpaste',
160+
"event.preventDefault();",
161+
'#' . $code . '_cc_cid'
162+
) ?>
133163
</div>
134164
</div>
135165
<?php endif; ?>

0 commit comments

Comments
 (0)