Skip to content

feat: Rename Fees to Revenue and add Event Date in Admin Sales Fees. #3211

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
merged 7 commits into from
Jul 6, 2019
Merged

feat: Rename Fees to Revenue and add Event Date in Admin Sales Fees. #3211

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
59d61c0
enh: Rename Fees to Revenue and add Event Date in Admin Sales Fees.
Anupam-dagar Jun 27, 2019
7722474
Change route name from fees to revenue and use async-await instead of…
Anupam-dagar Jun 28, 2019
23d2003
change frontend as per server change.
Anupam-dagar Jul 3, 2019
ff15196
remove async from model and unused moment import.
Anupam-dagar Jul 4, 2019
ef9a5af
Merge branch 'development' into revenue
mariobehling Jul 5, 2019
8aea93c
Merge branch 'development' into revenue
mariobehling Jul 5, 2019
e561242
Merge branch 'development' into revenue
abhinavk96 Jul 6, 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
0 app/controllers/admin/sales/fees.js → app/controllers/admin/sales/revenue.js
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion app/models/admin-sales-fee.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ export default ModelBase.extend({
feePercentage : attr('number'),
maximumFee : attr('number'),
revenue : attr('number'),
ticketCount : attr('number')
ticketCount : attr('number'),
eventDate : attr('moment')
});
2 changes: 1 addition & 1 deletion app/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ router.map(function() {
this.route('organizers');
this.route('marketer');
this.route('locations');
this.route('fees');
this.route('invoices');
this.route('revenue');
this.route('discounted-events');
});
this.route('sessions', function() {
Expand Down
2 changes: 1 addition & 1 deletion app/routes/admin/sales/fees.js → app/routes/admin/sales/revenue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Route from '@ember/routing/route';

export default Route.extend({
titleToken() {
return this.l10n.t('Fees');
return this.l10n.t('Revenue');
},

model() {
Expand Down
4 changes: 2 additions & 2 deletions app/templates/admin/sales.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
{{#link-to 'admin.sales.discounted-events' class='item'}}
{{t 'Discounted events'}}
{{/link-to}}
{{#link-to 'admin.sales.fees' class='item'}}
{{t 'Fees'}}
{{#link-to 'admin.sales.revenue' class='item'}}
{{t 'Revenue'}}
{{/link-to}}
{{#link-to 'admin.sales.invoices' class='item'}}
{{t 'Invoices'}}
Expand Down
8 changes: 7 additions & 1 deletion app/templates/admin/sales/fees.hbs → app/templates/admin/sales/revenue.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="ui stackable grid">
<div class="row">
<h2 class="ui header column">
{{t 'Fee Summary'}}
{{t 'Revenue Summary'}}
</h2>
</div>
<div class="row">
Expand All @@ -12,6 +12,9 @@
<th rowspan="2">
{{t 'Events'}}
</th>
<th rowspan="2">
{{t 'Event Date '}}
</th>
<th colspan="3" class="ui green inverted segment center aligned">
{{t 'Completed Orders '}}
</th>
Expand All @@ -34,6 +37,9 @@
<td>
{{order.name}}
</td>
<td>
{{moment-format order.eventDate 'MM/DD/YYYY'}}
</td>
<td class="right aligned">
{{order.ticketCount}}
</td>
Expand Down