diff --git a/app/controllers/events/view/tickets/attendees/list.js b/app/controllers/events/view/tickets/attendees/list.js index 4f595b4ddb2..c7a7808fbdd 100644 --- a/app/controllers/events/view/tickets/attendees/list.js +++ b/app/controllers/events/view/tickets/attendees/list.js @@ -25,14 +25,13 @@ export default class extends Controller.extend(EmberTableControllerMixin) { }, options: { tags: this.model.tags - } }, { name : 'Order', width : 190, - valuePath : 'order', - extraValuePaths : ['user'], + valuePath : 'order.identifier', + extraValuePaths : ['order'], cellComponent : 'ui-table/cell/events/view/tickets/attendees/cell-order' }, { diff --git a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs index a183b12089e..b3af9736a51 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs @@ -1,20 +1,22 @@ -
- {{this.record.identifier}} -
- {{this.record.status}} +{{#if this.record}} +
+ {{this.extraRecords.order.identifier}} +
+ {{this.extraRecords.order.status}} +
+
+ {{#if this.extraRecords.order.paidVia}} + + {{t 'Payment via'}} {{this.extraRecords.order.paidVia}} + + {{/if}} + {{#if (eq this.extraRecords.order.status 'completed')}} + {{general-date this.extraRecords.order.completedAt 'date-time-short'}} + {{moment-from-now this.extraRecords.order.completedAt}} + {{else}} + {{general-date this.extraRecords.order.createdAt 'date-time-short'}} + {{moment-from-now this.extraRecords.order.createdAt}} + {{/if}} +
-
- {{#if this.record.paidVia}} - - {{t 'Payment via'}} {{this.record.paidVia}} - - {{/if}} - {{#if (eq this.record.status 'completed')}} - {{general-date this.record.completedAt 'date-time-short'}} - {{moment-from-now this.record.completedAt}} - {{else}} - {{general-date this.record.createdAt 'date-time-short'}} - {{moment-from-now this.record.createdAt}} - {{/if}} -
-
+{{/if}} \ No newline at end of file