Skip to content

Commit 99764dd

Browse files
author
hwyu@adobe.com
committed
MC-40818: Disable clipboard for cc inputs
- Fixed static test failures
1 parent 35e4a76 commit 99764dd

File tree

3 files changed

+29
-19
lines changed

3 files changed

+29
-19
lines changed

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

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
3131
"orderSaveUrl":"<?= $block->escapeUrl($block->getOrderUrl()) ?>",
3232
"cgiUrl":"<?= $block->escapeUrl($block->getCgiUrl()) ?>",
3333
"expireYearLength":"<?= $block->escapeHtml($block->getMethodConfigData('cc_year_length')) ?>",
34-
"nativeAction":"<?= $block->escapeUrl($block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()])) ?>"
34+
"nativeAction":"<?= $block->escapeUrl(
35+
$block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()])
36+
) ?>"
3537
}, "validation":[]}'
3638
style="display: none;">
3739
<div class="admin__field _required">
@@ -43,12 +45,16 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
4345
<select id="<?= /* @noEscape */ $code ?>_cc_type"
4446
data-container="<?= /* @noEscape */ $code ?>-cc-type"
4547
name="payment[cc_type]"
46-
data-validate='{required:true, "validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"}'
48+
data-validate='{
49+
required:true,
50+
"validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"
51+
}'
4752
class="admin__control-select">
4853
<option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
49-
<?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
54+
<?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
5055
<option
51-
value="<?= $block->escapeHtmlAttr($typeCode) ?>"<?php if ($typeCode == $ccType) : ?> selected="selected"<?php endif ?>>
56+
value="<?= $block->escapeHtmlAttr($typeCode) ?>"
57+
<?php if ($typeCode == $ccType): ?> selected="selected"<?php endif ?>>
5258
<?= $block->escapeHtml($typeName) ?>
5359
</option>
5460
<?php endforeach ?>
@@ -90,10 +96,10 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
9096
data-container="<?= /* @noEscape */ $code ?>-cc-month"
9197
class="admin__control-select admin__control-select-month"
9298
data-validate='{required:true, "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"}'>
93-
<?php foreach ($block->getCcMonths() as $k => $v) : ?>
99+
<?php foreach ($block->getCcMonths() as $k => $v): ?>
94100
<option
95101
value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
96-
<?php if ($k == $ccExpMonth) : ?> selected="selected"<?php endif; ?>>
102+
<?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
97103
<?= $block->escapeHtml($v) ?>
98104
</option>
99105
<?php endforeach ?>
@@ -102,17 +108,17 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
102108
<select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
103109
class="admin__control-select admin__control-select-year"
104110
data-container="<?= /* @noEscape */ $code ?>-cc-year" data-validate='{required:true}'>
105-
<?php foreach ($block->getCcYears() as $k => $v) : ?>
111+
<?php foreach ($block->getCcYears() as $k => $v): ?>
106112
<option
107113
value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
108-
<?php if ($k == $ccExpYear) : ?> selected="selected"<?php endif ?>>
114+
<?php if ($k == $ccExpYear): ?> selected="selected"<?php endif ?>>
109115
<?= $block->escapeHtml($v) ?>
110116
</option>
111117
<?php endforeach ?>
112118
</select>
113119
</div>
114120
</div>
115-
<?php if ($block->hasVerification()) : ?>
121+
<?php if ($block->hasVerification()): ?>
116122
<div class="admin__field _required field-cvv" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
117123
<label for="<?= /* @noEscape */ $code ?>_cc_cid" class="admin__field-label">
118124
<span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
@@ -129,7 +135,10 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
129135
id="<?= /* @noEscape */ $code ?>_cc_cid"
130136
name="payment[cc_cid]"
131137
value=""
132-
data-validate='{"required-number":true, "validate-cc-cvn":"#<?= /* @noEscape */ $code ?>_cc_type"}'
138+
data-validate='{
139+
"required-number":true,
140+
"validate-cc-cvn":"#<?= /* @noEscape */ $code ?>_cc_type"
141+
}'
133142
autocomplete="off"/>
134143
</div>
135144
</div>

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
2727
"cgiUrl":"<?= $block->escapeUrl($block->getCgiUrl()) ?>",
2828
"dateDelim":"<?= $block->escapeHtml($block->getDateDelim()) ?>",
2929
"cardFieldsMap":<?= $block->escapeHtml($block->getCardFieldsMap()) ?>,
30-
"nativeAction":"<?= $block->escapeUrl($block->getUrl('checkout/onepage/saveOrder', ['_secure' => $block->getRequest()->isSecure()])) ?>"
30+
"nativeAction":"<?= $block->escapeUrl(
31+
$block->getUrl('checkout/onepage/saveOrder', ['_secure' => $block->getRequest()->isSecure()])
32+
) ?>"
3133
}, "validation":[]}'>
3234
<fieldset class="fieldset ccard <?= /* @noEscape */ $code ?>" id="payment_form_<?= /* @noEscape */ $code ?>">
3335
<legend class="legend">
@@ -45,9 +47,9 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
4547
"validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"
4648
}'>
4749
<option value=""><?= $block->escapeHtml(__('--Please Select--')) ?></option>
48-
<?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
50+
<?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
4951
<option value="<?= $block->escapeHtmlAttr($typeCode) ?>"
50-
<?php if ($typeCode == $ccType) : ?> selected="selected"<?php endif; ?>>
52+
<?php if ($typeCode == $ccType): ?> selected="selected"<?php endif; ?>>
5153
<?= $block->escapeHtml($typeName) ?></option>
5254
<?php endforeach ?>
5355
</select>
@@ -89,9 +91,9 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
8991
required:true,
9092
"validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"
9193
}'>
92-
<?php foreach ($block->getCcMonths() as $k => $v) : ?>
94+
<?php foreach ($block->getCcMonths() as $k => $v): ?>
9395
<option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
94-
<?php if ($k == $ccExpMonth) : ?> selected="selected"<?php endif; ?>>
96+
<?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
9597
<?= $block->escapeHtml($v) ?>
9698
</option>
9799
<?php endforeach ?>
@@ -103,9 +105,9 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
103105
<select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
104106
class="year" data-container="<?= /* @noEscape */ $code ?>-cc-year"
105107
data-validate='{required:true}'>
106-
<?php foreach ($block->getCcYears() as $k => $v) : ?>
108+
<?php foreach ($block->getCcYears() as $k => $v): ?>
107109
<option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
108-
<?php if ($k == $ccExpYear) : ?> selected="selected"<?php endif; ?>>
110+
<?php if ($k == $ccExpYear): ?> selected="selected"<?php endif; ?>>
109111
<?= $block->escapeHtml($v) ?>
110112
</option>
111113
<?php endforeach ?>
@@ -115,7 +117,7 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
115117
</div>
116118
</div>
117119
</div>
118-
<?php if ($block->hasVerification()) : ?>
120+
<?php if ($block->hasVerification()): ?>
119121
<div class="field required cvv" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
120122
<label for="<?= /* @noEscape */ $code ?>_cc_cid" class="label">
121123
<span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ define([
200200
return this.getCvvImageHtml();
201201
},
202202

203-
204203
/**
205204
* @deprecated
206205
* @returns {Object}

0 commit comments

Comments
 (0)