Skip to content

Commit b83ce2c

Browse files
shreyanshdwivediuds5501
authored andcommitted
fix: event invoice table 'all' filter displays invoices (#3396)
1 parent 3af8016 commit b83ce2c

File tree

3 files changed

+34
-17
lines changed

3 files changed

+34
-17
lines changed

app/controllers/account/billing/invoices/list.js

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
1010
columns = [
1111
{
1212
name : 'Invoice ID',
13-
valuePath : 'id'
13+
valuePath : 'identifier'
1414
},
1515
{
16-
name : 'Name',
16+
name : 'Event Name',
1717
valuePath : 'event',
1818
cellComponent : 'ui-table/cell/events/cell-event-invoice'
1919
},
@@ -22,8 +22,10 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
2222
valuePath : 'createdAt'
2323
},
2424
{
25-
name : 'Outstanding Amount',
26-
valuePath : 'amount'
25+
name : 'Outstanding Amount',
26+
valuePath : 'amount',
27+
extraValuePaths : ['event'],
28+
cellComponent : 'ui-table/cell/events/cell-amount'
2729
},
2830
{
2931
name : 'View Invoice',
@@ -34,10 +36,10 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
3436
columns = [
3537
{
3638
name : 'Invoice ID',
37-
valuePath : 'id'
39+
valuePath : 'identifier'
3840
},
3941
{
40-
name : 'Name',
42+
name : 'Event Name',
4143
valuePath : 'event',
4244
cellComponent : 'ui-table/cell/events/cell-event-invoice'
4345
},
@@ -46,8 +48,10 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
4648
valuePath : 'createdAt'
4749
},
4850
{
49-
name : 'Amount',
50-
valuePath : 'amount'
51+
name : 'Amount',
52+
valuePath : 'amount',
53+
extraValuePaths : ['event'],
54+
cellComponent : 'ui-table/cell/events/cell-amount'
5155
},
5256
{
5357
name : 'Date Paid',
@@ -63,10 +67,10 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
6367
columns = [
6468
{
6569
name : 'Invoice ID',
66-
valuePath : 'id'
70+
valuePath : 'identifier'
6771
},
6872
{
69-
name : 'Name',
73+
name : 'Event Name',
7074
valuePath : 'event',
7175
cellComponent : 'ui-table/cell/events/cell-event-invoice'
7276

@@ -76,29 +80,33 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
7680
valuePath : 'createdAt'
7781
},
7882
{
79-
name : 'Amount Due',
80-
valuePath : 'amount'
83+
name : 'Amount Due',
84+
valuePath : 'amount',
85+
extraValuePaths : ['event'],
86+
cellComponent : 'ui-table/cell/events/cell-amount'
8187
},
8288
{
8389
name : 'View Invoice',
8490
valuePath : 'invoicePdfUrl'
8591
}
8692

8793
];
88-
} else if (this.model.params.invoice_status === 'due') {
94+
} else if (this.model.params.invoice_status === 'all') {
8995
columns = [
9096
{
9197
name : 'Invoice ID',
92-
valuePath : 'id'
98+
valuePath : 'identifier'
9399
},
94100
{
95-
name : 'Name',
101+
name : 'Event Name',
96102
valuePath : 'event',
97103
cellComponent : 'ui-table/cell/events/cell-event-invoice'
98104
},
99105
{
100-
name : 'Amount',
101-
valuePath : 'amount'
106+
name : 'Amount',
107+
valuePath : 'amount',
108+
extraValuePaths : ['event'],
109+
cellComponent : 'ui-table/cell/events/cell-amount'
102110
},
103111
{
104112
name : 'Status',
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import Route from '@ember/routing/route';
2+
3+
export default Route.extend({
4+
beforeModel() {
5+
this._super(...arguments);
6+
this.transitionTo('account.billing.invoices.list', 'all');
7+
}
8+
});
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{currency-symbol extraRecords.event.paymentCurrency}} {{format-number record}}

0 commit comments

Comments
 (0)