Merge branch 'development' into gamma

Author: kushthedude

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

@@ -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'
         },
@@ -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',
@@ -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'
         },
@@ -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',
@@ -56,17 +60,23 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
         {
           name      : 'View Invoice',
           valuePath : 'invoicePdfUrl'
+        },
+        {
+          name            : 'Action',
+          valuePath       : 'identifier',
+          extraValuePaths : ['status'],
+          cellComponent   : 'ui-table/cell/events/cell-action'
         }
 
       ];
     } else if (this.model.params.invoice_status === 'due') {
       columns =   [
         {
           name      : 'Invoice ID',
-          valuePath : 'id'
+          valuePath : 'identifier'
         },
         {
-          name          : 'Name',
+          name          : 'Event Name',
           valuePath     : 'event',
           cellComponent : 'ui-table/cell/events/cell-event-invoice'
 
@@ -76,33 +86,49 @@ 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'
+        },
+        {
+          name            : 'Action',
+          valuePath       : 'identifier',
+          extraValuePaths : ['status'],
+          cellComponent   : 'ui-table/cell/events/cell-action'
         }
 
       ];
-    } 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',
           valuePath : 'status'
+        },
+        {
+          name            : 'Action',
+          valuePath       : 'identifier',
+          extraValuePaths : ['status'],
+          cellComponent   : 'ui-table/cell/events/cell-action'
         }
 
       ];

app/routes/account/billing/invoices/index.js

@@ -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');
+  }
+});

app/templates/components/ui-table/cell/events/cell-action.hbs

@@ -0,0 +1,9 @@
+{{#if (eq extraRecords.status 'due')}}
+  {{#link-to 'event-invoice.review' record class='ui blue button'}}
+    {{t 'Review and Pay'}}
+  {{/link-to}}
+{{else}}
+  {{#link-to 'event-invoice.paid' record class='ui green button'}}
+    {{t 'See Payment'}}
+  {{/link-to}}
+{{/if}}

app/templates/components/ui-table/cell/events/cell-amount.hbs

@@ -0,0 +1 @@
+{{currency-symbol extraRecords.event.paymentCurrency}} {{format-number record}}

tests/integration/components/ui-table/cell/events/view/tickets/orders/cell-amount-test.js

@@ -5,10 +5,14 @@ import { render } from '@ember/test-helpers';
 
 module('Integration | Component | ui table/cell/events/view/tickets/orders/cell amount', function(hooks) {
   setupIntegrationTest(hooks);
-
+  const extraRecords = {
+    event: {
+      paymentCurrency: 'USD'
+    }
+  };
   test('it renders', async function(assert) {
-
-    await render(hbs`{{ui-table/cell/events/view/tickets/orders/cell-amount paymentCurrency='USD'}}`);
+    this.set('extraRecords', extraRecords);
+    await render(hbs`{{ui-table/cell/events/view/tickets/orders/cell-amount extraRecords=extraRecords}}`);
     assert.ok(this.element.textContent.trim().includes(''));
   });
 });