diff --git a/app/components/events/view/overview/event-tickets.js b/app/components/events/view/overview/event-tickets.js index 598fbf32d86..8139cd0d597 100644 --- a/app/components/events/view/overview/event-tickets.js +++ b/app/components/events/view/overview/event-tickets.js @@ -1,5 +1,16 @@ import Component from '@ember/component'; +import { computed } from '@ember/object'; export default Component.extend({ - classNames: ['ui', 'fluid', 'card'] + classNames: ['ui', 'fluid', 'card'], + + tickets: computed('data.orderStat.tickets', function() { + return this.data.orderStat.tickets.completed + this.data.orderStat.tickets.placed; + }), + orders: computed('data.orderStat.orders', function() { + return this.data.orderStat.orders.completed + this.data.orderStat.orders.placed; + }), + sales: computed('data.orderStat.sales', function() { + return this.data.orderStat.sales.completed + this.data.orderStat.sales.placed; + }) }); diff --git a/app/templates/components/events/view/overview/event-tickets.hbs b/app/templates/components/events/view/overview/event-tickets.hbs index af7aa04aee4..a503b868f2b 100644 --- a/app/templates/components/events/view/overview/event-tickets.hbs +++ b/app/templates/components/events/view/overview/event-tickets.hbs @@ -7,15 +7,15 @@ {{t 'Total tickets sold'}} - {{data.orderStat.tickets.completed}} + {{tickets}} {{t 'No. of orders'}} - {{data.orderStat.orders.completed}} + {{orders}} {{t 'Sales (amount)'}} - {{currency-symbol data.event.paymentCurrency}} {{format-number data.orderStat.sales.completed}} + {{currency-symbol data.event.paymentCurrency}} {{format-number sales}} @@ -33,9 +33,9 @@ {{#each data.tickets as |ticket|}} {{ticket.name}} - {{ticket.orderStatistics.tickets.completed}} + {{add ticket.orderStatistics.tickets.completed ticket.orderStatistics.tickets.placed}} {{ticket.quantity}} - {{sub ticket.quantity ticket.orderStatistics.tickets.completed}} + {{sub ticket.quantity (add ticket.orderStatistics.tickets.completed ticket.orderStatistics.tickets.placed)}} {{else}}
diff --git a/tests/integration/components/events/view/overview/event-tickets-test.js b/tests/integration/components/events/view/overview/event-tickets-test.js index 183ea5bb4ee..e7a893ba7a0 100644 --- a/tests/integration/components/events/view/overview/event-tickets-test.js +++ b/tests/integration/components/events/view/overview/event-tickets-test.js @@ -12,7 +12,10 @@ module('Integration | Component | events/view/overview/event tickets', function( paymentCurrency: 'USD' } }); - await render(hbs`{{events/view/overview/event-tickets data=model}}`); + this.set('tickets', 10); + this.set('orders', 10); + this.set('sales', 100); + await render(hbs`{{events/view/overview/event-tickets data=model tickets=tickets orders=orders sales=sales}}`); assert.ok(this.element.innerHTML.trim().includes('Tickets')); }); });