Skip to content

Commit fd27939

Browse files
committed
feat(orders): ORDERS-7935 add badge for CANCELLED order returns
1 parent 4a8e4e7 commit fd27939

4 files changed

Lines changed: 14 additions & 0 deletions

File tree

assets/scss/components/stencil/account/_account.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,11 @@ $account-backorder-textColor: #757575;
398398
color: stencilColor("color-textBase");
399399
}
400400

401+
.account-orderStatus-label--cancelled {
402+
background-color: color("greys", "darker");
403+
color: color("whites", "bright");
404+
}
405+
401406
.account-orderStatus-action {
402407
color: stencilColor("color-textSecondary");
403408
display: inline-block;

assets/scss/components/stencil/returnDetails/_returnDetails.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@
5050
color: stencilColor("color-textBase");
5151
}
5252

53+
.returnDetails-statusBadge--cancelled {
54+
background-color: color("greys", "darker");
55+
color: color("whites", "bright");
56+
}
57+
5358
.returnDetails-divider {
5459
border: 0;
5560
border-top: container("border");

templates/components/account/returns-list-v2.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ <h6 class="account-orderStatus-label account-orderStatus-label--open">{{lang 'ac
1212
<h6 class="account-orderStatus-label account-orderStatus-label--inProgress">{{lang 'account.returns.status.in_progress'}}</h6>
1313
{{else if status '===' 'CLOSED'}}
1414
<h6 class="account-orderStatus-label account-orderStatus-label--closed">{{lang 'account.returns.status.closed'}}</h6>
15+
{{else if status '===' 'CANCELLED'}}
16+
<h6 class="account-orderStatus-label account-orderStatus-label--cancelled">{{lang 'account.returns.status.cancelled'}}</h6>
1517
{{/if}}
1618
</div>
1719
<a class="button button--small" href="/account.php?action=view_return&return_id={{id}}">{{lang 'account.returns.list.view_details'}}</a>

templates/pages/account/return-details.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ <h1 class="returnDetails-title">{{lang 'account.returns.details.return_number' i
3333
<span class="returnDetails-statusBadge returnDetails-statusBadge--in_progress">{{lang 'account.returns.status.in_progress'}}</span>
3434
{{else if return_detail.status '===' 'CLOSED'}}
3535
<span class="returnDetails-statusBadge returnDetails-statusBadge--closed">{{lang 'account.returns.status.closed'}}</span>
36+
{{else if return_detail.status '===' 'CANCELLED'}}
37+
<span class="returnDetails-statusBadge returnDetails-statusBadge--cancelled">{{lang 'account.returns.status.cancelled'}}</span>
3638
{{/if}}
3739
</div>
3840

0 commit comments

Comments
 (0)