MC-42306: Fix copy paste false positive issue

- Roll back all MC-42306 changes

Author: [email protected]

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

@@ -11,8 +11,6 @@ $code = $block->escapeHtml($block->getMethodCode());
 $ccType = $block->getInfoData('cc_type');
 $ccExpYear = $block->getInfoData('cc_exp_year');
 $ccExpMonth = $block->getInfoData('cc_exp_month');
-$ccNumberElementSelector = '#' . $code . '_cc_number';
-$ccCidElementSelector = '#' . $code . '_cc_cid';
 ?>
 
 <!-- IFRAME for request to Payment Gateway -->
@@ -46,6 +44,7 @@ $ccCidElementSelector = '#' . $code . '_cc_cid';
         <label for="<?= /* @noEscape */ $code ?>_cc_type" class="admin__field-label">
             <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
         </label>
+
         <div class="admin__field-control">
             <select id="<?= /* @noEscape */ $code ?>_cc_type"
                     data-container="<?= /* @noEscape */ $code ?>-cc-type"
@@ -63,13 +62,14 @@ $ccCidElementSelector = '#' . $code . '_cc_cid';
             </select>
         </div>
     </div>
+
     <div class="admin__field _required field-number">
         <label for="<?= /* @noEscape */ $code ?>_cc_number" class="admin__field-label">
             <span><?= $block->escapeHtml(__('Credit Card Number')) ?></span>
         </label>
+
         <div class="admin__field-control">
-            <input id="<?= /* @noEscape */ $code ?>_cc_number"
-                   type="text"
+            <input type="text" id="<?= /* @noEscape */ $code ?>_cc_number"
                    data-container="<?= /* @noEscape */ $code ?>-cc-number"
                    name="payment[cc_number]" title="<?= $block->escapeHtml(__('Credit Card Number')) ?>"
                    class="admin__control-text"
@@ -81,31 +81,32 @@ $ccCidElementSelector = '#' . $code . '_cc_cid';
                    }'
                    autocomplete="off"/>
             <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                'onpaste',
+                'oncopy',
                 "event.preventDefault();",
-                $ccNumberElementSelector
+                '#' . $code . '_cc_number'
             ) ?>
             <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                 'oncut',
                 "event.preventDefault();",
-                $ccNumberElementSelector
+                '#' . $code . '_cc_number'
             ) ?>
             <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                'oncopy',
+                'onpaste',
                 "event.preventDefault();",
-                $ccNumberElementSelector
+                '#' . $code . '_cc_number'
             ) ?>
         </div>
     </div>
+
     <div class="admin__field _required field-date" id="<?= /* @noEscape */ $code ?>_cc_type_exp_div">
         <label for="<?= /* @noEscape */ $code ?>_expiration" class="admin__field-label">
             <span><?= $block->escapeHtml(__('Expiration Date')) ?></span>
         </label>
+
         <div class="admin__field-control">
-            <select id="<?= /* @noEscape */ $code ?>_expiration"
-                    name="payment[cc_exp_month]"
-                    class="admin__control-select admin__control-select-month"
+            <select id="<?= /* @noEscape */ $code ?>_expiration" name="payment[cc_exp_month]"
                     data-container="<?= /* @noEscape */ $code ?>-cc-month"
+                    class="admin__control-select admin__control-select-month"
                     data-validate='{required:true, "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"}'>
                 <?php foreach ($block->getCcMonths() as $k => $v): ?>
                     <option
@@ -115,11 +116,10 @@ $ccCidElementSelector = '#' . $code . '_cc_cid';
                     </option>
                 <?php endforeach ?>
             </select>
-            <select id="<?= /* @noEscape */ $code ?>_expiration_yr"
-                    name="payment[cc_exp_year]"
+
+            <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
                     class="admin__control-select admin__control-select-year"
-                    data-container="<?= /* @noEscape */ $code ?>-cc-year"
-                    data-validate='{required:true}'>
+                    data-container="<?= /* @noEscape */ $code ?>-cc-year" data-validate='{required:true}'>
                 <?php foreach ($block->getCcYears() as $k => $v): ?>
                     <option
                         value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
@@ -135,30 +135,30 @@ $ccCidElementSelector = '#' . $code . '_cc_cid';
             <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="admin__field-label">
                 <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
             </label>
+
             <div class="admin__field-control">
-                <input type="text"
-                       title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
+                <input type="text" title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
+                       data-container="<?= /* @noEscape */ $code ?>-cc-cvv"
                        class="admin__control-text cvv"
-                       id="<?= /* @noEscape */ $code ?>_cc_cid"
-                       name="payment[cc_cid]"
+                       id="<?= /* @noEscape */ $code ?>_cc_cid" name="payment[cc_cid]"
                        value=""
                        data-container="<?= /* @noEscape */ $code ?>-cc-cvv"
                        data-validate='{"required-number":true, "validate-cc-cvn":"#<?=/* @noEscape */ $code?>_cc_type"}'
                        autocomplete="off"/>
                 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                    'onpaste',
+                    'oncopy',
                     "event.preventDefault();",
-                    $ccCidElementSelector
+                    '#' . $code . '_cc_cid'
                 ) ?>
                 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                     'oncut',
                     "event.preventDefault();",
-                    $ccCidElementSelector
+                    '#' . $code . '_cc_cid'
                 ) ?>
                 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                    'oncopy',
+                    'onpaste',
                     "event.preventDefault();",
-                    $ccCidElementSelector
+                    '#' . $code . '_cc_cid'
                 ) ?>
             </div>
         </div>