Skip to content
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

feat: Defining cancelled orders in order view template #3722

Merged
merged 2 commits into from
Dec 25, 2019
Merged

feat: Defining cancelled orders in order view template #3722

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05553d3
feat: Defining cancelles orders in order view template
kushthedude Dec 25, 2019
b98fc29
Merge branch 'development' into cancel
kushthedude Dec 25, 2019
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
18 changes: 16 additions & 2 deletions app/templates/components/orders/order-summary.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="ui segments">
{{#if (eq session.currentRouteName 'orders.view')}}
{{#if (and (eq session.currentRouteName 'orders.view') (not-eq data.status 'cancelled'))}}
<div class="ui {{order-color data.status}} inverted segment center aligned">
<div class="ui inverted mini statistic horizontal">
<div class="value">
Expand Down Expand Up @@ -38,7 +38,7 @@
<div class="ui secondary segment">
<h3 class="weight-400">{{t 'Order Summary'}}</h3>
</div>
{{#if (or (eq session.currentRouteName 'orders.new') (eq session.currentRouteName 'orders.view') (eq session.currentRouteName 'orders.pending'))}}
{{#if (and (or (eq session.currentRouteName 'orders.new') (eq session.currentRouteName 'orders.view') (eq session.currentRouteName 'orders.pending')) (not-eq data.status 'cancelled'))}}
<table class="ui very basic tablet stackable table order-summary center aligned">
<thead>
<tr>
Expand Down Expand Up @@ -158,3 +158,17 @@
</div>
</div>
{{/if}}
{{#if (and (eq session.currentRouteName 'orders.view') (eq data.status 'cancelled'))}}
<div class="ui {{order-color data.status}} inverted segment">
<div class="ui inverted mini statistic horizontal">
<div class="value">
{{t 'Cancelled'}}
</div>
<div class="label">
{{t 'Your order has been cancelled due to some unavoidable circumstances.'}}
<br>
{{t 'Please contact the event organizer for further details.'}}
</div>
</div>
</div>
{{/if}}