Skip to content

fix: event invoice table 'all' filter displays invoices #3396

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 2 commits into from
Aug 14, 2019
Merged

fix: event invoice table 'all' filter displays invoices #3396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b8310d
fix: event invoice table 'all' filter displays invoices
shreyanshdwivedi Aug 13, 2019
bedfc65
Merge branch 'development' into eventInvoiceTable
kushthedude Aug 14, 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
42 changes: 25 additions & 17 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 @@ -10,10 +10,10 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
columns = [
{
name : 'Invoice ID',
valuePath : 'id'
valuePath : 'identifier'
},
{
name : 'Name',
name : 'Event Name',
valuePath : 'event',
cellComponent : 'ui-table/cell/events/cell-event-invoice'
},
Expand All @@ -22,8 +22,10 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
valuePath : 'createdAt'
},
{
name : 'Outstanding Amount',
valuePath : 'amount'
name : 'Outstanding Amount',
valuePath : 'amount',
extraValuePaths : ['event'],
cellComponent : 'ui-table/cell/events/cell-amount'
},
{
name : 'View Invoice',
Expand All @@ -34,10 +36,10 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
columns = [
{
name : 'Invoice ID',
valuePath : 'id'
valuePath : 'identifier'
},
{
name : 'Name',
name : 'Event Name',
valuePath : 'event',
cellComponent : 'ui-table/cell/events/cell-event-invoice'
},
Expand All @@ -46,8 +48,10 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
valuePath : 'createdAt'
},
{
name : 'Amount',
valuePath : 'amount'
name : 'Amount',
valuePath : 'amount',
extraValuePaths : ['event'],
cellComponent : 'ui-table/cell/events/cell-amount'
},
{
name : 'Date Paid',
Expand All @@ -63,10 +67,10 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
columns = [
{
name : 'Invoice ID',
valuePath : 'id'
valuePath : 'identifier'
},
{
name : 'Name',
name : 'Event Name',
valuePath : 'event',
cellComponent : 'ui-table/cell/events/cell-event-invoice'

Expand All @@ -76,29 +80,33 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
valuePath : 'createdAt'
},
{
name : 'Amount Due',
valuePath : 'amount'
name : 'Amount Due',
valuePath : 'amount',
extraValuePaths : ['event'],
cellComponent : 'ui-table/cell/events/cell-amount'
},
{
name : 'View Invoice',
valuePath : 'invoicePdfUrl'
}

];
} else if (this.model.params.invoice_status === 'due') {
} else if (this.model.params.invoice_status === 'all') {
columns = [
{
name : 'Invoice ID',
valuePath : 'id'
valuePath : 'identifier'
},
{
name : 'Name',
name : 'Event Name',
valuePath : 'event',
cellComponent : 'ui-table/cell/events/cell-event-invoice'
},
{
name : 'Amount',
valuePath : 'amount'
name : 'Amount',
valuePath : 'amount',
extraValuePaths : ['event'],
cellComponent : 'ui-table/cell/events/cell-amount'
},
{
name : 'Status',
Expand Down
8 changes: 8 additions & 0 deletions app/routes/account/billing/invoices/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import Route from '@ember/routing/route';

export default Route.extend({
beforeModel() {
this._super(...arguments);
this.transitionTo('account.billing.invoices.list', 'all');
}
});
1 change: 1 addition & 0 deletions app/templates/components/ui-table/cell/events/cell-amount.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{currency-symbol extraRecords.event.paymentCurrency}} {{format-number record}}