diff --git a/app/controllers/admin/sales/fees.js b/app/controllers/admin/sales/revenue.js similarity index 100% rename from app/controllers/admin/sales/fees.js rename to app/controllers/admin/sales/revenue.js diff --git a/app/models/admin-sales-fee.js b/app/models/admin-sales-fee.js index 07671c76f49..d5b337d42b2 100644 --- a/app/models/admin-sales-fee.js +++ b/app/models/admin-sales-fee.js @@ -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') }); diff --git a/app/router.js b/app/router.js index 71b77feb237..bac71b7f1a9 100644 --- a/app/router.js +++ b/app/router.js @@ -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() { diff --git a/app/routes/admin/sales/fees.js b/app/routes/admin/sales/revenue.js similarity index 82% rename from app/routes/admin/sales/fees.js rename to app/routes/admin/sales/revenue.js index d7f9d25c387..7436d0bf537 100644 --- a/app/routes/admin/sales/fees.js +++ b/app/routes/admin/sales/revenue.js @@ -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() { diff --git a/app/templates/admin/sales.hbs b/app/templates/admin/sales.hbs index 3546c8f7abb..77e335b9ad3 100644 --- a/app/templates/admin/sales.hbs +++ b/app/templates/admin/sales.hbs @@ -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'}} diff --git a/app/templates/admin/sales/fees.hbs b/app/templates/admin/sales/revenue.hbs similarity index 90% rename from app/templates/admin/sales/fees.hbs rename to app/templates/admin/sales/revenue.hbs index e0462a95dfe..5c14dfcd3b3 100644 --- a/app/templates/admin/sales/fees.hbs +++ b/app/templates/admin/sales/revenue.hbs @@ -1,7 +1,7 @@

- {{t 'Fee Summary'}} + {{t 'Revenue Summary'}}

@@ -12,6 +12,9 @@ {{t 'Events'}} + + {{t 'Event Date '}} + {{t 'Completed Orders '}} @@ -34,6 +37,9 @@ {{order.name}} + + {{moment-format order.eventDate 'MM/DD/YYYY'}} + {{order.ticketCount}}