Skip to content

Commit a09fc4d

Browse files
committed
Fix Travis & add include id in URL
1 parent acedea7 commit a09fc4d

File tree

3 files changed

+38
-38
lines changed

3 files changed

+38
-38
lines changed
Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
import Controller from '@ember/controller';
22
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
3-
import { computed } from '@ember/object'
3+
import { computed } from '@ember/object';
44

55
export default class extends Controller.extend(EmberTableControllerMixin) {
66
@computed()
7-
get columns() {
8-
return [
9-
{
10-
name : 'Invoice ID',
11-
valuePath : 'id',
12-
},
13-
{
14-
name : 'Event Name',
15-
valuePath : 'name',
16-
},
17-
{
18-
name : 'Date Issued',
19-
valuePath : 'createdAt',
20-
},
21-
{
22-
name : 'Amount',
23-
valuePath : 'amount',
24-
}
25-
]
26-
}
7+
get columns() {
8+
return [
9+
{
10+
name : 'Invoice ID',
11+
valuePath : 'id'
12+
},
13+
{
14+
name : 'Event Name',
15+
valuePath : 'name'
16+
},
17+
{
18+
name : 'Date Issued',
19+
valuePath : 'createdAt'
20+
},
21+
{
22+
name : 'Amount',
23+
valuePath : 'amount'
24+
}
25+
];
26+
}
2727
get rows() {
28-
const rows = [];
29-
this.model.eventInvoice.forEach(row => {
30-
rows.pushObject({
31-
id : row.id,
32-
name : row.event.name,
33-
createdAt : row.createdAt,
34-
amount : row.amount
35-
});
28+
const rows = [];
29+
this.model.eventInvoice.forEach(row => {
30+
rows.pushObject({
31+
id : row.id,
32+
name : row.event.name,
33+
createdAt : row.createdAt,
34+
amount : row.amount
3635
});
37-
return rows;
38-
}
36+
});
37+
return rows;
38+
}
3939
}

app/router.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ router.map(function() {
212212
this.route('verify');
213213

214214
this.route('event-invoice', function() {
215-
this.route('review');
215+
this.route('review', { path: '/:event_id/review' });
216216
});
217217
});
218218

app/routes/event-invoice/review.js

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

33
export default class extends Route.extend() {
4-
async model() {
5-
return {
6-
'user' : await this.authManager.currentUser,
7-
'eventInvoice' : await this.store.query('event-invoice', { include: 'event' })
8-
}
9-
}
4+
async model() {
5+
return {
6+
'user' : await this.authManager.currentUser,
7+
'eventInvoice' : await this.store.query('event-invoice', { include: 'event' })
8+
};
9+
}
1010

1111
}

0 commit comments

Comments
 (0)