Skip to content
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

fix: Solving Ticket Sales ambiguity #3474

Merged
merged 5 commits into from
Aug 29, 2019
Merged

fix: Solving Ticket Sales ambiguity #3474

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0626098
Solving Ticket Sales ambiguity
kushthedude Aug 23, 2019
6c72c6f
Update index.hbs
kushthedude Aug 25, 2019
1129218
Merge branch 'development' into ambi
kushthedude Aug 26, 2019
746e0f3
Merge branch 'development' into ambi
shreyanshdwivedi Aug 27, 2019
17b75cf
Merge branch 'development' into ambi
abhinavk96 Aug 29, 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
18 changes: 9 additions & 9 deletions app/templates/events/view/tickets/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</div>
<div class="ui {{if device.isMobile 'horizontal'}} three statistics">
<div class="statistic"><div class="value">{{totalOrders}}</div><div class="label">{{t 'Orders'}}</div></div>
<div class="statistic"><div class="value">{{format-number totalAmount}}</div><div class="label">{{t 'Sales '}}({{currency-symbol model.eventDetail.paymentCurrency}})</div></div>
<div class="statistic"><div class="value">{{totalAmount}}</div><div class="label">{{t 'Sales '}}({{currency-symbol model.eventDetail.paymentCurrency}})</div></div>
<div class="statistic"><div class="value">{{totalSales}}</div><div class="label">{{t 'Tickets sold'}}</div></div>
</div>
</div>
Expand Down Expand Up @@ -33,7 +33,7 @@
{{/link-to}}
<td class="right aligned">{{model.orderStats.tickets.cancelled}}</td>
<td class="right aligned">{{model.orderStats.orders.cancelled}}</td>
<td class="right aligned">{{format-number model.orderStats.sales.cancelled}}</td>
<td class="right aligned">{{model.orderStats.sales.cancelled}}</td>
<td>
{{#link-to 'events.view.tickets.orders.list' 'cancelled'}}
{{t 'View orders'}}
Expand All @@ -51,7 +51,7 @@
{{/link-to}}
<td class="right aligned">{{model.orderStats.tickets.pending}}</td>
<td class="right aligned">{{model.orderStats.orders.pending}}</td>
<td class="right aligned">{{format-number model.orderStats.sales.pending}}</td>
<td class="right aligned">{{model.orderStats.sales.pending}}</td>
<td>
{{#link-to 'events.view.tickets.orders.list' 'pending'}}
{{t 'View orders'}}
Expand All @@ -69,7 +69,7 @@
{{/link-to}}
<td class="right aligned">{{model.orderStats.tickets.expired}}</td>
<td class="right aligned">{{model.orderStats.orders.expired}}</td>
<td class="right aligned">{{format-number model.orderStats.sales.expired}}</td>
<td class="right aligned">{{model.orderStats.sales.expired}}</td>
<td>
{{#link-to 'events.view.tickets.orders.list' 'expired'}}
{{t 'View orders'}}
Expand All @@ -87,7 +87,7 @@
{{/link-to}}
<td class="right aligned">{{model.orderStats.tickets.placed}}</td>
<td class="right aligned">{{model.orderStats.orders.placed}}</td>
<td class="right aligned">{{format-number model.orderStats.sales.placed}}</td>
<td class="right aligned">{{model.orderStats.sales.placed}}</td>
<td>
{{#link-to 'events.view.tickets.orders.list' 'placed'}}
{{t 'View orders'}}
Expand All @@ -105,7 +105,7 @@
{{/link-to}}
<td class="right aligned">{{model.orderStats.tickets.completed}}</td>
<td class="right aligned">{{model.orderStats.orders.completed}}</td>
<td class="right aligned">{{format-number model.orderStats.sales.completed}}</td>
<td class="right aligned">{{model.orderStats.sales.completed}}</td>
<td>
{{#link-to 'events.view.tickets.orders.index'}}
{{t 'View orders'}}
Expand Down Expand Up @@ -150,15 +150,15 @@
{{#unless device.isMobile}}
<td class="right aligned">{{ticket.orderStatistics.tickets.completed}}</td>
{{/unless}}
<td class="right aligned">{{currency-symbol model.eventDetail.paymentCurrency}} {{format-number ticket.orderStatistics.sales.completed}}</td>
<td class="right aligned">{{currency-symbol model.eventDetail.paymentCurrency}} {{mult ticket.orderStatistics.tickets.completed ticket.price}}</td>
{{#unless device.isMobile}}
<td class="right aligned">{{ticket.orderStatistics.tickets.placed}}</td>
{{/unless}}
<td class="right aligned">{{currency-symbol model.eventDetail.paymentCurrency}} {{format-number ticket.orderStatistics.sales.placed}}</td>
<td class="right aligned">{{currency-symbol model.eventDetail.paymentCurrency}} {{mult ticket.orderStatistics.tickets.placed ticket.price}}</td>
{{#unless device.isMobile}}
<td class="right aligned">{{ticket.orderStatistics.tickets.pending}}</td>
{{/unless}}
<td class="right aligned">{{currency-symbol model.eventDetail.paymentCurrency}} {{format-number ticket.orderStatistics.sales.pending}}</td>
<td class="right aligned">{{currency-symbol model.eventDetail.paymentCurrency}} {{mult ticket.orderStatistics.tickets.pending ticket.price}}</td>
</tr>
{{/each}}
</tbody>
Expand Down