Skip to content
This repository has been archived by the owner on Apr 26, 2023. It is now read-only.

Commit

Permalink
Merge branch 'feature/88899' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ofrankowska committed Jun 14, 2022
2 parents 8c10a58 + fce3f8f commit 7c33284
Show file tree
Hide file tree
Showing 85 changed files with 11,375 additions and 11,176 deletions.
20 changes: 10 additions & 10 deletions Amasty_GiftCardAccount/web/template/account/codes.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
>
<div class="dashboard-table__header">
<h2 class="dashboard-table__title">
<text args="$t('Gift Codes')"/>
<text args="$t('Gift Codes')"></text>
</h2>
</div>
<div class="dashboard-table__content">
Expand All @@ -22,7 +22,7 @@ <h2 class="dashboard-table__title">
role="table"
>
<caption class="table-caption table__caption">
<text args="$t('Gift Codes')"/>
<text args="$t('Gift Codes')"></text>
</caption>
<thead>
<tr role="row">
Expand All @@ -31,14 +31,14 @@ <h2 class="dashboard-table__title">
scope="col"
class="col code"
>
<text args="$t('Code')"/>
<text args="$t('Code')"></text>
</th>
<th
role="columnheader"
scope="col"
class="col status"
>
<text args="$t('Status')"/>
<text args="$t('Status')"></text>
</th>
<!-- ko foreach: getRegion('extra-column-header') -->
<!-- ko template: getTemplate() --><!-- /ko -->
Expand All @@ -48,22 +48,22 @@ <h2 class="dashboard-table__title">
scope="col"
class="col balance"
>
<text args="$t('Current Balance')"/>
<text args="$t('Current Balance')"></text>
</th>
<th
role="columnheader"
scope="col"
class="col expired-date"
>
<text args="$t('Valid Till')"/>
<text args="$t('Valid Till')"></text>
</th>
<th
role="columnheader"
scope="col"
class="col expired-date"
if="$data.isAccount"
>
<text args="$t('Action')"/>
<text args="$t('Action')"></text>
</th>
</tr>
</thead>
Expand All @@ -74,13 +74,13 @@ <h2 class="dashboard-table__title">
attr="'data-th': $t('Code')"
class="col code"
>
<text args="code"/>
<text args="code"></text>
</td>
<td
attr="'data-th': $t('Status')"
class="col status"
>
<text args="status"/>
<text args="status"></text>
</td>
<!-- ko foreach: $parent.getRegion('extra-column') -->
<!-- ko template: getTemplate() --><!-- /ko -->
Expand All @@ -94,7 +94,7 @@ <h2 class="dashboard-table__title">
attr="'data-th': $t('Valid Till')"
class="col expired-date"
>
<text args="expiredDate"/>
<text args="expiredDate"></text>
</td>
<td
class="col actions"
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,15 @@ USE GITHUB ISSUE/PULL REQUEST NUMBERS, NOT INTERNAL ONE
- fotorama.js and magnifier.js magepack errors fixes (#544)
- checkout - shipping method item error display (#85516)
- hiding State/Province field when it's not required for selected country (#554)
- My Orders styling issues in M244 (#556)
- File upload link styling in Request a Quote (#557)
- Remove reward points button leading to 404 (#558)
### Removed
- unnecessary !important flags (#537)
- elasticsuite footer (#549)
- `select2magepack.full.min.js` that doesn't work correctly (select 2 ends up loading twice in magepack bundle and as a separate file), select2 should be removed from magepack config instead (#559)
### Updated
- Magento to 2.4.4 (#546)

## [Released]
## [2.26.3] - 2022-05-19
Expand Down
148 changes: 148 additions & 0 deletions Magento_AsyncOrder/templates/order/history.phtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
<?php
/** @var \Magento\Sales\Block\Order\History $block */
?>
<?php $_orders = $block->getOrders(); ?>
<?= $block->getChildHtml('info'); ?>

<?php if ($_orders && count($_orders)): ?>
<div class="dashboard-table">
<div class="dashboard-table__header">
<h2 class="heading dashboard-table__title">
<?= $escaper->escapeHtml(__('Recent orders')) ?>
</h2>
</div>
<div class="dashboard-table__content">
<table
class="table margin-0"
tabindex="0"
role="table"
>
<caption class="table__caption">
<?= $escaper->escapeHtml(__('Recent orders')) ?>
</caption>
<thead>
<tr role="row">
<th
scope="col"
role="columnheader"
>
<?= $escaper->escapeHtml(__('Order #')) ?>
</th>

<th
scope="col"
role="columnheader"
>
<?= $escaper->escapeHtml(__('Date')) ?>
</th>

<?= $block->getChildHtml('extra.column.header'); ?>

<th
scope="col"
role="columnheader"
>
<?= $escaper->escapeHtml(__('Order Total')) ?>
</th>

<th
scope="col"
role="columnheader"
>
<?= $escaper->escapeHtml(__('Status')) ?>
</th>

<th
scope="col"
role="columnheader"
>
<span class="table__visually-hidden">
<?= $escaper->escapeHtml(__('Action')) ?>
</span>
</th>
</tr>
</thead>
<tbody>
<?php foreach ($_orders as $_order): ?>
<tr role="row">
<td
data-th="<?= $escaper->escapeHtmlAttr(__('Order #')) ?>"
role="gridcell"
>
<?= $escaper->escapeHtml($_order->getRealOrderId()) ?>
</td>

<td
data-th="<?= $escaper->escapeHtmlAttr(__('Date')) ?>"
role="gridcell"
>
<?= /* @noEscape */ $block->formatDate($_order->getCreatedAt()) ?>
</td>

<?php $extra = $block->getChildBlock('extra.container'); ?>

<?php if ($extra): ?>
<?php $extra->setOrder($_order); ?>
<?= $extra->getChildHtml() ?>
<?php endif; ?>

<td
data-th="<?= $escaper->escapeHtmlAttr(__('Order Total')) ?>"
role="gridcell"
>
<?= /* @noEscape */ $_order->formatPrice($_order->getGrandTotal()) ?>
</td>

<td
data-th="<?= $escaper->escapeHtmlAttr(__('Status')) ?>"
role="gridcell"
>
<?= $escaper->escapeHtml($_order->getStatusLabel()) ?>
</td>

<td
data-th="<?= $escaper->escapeHtmlAttr(__('Actions')) ?>"
role="gridcell"
>
<a
href="<?= $escaper->escapeUrl($block->getViewUrl($_order)) ?>"
class="link dashboard-table__link"
>
<?= $escaper->escapeHtml(__('View Order')) ?>
</a>
<?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())): ?>
<span class="dashboard-table__divider">|</span>
<button
data-post='<?= /* @noEscape */ $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)->getPostData($block->getReorderUrl($_order)) ?>'
class="
action
reorder
link
dashboard-table__link
button--link-secondary
"
>
<?= $escaper->escapeHtml(__('Reorder')) ?>
</button>
<?php endif; ?>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
</div>
<?php if ($block->getPagerHtml()): ?>
<?= $block->getPagerHtml(); ?>
<?php endif ?>
<?php else: ?>
<div
class="
message
info
empty
"
>
<?= $escaper->escapeHtml($block->getEmptyOrdersMessage()) ?>
</div>
<?php endif; ?>
Loading

0 comments on commit 7c33284

Please sign in to comment.