Skip to content

fix: pagination/searching/sorting in billing invoice table #3473

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 6 commits into from
Aug 31, 2019
Merged

fix: pagination/searching/sorting in billing invoice table #3473

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ece482c
fix: pagination/searching/sorting in billing invoice table
shreyanshdwivedi Aug 23, 2019
5346053
Merge branch 'development' into invoiceTable
shreyanshdwivedi Aug 27, 2019
423545e
Merge branch 'development' into invoiceTable
shreyanshdwivedi Aug 27, 2019
133db7b
Merge branch 'development' into invoiceTable
mariobehling Aug 30, 2019
06249b5
Merge branch 'development' into invoiceTable
mariobehling Aug 30, 2019
cac93f4
Merge branch 'development' into invoiceTable
abhinavk96 Aug 31, 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
10 changes: 7 additions & 3 deletions app/controllers/account/billing/invoices/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,15 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
name : 'Amount',
valuePath : 'amount',
extraValuePaths : ['event'],
cellComponent : 'ui-table/cell/events/cell-amount'
cellComponent : 'ui-table/cell/events/cell-amount',
isSortable : true,
headerComponent : 'tables/headers/sort'
},
{
name : 'Status',
valuePath : 'status'
name : 'Status',
valuePath : 'status',
isSortable : true,
headerComponent : 'tables/headers/sort'
},
{
name : 'Action',
Expand Down
4 changes: 2 additions & 2 deletions app/routes/account/billing/invoices/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default class extends Route.extend(EmberTableRouteMixin) {
}
async model(params) {
this.set('params', params);
const searchField = 'name';
const searchField = 'status';
let filterOptions = [];
if (params.invoice_status === 'paid' || params.invoice_status === 'due') {
filterOptions = [
Expand Down Expand Up @@ -59,7 +59,7 @@ export default class extends Route.extend(EmberTableRouteMixin) {

queryString = this.applySortFilters(queryString, params);
return {
eventInvoices: (await this.store.query('event-invoice', queryString)).toArray(),
eventInvoices: await this.asArray(this.store.query('event-invoice', queryString)),
params

};
Expand Down
2 changes: 1 addition & 1 deletion app/templates/account/billing/invoices/list.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="sixteen wide column">
{{tables/default columns=columns
rows=model.eventInvoices
rows=model.eventInvoices.data
currentPage=page
pageSize=per_page
searchQuery=search
Expand Down