Skip to content

Commit 6be6610

Browse files
shreyanshdwivediabhinavk96
authored andcommitted
enh: rearranges tabs in order and attendee view (#3235)
include pending tickets for admin/superadmin updates the condition
1 parent 7fdb688 commit 6be6610

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

app/routes/events/view/tickets/attendees/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ import Route from '@ember/routing/route';
33
export default Route.extend({
44
beforeModel() {
55
this._super(...arguments);
6-
this.transitionTo('events.view.tickets.attendees.list', 'all');
6+
this.transitionTo('events.view.tickets.attendees.list', 'completed');
77
}
88
});

app/routes/events/view/tickets/orders/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ import Route from '@ember/routing/route';
33
export default Route.extend({
44
beforeModel() {
55
this._super(...arguments);
6-
this.transitionTo('events.view.tickets.orders.list', 'all');
6+
this.transitionTo('events.view.tickets.orders.list', 'completed');
77
}
88
});

app/templates/events/view/tickets/attendees.hbs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,17 @@
5151
<div class="row">
5252
<div class="x-scrollable sixteen wide column">
5353
{{#tabbed-navigation isNonPointing=true}}
54-
{{#link-to 'events.view.tickets.attendees.list' 'all' class='item'}}
55-
{{t 'All'}}
56-
{{/link-to}}
5754
{{#link-to 'events.view.tickets.attendees.list' 'completed' class='item'}}
5855
{{t 'Completed'}}
5956
{{/link-to}}
6057
{{#link-to 'events.view.tickets.attendees.list' 'placed' class='item'}}
6158
{{t 'Placed'}}
6259
{{/link-to}}
63-
{{#link-to 'events.view.tickets.attendees.list' 'pending' class='item'}}
64-
{{t 'Pending'}}
65-
{{/link-to}}
60+
{{#if authManager.currentUser.isAnAdmin}}
61+
{{#link-to 'events.view.tickets.attendees.list' 'pending' class='item'}}
62+
{{t 'Pending'}}
63+
{{/link-to}}
64+
{{/if}}
6665
{{#link-to 'events.view.tickets.attendees.list' 'expired' class='item'}}
6766
{{t 'Expired'}}
6867
{{/link-to}}
@@ -75,6 +74,9 @@
7574
{{#link-to 'events.view.tickets.attendees.list' 'notCheckedIn' class='item'}}
7675
{{t 'Not Checked In'}}
7776
{{/link-to}}
77+
{{#link-to 'events.view.tickets.attendees.list' 'all' class='item'}}
78+
{{t 'All'}}
79+
{{/link-to}}
7880
{{/tabbed-navigation}}
7981
</div>
8082
</div>

app/templates/events/view/tickets/orders.hbs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,24 +51,26 @@
5151
<div class="row">
5252
<div class="eight wide column">
5353
{{#tabbed-navigation isNonPointing=true}}
54-
{{#link-to 'events.view.tickets.orders.list' 'all' class='item'}}
55-
{{t 'All'}}
56-
{{/link-to}}
5754
{{#link-to 'events.view.tickets.orders.list' 'completed' class='item'}}
5855
{{t 'Completed'}}
5956
{{/link-to}}
6057
{{#link-to 'events.view.tickets.orders.list' 'placed' class='item'}}
6158
{{t 'Placed'}}
6259
{{/link-to}}
63-
{{#link-to 'events.view.tickets.orders.list' 'pending' class='item'}}
64-
{{t 'Pending'}}
65-
{{/link-to}}
60+
{{#if authManager.currentUser.isAnAdmin}}
61+
{{#link-to 'events.view.tickets.orders.list' 'pending' class='item'}}
62+
{{t 'Pending'}}
63+
{{/link-to}}
64+
{{/if}}
6665
{{#link-to 'events.view.tickets.orders.list' 'expired' class='item'}}
6766
{{t 'Expired'}}
6867
{{/link-to}}
6968
{{#link-to 'events.view.tickets.orders.list' 'cancelled' class='item'}}
7069
{{t 'Cancelled'}}
7170
{{/link-to}}
71+
{{#link-to 'events.view.tickets.orders.list' 'all' class='item'}}
72+
{{t 'All'}}
73+
{{/link-to}}
7274
{{/tabbed-navigation}}
7375
</div>
7476
</div>

0 commit comments

Comments
 (0)