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

feat: Order Summary making similar to EventBrite #3280

Merged
merged 14 commits into from
Aug 13, 2019
Merged

feat: Order Summary making similar to EventBrite #3280

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
46b87db
Order Summary Enhancements
kushthedude Jul 14, 2019
06892a7
Merge branch 'development' into summary
kushthedude Jul 18, 2019
e4f9488
Merge branch 'development' into summary
kushthedude Jul 23, 2019
6b93d05
Merge branch 'development' into summary
kushthedude Jul 28, 2019
015fb42
Merge branch 'development' into summary
kushthedude Jul 30, 2019
3b9c3c3
Merge branch 'development' into summary
kushthedude Jul 30, 2019
8ee3c4c
Update order-summary.hbs
kushthedude Jul 30, 2019
52eb100
Merge branch 'development' into summary
kushthedude Jul 31, 2019
904d4eb
Merge branch 'development' into summary
kushthedude Aug 8, 2019
94fc32f
Merge branch 'development' into summary
kushthedude Aug 10, 2019
86bdf6a
Merge branch 'development' into summary
kushthedude Aug 11, 2019
29b7565
Merge branch 'development' into summary
kushthedude Aug 11, 2019
0192cff
Merge branch 'development' into summary
kushthedude Aug 13, 2019
8898787
Merge branch 'development' into summary
kushthedude Aug 13, 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
126 changes: 86 additions & 40 deletions app/templates/components/orders/order-summary.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,59 +42,105 @@
<table class="ui very basic tablet stackable table order-summary center aligned">
<thead>
<tr>
<th class="four wide">{{t 'Ticket Type'}}</th>
<th class="four wide">{{t 'Price'}}</th>
<th class="ui aligned two wide">{{t 'Discount'}}</th>
<th class="one wide">{{t 'Quantity'}}</th>
<th class="ui aligned two wide">{{t 'Subtotal'}}</th>
{{#if event.tax}}
<th class="four wide">{{t 'Tax'}}</th>
{{#if (eq data.amount 0)}}
<th class="ui aligned two wide">{{t 'Ticket Type'}}</th>
{{#if data.discountCode}}
<th class="two wide">{{t 'Price'}}</th>
<th class=" two wide">{{t 'Discount'}}</th>
<th class="ui aligned two wide">{{t 'Subtotal'}}</th>
{{/if}}
<th class="two wide">{{t 'Quantity'}}</th>
{{else}}
<th class="four wide">{{t 'Ticket Type'}}</th>
<th class="four wide">{{t 'Price'}}</th>
{{#if data.discountCode}}
<th class="ui aligned two wide">{{t 'Discount'}}</th>
{{/if}}
<th class="four wide">{{t 'Quantity'}}</th>
{{#if event.tax}}
<th class="one wide">{{t 'Tax'}}</th>
{{/if}}
<th class="ui aligned four wide">{{t 'Subtotal'}}</th>

{{/if}}
</tr>
</thead>
<tbody>
{{#each tickets as |ticket|}}
<tr>
<td>
<div class="ui small">
{{ticket.name}}
</div>
</td>
<td>{{currency-symbol eventCurrency}} {{format-number ticket.price}}</td>
<td>{{currency-symbol eventCurrency}} {{format-number ticket.discount}}</td>
<td>{{ticket-attendees data.attendees ticket.attendees}}</td>
<td>
{{currency-symbol eventCurrency}} {{format-number (mult (sub ticket.price ticket.discount) (ticket-attendees data.attendees ticket.attendees))}}
</td>
{{#if event.tax}}
{{#if (eq data.amount 0)}}
<td>
<div class="ui small">
{{ticket.name}}
</div>
</td>
{{#if data.discountCode}}
<td>{{currency-symbol eventCurrency}} {{format-number ticket.price}}</td>
<td>{{currency-symbol eventCurrency}} {{format-number ticket.discount}}</td>
<td>
{{currency-symbol eventCurrency}} {{format-number (mult (sub ticket.price ticket.discount) (ticket-attendees data.attendees ticket.attendees))}}
</td>
{{/if}}
<td>{{ticket-attendees data.attendees ticket.attendees}}</td>
{{else}}
<td>
<div class="ui small">
{{ticket.name}}
</div>
</td>
<td>{{currency-symbol eventCurrency}} {{format-number ticket.price}}</td>
{{#if data.discountCode}}
<td>{{currency-symbol eventCurrency}} {{format-number ticket.discount}}</td>
{{/if}}
<td>{{ticket-attendees data.attendees ticket.attendees}}</td>
{{#if event.tax}}
<td>
{{#if event.tax.isTaxIncludedInPrice}}
{{t 'The price is inclusive of all taxes.'}}
{{else}}
{{#if ticket.price}}
{{event.tax.rate}}%
{{else}}
{{t 'N/A'}}
{{/if}}
{{/if}}
</td>
{{/if}}
<td>
{{#if event.tax.isTaxIncludedInPrice}}
{{t 'The price is inclusive of all taxes.'}}
{{else}}
{{event.tax.rate}}%
{{/if}}
{{currency-symbol eventCurrency}} {{format-number (mult (sub ticket.price ticket.discount) (ticket-attendees data.attendees ticket.attendees))}}
</td>
{{/if}}


</tr>
{{/each}}
</tbody>
<tfoot class="full-width">
<tr>
<th></th>
<th></th>
<th></th>
<th>
<div class="ui aligned small primary icon">
{{t 'Grand Total'}}:
</div>
</th>
<th colspan="4">
<div class="ui aligned small primary icon">
{{#if (gt data.amount 0)}}
<tfoot class="full-width">
<tr>
<th></th>
{{#if data.discountCode}}
<th colspan="2"></th>
{{else}}
<th></th>
{{/if}}
{{#if event.tax}}
<th></th>
{{#if data.discountCode}}
<th></th>
{{/if}}
{{/if}}
<th>
<div class="ui aligned small primary icon">
{{t 'Grand Total'}}:
</div>
</th>
<th colspan="4">
{{currency-symbol eventCurrency}} {{format-number data.amount}}
</div>
</th>
</tr>
</tfoot>
</th>
</tr>
</tfoot>
{{/if}}
</table>
{{/if}}
</div>
Expand Down