Merge pull request #5969 from magento-tsg/2.4-develop-pr69

[TSG] Fixes for 2.4 (pr69) (2.4-develop)

Author: zakdma

app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml

@@ -11,7 +11,7 @@
 ?>
 <?php if ($block->getRatingSummary()->getCount()): ?>
     <div class="rating-box">
-        <div class="rating"/>
+        <div class="rating"></div>
     </div>
     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
         "width:" . /* @noEscape */ ceil($block->getRatingSummary()->getSum() /

app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml

@@ -6,8 +6,11 @@
 
 /* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
+$blockDataId = $block->getDataId();
+$jsEscapedBlockDataId = $block->escapeJs($blockDataId);
 ?>
-<div class="create-order-sidebar-block" id="sidebar_data_<?= $block->escapeHtmlAttr($block->getDataId()) ?>">
+<div class="create-order-sidebar-block" id="sidebar_data_<?= $block->escapeHtmlAttr($blockDataId) ?>">
     <div class="head sidebar-title-block">
         <a href="#" class="action-refresh" title="<?= $block->escapeHtml(__('Refresh')) ?>">
             <span><?= $block->escapeHtml(__('Refresh')) ?></span>
@@ -19,9 +22,12 @@
     </div>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onclick',
-        "order.loadArea('sidebar_" . $block->escapeJs($block->getDataId()) .
-        "', 'sidebar_data_" . $block->escapeJs($block->getDataId()) . "');event.preventDefault();",
-        'div.head.sidebar-title-block'
+        "order.loadArea(
+            'sidebar_" . $jsEscapedBlockDataId ."',
+            'sidebar_data_" . $jsEscapedBlockDataId . "'
+        );
+        event.preventDefault();",
+        'div#sidebar_data_'. $jsEscapedBlockDataId . ' a.action-refresh'
     ) ?>
     <div class="content">
         <div class="auto-scroll">
@@ -83,7 +89,7 @@
                                            type="checkbox"
                                            class="admin__control-checkbox"
                                            name="sidebar[remove][<?= (int) $block->getItemId($_item) ?>]"
-                                           value="<?= $block->escapeHtmlAttr($block->getDataId()) ?>"
+                                           value="<?= $block->escapeHtmlAttr($blockDataId) ?>"
                                            title="<?= $block->escapeHtml(__('Remove')) ?>" />
                                     <label class="admin__field-label"
                                            for="sidebar-remove-<?=
@@ -97,7 +103,7 @@
                         <td class="col-add">
                             <div class="admin__field-option">
                                 <?php if ($block->isConfigurationRequired($_item->getTypeId()) &&
-                                    $block->getDataId() == 'wishlist'): ?>
+                                    $blockDataId == 'wishlist'): ?>
                                     <a href="#"
                                        class="icon icon-configure"
                                        title="<?= $block->escapeHtml(__('Configure and Add to Order')) ?>">

app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml

@@ -76,9 +76,11 @@
                         <span><?= $block->escapeHtml(__('Invoice Comments')) ?></span>
                     </label>
                     <div class="admin__field-control">
-                        <textarea id="invoice_comment_text" name="invoice[comment_text]" class="admin__control-textarea"
-                                  rows="3" cols="5"><?= $block->escapeHtml($block->getInvoice()->getCommentText()) ?>
-                        </textarea>
+                        <textarea id="invoice_comment_text"
+                                  name="invoice[comment_text]"
+                                  class="admin__control-textarea"
+                                  rows="3"
+                                  cols="5"><?= $block->escapeHtml($block->getInvoice()->getCommentText())?></textarea>
                     </div>
                 </div>
             </div>