Skip to content

fix: event invoice fetched correctly in review route #3414

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
merged 2 commits into from
Aug 16, 2019
Merged

fix: event invoice fetched correctly in review route #3414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f59318e
fix: event invoice fetched correctly in review route
shreyanshdwivedi Aug 14, 2019
3dbb4f4
Merge branch 'development' into invoiceB1
mrsaicharan1 Aug 16, 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
3 changes: 1 addition & 2 deletions app/routes/event-invoice/paid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import Route from '@ember/routing/route';
export default class extends Route {

titleToken(model) {
let invoice_identifier = model.get('identifier');
return this.l10n.t(`Paid Event Invoice -${invoice_identifier}`);
return this.l10n.tVar(`Paid Event Invoice - ${model.get('identifier')}`);
}

model(params) {
Expand Down
31 changes: 16 additions & 15 deletions app/routes/event-invoice/review.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
import Route from '@ember/routing/route';

export default class extends Route {
async model(params) {
let filterOptions = [
{
name : 'identifier',
op : 'eq',
val : params.invoice_identifier
}
];
return {
'user' : await this.authManager.currentUser,
'data' : await this.store.query('event-invoice', {
include : 'event',
filter : filterOptions
})
};
titleToken(model) {
return this.l10n.tVar(`Review Event Invoice - ${model.get('identifier')}`);
}

model(params) {
return this.store.findRecord('event-invoice', params.invoice_identifier, {
include : 'event,user',
reload : true
});
}

afterModel(model) {
if (model.get('status') === 'due') {
this.transitionTo('event-invoice.review', model.get('identifier'));
} else if (model.get('status') === 'paid') {
this.transitionTo('event-invoice.paid', model.get('identifier'));
}
}
}
6 changes: 3 additions & 3 deletions app/templates/event-invoice/review.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@
<div class="ui padded segment">
<div class="ui list">
<div class="item">
<strong>{{t 'Event Name'}}:</strong> {{model.data.event.name}}
<strong>{{t 'Event Name'}}:</strong> {{model.event.name}}
</div>
<div class="item">
<strong>{{t 'Date Issued'}}:</strong> {{moment-format model.data.createdAt 'MM/DD/YYYY'}}
<strong>{{t 'Date Issued'}}:</strong> {{moment-format model.createdAt 'MM/DD/YYYY'}}
</div>
<div class="item">
<strong>{{t 'Total Invoice Amount'}}:</strong> {{format-number model.data.amount}}
<strong>{{t 'Total Invoice Amount'}}:</strong> {{currency-symbol model.event.paymentCurrency}} {{format-number model.amount}}
</div>
</div>
</div>
Expand Down