Merge branch '2.4-develop' into L3-PR-2023-09-13

Author: magento-devops-queue-mgr-svc

app/code/Magento/OrderCancellationUi/view/frontend/templates/cancel-order-modal.phtml

@@ -15,14 +15,14 @@
  * ************************************************************************
  */
 ?>
-<div id="cancel-order-modal-<?=/* @noEscape */ $block->getOrder()->getRealOrderId() ?>">
+<div id="cancel-order-modal-<?=/* @noEscape */ $block->getOrder()->getId() ?>">
     <div class="modal-body-content">
         <h3><?= $block->escapeHtml(__('Cancel order')) ?>
             <span class="cancel-order-id"><?=/* @noEscape */ $block->getOrder()->getRealOrderId() ?></span>
         </h3>
         <p><?= $block->escapeHtml(__('Provide a cancellation reason:')) ?></p>
         <form>
-            <select id="cancel-order-reason-<?=/* @noEscape */ $block->getOrder()->getRealOrderId() ?>"
+            <select id="cancel-order-reason-<?=/* @noEscape */ $block->getOrder()->getId() ?>"
                     class="cancel-order-reason" name="reason">
                 <?php foreach ($block->getReasons() as $key => $description): ?>
                     <option value="<?= $block->escapeHtml(__($description)) ?>">

app/code/Magento/OrderCancellationUi/view/frontend/templates/order/history.phtml

@@ -64,10 +64,10 @@ $viewModel = $block->getViewModel();
                             <?php endif ?>
                             <?php if ($viewModel->canCancel($_order->getEntityId())): ?>
                                 <a href="#" class="cancel-order"
-                                   id="cancel-order-<?=/* @noEscape */ $_order->getRealOrderId() ?>" data-mage-init='{
+                                   id="cancel-order-<?=/* @noEscape */ $_order->getId() ?>" data-mage-init='{
                                        "cancelOrderModal":{
                                            "url": "<?=/* @noEscape */ $block->getBaseUrl(); ?>",
-                                           "order_id": "<?= $block->escapeHtml(__($_order->getRealOrderId())); ?>"
+                                           "order_id": "<?= $block->escapeHtml(__($_order->getId())); ?>"
                                        }
                                     }'>
                                     <span><?= $block->escapeHtml(__('Cancel Order')) ?></span>

app/code/Magento/OrderCancellationUi/view/frontend/templates/order/info/buttons.phtml

@@ -33,10 +33,10 @@ $viewModel = $block->getViewModel();
     <?php endif ?>
     <?php if ($viewModel->canCancel($_order->getEntityId())): ?>
         <a href="#" class="cancel-order"
-            id="cancel-order-<?=/* @noEscape */ $_order->getRealOrderId() ?>" data-mage-init='{
+            id="cancel-order-<?=/* @noEscape */ $_order->getId() ?>" data-mage-init='{
             "cancelOrderModal":{
                 "url": "<?=/* @noEscape */ $block->getBaseUrl(); ?>",
-                "order_id": "<?= $block->escapeHtml(__($_order->getRealOrderId())); ?>"
+                "order_id": "<?= $block->escapeHtml(__($_order->getId())); ?>"
             }
         }'>
             <span><?= $block->escapeHtml(__('Cancel Order')) ?></span>

app/code/Magento/OrderCancellationUi/view/frontend/templates/order/recent.phtml

@@ -75,10 +75,10 @@ $viewModel = $block->getViewModel();
                                     <?php endif ?>
                                     <?php if ($viewModel->canCancel($_order->getEntityId())): ?>
                                         <a href="#" class="cancel-order"
-                                           id="cancel-order-<?=/* @noEscape */ $_order->getRealOrderId() ?>" data-mage-init='{
+                                           id="cancel-order-<?=/* @noEscape */ $_order->getId() ?>" data-mage-init='{
                                            "cancelOrderModal":{
                                                "url": "<?=/* @noEscape */ $block->getBaseUrl(); ?>",
-                                               "order_id": "<?= $block->escapeHtml(__($_order->getRealOrderId())); ?>"
+                                               "order_id": "<?= $block->escapeHtml(__($_order->getId())); ?>"
                                            }
                                         }'>
                                             <span><?= $block->escapeHtml(__('Cancel Order')) ?></span>