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: Properly format money everywhere #4428

Merged
merged 1 commit into from
May 31, 2020
Merged

fix: Properly format money everywhere #4428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions app/initializers/accounting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { currency } from 'accounting/settings';

export default {
name: 'accounting.js',
initialize() {
currency.symbol = '';
}
};
12 changes: 6 additions & 6 deletions app/templates/admin/sales/discounted-events.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,19 @@
{{entry.sales.completed.ticket_count}}
</td>
<td class="right aligned">
{{currency-symbol this.order.paymentCurrency}} {{format-number entry.sales.completed.sales_total}}
{{currency-symbol this.order.paymentCurrency}} {{format-money entry.sales.completed.sales_total}}
</td>
<td class="right aligned">
{{entry.sales.placed.ticket_count}}
</td>
<td class="right aligned">
{{currency-symbol this.order.paymentCurrency}} {{format-number entry.sales.places.sales_total}}
{{currency-symbol this.order.paymentCurrency}} {{format-money entry.sales.places.sales_total}}
</td>
<td class="right aligned">
{{entry.sales.pending.ticket_count}}
</td>
<td class="right aligned">
{{currency-symbol this.order.paymentCurrency}} {{format-number entry.sales.pending.sales_total}}
{{currency-symbol this.order.paymentCurrency}} {{format-money entry.sales.pending.sales_total}}
</td>
</tr>
{{/each}}
Expand All @@ -91,19 +91,19 @@
{{totalCompletedTickets}}
</th>
<th class="right aligned">
US$ {{format-number totalCompletedSales}}
US$ {{format-money totalCompletedSales}}
</th>
<th class="right aligned">
{{totalPlacedTickets}}
</th>
<th class="right aligned">
US$ {{format-number totalPlacedSales}}
US$ {{format-money totalPlacedSales}}
</th>
<th class="right aligned">
{{totalPendingTickets}}
</th>
<th class="right aligned">
US$ {{format-number totalPendingSales}}
US$ {{format-money totalPendingSales}}
</th>
</tr>
</tfoot> --}}
Expand Down
12 changes: 6 additions & 6 deletions app/templates/admin/sales/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
<td>{{entry.name}}</td>
<td>{{moment-format entry.startsAt 'ddd, MMM DD \at h:mm A'}}</td>
<td class="right aligned">{{entry.sales.completed.ticket_count}}</td>
<td class="right aligned">{{currency-symbol entry.paymentCurrency}} {{format-number entry.sales.completed.sales_total}}</td>
<td class="right aligned">{{currency-symbol entry.paymentCurrency}} {{format-money entry.sales.completed.sales_total}}</td>
<td class="right aligned">{{entry.sales.placed.ticket_count}}</td>
<td class="right aligned">{{currency-symbol entry.paymentCurrency}} {{format-number entry.sales.placed.sales_total}}</td>
<td class="right aligned">{{currency-symbol entry.paymentCurrency}} {{format-money entry.sales.placed.sales_total}}</td>
<td class="right aligned">{{entry.sales.pending.ticket_count}}</td>
<td class="right aligned">{{currency-symbol entry.paymentCurrency}} {{format-number entry.sales.pending.sales_total}}</td>
<td class="right aligned">{{currency-symbol entry.paymentCurrency}} {{format-money entry.sales.pending.sales_total}}</td>
</tr>
{{/each}}
</tbody>
Expand All @@ -45,19 +45,19 @@
{{totalCompletedTickets}}
</th>
<th class="right aligned">
US$ {{format-number totalCompletedSales}}
US$ {{format-money totalCompletedSales}}
</th>
<th class="right aligned">
{{totalPlacedTickets}}
</th>
<th class="right aligned">
US$ {{format-number totalPlacedSales}}
US$ {{format-money totalPlacedSales}}
</th>
<th class="right aligned">
{{totalPendingTickets}}
</th>
<th class="right aligned">
US$ {{format-number totalPendingSales}}
US$ {{format-money totalPendingSales}}
</th>
</tr>
</tfoot> --}}
Expand Down
12 changes: 6 additions & 6 deletions app/templates/admin/sales/locations.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@
<tr>
<td>{{entry.locationName}}</td>
<td class="right aligned">{{entry.sales.completed.ticket_count}}</td>
<td class="right aligned">US$ {{format-number entry.sales.completed.sales_total}}</td>
<td class="right aligned">US$ {{format-money entry.sales.completed.sales_total}}</td>
<td class="right aligned">{{entry.sales.placed.ticket_count}}</td>
<td class="right aligned">US$ {{format-number entry.sales.placed.sales_total}}</td>
<td class="right aligned">US$ {{format-money entry.sales.placed.sales_total}}</td>
<td class="right aligned">{{entry.sales.pending.ticket_count}}</td>
<td class="right aligned">US$ {{format-number entry.sales.pending.sales_total}}</td>
<td class="right aligned">US$ {{format-money entry.sales.pending.sales_total}}</td>
</tr>
{{/each}}
</tbody>
{{!-- <tfoot>
<tr>
<th><span class="weight-600">{{t 'Total'}}</span></th>
<th class="right aligned">{{totalCompletedTickets}}</th>
<th class="right aligned">US$ {{format-number totalCompletedSales}}</th>
<th class="right aligned">US$ {{format-money totalCompletedSales}}</th>
<th class="right aligned">{{totalPlacedTickets}}</th>
<th class="right aligned">US$ {{format-number totalPlacedSales}}</th>
<th class="right aligned">US$ {{format-money totalPlacedSales}}</th>
<th class="right aligned">{{totalPendingTickets}}</th>
<th class="right aligned">US$ {{format-number totalPendingSales}}</th>
<th class="right aligned">US$ {{format-money totalPendingSales}}</th>
</tr>
</tfoot> --}}
</table>
Expand Down
6 changes: 3 additions & 3 deletions app/templates/admin/sales/marketer.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{{entry.sales.completed.ticket_count}}
</td>
<td class="right aligned">
US$ {{format-number entry.sales.completed.sales_total}}
US$ {{format-money entry.sales.completed.sales_total}}
</td>
</tr>
{{/each}}
Expand All @@ -38,8 +38,8 @@
</span>
</th>
<th class="right aligned">{{ticketsTotal}}</th>
<th class="right aligned">US$ {{format-number salesTotal}}</th>
<th class="right aligned">US$ {{format-number discountsTotal}}</th>
<th class="right aligned">US$ {{format-money salesTotal}}</th>
<th class="right aligned">US$ {{format-money discountsTotal}}</th>
</tr>
</tfoot> --}}
</table>
Expand Down
12 changes: 6 additions & 6 deletions app/templates/admin/sales/organizers.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,19 @@
{{entry.sales.completed.ticket_count}}
</td>
<td class="right aligned">
US$ {{format-number entry.sales.completed.sales_total}}
US$ {{format-money entry.sales.completed.sales_total}}
</td>
<td class="right aligned">
{{entry.sales.placed.ticket_count}}
</td>
<td class="right aligned">
US$ {{format-number entry.sales.places.sales_total}}
US$ {{format-money entry.sales.places.sales_total}}
</td>
<td class="right aligned">
{{entry.sales.pending.ticket_count}}
</td>
<td class="right aligned">
US$ {{format-number entry.sales.pending.sales_total}}
US$ {{format-money entry.sales.pending.sales_total}}
</td>
</tr>
{{/each}}
Expand All @@ -84,19 +84,19 @@
{{totalCompletedTickets}}
</th>
<th class="right aligned">
US$ {{format-number totalCompletedSales}}
US$ {{format-money totalCompletedSales}}
</th>
<th class="right aligned">
{{totalPlacedTickets}}
</th>
<th class="right aligned">
US$ {{format-number totalPlacedSales}}
US$ {{format-money totalPlacedSales}}
</th>
<th class="right aligned">
{{totalPendingTickets}}
</th>
<th class="right aligned">
US$ {{format-number totalPendingSales}}
US$ {{format-money totalPendingSales}}
</th>
</tr>
</tfoot> --}}
Expand Down
6 changes: 3 additions & 3 deletions app/templates/admin/sales/revenue.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
{{order.ticketCount}}
</td>
<td class="right aligned">
{{format-number order.feePercentage}}%
{{format-money order.feePercentage}}%
{{#if order.maximumFee}}
<span class="item muted text">[{{t 'Max.'}} {{currency-symbol order.paymentCurrency}} {{order.maximumFee}}]</span>
{{/if}}
</td>
<td class="right aligned">
{{currency-symbol order.paymentCurrency}} {{format-number order.revenue}}
{{currency-symbol order.paymentCurrency}} {{format-money order.revenue}}
</td>
</tr>
{{/each}}
Expand All @@ -66,7 +66,7 @@
{{ticketsTotal}}
</th>
<th colspan="2" class="right aligned">
US$ {{format-number revenueTotal}}
US$ {{format-money revenueTotal}}
</th>
</tr>
</tfoot> --}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/event-invoice/invoice-summary.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<td>{{this.event.name}}</td>
<td>{{moment-format this.data.createdAt 'MM/DD/YYYY'}}</td>
<td>{{moment-format this.data.completedAt 'MM/DD/YYYY'}}</td>
<td>{{currency-symbol this.eventCurrency}} {{format-number this.data.amount}}</td>
<td>{{currency-symbol this.eventCurrency}} {{format-money this.data.amount}}</td>
</tr>
</tbody>
</table>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/events/view/overview/event-tickets.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</tr>
<tr>
<td>{{t 'Sales (amount)'}}</td>
<td>{{currency-symbol this.data.event.paymentCurrency}} {{format-number this.sales}}</td>
<td>{{currency-symbol this.data.event.paymentCurrency}} {{format-money this.sales}}</td>
</tr>
</tbody>
</table>
Expand Down
14 changes: 7 additions & 7 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 @@ -75,10 +75,10 @@
</div>
</td>
{{#if this.data.discountCode}}
<td>{{currency-symbol this.eventCurrency}} {{format-number ticket.price}}</td>
<td>{{currency-symbol this.eventCurrency}} {{format-number ticket.discount}}</td>
<td>{{currency-symbol this.eventCurrency}} {{format-money ticket.price}}</td>
<td>{{currency-symbol this.eventCurrency}} {{format-money ticket.discount}}</td>
<td>
{{currency-symbol this.eventCurrency}} {{format-number (mult (sub ticket.price ticket.discount) (ticket-attendees this.data.attendees ticket.attendees))}}
{{currency-symbol this.eventCurrency}} {{format-money (mult (sub ticket.price ticket.discount) (ticket-attendees this.data.attendees ticket.attendees))}}
</td>
{{/if}}
<td>{{ticket-attendees this.data.attendees ticket.attendees}}</td>
Expand All @@ -88,9 +88,9 @@
{{ticket.name}}
</div>
</td>
<td>{{currency-symbol this.eventCurrency}} {{format-number ticket.price}}</td>
<td>{{currency-symbol this.eventCurrency}} {{format-money ticket.price}}</td>
{{#if this.data.discountCode}}
<td>{{currency-symbol this.eventCurrency}} {{format-number ticket.discount}}</td>
<td>{{currency-symbol this.eventCurrency}} {{format-money ticket.discount}}</td>
{{/if}}
<td>{{ticket-attendees this.data.attendees ticket.attendees}}</td>
{{#if this.event.tax}}
Expand All @@ -107,7 +107,7 @@
</td>
{{/if}}
<td>
{{currency-symbol this.eventCurrency}} {{format-number (mult (sub ticket.price ticket.discount) (ticket-attendees this.data.attendees ticket.attendees))}}
{{currency-symbol this.eventCurrency}} {{format-money (mult (sub ticket.price ticket.discount) (ticket-attendees this.data.attendees ticket.attendees))}}
</td>
{{/if}}

Expand Down Expand Up @@ -136,7 +136,7 @@
</div>
</th>
<th colspan="4">
{{currency-symbol this.eventCurrency}} {{format-number this.data.amount}}
{{currency-symbol this.eventCurrency}} {{format-money this.data.amount}}
</th>
</tr>
</tfoot>
Expand Down
20 changes: 10 additions & 10 deletions app/templates/components/public/ticket-list.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@
{{#if ticket.discount}}
<td>
<div id="{{ticket.id}}_price" class="strike text">
{{this.eventCurrency}} {{format-number ticket.price}}
{{this.eventCurrency}} {{format-money ticket.price}}
</div>
<div id="{{ticket.id}}_discount">
{{this.eventCurrency}} {{format-number (sub ticket.price ticket.discount)}}
{{this.eventCurrency}} {{format-money (sub ticket.price ticket.discount)}}
{{#if this.taxInfo}}
{{#if this.showTaxIncludedMessage}}
<small class="ui gray-text small">
{{t 'includes'}} {{this.eventCurrency}} {{format-number ticket.includedTaxAmount}}
{{t 'includes'}} {{this.eventCurrency}} {{format-money ticket.includedTaxAmount}}
</small>
{{else}}
<small class="ui gray-text small">
+ {{this.eventCurrency}}
{{format-number (add (sub ticket.ticketPriceWithTax ticket.price) ticket.discount)}}
{{format-money (add (sub ticket.ticketPriceWithTax ticket.price) ticket.discount)}}
</small>
{{/if}}
<div>
Expand All @@ -65,16 +65,16 @@
@value={{ticket.price}} /><br>
</div>
{{else}}
{{this.eventCurrency}} {{format-number ticket.price}}
{{this.eventCurrency}} {{format-money ticket.price}}
{{/if}}
{{#if (and this.taxInfo (not-eq ticket.type 'free'))}}
{{#if this.showTaxIncludedMessage}}
<small class="ui gray-text small">
{{t 'includes'}} {{this.eventCurrency}} {{format-number ticket.includedTaxAmount}}
{{t 'includes'}} {{this.eventCurrency}} {{format-money ticket.includedTaxAmount}}
</small>
{{else}}
<small class="ui gray-text small">
+ {{this.eventCurrency}} {{format-number (sub ticket.ticketPriceWithTax ticket.price)}}
+ {{this.eventCurrency}} {{format-money (sub ticket.ticketPriceWithTax ticket.price)}}
</small>
{{/if}}
<div>
Expand Down Expand Up @@ -107,9 +107,9 @@
<td id='{{ticket.id}}_subtotal' class="ui right aligned">
{{#if this.taxInfo}}
{{this.eventCurrency}}
{{format-number (mult (sub ticket.ticketPriceWithTax ticket.discount) ticket.orderQuantity)}}
{{format-money (mult (sub ticket.ticketPriceWithTax ticket.discount) ticket.orderQuantity)}}
{{else}}
{{this.eventCurrency}} {{format-number (mult (sub ticket.price ticket.discount) ticket.orderQuantity)}}
{{this.eventCurrency}} {{format-money (mult (sub ticket.price ticket.discount) ticket.orderQuantity)}}
{{/if}}
</td>
</tr>
Expand All @@ -124,7 +124,7 @@
<th></th>
<th colspan="4">
<div class="ui right aligned small primary icon">
{{t 'Total'}}: {{this.eventCurrency}} {{format-number this.total}}
{{t 'Total'}}: {{this.eventCurrency}} {{format-money this.total}}
</div>
</th>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/ui-table/cell/admin/sales/status/cell-amount.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<span>
US$ {{format-number this.record}}
US$ {{format-money this.record}}
</span>
2 changes: 1 addition & 1 deletion app/templates/components/ui-table/cell/events/cell-amount.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{currency-symbol this.extraRecords.event.paymentCurrency}} {{format-number this.record}}
{{currency-symbol this.extraRecords.event.paymentCurrency}} {{format-money this.record}}
2 changes: 1 addition & 1 deletion app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-price.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="weight-400">
{{currency-symbol this.extraRecords.event.paymentCurrency}} {{format-number this.record}}
{{currency-symbol this.extraRecords.event.paymentCurrency}} {{format-money this.record}}
</div>
{{#if this.extraRecords.discountCode.code}}
<div class="ui mini yellow label">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/ui-table/cell/events/view/tickets/cell-add-order-price.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{currency-symbol this.paymentCurrency}} {{format-number this.record.price}}
{{currency-symbol this.paymentCurrency}} {{format-money this.record.price}}
2 changes: 1 addition & 1 deletion app/templates/components/ui-table/cell/events/view/tickets/cell-add-order-total.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{currency-symbol this.paymentCurrency}} {{format-number (mult this.record.orderQuantity this.record.price)}}
{{currency-symbol this.paymentCurrency}} {{format-money (mult this.record.orderQuantity this.record.price)}}
2 changes: 1 addition & 1 deletion app/templates/components/ui-table/cell/events/view/tickets/orders/cell-amount.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="weight-400">
{{currency-symbol this.extraRecords.event.paymentCurrency}} {{format-number this.record}}
{{currency-symbol this.extraRecords.event.paymentCurrency}} {{format-money this.record}}
</div>
{{#if this.extraRecords.discountCode.code}}
<div class="ui mini yellow label">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/event-invoice/review.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<strong>{{t 'Date Issued'}}:</strong> {{moment-format this.model.createdAt 'MM/DD/YYYY'}}
</div>
<div class="item">
<strong>{{t 'Total Invoice Amount'}}:</strong> {{currency-symbol this.model.event.paymentCurrency}} {{format-number this.model.amount}}
<strong>{{t 'Total Invoice Amount'}}:</strong> {{currency-symbol this.model.event.paymentCurrency}} {{format-money this.model.amount}}
</div>
</div>
</div>
Expand Down