Skip to content

Commit 9c995ff

Browse files
shreyanshdwivedimrsaicharan1
authored andcommitted
fix: event invoice fetched correctly in review route (#3414)
1 parent fb2d628 commit 9c995ff

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

app/routes/event-invoice/paid.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ import Route from '@ember/routing/route';
33
export default class extends Route {
44

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

109
model(params) {

app/routes/event-invoice/review.js

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
import Route from '@ember/routing/route';
22

33
export default class extends Route {
4-
async model(params) {
5-
let filterOptions = [
6-
{
7-
name : 'identifier',
8-
op : 'eq',
9-
val : params.invoice_identifier
10-
}
11-
];
12-
return {
13-
'user' : await this.authManager.currentUser,
14-
'data' : await this.store.query('event-invoice', {
15-
include : 'event',
16-
filter : filterOptions
17-
})
18-
};
4+
titleToken(model) {
5+
return this.l10n.tVar(`Review Event Invoice - ${model.get('identifier')}`);
196
}
207

8+
model(params) {
9+
return this.store.findRecord('event-invoice', params.invoice_identifier, {
10+
include : 'event,user',
11+
reload : true
12+
});
13+
}
14+
15+
afterModel(model) {
16+
if (model.get('status') === 'due') {
17+
this.transitionTo('event-invoice.review', model.get('identifier'));
18+
} else if (model.get('status') === 'paid') {
19+
this.transitionTo('event-invoice.paid', model.get('identifier'));
20+
}
21+
}
2122
}

app/templates/event-invoice/review.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@
5959
<div class="ui padded segment">
6060
<div class="ui list">
6161
<div class="item">
62-
<strong>{{t 'Event Name'}}:</strong> {{model.data.event.name}}
62+
<strong>{{t 'Event Name'}}:</strong> {{model.event.name}}
6363
</div>
6464
<div class="item">
65-
<strong>{{t 'Date Issued'}}:</strong> {{moment-format model.data.createdAt 'MM/DD/YYYY'}}
65+
<strong>{{t 'Date Issued'}}:</strong> {{moment-format model.createdAt 'MM/DD/YYYY'}}
6666
</div>
6767
<div class="item">
68-
<strong>{{t 'Total Invoice Amount'}}:</strong> {{format-number model.data.amount}}
68+
<strong>{{t 'Total Invoice Amount'}}:</strong> {{currency-symbol model.event.paymentCurrency}} {{format-number model.amount}}
6969
</div>
7070
</div>
7171
</div>

0 commit comments

Comments
 (0)