Skip to content

feat(orders): ORDERS-7965 align date format and status badge between returns listing and details page #2732

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
jpajar merged 1 commit into from
Aug 26, 2026
Merged

feat(orders): ORDERS-7965 align date format and status badge between returns listing and details page #2732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 4 additions & 30 deletions assets/scss/components/stencil/returnDetails/_returnDetails.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,11 @@
margin: 0;
}

.returnDetails-statusBadge {
display: inline-block;
padding: spacing("eighth") spacing("quarter");
border-radius: remCalc(4px);
font-size: remCalc(11px);
font-weight: fontWeight("bold");
letter-spacing: remCalc(1px);
// Status badge is shared with the returns list (.account-orderStatus-label);
.returnDetails-titleGroup .account-orderStatus-label {
font-family: $header-font-family;
text-transform: uppercase;
background-color: stencilColor("returnStatus-closed-backgroundColor");
color: stencilColor("returnStatus-closed-color");
}

// Status badges pair a background and text colour per variation
.returnDetails-statusBadge--open {
background-color: stencilColor("returnStatus-open-backgroundColor");
color: stencilColor("returnStatus-open-color");
}

.returnDetails-statusBadge--in_progress {
background-color: stencilColor("returnStatus-inProgress-backgroundColor");
color: stencilColor("returnStatus-inProgress-color");
}

.returnDetails-statusBadge--closed {
background-color: stencilColor("returnStatus-closed-backgroundColor");
color: stencilColor("returnStatus-closed-color");
}

.returnDetails-statusBadge--cancelled {
background-color: stencilColor("returnStatus-cancelled-backgroundColor");
color: stencilColor("returnStatus-cancelled-color");
margin: 0;
}

.returnDetails-divider {
Expand Down
12 changes: 6 additions & 6 deletions templates/pages/account/return-details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ <h1 class="page-heading">{{lang 'account.returns.heading'}}</h1>
<h2 class="returnDetails-title">{{lang 'account.returns.details.return_number' id=return_detail.rma}}</h2>
{{#if return_detail.status '===' 'OPEN'}}
<span class="aria-description--hidden">{{lang 'account.returns.details.status_label'}}</span>
<span class="returnDetails-statusBadge returnDetails-statusBadge--open">{{lang 'account.returns.status.open'}}</span>
<span class="account-orderStatus-label account-orderStatus-label--open">{{lang 'account.returns.status.open'}}</span>
{{else if return_detail.status '===' 'IN_PROGRESS'}}
<span class="aria-description--hidden">{{lang 'account.returns.details.status_label'}}</span>
<span class="returnDetails-statusBadge returnDetails-statusBadge--in_progress">{{lang 'account.returns.status.in_progress'}}</span>
<span class="account-orderStatus-label account-orderStatus-label--inProgress">{{lang 'account.returns.status.in_progress'}}</span>
{{else if return_detail.status '===' 'CLOSED'}}
<span class="aria-description--hidden">{{lang 'account.returns.details.status_label'}}</span>
<span class="returnDetails-statusBadge returnDetails-statusBadge--closed">{{lang 'account.returns.status.closed'}}</span>
<span class="account-orderStatus-label account-orderStatus-label--closed">{{lang 'account.returns.status.closed'}}</span>
{{else if return_detail.status '===' 'CANCELLED'}}
<span class="aria-description--hidden">{{lang 'account.returns.details.status_label'}}</span>
<span class="returnDetails-statusBadge returnDetails-statusBadge--cancelled">{{lang 'account.returns.status.cancelled'}}</span>
<span class="account-orderStatus-label account-orderStatus-label--cancelled">{{lang 'account.returns.status.cancelled'}}</span>
{{/if}}
</div>

Expand Down Expand Up @@ -94,11 +94,11 @@ <h2 class="returnDetails-sectionHeading">{{lang 'account.returns.summary'}}</h2>
<dl class="returnDetails-summaryList">
<div class="returnDetails-summaryRow">
<dt class="returnDetails-summaryLabel">{{lang 'account.returns.details.date_submitted'}}</dt>
<dd class="returnDetails-summaryValue">{{moment return_detail.date_submitted format="MMMM D, YYYY"}}</dd>
<dd class="returnDetails-summaryValue">{{moment return_detail.date_submitted format="Do MMM YYYY"}}</dd>
</div>
<div class="returnDetails-summaryRow">
<dt class="returnDetails-summaryLabel">{{lang 'account.returns.details.last_update'}}</dt>
<dd class="returnDetails-summaryValue">{{#if return_detail.last_updated}}{{moment return_detail.last_updated format="MMMM D, YYYY"}}{{else}}{{moment return_detail.date_submitted format="MMMM D, YYYY"}}{{/if}}</dd>
<dd class="returnDetails-summaryValue">{{#if return_detail.last_updated}}{{moment return_detail.last_updated format="Do MMM YYYY"}}{{else}}{{moment return_detail.date_submitted format="Do MMM YYYY"}}{{/if}}</dd>
</div>
<div class="returnDetails-summaryRow">
<dt class="returnDetails-summaryLabel">{{lang 'account.returns.details.order_number'}}</dt>
Expand Down