diff --git a/app/controllers/events/view/tickets/attendees/list.js b/app/controllers/events/view/tickets/attendees/list.js index c14f93f9304..6e40e075997 100644 --- a/app/controllers/events/view/tickets/attendees/list.js +++ b/app/controllers/events/view/tickets/attendees/list.js @@ -16,13 +16,19 @@ export default class extends Controller.extend(EmberTableControllerMixin) { }, { name : 'Ticket Name', - width : 110, + width : 80, valuePath : 'ticket.name' }, + { + name : 'Date and Time', + width : 140, + valuePath : 'order', + cellComponent : 'ui-table/cell/events/view/tickets/attendees/cell-date' + }, { name : 'Ticket Price', valuePath : 'ticket.price', - width : 100, + width : 90, extraValuePaths : ['event', 'discountCode'], cellComponent : 'ui-table/cell/events/view/tickets/attendees/cell-price' }, @@ -39,12 +45,12 @@ export default class extends Controller.extend(EmberTableControllerMixin) { { name : 'Email', valuePath : 'email', - width : 160 + width : 120 }, { name : 'Actions', valuePath : 'id', - width : 130, + width : 90, extraValuePaths : ['order', 'isCheckedIn'], cellComponent : 'ui-table/cell/events/view/tickets/attendees/cell-action', actions : { diff --git a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs new file mode 100644 index 00000000000..fa930edc801 --- /dev/null +++ b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs @@ -0,0 +1,5 @@ +{{#if (eq @record.status 'completed')}} + {{moment-format @record.completedAt 'MMMM DD, YYYY - hh:mm A'}} +{{else}} + {{moment-format @record.createdAt 'MMMM DD, YYYY - hh:mm A'}} +{{/if}} 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 03547b8d34f..0357dcabbb8 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,9 +1,5 @@
{{this.record.identifier}} - - {{t 'by'}} - {{this.extraRecords.user.email}} -
{{this.record.status}}
@@ -13,12 +9,5 @@ {{t 'Payment via'}} {{this.record.paidVia}} {{/if}} - {{#if (eq this.record.status 'completed')}} - {{moment-format this.record.completedAt 'MMMM Do YYYY, h:mm A -'}} - {{moment-from-now this.record.completedAt}} - {{else}} - {{moment-format this.record.createdAt 'MMMM Do YYYY, h:mm A -'}} - {{moment-from-now this.record.createdAt}} - {{/if}}