diff --git a/app/components/public/add-to-calender.hbs b/app/components/public/add-to-calender.hbs index 22cb25e7b7f..e80a441406b 100644 --- a/app/components/public/add-to-calender.hbs +++ b/app/components/public/add-to-calender.hbs @@ -3,9 +3,9 @@
{{#if this.isSingleDay}} - {{general-date @event.startsAt @event.timezone "dddd, MMMM DD, YYYY"}}
{{general-date @event.startsAt @event.timezone "h:mm A"}} {{t 'to'}} {{general-date @event.endsAt @event.timezone "h:mm A"}} + {{general-date @event.startsAt @event.timezone "dddd, D MMMM, YYYY"}}
{{general-date @event.startsAt @event.timezone "h:mm A"}} {{t 'to'}} {{general-date @event.endsAt @event.timezone "h:mm A"}} {{else}} - {{general-date @event.startsAt @event.timezone "dddd, MMMM DD, YYYY h:mm A"}} {{t 'to'}} {{general-date @event.endsAt @event.timezone "dddd, MMMM DD, YYYY h:mm A"}} + {{general-date @event.startsAt @event.timezone "dddd, D MMMM, YYYY h:mm A"}} {{t 'to'}} {{general-date @event.endsAt @event.timezone "dddd, D MMMM, YYYY h:mm A"}} {{/if}} ({{this.timezone}})
diff --git a/app/components/public/session-item.hbs b/app/components/public/session-item.hbs index 925b31b4f74..fbdd71e34b2 100644 --- a/app/components/public/session-item.hbs +++ b/app/components/public/session-item.hbs @@ -41,7 +41,7 @@
{{#if @session.startsAt}}
{{@session.microlocation.name}}
-
{{general-date @session.startsAt @timezone 'hh:mm a / DD-MM-YYYY (z)'}}
+
{{general-date @session.startsAt @timezone 'D MMM, YYYY h:mm A (z)'}}
{{/if}}
{{/if}} diff --git a/app/controllers/account/billing/invoices/list.js b/app/controllers/account/billing/invoices/list.js index 638996faa30..12f9258412a 100644 --- a/app/controllers/account/billing/invoices/list.js +++ b/app/controllers/account/billing/invoices/list.js @@ -28,7 +28,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) { cellComponent : 'ui-table/cell/cell-date', options : { timezone : 'UTC', - dateFormat : 'MMMM DD, YYYY' + dateFormat : 'D MMM, YYYY' } }, { @@ -37,7 +37,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) { cellComponent : 'ui-table/cell/cell-date', options : { timezone : 'UTC', - dateFormat : 'MMMM DD, YYYY' + dateFormat : 'D MMM, YYYY' } }, { diff --git a/app/controllers/admin/messages/list.js b/app/controllers/admin/messages/list.js index aa1a68d7a87..bdb21cc9657 100644 --- a/app/controllers/admin/messages/list.js +++ b/app/controllers/admin/messages/list.js @@ -54,7 +54,7 @@ get columns() { isSortable : true, cellComponent : 'ui-table/cell/cell-simple-date', options : { - dateFormat: 'MMMM DD, YYYY - HH:mm A' + dateFormat: 'D MMM, YYYY h:mm A' } } diff --git a/app/controllers/admin/sales/invoices.js b/app/controllers/admin/sales/invoices.js index c589e2f27b9..25dab067140 100644 --- a/app/controllers/admin/sales/invoices.js +++ b/app/controllers/admin/sales/invoices.js @@ -27,7 +27,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) { cellComponent : 'ui-table/cell/cell-date', options : { timezone : 'UTC', - dateFormat : 'MMMM DD, YYYY' + dateFormat : 'D MMM, YYYY' } }, { @@ -36,7 +36,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) { cellComponent : 'ui-table/cell/cell-date', options : { timezone : 'UTC', - dateFormat : 'MMMM DD, YYYY' + dateFormat : 'D MMM, YYYY' } }, { diff --git a/app/controllers/admin/sessions/list.js b/app/controllers/admin/sessions/list.js index dc0e9428052..6801f9988fe 100644 --- a/app/controllers/admin/sessions/list.js +++ b/app/controllers/admin/sessions/list.js @@ -34,7 +34,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) { isSortable : true, headerComponent : 'tables/headers/sort', options : { - dateFormat: 'MMMM DD, YYYY - hh:mm A' + dateFormat: 'D MMM, YYYY h:mm A' } }, { @@ -44,7 +44,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) { isSortable : true, headerComponent : 'tables/headers/sort', options : { - dateFormat: 'MMMM DD, YYYY - hh:mm A' + dateFormat: 'D MMM, YYYY h:mm A' } }, { @@ -54,7 +54,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) { isSortable : true, headerComponent : 'tables/headers/sort', options : { - dateFormat: 'MMMM DD, YYYY - hh:mm A' + dateFormat: 'D MMM, YYYY h:mm A' } }, { diff --git a/app/controllers/admin/users/list.js b/app/controllers/admin/users/list.js index d35db14800b..0ef4ed33563 100644 --- a/app/controllers/admin/users/list.js +++ b/app/controllers/admin/users/list.js @@ -82,7 +82,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) { headerComponent : 'tables/headers/sort', cellComponent : 'ui-table/cell/cell-simple-date', options : { - dateFormat: 'MMMM DD, YYYY - hh:mm A' + dateFormat: 'D MMM, YYYY h:mm A' } } ]; diff --git a/app/controllers/events/list.js b/app/controllers/events/list.js index 0bf9985e710..6e8d60940d9 100644 --- a/app/controllers/events/list.js +++ b/app/controllers/events/list.js @@ -18,7 +18,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) { headerComponent : 'tables/headers/sort', cellComponent : 'ui-table/cell/cell-event-general', options : { - dateFormat: 'MMMM DD, YYYY - HH:mm A' + dateFormat: 'D MMM, YYYY h:mm A' } }, { diff --git a/app/controllers/events/view/sessions/list.js b/app/controllers/events/view/sessions/list.js index e27e3f866e2..5b8a200a1ad 100644 --- a/app/controllers/events/view/sessions/list.js +++ b/app/controllers/events/view/sessions/list.js @@ -73,7 +73,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) { valuePath : 'submittedAt', cellComponent : 'ui-table/cell/cell-simple-date', options : { - dateFormat: 'MMMM DD, YYYY - HH:mm' + dateFormat: 'D MMM, YYYY h:mm A' } }, { @@ -82,7 +82,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) { valuePath : 'lastModifiedAt', cellComponent : 'ui-table/cell/cell-simple-date', options : { - dateFormat: 'MMMM DD, YYYY - HH:mm' + dateFormat: 'D MMM, YYYY h:mm A' } }, { diff --git a/app/controllers/events/view/tickets/orders/list.js b/app/controllers/events/view/tickets/orders/list.js index 48f3968b0dc..3b8ab39e6eb 100644 --- a/app/controllers/events/view/tickets/orders/list.js +++ b/app/controllers/events/view/tickets/orders/list.js @@ -36,7 +36,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) { cellComponent : 'ui-table/cell/events/view/tickets/orders/cell-date', headerComponent : 'tables/headers/sort', width : 100, - dateFormat : 'MMMM DD, YYYY - HH:mm A', + dateFormat : 'D MMM, YYYY h:mm A', isSortable : true }, { diff --git a/app/templates/admin/sales/revenue.hbs b/app/templates/admin/sales/revenue.hbs index 88bd70c1d8a..57eee655ea6 100644 --- a/app/templates/admin/sales/revenue.hbs +++ b/app/templates/admin/sales/revenue.hbs @@ -38,7 +38,7 @@ {{order.name}} - {{moment-format order.eventDate 'MM/DD/YYYY'}} + {{moment-format order.eventDate 'D MMM, YYYY'}} {{order.ticketCount}} diff --git a/app/templates/components/event-invoice/invoice-summary.hbs b/app/templates/components/event-invoice/invoice-summary.hbs index 15334288c61..5c9f449ecea 100644 --- a/app/templates/components/event-invoice/invoice-summary.hbs +++ b/app/templates/components/event-invoice/invoice-summary.hbs @@ -26,8 +26,8 @@ {{this.event.name}} - {{moment-format this.data.issuedAt 'MM/DD/YYYY'}} - {{moment-format this.data.completedAt 'MM/DD/YYYY'}} + {{moment-format this.data.issuedAt 'D MMM, YYYY'}} + {{moment-format this.data.completedAt 'D MMM, YYYY'}} {{currency-symbol this.eventCurrency}} {{format-money this.data.amount}} diff --git a/app/templates/components/forms/wizard/basic-details-step.hbs b/app/templates/components/forms/wizard/basic-details-step.hbs index 9ab6e5653c3..f45a36c228a 100644 --- a/app/templates/components/forms/wizard/basic-details-step.hbs +++ b/app/templates/components/forms/wizard/basic-details-step.hbs @@ -93,7 +93,7 @@
@@ -102,7 +102,7 @@ @@ -111,7 +111,7 @@ @@ -121,7 +121,7 @@ diff --git a/app/templates/components/forms/wizard/sessions-speakers-step.hbs b/app/templates/components/forms/wizard/sessions-speakers-step.hbs index 2aaa39d69f5..da1750f78e4 100644 --- a/app/templates/components/forms/wizard/sessions-speakers-step.hbs +++ b/app/templates/components/forms/wizard/sessions-speakers-step.hbs @@ -88,7 +88,7 @@
- + {{#if (gt this.sessionTypes.length 1)}}
- +
@@ -142,7 +142,7 @@
- +
diff --git a/app/templates/components/order-card.hbs b/app/templates/components/order-card.hbs index 07cd172843f..8e772d4f453 100644 --- a/app/templates/components/order-card.hbs +++ b/app/templates/components/order-card.hbs @@ -27,7 +27,7 @@
- {{moment-format this.order.event.startsAt 'ddd, DD MMMM YYYY, h:mm A'}} + {{moment-format this.order.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}}
@@ -46,7 +46,7 @@ #{{this.order.identifier}} {{#if this.order.completedAt}} - {{t 'on'}} {{moment-format this.order.completedAt 'MMMM DD, YYYY h:mm A'}} + {{t 'on'}} {{moment-format this.order.completedAt 'D MMM, YYYY h:mm A'}} {{/if}}
diff --git a/app/templates/components/public/call-for-speakers.hbs b/app/templates/components/public/call-for-speakers.hbs index 188a5999e7f..97419fe873f 100644 --- a/app/templates/components/public/call-for-speakers.hbs +++ b/app/templates/components/public/call-for-speakers.hbs @@ -4,15 +4,15 @@ {{#if this.data.speakersCall.isOpen}} {{t 'Open'}}
- {{t 'Call for Speakers is open until'}} {{moment-format this.data.speakersCall.endsAt 'ddd, MMM DD h:mm A'}} + {{t 'Call for Speakers is open until'}} {{moment-format this.data.speakersCall.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
{{else}} {{t 'Closed'}}
{{#if this.data.speakersCall.isInFuture}} - {{t 'Call for Speakers will open at'}} {{moment-format this.data.speakersCall.startsAt 'ddd, MMM DD h:mm A' }} + {{t 'Call for Speakers will open at'}} {{moment-format this.data.speakersCall.startsAt 'dddd, D MMMM, YYYY h:mm A' }} {{else}} - {{t 'Call for Speakers was closed at'}} {{moment-format this.data.speakersCall.endsAt 'ddd, MMM DD h:mm A'}} + {{t 'Call for Speakers was closed at'}} {{moment-format this.data.speakersCall.endsAt 'dddd, D MMMM, YYYY h:mm A'}} {{/if}}
{{/if}} diff --git a/app/templates/components/public/ticket-list.hbs b/app/templates/components/public/ticket-list.hbs index 50b887d3e00..f0e9c8c3930 100644 --- a/app/templates/components/public/ticket-list.hbs +++ b/app/templates/components/public/ticket-list.hbs @@ -28,7 +28,7 @@ {{ticket.description}} {{/if}}
- Sale ends on {{moment-format ticket.salesEndsAt 'ddd, DD MMMM YY, h:mm A'}} + Sale ends on {{moment-format ticket.salesEndsAt 'dddd, D MMMM, YYYY h:mm A'}}
diff --git a/app/templates/components/session-card.hbs b/app/templates/components/session-card.hbs index 95c13fd792f..fd5f277a698 100644 --- a/app/templates/components/session-card.hbs +++ b/app/templates/components/session-card.hbs @@ -20,7 +20,7 @@
{{#if this.session.startsAt}} - {{moment-format this.session.startsAt 'ddd, MMM DD h:mm A'}} + {{moment-format this.session.startsAt 'D MMM, YYYY h:mm A'}} {{else}} {{t 'Session Not Yet Scheduled'}} {{/if}} diff --git a/app/templates/components/ui-table/cell/cell-simple-date.hbs b/app/templates/components/ui-table/cell/cell-simple-date.hbs index a7294390961..ac6477b4f03 100644 --- a/app/templates/components/ui-table/cell/cell-simple-date.hbs +++ b/app/templates/components/ui-table/cell/cell-simple-date.hbs @@ -4,6 +4,6 @@ {{else if this.record}} - {{moment-format this.record (if this.props.options.dateFormat this.props.options.dateFormat 'MMMM DD, YYYY - HH:mm A')}} + {{moment-format this.record (if this.props.options.dateFormat this.props.options.dateFormat 'D MMM, YYYY h:mm A')}} {{/if}} diff --git a/app/templates/components/ui-table/cell/cell-validity.hbs b/app/templates/components/ui-table/cell/cell-validity.hbs index fc31cecd379..3a635dd506d 100644 --- a/app/templates/components/ui-table/cell/cell-validity.hbs +++ b/app/templates/components/ui-table/cell/cell-validity.hbs @@ -1,5 +1,5 @@ - {{moment-format this.record 'MMMM DD, YYYY - h:mm A'}} + {{moment-format this.record 'D MMM, YYYY h:mm A'}}
To
- {{moment-format this.extraRecords.validTill 'MMMM DD, YYYY - h:mm A'}} + {{moment-format this.extraRecords.validTill 'D MMM, YYYY h:mm A'}}
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 0357dcabbb8..eb57e568238 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 @@ -9,5 +9,12 @@ {{t 'Payment via'}} {{this.record.paidVia}} {{/if}} + {{#if (eq this.record.status 'completed')}} + {{moment-format this.record.completedAt 'D MMM, YYYY h:mm A'}} + {{moment-from-now this.record.completedAt}} + {{else}} + {{moment-format this.record.createdAt 'D MMM, YYYY h:mm A'}} + {{moment-from-now this.record.createdAt}} + {{/if}}
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs b/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs index 180eb2d9b1a..7b4e34d02c9 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs @@ -1,3 +1,3 @@ - {{moment-format this.record 'MMMM Do YYYY, h:mm a'}} + {{moment-format this.record 'D MMM, YYYY h:mm A'}} diff --git a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs index b874e8b8c95..18f578b8035 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs @@ -1,9 +1,9 @@ {{#if this.record}}
- {{moment-format this.record 'MMMM DD, YYYY - hh:mm A'}} + {{moment-format this.record 'D MMM, YYYY h:mm A'}}
{{else}}
- {{moment-format this.extraRecords.createdAt 'MMMM DD, YYYY - hh:mm A'}} + {{moment-format this.extraRecords.createdAt 'D MMM, YYYY h:mm A'}}
{{/if}} diff --git a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs index f9f41bd77ec..ff1c308cd02 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs @@ -11,6 +11,13 @@ {{t 'Payment via'}} {{this.extraRecords.paidVia}} {{/if}} + + {{#if this.extraRecords.completedAt}} + {{moment-format this.extraRecords.completedAt 'D MMM, YYYY h:mm A'}} {{moment-from-now this.extraRecords.completedAt}} + {{else}} + {{moment-format this.extraRecords.createdAt 'D MMM, YYYY h:mm A'}} {{moment-from-now this.extraRecords.createdAt}} + {{/if}} +
diff --git a/app/templates/components/widgets/forms/ticket-input.hbs b/app/templates/components/widgets/forms/ticket-input.hbs index f06c983d235..8d2019820bb 100644 --- a/app/templates/components/widgets/forms/ticket-input.hbs +++ b/app/templates/components/widgets/forms/ticket-input.hbs @@ -141,7 +141,7 @@
@@ -159,7 +159,7 @@ diff --git a/app/templates/event-invoice/review.hbs b/app/templates/event-invoice/review.hbs index d9f00941d41..6df92d364d2 100644 --- a/app/templates/event-invoice/review.hbs +++ b/app/templates/event-invoice/review.hbs @@ -15,10 +15,10 @@ {{t 'Event Name'}}: {{this.model.event.name}}
- {{t 'Date Issued'}}: {{general-date this.model.issuedAt 'UTC' 'MMMM DD, YYYY'}} + {{t 'Date Issued'}}: {{general-date this.model.issuedAt 'UTC' 'D MMM, YYYY'}}
- {{t 'Due Date'}}: {{general-date this.model.dueAt 'UTC' 'MMMM DD, YYYY'}} + {{t 'Due Date'}}: {{general-date this.model.dueAt 'UTC' 'D MMM, YYYY'}}
{{t 'Total Invoice Amount'}}: {{currency-symbol this.model.event.paymentCurrency}} {{format-money this.model.amount}} diff --git a/app/templates/explore.hbs b/app/templates/explore.hbs index 644fe1f289a..28d7231dcd5 100644 --- a/app/templates/explore.hbs +++ b/app/templates/explore.hbs @@ -25,13 +25,13 @@ {{/if}} {{#if this.filters.start_date}}
- {{moment-format this.filters.start_date 'ddd, MMM DD'}} + {{moment-format this.filters.start_date 'D MMM, YYYY'}}
{{/if}} {{#if this.filters.end_date}}
- {{moment-format this.filters.end_date 'ddd, MMM DD'}} + {{moment-format this.filters.end_date 'D MMM, YYYY'}}
{{/if}} diff --git a/app/templates/public/sessions.hbs b/app/templates/public/sessions.hbs index b48efb5bf59..bf5a2d4044e 100644 --- a/app/templates/public/sessions.hbs +++ b/app/templates/public/sessions.hbs @@ -3,7 +3,7 @@
{{t 'All'}} {{#each this.allDates as |date|}} - {{moment-format date 'ddd, MMM Do'}} + {{moment-format date 'D MMM, YYYY'}} {{/each}}