Skip to content

Commit 7216317

Browse files
committed
Added invoice info
1 parent a09fc4d commit 7216317

File tree

4 files changed

+42
-67
lines changed

4 files changed

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

5-
export default class extends Controller.extend(EmberTableControllerMixin) {
6-
@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-
}
27-
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-
});
36-
});
37-
return rows;
38-
}
3+
export default class extends Controller {
4+
395
}

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', { path: '/:event_id/review' });
215+
this.route('review', { path: '/:invoice_identifier/review' });
216216
});
217217
});
218218

app/routes/event-invoice/review.js

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

3-
export default class extends Route.extend() {
4-
async model() {
3+
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+
];
512
return {
6-
'user' : await this.authManager.currentUser,
7-
'eventInvoice' : await this.store.query('event-invoice', { include: 'event' })
13+
'user' : await this.authManager.currentUser,
14+
'data' : await this.store.query('event-invoice', {
15+
include : 'event',
16+
filter : filterOptions
17+
})
818
};
919
}
1020

app/templates/event-invoice/review.hbs

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@
1010
<div class="ui padded segment">
1111
<div class="ui list">
1212
<div class="item">
13-
<strong>{{t 'From'}}:</strong> {{this.model.user.billingContactName}}
13+
<strong>{{t 'From'}}:</strong> {{model.user.billingContactName}}
1414
</div>
1515
<div class="item">
16-
<strong>{{t 'Phone'}}:</strong> {{this.model.user.billingPhone}}
16+
<strong>{{t 'Phone'}}:</strong> {{model.user.billingPhone}}
1717
</div>
1818
<div class="item">
19-
<strong>{{t 'Email'}}:</strong> {{this.model.user.email}}
19+
<strong>{{t 'Email'}}:</strong> {{model.user.email}}
2020
</div>
2121
<div class="item">
22-
<strong>{{t 'Billing Address'}}:</strong> {{this.model.user.billingAddress}}
22+
<strong>{{t 'Billing Address'}}:</strong> {{model.user.billingAddress}}
2323
</div>
2424
<div class="item">
25-
<strong>{{t 'Zip Code'}}:</strong> {{this.model.user.billingZipCode}}
25+
<strong>{{t 'Zip Code'}}:</strong> {{model.user.billingZipCode}}
2626
</div>
2727
<div class="item">
28-
<strong>{{t 'Country'}}:</strong> {{this.model.user.billingCountry}}
28+
<strong>{{t 'Country'}}:</strong> {{model.user.billingCountry}}
2929
</div>
3030
</div>
3131
</div>
@@ -52,26 +52,25 @@
5252
</div>
5353
</div>
5454
</div>
55-
</div>
56-
</div>
57-
<div class="row">
58-
<div class="sixteen wide column">
59-
{{tables/default columns=columns
60-
rows=rows
61-
currentPage=page
62-
pageSize=per_page
63-
searchQuery=search
64-
sortBy=sort_by
65-
sortDir=sort_dir
66-
metaData=model.data.meta
67-
filterOptions=filterOptions
68-
widthConstraint="eq-container"
69-
resizeMode="fluid"
70-
fillMode="equal-column"
71-
}}
72-
</div>
73-
<div class="mobile hidden sixteen wide column">
74-
{{orders/event-info data=model.order showBanner=false}}
55+
<div class="ui segments">
56+
<div class="ui secondary segment">
57+
<h3 class="weight-400">{{t 'Invoice Details'}}</h3>
58+
</div>
59+
<div class="ui padded segment">
60+
<div class="ui list">
61+
<div class="item">
62+
<strong>{{t 'Event Name'}}:</strong> {{model.data.event.name}}
63+
</div>
64+
<div class="item">
65+
<strong>{{t 'Date Issued'}}:</strong> {{moment-format model.data.createdAt 'MM/DD/YYYY'}}
66+
</div>
67+
<div class="item">
68+
<strong>{{t 'Total Invoice Amount'}}:</strong> {{format-number model.data.amount}}
69+
</div>
70+
</div>
71+
</div>
72+
</div>
73+
<button class="ui primary button" href="#">{{t 'Pay Now' }}</button>
7574
</div>
7675
</div>
7776
</div>

0 commit comments

Comments
 (0)