From 23e7c0f0059596100220d5eeae2bc120c8531d17 Mon Sep 17 00:00:00 2001 From: DIVYAM TAYAL Date: Wed, 25 Nov 2020 11:46:06 +0530 Subject: [PATCH 01/20] Start --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 593212e19da..92ca88394d5 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -GOOGLE_API_KEY="Sample Key" +GOOGLE_API_KEY="Sample Key " API_HOST=https://open-event-api-dev.herokuapp.com MAP_DISPLAY=embed FASTBOOT_DISABLED=true From 8760c75eb622b64126152e6d37f4434e1b35ddfa Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Wed, 25 Nov 2020 13:47:07 +0530 Subject: [PATCH 02/20] Changed to 24h --- app/helpers/general-date.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/helpers/general-date.js b/app/helpers/general-date.js index 8267fc3eae4..9f4abfc970c 100644 --- a/app/helpers/general-date.js +++ b/app/helpers/general-date.js @@ -3,7 +3,19 @@ import moment from 'moment'; export function generalDate(params) { const timezone = params[1] || moment.tz.guess(); - const format = params[2] || 'h:mm A, MMMM Do YYYY (z)'; + let changeTo24 = false; + + let format = params[2] || 'h:mm A, MMMM Do YYYY (z)'; + + if (moment(params[0]).tz(timezone).format('A') === 'AM' || moment(params[0]).tz(timezone).format('A') === 'PM') { + changeTo24 = true; + } + + if (changeTo24) { + format = format.replaceAll('h', 'H'); + format = format.replace('A', ''); + format = format.replace('a', ''); + } return moment(params[0]).tz(timezone).format(format); } From f07c128fe8ed514102948554a438035ca7f8d539 Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Wed, 25 Nov 2020 14:08:31 +0530 Subject: [PATCH 03/20] Changed to 24h-1 --- app/helpers/header-date.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/helpers/header-date.js b/app/helpers/header-date.js index 1aba6909981..f3d465a896c 100644 --- a/app/helpers/header-date.js +++ b/app/helpers/header-date.js @@ -3,7 +3,15 @@ import moment from 'moment'; export function headerDate(params) { const timezone = params[1] ? params[1] : moment.tz.guess(); - return `${moment(params[0]).tz(timezone).format('dddd, MMMM Do YYYY, h:mm A')} (${moment.tz(params[0], timezone).zoneAbbr()})`; + + let format = 'dddd, MMMM Do YYYY, h:mm A'; + + if (moment(params[0]).tz(timezone).format('A') === 'AM' || moment(params[0]).tz(timezone).format('A') === 'PM') { + format = format.replaceAll('h', 'H'); + format = format.replace('A', ''); + } + + return `${moment(params[0]).tz(timezone).format(format)} (${moment.tz(params[0], timezone).zoneAbbr()})`; } export default Helper.helper(headerDate); From 8c324bf39569aa4c2d2f56a263badffdd1329b74 Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Wed, 25 Nov 2020 14:46:58 +0530 Subject: [PATCH 04/20] Fix test --- app/helpers/general-date.js | 4 ++-- app/helpers/header-date.js | 4 ++-- tests/integration/helpers/general-date-test.js | 2 +- tests/integration/helpers/header-date-test.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/helpers/general-date.js b/app/helpers/general-date.js index 9f4abfc970c..e6bf1b80d12 100644 --- a/app/helpers/general-date.js +++ b/app/helpers/general-date.js @@ -13,8 +13,8 @@ export function generalDate(params) { if (changeTo24) { format = format.replaceAll('h', 'H'); - format = format.replace('A', ''); - format = format.replace('a', ''); + format = format.replace(' A', ''); + format = format.replace(' a', ''); } return moment(params[0]).tz(timezone).format(format); } diff --git a/app/helpers/header-date.js b/app/helpers/header-date.js index f3d465a896c..7775db77b45 100644 --- a/app/helpers/header-date.js +++ b/app/helpers/header-date.js @@ -8,9 +8,9 @@ export function headerDate(params) { if (moment(params[0]).tz(timezone).format('A') === 'AM' || moment(params[0]).tz(timezone).format('A') === 'PM') { format = format.replaceAll('h', 'H'); - format = format.replace('A', ''); + format = format.replace(' A', ''); } - + return `${moment(params[0]).tz(timezone).format(format)} (${moment.tz(params[0], timezone).zoneAbbr()})`; } diff --git a/tests/integration/helpers/general-date-test.js b/tests/integration/helpers/general-date-test.js index 3753064b465..8bbbc0dc2c4 100644 --- a/tests/integration/helpers/general-date-test.js +++ b/tests/integration/helpers/general-date-test.js @@ -11,6 +11,6 @@ module('Integration | Helper | general date', function(hooks) { this.set('inputMomentValue', moment('2019-05-01T03:30:00+09:00')); this.set('inputTimezoneValue', 'Japan'); await render(hbs`{{general-date inputMomentValue inputTimezoneValue}}`); - assert.equal(this.element.innerHTML.trim(), '3:30 AM, May 1st 2019 (JST)'); + assert.equal(this.element.innerHTML.trim(), '3:30, May 1st 2019 (JST)'); }); }); diff --git a/tests/integration/helpers/header-date-test.js b/tests/integration/helpers/header-date-test.js index 37d513ebb82..2218824a58c 100644 --- a/tests/integration/helpers/header-date-test.js +++ b/tests/integration/helpers/header-date-test.js @@ -11,6 +11,6 @@ module('Integration | Helper | header date', function(hooks) { this.set('inputMomentValue', moment('2019-05-01T03:30:00+09:00')); this.set('inputTimezoneValue', 'Japan'); await render(hbs`{{header-date inputMomentValue inputTimezoneValue}}`); - assert.equal(this.element.innerHTML.trim(), 'Wednesday, May 1st 2019, 3:30 AM (JST)'); + assert.equal(this.element.innerHTML.trim(), 'Wednesday, May 1st 2019, 3:30 (JST)'); }); }); From e71f3a18b8e74fee56cd253cd81d325c31754834 Mon Sep 17 00:00:00 2001 From: DIVYAM TAYAL Date: Wed, 25 Nov 2020 15:30:52 +0530 Subject: [PATCH 05/20] Update .env.example --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 92ca88394d5..593212e19da 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -GOOGLE_API_KEY="Sample Key " +GOOGLE_API_KEY="Sample Key" API_HOST=https://open-event-api-dev.herokuapp.com MAP_DISPLAY=embed FASTBOOT_DISABLED=true From 03aa56f271a4826da91809ce18631b56d0afb250 Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Wed, 25 Nov 2020 17:02:36 +0530 Subject: [PATCH 06/20] Improved Code --- app/helpers/general-date.js | 10 ++++------ app/helpers/header-date.js | 5 ++++- tests/integration/helpers/general-date-test.js | 2 +- tests/integration/helpers/header-date-test.js | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/helpers/general-date.js b/app/helpers/general-date.js index e6bf1b80d12..2a65a1f0d96 100644 --- a/app/helpers/general-date.js +++ b/app/helpers/general-date.js @@ -3,15 +3,13 @@ import moment from 'moment'; export function generalDate(params) { const timezone = params[1] || moment.tz.guess(); - let changeTo24 = false; - let format = params[2] || 'h:mm A, MMMM Do YYYY (z)'; + const locals = ['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']; + const local = moment(params[0]).tz(timezone).locale(); - if (moment(params[0]).tz(timezone).format('A') === 'AM' || moment(params[0]).tz(timezone).format('A') === 'PM') { - changeTo24 = true; - } + let format = params[2] || 'h:mm A, MMMM Do YYYY (z)'; - if (changeTo24) { + if (!locals.includes(local)) { format = format.replaceAll('h', 'H'); format = format.replace(' A', ''); format = format.replace(' a', ''); diff --git a/app/helpers/header-date.js b/app/helpers/header-date.js index 7775db77b45..85dfc62ef1f 100644 --- a/app/helpers/header-date.js +++ b/app/helpers/header-date.js @@ -4,9 +4,12 @@ import moment from 'moment'; export function headerDate(params) { const timezone = params[1] ? params[1] : moment.tz.guess(); + const locals = ['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']; + const local = moment(params[0]).tz(timezone).locale(); + let format = 'dddd, MMMM Do YYYY, h:mm A'; - if (moment(params[0]).tz(timezone).format('A') === 'AM' || moment(params[0]).tz(timezone).format('A') === 'PM') { + if (!locals.includes(local)) { format = format.replaceAll('h', 'H'); format = format.replace(' A', ''); } diff --git a/tests/integration/helpers/general-date-test.js b/tests/integration/helpers/general-date-test.js index 8bbbc0dc2c4..3753064b465 100644 --- a/tests/integration/helpers/general-date-test.js +++ b/tests/integration/helpers/general-date-test.js @@ -11,6 +11,6 @@ module('Integration | Helper | general date', function(hooks) { this.set('inputMomentValue', moment('2019-05-01T03:30:00+09:00')); this.set('inputTimezoneValue', 'Japan'); await render(hbs`{{general-date inputMomentValue inputTimezoneValue}}`); - assert.equal(this.element.innerHTML.trim(), '3:30, May 1st 2019 (JST)'); + assert.equal(this.element.innerHTML.trim(), '3:30 AM, May 1st 2019 (JST)'); }); }); diff --git a/tests/integration/helpers/header-date-test.js b/tests/integration/helpers/header-date-test.js index 2218824a58c..37d513ebb82 100644 --- a/tests/integration/helpers/header-date-test.js +++ b/tests/integration/helpers/header-date-test.js @@ -11,6 +11,6 @@ module('Integration | Helper | header date', function(hooks) { this.set('inputMomentValue', moment('2019-05-01T03:30:00+09:00')); this.set('inputTimezoneValue', 'Japan'); await render(hbs`{{header-date inputMomentValue inputTimezoneValue}}`); - assert.equal(this.element.innerHTML.trim(), 'Wednesday, May 1st 2019, 3:30 (JST)'); + assert.equal(this.element.innerHTML.trim(), 'Wednesday, May 1st 2019, 3:30 AM (JST)'); }); }); From f06a783cb558f49005163181e63fcca792dcfdee Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Wed, 25 Nov 2020 17:21:05 +0530 Subject: [PATCH 07/20] Improved code-1 --- app/helpers/general-date.js | 5 +++-- app/helpers/header-date.js | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/helpers/general-date.js b/app/helpers/general-date.js index 2a65a1f0d96..368d11a5bee 100644 --- a/app/helpers/general-date.js +++ b/app/helpers/general-date.js @@ -1,15 +1,16 @@ import Helper from '@ember/component/helper'; import moment from 'moment'; +const locales12Hours = new Set(['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']); + export function generalDate(params) { const timezone = params[1] || moment.tz.guess(); - const locals = ['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']; const local = moment(params[0]).tz(timezone).locale(); let format = params[2] || 'h:mm A, MMMM Do YYYY (z)'; - if (!locals.includes(local)) { + if (!locales12Hours.has(local)) { format = format.replaceAll('h', 'H'); format = format.replace(' A', ''); format = format.replace(' a', ''); diff --git a/app/helpers/header-date.js b/app/helpers/header-date.js index 85dfc62ef1f..ce124081df9 100644 --- a/app/helpers/header-date.js +++ b/app/helpers/header-date.js @@ -1,16 +1,17 @@ import Helper from '@ember/component/helper'; import moment from 'moment'; +const locales12Hours = new Set(['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']); + export function headerDate(params) { const timezone = params[1] ? params[1] : moment.tz.guess(); - const locals = ['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']; const local = moment(params[0]).tz(timezone).locale(); - let format = 'dddd, MMMM Do YYYY, h:mm A'; + let format = 'dddd, MMMM Do YYYY, hh:mm A'; - if (!locals.includes(local)) { - format = format.replaceAll('h', 'H'); + if (!locales12Hours.has(local)) { + format = format.replace('hh', 'HH'); format = format.replace(' A', ''); } From f2f5c6898c68c14434c6dbcacfd70cb7ddd7f2b2 Mon Sep 17 00:00:00 2001 From: DIVYAM TAYAL Date: Wed, 25 Nov 2020 17:33:41 +0530 Subject: [PATCH 08/20] code cleanup-1 --- app/helpers/header-date.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/header-date.js b/app/helpers/header-date.js index ce124081df9..7ec33074424 100644 --- a/app/helpers/header-date.js +++ b/app/helpers/header-date.js @@ -8,10 +8,10 @@ export function headerDate(params) { const local = moment(params[0]).tz(timezone).locale(); - let format = 'dddd, MMMM Do YYYY, hh:mm A'; + let format = 'dddd, MMMM Do YYYY, h:mm A'; if (!locales12Hours.has(local)) { - format = format.replace('hh', 'HH'); + format = format.replace('h', 'HH'); format = format.replace(' A', ''); } From 163699eebb9d9d6e4475bd52eb4ea035a731c5d9 Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Fri, 27 Nov 2020 09:55:28 +0530 Subject: [PATCH 09/20] Replace header-date with general-date --- app/helpers/general-date.js | 2 +- app/templates/components/event-invoice/event-info.hbs | 4 ++-- app/templates/components/orders/event-info.hbs | 4 ++-- app/templates/orders/expired.hbs | 2 +- app/templates/orders/new.hbs | 2 +- app/templates/orders/pending.hbs | 2 +- app/templates/orders/view.hbs | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/helpers/general-date.js b/app/helpers/general-date.js index 368d11a5bee..a55ff331cea 100644 --- a/app/helpers/general-date.js +++ b/app/helpers/general-date.js @@ -8,7 +8,7 @@ export function generalDate(params) { const local = moment(params[0]).tz(timezone).locale(); - let format = params[2] || 'h:mm A, MMMM Do YYYY (z)'; + let format = params[2] || 'dddd, D MMMM, YYYY h:mm A (z)'; if (!locales12Hours.has(local)) { format = format.replaceAll('h', 'H'); diff --git a/app/templates/components/event-invoice/event-info.hbs b/app/templates/components/event-invoice/event-info.hbs index 04301f1396b..a5a693dff8c 100644 --- a/app/templates/components/event-invoice/event-info.hbs +++ b/app/templates/components/event-invoice/event-info.hbs @@ -12,9 +12,9 @@
{{t 'At'}} {{this.event.locationName}}
- {{t 'From'}}: {{header-date this.event.startsAt}} + {{t 'From'}}: {{general-date this.event.startsAt}}
- {{t 'To'}}: {{header-date this.event.endsAt}} + {{t 'To'}}: {{general-date this.event.endsAt}} {{#if this.event.ownerName}}
{{t 'Organized By'}}: {{this.event.ownerName}} diff --git a/app/templates/components/orders/event-info.hbs b/app/templates/components/orders/event-info.hbs index d9068afcaac..f43e707b209 100644 --- a/app/templates/components/orders/event-info.hbs +++ b/app/templates/components/orders/event-info.hbs @@ -24,9 +24,9 @@ {{t 'Location or online event details to be announced'}} {{/if}}
- {{t 'From'}}: {{header-date this.data.event.startsAt}} + {{t 'From'}}: {{general-date this.data.event.startsAt}}
- {{t 'To'}}: {{header-date this.data.event.endsAt}} + {{t 'To'}}: {{general-date this.data.event.endsAt}} {{#if this.data.event.ownerName}}
{{t 'Organized By'}}: {{this.data.event.ownerName}} diff --git a/app/templates/orders/expired.hbs b/app/templates/orders/expired.hbs index 8d7a8b8b4a8..a65eab134d7 100644 --- a/app/templates/orders/expired.hbs +++ b/app/templates/orders/expired.hbs @@ -7,7 +7,7 @@
- {{header-date this.model.event.startsAt}} - {{header-date this.model.event.endsAt}} + {{general-date this.model.event.startsAt}} - {{general-date this.model.event.endsAt}}
{{this.model.event.locationName}}
diff --git a/app/templates/orders/new.hbs b/app/templates/orders/new.hbs index 905dcb9e68d..e936f683356 100644 --- a/app/templates/orders/new.hbs +++ b/app/templates/orders/new.hbs @@ -8,7 +8,7 @@
- {{header-date this.model.order.event.startsAt}} - {{header-date this.model.order.event.endsAt}} + {{general-date this.model.order.event.startsAt}} - {{general-date this.model.order.event.endsAt}}
{{this.model.order.event.locationName}}
diff --git a/app/templates/orders/pending.hbs b/app/templates/orders/pending.hbs index 89d974709de..ff16a4ea5c5 100644 --- a/app/templates/orders/pending.hbs +++ b/app/templates/orders/pending.hbs @@ -8,7 +8,7 @@
- {{header-date this.model.order.event.startsAt}} - {{header-date this.model.order.event.endsAt}} + {{general-date this.model.order.event.startsAt}} - {{general-date this.model.order.event.endsAt}}
{{this.model.order.event.locationName}}
diff --git a/app/templates/orders/view.hbs b/app/templates/orders/view.hbs index 015f66d2678..47cba805f40 100644 --- a/app/templates/orders/view.hbs +++ b/app/templates/orders/view.hbs @@ -7,7 +7,7 @@
- {{header-date this.model.order.event.startsAt}} - {{header-date this.model.order.event.endsAt}} + {{general-date this.model.order.event.startsAt}} - {{general-date this.model.order.event.endsAt}}
{{this.model.order.event.locationName}}
From ac4f96dc2263dd4e825a015405f512ef626b7c54 Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Fri, 27 Nov 2020 10:34:56 +0530 Subject: [PATCH 10/20] Replace moment-format with general-date --- app/templates/admin/sales/revenue.hbs | 2 +- app/templates/components/event-invoice/invoice-summary.hbs | 4 ++-- app/templates/components/footer-main.hbs | 2 +- app/templates/components/order-card.hbs | 2 +- app/templates/components/session-card.hbs | 2 +- app/templates/components/ui-table/cell/cell-simple-date.hbs | 2 +- app/templates/components/ui-table/cell/cell-validity.hbs | 4 ++-- .../ui-table/cell/events/view/tickets/attendees/cell-date.hbs | 4 ++-- .../cell/events/view/tickets/attendees/cell-order.hbs | 4 ++-- .../cell/events/view/tickets/discount-codes/cell-validity.hbs | 2 +- .../ui-table/cell/events/view/tickets/orders/cell-date.hbs | 4 ++-- .../ui-table/cell/events/view/tickets/orders/cell-order.hbs | 4 ++-- app/templates/explore.hbs | 4 ++-- app/templates/public/sessions.hbs | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/templates/admin/sales/revenue.hbs b/app/templates/admin/sales/revenue.hbs index 57eee655ea6..08f2e412d48 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 'D MMM, YYYY'}} + {{general-date 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 5c9f449ecea..416225341d0 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 'D MMM, YYYY'}} - {{moment-format this.data.completedAt 'D MMM, YYYY'}} + {{general-date this.data.issuedAt '' 'D MMM, YYYY'}} + {{general-date this.data.completedAt '' 'D MMM, YYYY'}} {{currency-symbol this.eventCurrency}} {{format-money this.data.amount}} diff --git a/app/templates/components/footer-main.hbs b/app/templates/components/footer-main.hbs index a3eff4d2305..fb9f45b5f36 100644 --- a/app/templates/components/footer-main.hbs +++ b/app/templates/components/footer-main.hbs @@ -105,7 +105,7 @@
- {{t 'Copyright'}} © {{moment-format (now) 'YYYY'}} {{this.settings.appName}} + {{t 'Copyright'}} © {{general-date (now) '' 'YYYY'}} {{this.settings.appName}} {{!-- Possible Page Values --}} {{t 'Terms'}} diff --git a/app/templates/components/order-card.hbs b/app/templates/components/order-card.hbs index 29fd63872d5..a8e48114cc8 100644 --- a/app/templates/components/order-card.hbs +++ b/app/templates/components/order-card.hbs @@ -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'}} {{general-date this.order.completedAt '' 'MMMM DD, YYYY h:mm A'}} {{/if}}
diff --git a/app/templates/components/session-card.hbs b/app/templates/components/session-card.hbs index fd5f277a698..d2b273ad2ef 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 'D MMM, YYYY h:mm A'}} + {{general-date 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 d20ed6b9c92..2c76574b5f3 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 "D MMM, YYYY h:mm A")}} + {{general-date 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 3a635dd506d..fdba41f392f 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 'D MMM, YYYY h:mm A'}} + {{general-date this.record '' 'D MMM, YYYY h:mm A'}}
To
- {{moment-format this.extraRecords.validTill 'D MMM, YYYY h:mm A'}} + {{general-date this.extraRecords.validTill '' 'D MMM, YYYY h:mm A'}} 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 index 9e60e1efee0..5fcbc35b480 100644 --- 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 @@ -1,5 +1,5 @@ {{#if (eq @record.status 'completed')}} - {{moment-format @record.completedAt "D MMM, YYYY h:mm A"}} + {{general-date @record.completedAt '' "D MMM, YYYY h:mm A"}} {{else}} - {{moment-format @record.createdAt "D MMM, YYYY h:mm A"}} + {{general-date @record.createdAt '' "D MMM, YYYY h: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 eb57e568238..9788f713dd6 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 @@ -10,10 +10,10 @@ {{/if}} {{#if (eq this.record.status 'completed')}} - {{moment-format this.record.completedAt 'D MMM, YYYY h:mm A'}} + {{general-date 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'}} + {{general-date 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 c49c0e47272..acf3f429f38 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 'D MMM, YYYY h:mm A'}} + {{general-date 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..03fb7cc0093 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'}} + {{general-date this.record '' 'MMMM DD, YYYY - hh:mm A'}}
{{else}}
- {{moment-format this.extraRecords.createdAt 'MMMM DD, YYYY - hh:mm A'}} + {{general-date this.extraRecords.createdAt '' 'MMMM DD, YYYY - hh: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 370b1ee8e13..c2f4ddabee8 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 @@ -13,9 +13,9 @@ {{/if}} {{#if this.extraRecords.completedAt}} - {{moment-format this.extraRecords.completedAt 'D MMM, YYYY h:mm A'}} {{moment-from-now this.extraRecords.completedAt}} + {{general-date 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}} + {{general-date this.extraRecords.createdAt '' 'D MMM, YYYY h:mm A'}} {{moment-from-now this.extraRecords.createdAt}} {{/if}}
diff --git a/app/templates/explore.hbs b/app/templates/explore.hbs index f8aa44fcdba..f5cbad5420e 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 'D MMM, YYYY'}} + {{general-date this.filters.start_date '' 'D MMM, YYYY'}}
{{/if}} {{#if this.filters.end_date}}
- {{moment-format this.filters.end_date 'D MMM, YYYY'}} + {{general-date this.filters.end_date '' 'D MMM, YYYY'}}
{{/if}} diff --git a/app/templates/public/sessions.hbs b/app/templates/public/sessions.hbs index b5c9786cb43..b84e09c33b9 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 'D MMM, YYYY'}} + {{general-date date '' 'D MMM, YYYY'}} {{/each}} Date: Fri, 27 Nov 2020 10:52:57 +0530 Subject: [PATCH 11/20] Fix and Improoved test --- tests/integration/helpers/general-date-test.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/integration/helpers/general-date-test.js b/tests/integration/helpers/general-date-test.js index 3753064b465..f880196603c 100644 --- a/tests/integration/helpers/general-date-test.js +++ b/tests/integration/helpers/general-date-test.js @@ -11,6 +11,8 @@ module('Integration | Helper | general date', function(hooks) { this.set('inputMomentValue', moment('2019-05-01T03:30:00+09:00')); this.set('inputTimezoneValue', 'Japan'); await render(hbs`{{general-date inputMomentValue inputTimezoneValue}}`); - assert.equal(this.element.innerHTML.trim(), '3:30 AM, May 1st 2019 (JST)'); + assert.equal(this.element.innerHTML.trim(), 'Wednesday, 1 May, 2019 3:30 AM (JST)'); + await render(hbs`{{general-date inputMomentValue '' 'D MMM, YYYY'}}`); + assert.equal(this.element.innerHTML.trim(), '1 May, 2019'); }); }); From b4647d745db732a58db93f318df1dc1e0de197a4 Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Fri, 27 Nov 2020 11:11:54 +0530 Subject: [PATCH 12/20] Improved Date format --- app/components/ui-table/cell/cell-date.hbs | 2 +- app/controllers/admin/messages/list.js | 2 +- app/controllers/admin/sessions/list.js | 2 +- app/templates/components/order-card.hbs | 2 +- .../ui-table/cell/events/view/tickets/orders/cell-date.hbs | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/components/ui-table/cell/cell-date.hbs b/app/components/ui-table/cell/cell-date.hbs index a70d6aef47d..25d9418c2de 100644 --- a/app/components/ui-table/cell/cell-date.hbs +++ b/app/components/ui-table/cell/cell-date.hbs @@ -1 +1 @@ -{{general-date @record @props.options.timezone @props.options.dateFormat}} +{{general-date @record @props.options.timezone '' @props.options.dateFormat}} 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/sessions/list.js b/app/controllers/admin/sessions/list.js index b020124090c..6801f9988fe 100644 --- a/app/controllers/admin/sessions/list.js +++ b/app/controllers/admin/sessions/list.js @@ -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/templates/components/order-card.hbs b/app/templates/components/order-card.hbs index a8e48114cc8..1d56fb6c5b3 100644 --- a/app/templates/components/order-card.hbs +++ b/app/templates/components/order-card.hbs @@ -46,7 +46,7 @@ #{{this.order.identifier}} {{#if this.order.completedAt}} - {{t 'on'}} {{general-date this.order.completedAt '' 'MMMM DD, YYYY h:mm A'}} + {{t 'on'}} {{general-date this.order.completedAt '' 'D MMM, YYYY h:mm A'}} {{/if}}
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 03fb7cc0093..9c85c9eb608 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}}
- {{general-date this.record '' 'MMMM DD, YYYY - hh:mm A'}} + {{general-date this.record '' 'D MMM, YYYY h:mm A'}}
{{else}}
- {{general-date this.extraRecords.createdAt '' 'MMMM DD, YYYY - hh:mm A'}} + {{general-date this.extraRecords.createdAt '' 'D MMM, YYYY h:mm A'}}
{{/if}} From ff36d5fc38ef1e800c8470d2e280f3619cd94949 Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Fri, 27 Nov 2020 11:15:28 +0530 Subject: [PATCH 13/20] Deleted header-date helper --- tests/integration/helpers/header-date-test.js | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 tests/integration/helpers/header-date-test.js diff --git a/tests/integration/helpers/header-date-test.js b/tests/integration/helpers/header-date-test.js deleted file mode 100644 index 37d513ebb82..00000000000 --- a/tests/integration/helpers/header-date-test.js +++ /dev/null @@ -1,16 +0,0 @@ -import { hbs } from 'ember-cli-htmlbars'; -import { module, test } from 'qunit'; -import { setupIntegrationTest } from 'open-event-frontend/tests/helpers/setup-integration-test'; -import { render } from '@ember/test-helpers'; -import moment from 'moment'; - -module('Integration | Helper | header date', function(hooks) { - setupIntegrationTest(hooks); - - test('it renders', async function(assert) { - this.set('inputMomentValue', moment('2019-05-01T03:30:00+09:00')); - this.set('inputTimezoneValue', 'Japan'); - await render(hbs`{{header-date inputMomentValue inputTimezoneValue}}`); - assert.equal(this.element.innerHTML.trim(), 'Wednesday, May 1st 2019, 3:30 AM (JST)'); - }); -}); From 888122f5256556aac9cd58996e20b09a39e257bf Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Fri, 27 Nov 2020 11:27:22 +0530 Subject: [PATCH 14/20] Fixed Test --- tests/integration/helpers/general-date-test.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/integration/helpers/general-date-test.js b/tests/integration/helpers/general-date-test.js index f880196603c..a0d80c11ed8 100644 --- a/tests/integration/helpers/general-date-test.js +++ b/tests/integration/helpers/general-date-test.js @@ -12,7 +12,5 @@ module('Integration | Helper | general date', function(hooks) { this.set('inputTimezoneValue', 'Japan'); await render(hbs`{{general-date inputMomentValue inputTimezoneValue}}`); assert.equal(this.element.innerHTML.trim(), 'Wednesday, 1 May, 2019 3:30 AM (JST)'); - await render(hbs`{{general-date inputMomentValue '' 'D MMM, YYYY'}}`); - assert.equal(this.element.innerHTML.trim(), '1 May, 2019'); }); }); From 64bde572616e134d457624cadd795247014b934a Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Fri, 27 Nov 2020 12:21:17 +0530 Subject: [PATCH 15/20] Revert default format --- app/helpers/general-date.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/general-date.js b/app/helpers/general-date.js index a55ff331cea..368d11a5bee 100644 --- a/app/helpers/general-date.js +++ b/app/helpers/general-date.js @@ -8,7 +8,7 @@ export function generalDate(params) { const local = moment(params[0]).tz(timezone).locale(); - let format = params[2] || 'dddd, D MMMM, YYYY h:mm A (z)'; + let format = params[2] || 'h:mm A, MMMM Do YYYY (z)'; if (!locales12Hours.has(local)) { format = format.replaceAll('h', 'H'); From 70f296c2e0ea545ad83893090bdf2c2da817e503 Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Fri, 27 Nov 2020 16:07:33 +0530 Subject: [PATCH 16/20] Revert changes --- app/components/ui-table/cell/cell-date.hbs | 2 +- app/helpers/test.js | 29 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 app/helpers/test.js diff --git a/app/components/ui-table/cell/cell-date.hbs b/app/components/ui-table/cell/cell-date.hbs index 25d9418c2de..a70d6aef47d 100644 --- a/app/components/ui-table/cell/cell-date.hbs +++ b/app/components/ui-table/cell/cell-date.hbs @@ -1 +1 @@ -{{general-date @record @props.options.timezone '' @props.options.dateFormat}} +{{general-date @record @props.options.timezone @props.options.dateFormat}} diff --git a/app/helpers/test.js b/app/helpers/test.js new file mode 100644 index 00000000000..2fc24b0bfef --- /dev/null +++ b/app/helpers/test.js @@ -0,0 +1,29 @@ +import Helper from '@ember/component/helper'; +import moment from 'moment'; + +const locales12Hours = new Set(['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']); + +export function generalDate(params) { + const timezone = params[1] || moment.tz.guess(); + const reg = new RegExp('[+-]?[0-9]+'); + const local = moment(params[0]).tz(timezone).locale(); + + let format = params[2] || 'dddd, D MMMM, YYYY h:mm A (z)'; + + if (!locales12Hours.has(local)) { + format = format.replaceAll('h', 'H'); + format = format.replace(' A', ''); + format = format.replace(' a', ''); + } + + let dateTime = moment(params[0]).tz(timezone).format(format); + const z = moment(params[0]).tz(timezone).format('z'); + + if (reg.test(z)) { + dateTime = dateTime.replace(z, timezone); + } + + return dateTime; +} + +export default Helper.helper(generalDate); From fe0a54245e622ea8d13007a81f7b18dfd332185c Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Fri, 27 Nov 2020 16:08:49 +0530 Subject: [PATCH 17/20] Revert "Revert changes" This reverts commit 70f296c2e0ea545ad83893090bdf2c2da817e503. --- app/components/ui-table/cell/cell-date.hbs | 2 +- app/helpers/test.js | 29 ---------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 app/helpers/test.js diff --git a/app/components/ui-table/cell/cell-date.hbs b/app/components/ui-table/cell/cell-date.hbs index a70d6aef47d..25d9418c2de 100644 --- a/app/components/ui-table/cell/cell-date.hbs +++ b/app/components/ui-table/cell/cell-date.hbs @@ -1 +1 @@ -{{general-date @record @props.options.timezone @props.options.dateFormat}} +{{general-date @record @props.options.timezone '' @props.options.dateFormat}} diff --git a/app/helpers/test.js b/app/helpers/test.js deleted file mode 100644 index 2fc24b0bfef..00000000000 --- a/app/helpers/test.js +++ /dev/null @@ -1,29 +0,0 @@ -import Helper from '@ember/component/helper'; -import moment from 'moment'; - -const locales12Hours = new Set(['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']); - -export function generalDate(params) { - const timezone = params[1] || moment.tz.guess(); - const reg = new RegExp('[+-]?[0-9]+'); - const local = moment(params[0]).tz(timezone).locale(); - - let format = params[2] || 'dddd, D MMMM, YYYY h:mm A (z)'; - - if (!locales12Hours.has(local)) { - format = format.replaceAll('h', 'H'); - format = format.replace(' A', ''); - format = format.replace(' a', ''); - } - - let dateTime = moment(params[0]).tz(timezone).format(format); - const z = moment(params[0]).tz(timezone).format('z'); - - if (reg.test(z)) { - dateTime = dateTime.replace(z, timezone); - } - - return dateTime; -} - -export default Helper.helper(generalDate); From d6909bf24446ef3e7b295e1530da480346c62abc Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Fri, 27 Nov 2020 16:09:56 +0530 Subject: [PATCH 18/20] Finalizing the PR --- app/components/ui-table/cell/cell-date.hbs | 2 +- tests/integration/helpers/general-date-test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/ui-table/cell/cell-date.hbs b/app/components/ui-table/cell/cell-date.hbs index 25d9418c2de..a70d6aef47d 100644 --- a/app/components/ui-table/cell/cell-date.hbs +++ b/app/components/ui-table/cell/cell-date.hbs @@ -1 +1 @@ -{{general-date @record @props.options.timezone '' @props.options.dateFormat}} +{{general-date @record @props.options.timezone @props.options.dateFormat}} diff --git a/tests/integration/helpers/general-date-test.js b/tests/integration/helpers/general-date-test.js index a0d80c11ed8..3753064b465 100644 --- a/tests/integration/helpers/general-date-test.js +++ b/tests/integration/helpers/general-date-test.js @@ -11,6 +11,6 @@ module('Integration | Helper | general date', function(hooks) { this.set('inputMomentValue', moment('2019-05-01T03:30:00+09:00')); this.set('inputTimezoneValue', 'Japan'); await render(hbs`{{general-date inputMomentValue inputTimezoneValue}}`); - assert.equal(this.element.innerHTML.trim(), 'Wednesday, 1 May, 2019 3:30 AM (JST)'); + assert.equal(this.element.innerHTML.trim(), '3:30 AM, May 1st 2019 (JST)'); }); }); From fdc6fc0277fd26d168be0f56aacf58b546a7890c Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Fri, 27 Nov 2020 16:14:39 +0530 Subject: [PATCH 19/20] Deleted header-date helper --- app/helpers/header-date.js | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 app/helpers/header-date.js diff --git a/app/helpers/header-date.js b/app/helpers/header-date.js deleted file mode 100644 index 7ec33074424..00000000000 --- a/app/helpers/header-date.js +++ /dev/null @@ -1,21 +0,0 @@ -import Helper from '@ember/component/helper'; -import moment from 'moment'; - -const locales12Hours = new Set(['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']); - -export function headerDate(params) { - const timezone = params[1] ? params[1] : moment.tz.guess(); - - const local = moment(params[0]).tz(timezone).locale(); - - let format = 'dddd, MMMM Do YYYY, h:mm A'; - - if (!locales12Hours.has(local)) { - format = format.replace('h', 'HH'); - format = format.replace(' A', ''); - } - - return `${moment(params[0]).tz(timezone).format(format)} (${moment.tz(params[0], timezone).zoneAbbr()})`; -} - -export default Helper.helper(headerDate); From fe1151ac37eabb8243ecc973cf5c1c573057a23f Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Sat, 28 Nov 2020 01:22:12 +0530 Subject: [PATCH 20/20] Added format for all replaced header-date --- app/templates/components/event-invoice/event-info.hbs | 4 ++-- app/templates/components/orders/event-info.hbs | 4 ++-- app/templates/orders/expired.hbs | 2 +- app/templates/orders/new.hbs | 2 +- app/templates/orders/pending.hbs | 2 +- app/templates/orders/view.hbs | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/templates/components/event-invoice/event-info.hbs b/app/templates/components/event-invoice/event-info.hbs index a5a693dff8c..0e8854f3f43 100644 --- a/app/templates/components/event-invoice/event-info.hbs +++ b/app/templates/components/event-invoice/event-info.hbs @@ -12,9 +12,9 @@
{{t 'At'}} {{this.event.locationName}}
- {{t 'From'}}: {{general-date this.event.startsAt}} + {{t 'From'}}: {{general-date this.event.startsAt '' 'dddd, D MMMM, YYYY h:mm A'}}
- {{t 'To'}}: {{general-date this.event.endsAt}} + {{t 'To'}}: {{general-date this.event.endsAt '' 'dddd, D MMMM, YYYY h:mm A'}} {{#if this.event.ownerName}}
{{t 'Organized By'}}: {{this.event.ownerName}} diff --git a/app/templates/components/orders/event-info.hbs b/app/templates/components/orders/event-info.hbs index f43e707b209..872f1404804 100644 --- a/app/templates/components/orders/event-info.hbs +++ b/app/templates/components/orders/event-info.hbs @@ -24,9 +24,9 @@ {{t 'Location or online event details to be announced'}} {{/if}}
- {{t 'From'}}: {{general-date this.data.event.startsAt}} + {{t 'From'}}: {{general-date this.data.event.startsAt '' 'dddd, D MMMM, YYYY h:mm A'}}
- {{t 'To'}}: {{general-date this.data.event.endsAt}} + {{t 'To'}}: {{general-date this.data.event.endsAt '' 'dddd, D MMMM, YYYY h:mm A'}} {{#if this.data.event.ownerName}}
{{t 'Organized By'}}: {{this.data.event.ownerName}} diff --git a/app/templates/orders/expired.hbs b/app/templates/orders/expired.hbs index a65eab134d7..cbd6bd4fd97 100644 --- a/app/templates/orders/expired.hbs +++ b/app/templates/orders/expired.hbs @@ -7,7 +7,7 @@
- {{general-date this.model.event.startsAt}} - {{general-date this.model.event.endsAt}} + {{general-date this.model.event.startsAt '' 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.event.endsAt '' 'dddd, D MMMM, YYYY h:mm A'}}
{{this.model.event.locationName}}
diff --git a/app/templates/orders/new.hbs b/app/templates/orders/new.hbs index e936f683356..58c640a859d 100644 --- a/app/templates/orders/new.hbs +++ b/app/templates/orders/new.hbs @@ -8,7 +8,7 @@
- {{general-date this.model.order.event.startsAt}} - {{general-date this.model.order.event.endsAt}} + {{general-date this.model.order.event.startsAt '' 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.order.event.endsAt '' 'dddd, D MMMM, YYYY h:mm A'}}
{{this.model.order.event.locationName}}
diff --git a/app/templates/orders/pending.hbs b/app/templates/orders/pending.hbs index ff16a4ea5c5..7708eb128c4 100644 --- a/app/templates/orders/pending.hbs +++ b/app/templates/orders/pending.hbs @@ -8,7 +8,7 @@
- {{general-date this.model.order.event.startsAt}} - {{general-date this.model.order.event.endsAt}} + {{general-date this.model.order.event.startsAt '' 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.order.event.endsAt '' 'dddd, D MMMM, YYYY h:mm A'}}
{{this.model.order.event.locationName}}
diff --git a/app/templates/orders/view.hbs b/app/templates/orders/view.hbs index 47cba805f40..c0e4fd448bc 100644 --- a/app/templates/orders/view.hbs +++ b/app/templates/orders/view.hbs @@ -7,7 +7,7 @@
- {{general-date this.model.order.event.startsAt}} - {{general-date this.model.order.event.endsAt}} + {{general-date this.model.order.event.startsAt '' 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.order.event.endsAt '' 'dddd, D MMMM, YYYY h:mm A'}}
{{this.model.order.event.locationName}}