Skip to content

Parsing Currency symbol in various places #2376

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

Merged
abhinavk96 merged 18 commits into from
Apr 1, 2019
Merged

Parsing Currency symbol in various places #2376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8926993
Parsing Currency symbol in various places
kushthedude Mar 25, 2019
d566117
Updation in add value
kushthedude Mar 25, 2019
143b7bf
Fixing test of event-tickets
kushthedude Mar 25, 2019
ecba239
Fixing test of event-ticket
kushthedude Mar 25, 2019
cf518f5
Test
kushthedude Mar 26, 2019
e7f06ea
Test
kushthedude Mar 26, 2019
5dcb4ff
Update Parser
kushthedude Mar 27, 2019
78c11a2
Update Parser
kushthedude Mar 27, 2019
705aa73
Undo Organiser
kushthedude Mar 27, 2019
d7491c2
Merge branch 'development' into timestart
kushthedude Mar 28, 2019
135d1d5
Undo Test
kushthedude Mar 28, 2019
c5439f8
Cell amount
kushthedude Mar 29, 2019
791ee52
Merge branch 'development' into timestart
kushthedude Apr 1, 2019
4155b06
Failing builds
kushthedude Apr 1, 2019
eb0aa11
Update event-tickets.hbs
kushthedude Apr 1, 2019
a01fb4c
Update cell-amount.hbs
kushthedude Apr 1, 2019
8a70bc9
Update cell-amount.hbs
kushthedude Apr 1, 2019
82138e7
Update cell-amount.hbs
kushthedude Apr 1, 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
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$ {{number-format record.amount}}
</span>
</span>
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 @@
{{number-format (mult record.orderQuantity record.price)}}
{{currency-symbol paymentCurrency}} {{number-format (mult record.orderQuantity record.price)}}
2 changes: 1 addition & 1 deletion app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-value.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
{{#if (eq record.type 'percent')}}
{{number-format record.value}}{{t '%'}}
{{else if (eq record.type 'amount')}}
{{t 'US$ '}}{{number-format record.value}}
{{t currency-symbol record.event.paymentCurrency }}{{number-format record.value}}
{{/if}}
</span>
6 changes: 3 additions & 3 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 @@ -144,11 +144,11 @@
<td>{{ticket.name}}</td>
<td>{{ticket.quantity}}</td>
<td class="right aligned">{{ticket.orderStatistics.tickets.completed}}</td>
<td class="right aligned">{{number-format ticket.orderStatistics.sales.completed}}</td>
<td class="right aligned">{{currency-symbol model.eventDetail.paymentCurrency}} {{number-format ticket.orderStatistics.sales.completed}}</td>
<td class="right aligned">{{ticket.orderStatistics.tickets.placed}}</td>
<td class="right aligned">{{number-format ticket.orderStatistics.sales.placed}}</td>
<td class="right aligned">{{currency-symbol model.eventDetail.paymentCurrency}} {{number-format ticket.orderStatistics.sales.placed}}</td>
<td class="right aligned">{{ticket.orderStatistics.tickets.pending}}</td>
<td class="right aligned">{{number-format ticket.orderStatistics.sales.pending}}</td>
<td class="right aligned">{{currency-symbol model.eventDetail.paymentCurrency}} {{number-format ticket.orderStatistics.sales.pending}}</td>
</tr>
{{/each}}
</tbody>
Expand Down
1 change: 1 addition & 0 deletions tests/integration/components/events/view/overview/event-tickets-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ module('Integration | Component | events/view/overview/event tickets', function(
assert.ok(this.element.innerHTML.trim().includes('Tickets'));
});
});
Copy link
Member Author

@kushthedude kushthedude Mar 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@CosmicCoder96 @iamareebjamal , A little help needed, Travis says not able read the 'property symbol' , Is something wrong with the test i added or i am completely on a wrong path.

Copy link
Member Author

@kushthedude kushthedude Mar 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shreyanshdwivedi If you could see some possible error in this , Why travis is failing?

Copy link
Contributor

@uds5501 uds5501 Mar 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kushthedude Just a question, after removing this test, does the build passes?

Copy link
Member Author

@kushthedude kushthedude Mar 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@uds5501 nope even after removing the test it tells unknown attribute ‘symbol’