Skip to content

Commit b716af7

Browse files
author
Oleksii Korshenko
authored
Merge pull request #245 from magento-folks/github_pr_2.0
Fixed Issues: - MAGETWO-56700 [GITHUB] Addresses #5719 #5890 - Order comment history status time was updating to current time whenever refreshing order view page instead of time when comment has been added or status has been changed
2 parents 8be666f + 2eb7f42 commit b716af7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<ul class="note-list">
5454
<?php foreach ($_entity->getCommentsCollection(true) as $_comment): ?>
5555
<li>
56-
<span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_comment->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
57-
<span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_comment->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
56+
<span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
57+
<span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
5858
<span class="note-list-customer">
5959
<?php /* @escapeNotVerified */ echo __('Customer') ?>
6060
<?php if ($_comment->getIsCustomerNotified()): ?>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
<ul class="note-list">
7373
<?php foreach ($block->getOrder()->getStatusHistoryCollection(true) as $_item): ?>
7474
<li class="note-list-item">
75-
<span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_item->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
76-
<span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_item->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
75+
<span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
76+
<span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
7777
<span class="note-list-status"><?php /* @escapeNotVerified */ echo $_item->getStatusLabel() ?></span>
7878
<span class="note-list-customer">
7979
<?php /* @escapeNotVerified */ echo __('Customer') ?>

0 commit comments

Comments
 (0)