Skip to content

Commit 6a5dcee

Browse files
committed
AC-10528:Fix for Order Invoice Comment
1 parent b54758b commit 6a5dcee

File tree

1 file changed

+8
-7
lines changed
  • app/code/Magento/Sales/view/adminhtml/templates/order/view/tab

1 file changed

+8
-7
lines changed

app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
/** @var \Magento\Sales\Block\Adminhtml\Order\View\Tab\History $block */
8+
/** @var \Magento\Framework\Escaper $escaper */
89
?>
910
<section class="admin__page-section edit-order-comments">
1011
<ul class="note-list">
@@ -15,18 +16,18 @@
1516
<span class="note-list-status"><?= /* @noEscape */ $block->getItemTitle($_item) ?></span>
1617
<?php if ($block->isItemNotified($_item, false)): ?>
1718
<span class="note-list-customer">
18-
<?= $block->escapeHtml(__('Customer')) ?>
19+
<?= $escaper->escapeHtml(__('Customer')) ?>
1920
<?php if ($block->isCustomerNotificationNotApplicable($_item)): ?>
2021
<span class="note-list-customer-notapplicable">
21-
<?= $block->escapeHtml(__('Notification Not Applicable')) ?>
22+
<?= $escaper->escapeHtml(__('Notification Not Applicable')) ?>
2223
</span>
2324
<?php elseif ($block->isItemNotified($_item)): ?>
2425
<span class="note-list-customer-notified">
25-
<?= $block->escapeHtml(__('Notified')) ?>
26+
<?= $escaper->escapeHtml(__('Notified')) ?>
2627
</span>
2728
<?php else: ?>
2829
<span class="note-list-customer-not-notified">
29-
<?= $block->escapeHtml(__('Not Notified')) ?>
30+
<?= $escaper->escapeHtml(__('Not Notified')) ?>
3031
</span>
3132
<?php endif; ?>
3233
</span>
@@ -36,16 +37,16 @@
3637
</ul>
3738
<div class="edit-order-comments-block">
3839
<div class="edit-order-comments-block-title">
39-
<?= $block->escapeHtml(__('Notes for this Order')) ?>
40+
<?= $escaper->escapeHtml(__('Notes for this Order')) ?>
4041
</div>
4142
<?php foreach ($block->getFullHistory() as $_item): ?>
4243
<?php if ($_comment = $block->getItemComment($_item)): ?>
4344
<div class="comments-block-item">
4445
<div class="comments-block-item-comment">
45-
<?= /* @noEscape */ $block->escapeHtml($_comment) ?>
46+
<?= /* @noEscape */ $escaper->escapeHtml($_comment) ?>
4647
</div>
4748
<span class="comments-block-item-date-time">
48-
<?= $block->escapeHtml(__('Comment added')) ?>
49+
<?= $escaper->escapeHtml(__('Comment added')) ?>
4950
<?= /* @noEscape */ $block->getItemCreatedAt($_item) ?>
5051
<?= /* @noEscape */ $block->getItemCreatedAt($_item, 'time') ?>
5152
</span>

0 commit comments

Comments
 (0)