Skip to content

Commit 788eb6e

Browse files
kushthedudeabhinavk96
authored andcommitted
fix: Using ember tables for Admin/Sales/Invoices (#3429)
* Using ember tables for Admin/Sales/Invoices * Update invoices.js * Update invoices.js
1 parent 9968963 commit 788eb6e

File tree

6 files changed

+75
-64
lines changed

6 files changed

+75
-64
lines changed
Lines changed: 44 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,47 @@
11
import Controller from '@ember/controller';
2+
import { computed } from '@ember/object';
3+
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
24

3-
export default Controller.extend({
4-
columns: [
5-
{
6-
propertyName : 'identifier',
7-
title : 'Invoice #'
8-
},
9-
{
10-
propertyName : 'event.name',
11-
title : 'Event',
12-
disableSorting : true,
13-
disableFiltering : true
145

15-
},
16-
{
17-
propertyName : 'created-at',
18-
template : 'components/ui-table/cell/admin/sales/status/cell-dated',
19-
title : 'Dated'
20-
},
21-
{
22-
propertyName : 'amount',
23-
template : 'components/ui-table/cell/admin/sales/status/cell-amount',
24-
title : 'Amount'
25-
},
26-
{
27-
propertyName : 'user.email',
28-
title : 'Sent To',
29-
disableSorting : true,
30-
disableFiltering : true
31-
},
32-
{
33-
propertyName : 'status',
34-
title : 'Status'
35-
}
36-
]
37-
});
6+
export default class extends Controller.extend(EmberTableControllerMixin) {
7+
8+
@computed()
9+
get columns() {
10+
return [
11+
{
12+
name : 'Invoice #',
13+
headerComponent : 'tables/headers/sort',
14+
isSortable : true,
15+
valuePath : 'identifier'
16+
},
17+
{
18+
name : 'Event',
19+
valuePath : 'event.name'
20+
},
21+
{
22+
name : 'Dated',
23+
valuePath : 'createdAt',
24+
headerComponent : 'tables/headers/sort',
25+
isSortable : true,
26+
cellComponent : 'ui-table/cell/cell-simple-date',
27+
options : {
28+
dateFormat: 'MMMM DD, YYYY - HH:mm A'
29+
}
30+
},
31+
{
32+
name : 'Amount',
33+
valuePath : 'amount',
34+
cellComponent : 'ui-table/cell/admin/sales/status/cell-amount'
35+
},
36+
{
37+
name : 'Sent To',
38+
valuePath : 'user.email'
39+
},
40+
{
41+
name : 'Status',
42+
valuePath : 'status'
43+
}
44+
];
45+
}
46+
}
47+

app/routes/admin/sales/invoices.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
import Route from '@ember/routing/route';
2+
import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';
23

3-
export default Route.extend({
4+
export default class extends Route.extend(EmberTableRouteMixin) {
45
titleToken() {
56
return this.l10n.t('Invoices');
6-
},
7-
model() {
8-
return this.store.query('event-invoice', { include: 'event,user' });
97
}
10-
});
8+
9+
async model(params) {
10+
const searchField = 'identifier';
11+
let filterOptions = this.applySearchFilters([], params, searchField);
12+
let queryString = {
13+
filter : filterOptions,
14+
'page[size]' : params.per_page || 100,
15+
'page[number' : params.page || 1
16+
};
17+
queryString = this.applySortFilters(queryString, params);
18+
return this.asArray(this.store.query('event-invoice', { include: 'event,user' }, queryString));
19+
}
20+
21+
}
Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="ui stackable grid">
1+
<div class="ui unstackable grid">
22
<div class="row">
33
<div class="column">
44
<h2 class="ui header">
@@ -8,11 +8,19 @@
88
</div>
99
<div class="row">
1010
<div class="column">
11-
{{events/events-table columns=columns data=model
12-
useNumericPagination=true
13-
showGlobalFilter=true
14-
showPageSize=true
15-
}}
11+
{{tables/default columns=columns
12+
rows=model.data
13+
currentPage=page
14+
pageSize=per_page
15+
searchQuery=search
16+
sortBy=sort_by
17+
sortDir=sort_dir
18+
metaData=model.meta
19+
filterOptions=filterOptions
20+
widthConstraint="eq-container"
21+
resizeMode="fluid"
22+
fillMode="equal-column"
23+
}}
1624
</div>
1725
</div>
1826
</div>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<span>
2-
US$ {{format-number record.amount}}
2+
US$ {{format-number record}}
33
</span>

app/templates/components/ui-table/cell/admin/sales/status/cell-dated.hbs

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/integration/components/ui-table/cell/admin/sales/status/cell-dated-test.js

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)