MAGETWO-55785: Merge branch '2.0' of github.com:magento/magento2ce into MAGETWO-55785

Author: ishakhsuvarov

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

@@ -53,8 +53,8 @@
     <ul class="note-list">
         <?php foreach ($_entity->getCommentsCollection(true) as $_comment): ?>
             <li>
-                <span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_comment->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
-                <span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_comment->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
+                <span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
+                <span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
                 <span class="note-list-customer">
                     <?php /* @escapeNotVerified */ echo __('Customer') ?>
                     <?php if ($_comment->getIsCustomerNotified()): ?>

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

@@ -72,8 +72,8 @@
     <ul class="note-list">
     <?php foreach ($block->getOrder()->getStatusHistoryCollection(true) as $_item): ?>
         <li class="note-list-item">
-            <span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_item->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
-            <span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_item->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
+            <span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
+            <span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
             <span class="note-list-status"><?php /* @escapeNotVerified */ echo $_item->getStatusLabel() ?></span>
             <span class="note-list-customer">
                 <?php /* @escapeNotVerified */ echo __('Customer') ?>