From 1764aa8d357557ca5487ca211828e8c5e9e46137 Mon Sep 17 00:00:00 2001
From: "a.chorniy" <a.chorniy@atwix.com>
Date: Wed, 4 Dec 2019 10:39:02 +0200
Subject: [PATCH 1/2] change tag name from <date> to <span>, to avoid
 unnecessary issue in exception.log

---
 .../Sales/view/frontend/templates/order/order_date.phtml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
index 80a0ea02499cc..0cc899530e062 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
@@ -5,5 +5,5 @@
  */
 ?>
 <div class="order-date">
-    <?= $block->escapeHtml(__('<span class="label">Order Date:</span> %1', '<date>' . $block->formatDate($block->getOrder()->getCreatedAt(), \IntlDateFormatter::LONG) . '</date>'), ['span', 'date']) ?>
+    <?= $block->escapeHtml(__('<span class="label">Order Date:</span> %1', '<span>' . $block->formatDate($block->getOrder()->getCreatedAt(), \IntlDateFormatter::LONG) . '</span>'), ['span']) ?>
 </div>

From e537a76055864b4e3c17f21beb745cab276ec849 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 17 Feb 2020 16:37:58 +0200
Subject: [PATCH 2/2] mftf, fix static

---
 .../Test/Mftf/Section/StorefrontOrderDetailsSection.xml   | 1 +
 .../Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml   | 1 +
 .../Sales/view/frontend/templates/order/order_date.phtml  | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderDetailsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderDetailsSection.xml
index d262dfa9b010c..d1c94965640c5 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderDetailsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderDetailsSection.xml
@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontOrderDetailsSection">
+        <element name="orderDateTagElement" type="block" selector=".order-date date"/>
         <element name="orderDetailsBlock" type="block" selector=".block-order-details-view"/>
         <element name="billingAddressBlock" type="block" selector=".box-order-billing-address > .box-content > address"/>
         <element name="discountSalesRule" type="text" selector="tr.discount span.price"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
index 45953b7b584f2..bcfa9cb6f945f 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
@@ -143,6 +143,7 @@
 
         <!-- Assert invoiced amount on frontend -->
         <click selector="{{StorefrontCustomerOrderSection.viewOrder}}" stepKey="clickViewOrder"/>
+        <dontSeeElement selector="{{StorefrontOrderDetailsSection.orderDateTagElement}}" stepKey="dontSeeDateTag"/>
         <click selector="{{StorefrontOrderInvoicesSection.invoiceTab}}" stepKey="clickInvoiceTabOnStorefront"/>
         <see selector="{{StorefrontOrderInvoicesSection.grandTotalPrice}}" userInput="$110.00" stepKey="seePrice"/>
     </test>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
index 0cc899530e062..3e2b653e8b3bd 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
@@ -5,5 +5,11 @@
  */
 ?>
 <div class="order-date">
-    <?= $block->escapeHtml(__('<span class="label">Order Date:</span> %1', '<span>' . $block->formatDate($block->getOrder()->getCreatedAt(), \IntlDateFormatter::LONG) . '</span>'), ['span']) ?>
+    <?= $block->escapeHtml(
+        __(
+            '<span class="label">Order Date:</span> %1',
+            '<span>' . $block->formatDate($block->getOrder()->getCreatedAt(), \IntlDateFormatter::LONG) . '</span>'
+        ),
+        ['span']
+    )?>
 </div>