Skip to content

Commit b044775

Browse files
admanesachinadmanesachin
authored
Merge pull request #6866 from magento-cia/MC-42311
[cia] MC-42311: 2.4.3-develop stabilization
2 parents a2238d9 + 67bf2db commit b044775

File tree

3 files changed

+47
-41
lines changed
  • app/code/Magento

3 files changed

+47
-41
lines changed

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

+19-20
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
2929
class="admin__fieldset"
3030
data-mage-init='{
3131
"transparent":{
32+
"cardFieldsMap":<?= $block->escapeHtml($block->getCardFieldsMap()) ?>,
3233
"controller":"<?= $block->escapeHtml($block->getRequest()->getControllerName()) ?>",
3334
"gateway":"<?= /* @noEscape */ $code ?>",
3435
"dateDelim":"<?= $block->escapeHtml($block->getDateDelim()) ?>",
35-
"cardFieldsMap":<?= $block->escapeHtml($block->getCardFieldsMap()) ?>,
3636
"orderSaveUrl":"<?= $block->escapeUrl($block->getOrderUrl()) ?>",
3737
"cgiUrl":"<?= $block->escapeUrl($block->getCgiUrl()) ?>",
3838
"expireYearLength":"<?= $block->escapeHtml($block->getMethodConfigData('cc_year_length')) ?>",
@@ -44,13 +44,12 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
4444
<label for="<?= /* @noEscape */ $code ?>_cc_type" class="admin__field-label">
4545
<span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
4646
</label>
47-
4847
<div class="admin__field-control">
4948
<select id="<?= /* @noEscape */ $code ?>_cc_type"
49+
class="admin__control-select"
5050
data-container="<?= /* @noEscape */ $code ?>-cc-type"
51-
name="payment[cc_type]"
5251
data-validate='{required:true, "validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"}'
53-
class="admin__control-select">
52+
name="payment[cc_type]">
5453
<option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
5554
<?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
5655
<option
@@ -62,16 +61,16 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
6261
</select>
6362
</div>
6463
</div>
65-
6664
<div class="admin__field _required field-number">
6765
<label for="<?= /* @noEscape */ $code ?>_cc_number" class="admin__field-label">
6866
<span><?= $block->escapeHtml(__('Credit Card Number')) ?></span>
6967
</label>
70-
7168
<div class="admin__field-control">
72-
<input type="text" id="<?= /* @noEscape */ $code ?>_cc_number"
69+
<input type="text"
70+
id="<?= /* @noEscape */ $code ?>_cc_number"
7371
data-container="<?= /* @noEscape */ $code ?>-cc-number"
74-
name="payment[cc_number]" title="<?= $block->escapeHtml(__('Credit Card Number')) ?>"
72+
name="payment[cc_number]"
73+
title="<?= $block->escapeHtml(__('Credit Card Number')) ?>"
7574
class="admin__control-text"
7675
value=""
7776
data-validate='{
@@ -81,12 +80,12 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
8180
}'
8281
autocomplete="off"/>
8382
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
84-
'oncopy',
83+
'oncut',
8584
"event.preventDefault();",
8685
'#' . $code . '_cc_number'
8786
) ?>
8887
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
89-
'oncut',
88+
'oncopy',
9089
"event.preventDefault();",
9190
'#' . $code . '_cc_number'
9291
) ?>
@@ -97,17 +96,17 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
9796
) ?>
9897
</div>
9998
</div>
100-
10199
<div class="admin__field _required field-date" id="<?= /* @noEscape */ $code ?>_cc_type_exp_div">
102100
<label for="<?= /* @noEscape */ $code ?>_expiration" class="admin__field-label">
103101
<span><?= $block->escapeHtml(__('Expiration Date')) ?></span>
104102
</label>
105103

106104
<div class="admin__field-control">
107-
<select id="<?= /* @noEscape */ $code ?>_expiration" name="payment[cc_exp_month]"
108-
data-container="<?= /* @noEscape */ $code ?>-cc-month"
105+
<select id="<?= /* @noEscape */ $code ?>_expiration"
109106
class="admin__control-select admin__control-select-month"
110-
data-validate='{required:true, "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"}'>
107+
data-container="<?= /* @noEscape */ $code ?>-cc-month"
108+
data-validate='{required:true, "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"}'
109+
name="payment[cc_exp_month]">
111110
<?php foreach ($block->getCcMonths() as $k => $v): ?>
112111
<option
113112
value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
@@ -116,10 +115,11 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
116115
</option>
117116
<?php endforeach ?>
118117
</select>
119-
120-
<select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
118+
<select id="<?= /* @noEscape */ $code ?>_expiration_yr"
121119
class="admin__control-select admin__control-select-year"
122-
data-container="<?= /* @noEscape */ $code ?>-cc-year" data-validate='{required:true}'>
120+
data-container="<?= /* @noEscape */ $code ?>-cc-year"
121+
data-validate='{required:true}'
122+
name="payment[cc_exp_year]">
123123
<?php foreach ($block->getCcYears() as $k => $v): ?>
124124
<option
125125
value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
@@ -135,7 +135,6 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
135135
<label for="<?= /* @noEscape */ $code ?>_cc_cid" class="admin__field-label">
136136
<span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
137137
</label>
138-
139138
<div class="admin__field-control">
140139
<input type="text" title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
141140
data-container="<?= /* @noEscape */ $code ?>-cc-cvv"
@@ -145,12 +144,12 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
145144
data-validate='{"required-number":true, "validate-cc-cvn":"#<?=/* @noEscape */ $code?>_cc_type"}'
146145
autocomplete="off"/>
147146
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
148-
'oncopy',
147+
'oncut',
149148
"event.preventDefault();",
150149
'#' . $code . '_cc_cid'
151150
) ?>
152151
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
153-
'oncut',
152+
'oncopy',
154153
"event.preventDefault();",
155154
'#' . $code . '_cc_cid'
156155
) ?>

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

+24-13
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,12 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
6666
<span><?= $block->escapeHtml(__('Credit Card Number')) ?></span>
6767
</label>
6868
<div class="control">
69-
<input type="number" id="<?= /* @noEscape */ $code ?>_cc_number"
69+
<input id="<?= /* @noEscape */ $code ?>_cc_number"
70+
type="number"
7071
data-container="<?= /* @noEscape */ $code ?>-cc-number" name="payment[cc_number]"
71-
title="<?= $block->escapeHtml(__('Credit Card Number')) ?>" class="input-text" value=""
72+
title="<?= $block->escapeHtml(__('Credit Card Number')) ?>"
73+
class="input-text"
74+
value=""
7275
data-validate='{
7376
"required-number":true,
7477
"validate-cc-number":"#<?= /* @noEscape */ $code ?>_cc_type",
@@ -81,12 +84,12 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
8184
'#' . $code . '_cc_number'
8285
) ?>
8386
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
84-
'oncut',
87+
'onpaste',
8588
"event.preventDefault();",
8689
'#' . $code . '_cc_number'
8790
) ?>
8891
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
89-
'onpaste',
92+
'oncut',
9093
"event.preventDefault();",
9194
'#' . $code . '_cc_number'
9295
) ?>
@@ -100,8 +103,10 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
100103
<div class="fields group group-2">
101104
<div class="field no-label month">
102105
<div class="control">
103-
<select id="<?= /* @noEscape */ $code ?>_expiration" name="payment[cc_exp_month]"
104-
data-container="<?= /* @noEscape */ $code ?>-cc-month" class="month"
106+
<select id="<?= /* @noEscape */ $code ?>_expiration"
107+
name="payment[cc_exp_month]"
108+
data-container="<?= /* @noEscape */ $code ?>-cc-month"
109+
class="month"
105110
data-validate='{
106111
required:true,
107112
"validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"
@@ -117,8 +122,10 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
117122
</div>
118123
<div class="field no-label year">
119124
<div class="control">
120-
<select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
121-
class="year" data-container="<?= /* @noEscape */ $code ?>-cc-year"
125+
<select id="<?= /* @noEscape */ $code ?>_expiration_yr"
126+
name="payment[cc_exp_year]"
127+
class="year"
128+
data-container="<?= /* @noEscape */ $code ?>-cc-year"
122129
data-validate='{required:true}'>
123130
<?php foreach ($block->getCcYears() as $k => $v): ?>
124131
<option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
@@ -138,9 +145,13 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
138145
<span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
139146
</label>
140147
<div class="control">
141-
<input type="number" title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
142-
data-container="<?= /* @noEscape */ $code ?>-cc-cvv" class="input-text cvv"
143-
id="<?= /* @noEscape */ $code ?>_cc_cid" name="payment[cc_cid]" value=""
148+
<input id="<?= /* @noEscape */ $code ?>_cc_cid"
149+
name="payment[cc_cid]"
150+
type="number"
151+
title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
152+
data-container="<?= /* @noEscape */ $code ?>-cc-cvv"
153+
class="input-text cvv"
154+
value=""
144155
data-validate='{
145156
"required-number":true,
146157
"validate-cc-cvn":"#<?= /* @noEscape */ $code ?>_cc_type"
@@ -151,12 +162,12 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
151162
'#' . $code . '_cc_cid'
152163
) ?>
153164
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
154-
'oncut',
165+
'onpaste',
155166
"event.preventDefault();",
156167
'#' . $code . '_cc_cid'
157168
) ?>
158169
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
159-
'onpaste',
170+
'oncut',
160171
"event.preventDefault();",
161172
'#' . $code . '_cc_cid'
162173
) ?>

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

+4-8
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,12 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
7373
<input type="text" id="<?= /* @noEscape */ $code ?>_cc_number"
7474
data-container="<?= /* @noEscape */ $code ?>-cc-number"
7575
name="payment[cc_number]" title="<?= $block->escapeHtml(__('Credit Card Number')) ?>"
76-
class="admin__control-text"
77-
value=""
76+
class="admin__control-text" value="" autocomplete="off"
7877
data-validate='{
7978
"required-number":true,
8079
"validate-cc-number":"#<?= /* @noEscape */ $code ?>_cc_type",
8180
"validate-cc-type":"#<?= /* @noEscape */ $code ?>_cc_type"
82-
}'
83-
autocomplete="off"/>
81+
}'/>
8482
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
8583
'oncopy',
8684
"event.preventDefault();",
@@ -139,10 +137,8 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
139137

140138
<div class="admin__field-control">
141139
<input type="text" title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
142-
data-container="<?= /* @noEscape */ $code ?>-cc-cvv"
143-
class="admin__control-text cvv"
144-
id="<?= /* @noEscape */ $code ?>_cc_cid" name="payment[cc_cid]"
145-
value=""
140+
data-container="<?= /* @noEscape */ $code ?>-cc-cvv" class="admin__control-text cvv"
141+
id="<?= /* @noEscape */ $code ?>_cc_cid" name="payment[cc_cid]" value=""
146142
data-validate='{"required-number":true, "validate-cc-cvn":"#<?=/* @noEscape */ $code?>_cc_type"}'
147143
autocomplete="off"/>
148144
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(

0 commit comments

Comments
 (0)