Skip to content

Commit f29899b

Browse files
Anupam-dagarabhinavk96
authored andcommitted
feat: Rename Fees to Revenue and add Event Date in Admin Sales Fees. (#3211)
* enh: Rename Fees to Revenue and add Event Date in Admin Sales Fees. Reference: #3173 * Change route name from fees to revenue and use async-await instead of RSVP.hash * change frontend as per server change. * remove async from model and unused moment import.
1 parent 1415ddb commit f29899b

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

app/models/admin-sales-fee.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ export default ModelBase.extend({
77
feePercentage : attr('number'),
88
maximumFee : attr('number'),
99
revenue : attr('number'),
10-
ticketCount : attr('number')
10+
ticketCount : attr('number'),
11+
eventDate : attr('moment')
1112
});

app/router.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ router.map(function() {
144144
this.route('organizers');
145145
this.route('marketer');
146146
this.route('locations');
147-
this.route('fees');
148147
this.route('invoices');
148+
this.route('revenue');
149149
this.route('discounted-events');
150150
});
151151
this.route('sessions', function() {

app/routes/admin/sales/fees.js renamed to app/routes/admin/sales/revenue.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Route from '@ember/routing/route';
22

33
export default Route.extend({
44
titleToken() {
5-
return this.l10n.t('Fees');
5+
return this.l10n.t('Revenue');
66
},
77

88
model() {

app/templates/admin/sales.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
{{#link-to 'admin.sales.discounted-events' class='item'}}
1818
{{t 'Discounted events'}}
1919
{{/link-to}}
20-
{{#link-to 'admin.sales.fees' class='item'}}
21-
{{t 'Fees'}}
20+
{{#link-to 'admin.sales.revenue' class='item'}}
21+
{{t 'Revenue'}}
2222
{{/link-to}}
2323
{{#link-to 'admin.sales.invoices' class='item'}}
2424
{{t 'Invoices'}}

app/templates/admin/sales/fees.hbs renamed to app/templates/admin/sales/revenue.hbs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="ui stackable grid">
22
<div class="row">
33
<h2 class="ui header column">
4-
{{t 'Fee Summary'}}
4+
{{t 'Revenue Summary'}}
55
</h2>
66
</div>
77
<div class="row">
@@ -12,6 +12,9 @@
1212
<th rowspan="2">
1313
{{t 'Events'}}
1414
</th>
15+
<th rowspan="2">
16+
{{t 'Event Date '}}
17+
</th>
1518
<th colspan="3" class="ui green inverted segment center aligned">
1619
{{t 'Completed Orders '}}
1720
</th>
@@ -34,6 +37,9 @@
3437
<td>
3538
{{order.name}}
3639
</td>
40+
<td>
41+
{{moment-format order.eventDate 'MM/DD/YYYY'}}
42+
</td>
3743
<td class="right aligned">
3844
{{order.ticketCount}}
3945
</td>

0 commit comments

Comments
 (0)