Skip to content

Change tag name #25895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 26, 2020
Merged

Change tag name #25895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1764aa8
change tag name from <date> to <span>, to avoid unnecessary issue in …
Dec 4, 2019
e537a76
mftf, fix static
engcom-Charlie Feb 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderDetailsSection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 7 additions & 1 deletion app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,11 @@
*/
?>
<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>