Revert - AC-15304:Price of product in cart affected by catalog price rule does not change when rule is adjusted by the staging update

Author: glo60612

app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml

@@ -10,13 +10,12 @@
 ?>
 <?php $mergedCells = ($this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices() ? 2 : 1); ?>
 <?= $block->getChildHtml('form_before') ?>
-<form action="<?= $escaper->escapeUrl($block->getUrl('checkout/cart/updatePost')) ?>"
+<form action="<?= $block->escapeUrl($block->getUrl('checkout/cart/updatePost')) ?>"
           method="post"
           id="form-validate"
           data-mage-init='{"Magento_Checkout/js/action/update-shopping-cart":
-              {"validationURL" : "<?= $escaper->escapeUrl($block->getUrl('checkout/cart/updateItemQty')) ?>",
-              "updateCartActionContainer": "#update_cart_action_container"},
-              "Magento_Checkout/js/cart/ensure-subtotal-sync": {}
+              {"validationURL" : "<?= $block->escapeUrl($block->getUrl('checkout/cart/updateItemQty')) ?>",
+              "updateCartActionContainer": "#update_cart_action_container"}
           }'
           class="form form-cart">
     <?= $block->getBlockHtml('formkey') ?>
@@ -30,13 +29,13 @@
                class="cart items data table"
                data-mage-init='{"shoppingCart":{"emptyCartButton": ".action.clear",
                "updateCartActionContainer": "#update_cart_action_container"}}'>
-            <caption class="table-caption"><?= $escaper->escapeHtml(__('Shopping Cart Items')) ?></caption>
+            <caption class="table-caption"><?= $block->escapeHtml(__('Shopping Cart Items')) ?></caption>
             <thead>
                 <tr>
-                    <th class="col item" scope="col"><span><?= $escaper->escapeHtml(__('Item')) ?></span></th>
-                    <th class="col price" scope="col"><span><?= $escaper->escapeHtml(__('Price')) ?></span></th>
-                    <th class="col qty" scope="col"><span><?= $escaper->escapeHtml(__('Qty')) ?></span></th>
-                    <th class="col subtotal" scope="col"><span><?= $escaper->escapeHtml(__('Subtotal')) ?></span></th>
+                    <th class="col item" scope="col"><span><?= $block->escapeHtml(__('Item')) ?></span></th>
+                    <th class="col price" scope="col"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
+                    <th class="col qty" scope="col"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
+                    <th class="col subtotal" scope="col"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
                 </tr>
             </thead>
             <?php foreach ($block->getItems() as $_item): ?>
@@ -52,28 +51,28 @@
     <div class="cart main actions">
         <?php if ($block->getContinueShoppingUrl()): ?>
             <a class="action continue"
-               href="<?= $escaper->escapeUrl($block->getContinueShoppingUrl()) ?>"
-               title="<?= $escaper->escapeHtml(__('Continue Shopping')) ?>">
-                <span><?= $escaper->escapeHtml(__('Continue Shopping')) ?></span>
+               href="<?= $block->escapeUrl($block->getContinueShoppingUrl()) ?>"
+               title="<?= $block->escapeHtml(__('Continue Shopping')) ?>">
+                <span><?= $block->escapeHtml(__('Continue Shopping')) ?></span>
             </a>
         <?php endif; ?>
         <?php if ($block->getViewModel()->isClearShoppingCartEnabled()): ?>
             <button type="button"
                     name="update_cart_action"
                     data-cart-empty=""
                     value="empty_cart"
-                    title="<?= $escaper->escapeHtml(__('Clear Shopping Cart')) ?>"
+                    title="<?= $block->escapeHtml(__('Clear Shopping Cart')) ?>"
                     class="action clear" id="empty_cart_button">
-                <span><?= $escaper->escapeHtml(__('Clear Shopping Cart')) ?></span>
+                <span><?= $block->escapeHtml(__('Clear Shopping Cart')) ?></span>
             </button>
         <?php endif ?>
         <button type="submit"
                 name="update_cart_action"
                 data-cart-item-update=""
                 value="update_qty"
-                title="<?= $escaper->escapeHtml(__('Update Shopping Cart')) ?>"
+                title="<?= $block->escapeHtml(__('Update Shopping Cart')) ?>"
                 class="action update">
-            <span><?= $escaper->escapeHtml(__('Update Shopping Cart')) ?></span>
+            <span><?= $block->escapeHtml(__('Update Shopping Cart')) ?></span>
         </button>
         <input type="hidden" value="" id="update_cart_action_container" data-cart-item-update=""/>
     </div>