From fce9075d9c7b677075e8afc5553bc2db1ad3b75b Mon Sep 17 00:00:00 2001 From: kushthedude Date: Wed, 3 Jul 2019 00:23:52 +0530 Subject: [PATCH 1/6] Moving Order_Expiry_Time into Admin/Settings --- .../forms/admin/settings/system-form.js | 9 +++++++++ .../admin/settings/system/captcha-form.js | 1 + .../admin/settings/system/order-expiry-form.js | 4 ++++ app/components/forms/events/view/order-form.js | 18 ------------------ app/components/forms/orders/order-form.js | 4 ++-- app/controllers/admin/settings/index.js | 1 + app/models/event.js | 1 - app/models/setting.js | 1 + app/routes/admin/settings/index.js | 3 +++ .../forms/admin/settings/system-form.hbs | 2 ++ .../settings/system/order-expiry-form.hbs | 12 ++++++++++++ .../forms/events/view/order-form.hbs | 12 ------------ .../components/forms/orders/order-form.hbs | 4 ++-- .../components/forms/wizard/attendee-step.hbs | 12 ------------ app/templates/orders/new.hbs | 2 +- 15 files changed, 38 insertions(+), 48 deletions(-) create mode 100644 app/components/forms/admin/settings/system/order-expiry-form.js create mode 100644 app/templates/components/forms/admin/settings/system/order-expiry-form.hbs diff --git a/app/components/forms/admin/settings/system-form.js b/app/components/forms/admin/settings/system-form.js index cf0b6f1e382..c165e718185 100644 --- a/app/components/forms/admin/settings/system-form.js +++ b/app/components/forms/admin/settings/system-form.js @@ -109,6 +109,15 @@ export default Component.extend(FormMixin, { ] }, + orderExpiryTime: { + identifier : 'order_expiry_time', + rules : [ + { + type : 'empty', + prompt : this.l10n.t('Please enter a Expiry Time for Order') + }] + }, + googlereCAPTCHAsecretkey: { identifier : 'google_recaptcha_secretkey', rules : [ diff --git a/app/components/forms/admin/settings/system/captcha-form.js b/app/components/forms/admin/settings/system/captcha-form.js index bb93d73f350..8be82b680ae 100644 --- a/app/components/forms/admin/settings/system/captcha-form.js +++ b/app/components/forms/admin/settings/system/captcha-form.js @@ -1,4 +1,5 @@ import Component from '@ember/component'; export default Component.extend({ + }); diff --git a/app/components/forms/admin/settings/system/order-expiry-form.js b/app/components/forms/admin/settings/system/order-expiry-form.js new file mode 100644 index 00000000000..bb93d73f350 --- /dev/null +++ b/app/components/forms/admin/settings/system/order-expiry-form.js @@ -0,0 +1,4 @@ +import Component from '@ember/component'; + +export default Component.extend({ +}); diff --git a/app/components/forms/events/view/order-form.js b/app/components/forms/events/view/order-form.js index 021640ba701..8f2a2f8e8e6 100644 --- a/app/components/forms/events/view/order-form.js +++ b/app/components/forms/events/view/order-form.js @@ -2,24 +2,6 @@ import Component from '@ember/component'; import FormMixin from 'open-event-frontend/mixins/form'; export default Component.extend(FormMixin, { - getValidationRules() { - return { - inline : true, - delay : false, - on : 'blur', - fields : { - orderExpiryTime: { - identifier : 'orderExpiryTime', - rules : [ - { - type : 'integer[1..60]', - prompt : this.l10n.t('Please enter a valid registration time limit between 1 to 60 minutes.') - } - ] - } - } - }; - }, actions: { submit(data) { this.onValid(() => { diff --git a/app/components/forms/orders/order-form.js b/app/components/forms/orders/order-form.js index afacef2ebb5..b7f45486330 100644 --- a/app/components/forms/orders/order-form.js +++ b/app/components/forms/orders/order-form.js @@ -37,8 +37,8 @@ export default Component.extend(FormMixin, { }), sameAsBuyer: false, - getRemainingTime: computed('data', function() { - let orderExpiryTime = this.get('data.event.orderExpiryTime'); + getRemainingTime: computed('settings', function() { + let orderExpiryTime = this.get('settings.orderExpiryTime'); let willExpireAt = this.get('data.createdAt').add(orderExpiryTime, 'minutes'); this.timer(willExpireAt, this.get('data.identifier')); }), diff --git a/app/controllers/admin/settings/index.js b/app/controllers/admin/settings/index.js index 71f90573c46..da55f5ca4ea 100644 --- a/app/controllers/admin/settings/index.js +++ b/app/controllers/admin/settings/index.js @@ -8,6 +8,7 @@ export default Controller.extend({ settings.save() .then(() => { this.notify.success(this.l10n.t('Settings have been saved successfully.')); + this.send('refreshRoute'); }) .catch(() => { this.notify.error(this.l10n.t('An unexpected error has occurred. Settings not saved.')); diff --git a/app/models/event.js b/app/models/event.js index 0ffdb23bd1c..e2de0c25dd6 100644 --- a/app/models/event.js +++ b/app/models/event.js @@ -67,7 +67,6 @@ export default ModelBase.extend(CustomPrimaryKeyMixin, { chequeDetails : attr('string'), bankDetails : attr('string'), onsiteDetails : attr('string'), - orderExpiryTime : attr('number', { defaultValue: 10 }), schedulePublishedOn: attr('moment', { defaultValue: () => moment(0) }), diff --git a/app/models/setting.js b/app/models/setting.js index b228b8f5a25..d7e8f6f59e7 100644 --- a/app/models/setting.js +++ b/app/models/setting.js @@ -11,6 +11,7 @@ export default ModelBase.extend({ appEnvironment : attr('string'), appName : attr('string'), tagline : attr('string'), + orderExpiryTime : attr('number', { defaultValue: 15 }), secret : attr('string'), storagePlace : attr('string'), awsKey : attr('string'), diff --git a/app/routes/admin/settings/index.js b/app/routes/admin/settings/index.js index 7f559df5cfd..de1567e08f5 100644 --- a/app/routes/admin/settings/index.js +++ b/app/routes/admin/settings/index.js @@ -7,6 +7,9 @@ export default Route.extend({ actions: { willTransition() { this.get('controller.model').rollbackAttributes(); + }, + refreshRoute() { + this.refresh(); } } }); diff --git a/app/templates/components/forms/admin/settings/system-form.hbs b/app/templates/components/forms/admin/settings/system-form.hbs index ad6d0c49f09..da6a1ef5b6f 100644 --- a/app/templates/components/forms/admin/settings/system-form.hbs +++ b/app/templates/components/forms/admin/settings/system-form.hbs @@ -41,6 +41,8 @@ {{forms/admin/settings/system/mail-settings settings=settings}} + {{forms/admin/settings/system/order-expiry-form settings=settings}} +

{{t 'App secret key'}}
diff --git a/app/templates/components/forms/admin/settings/system/order-expiry-form.hbs b/app/templates/components/forms/admin/settings/system/order-expiry-form.hbs new file mode 100644 index 00000000000..c724039b2f9 --- /dev/null +++ b/app/templates/components/forms/admin/settings/system/order-expiry-form.hbs @@ -0,0 +1,12 @@ +

+ {{t 'Order Expiry Time'}} +
+ {{t 'Set registration time limit for your order'}} +
+

+
+ +
+ {{input type='number' id='orderExpiryTime' name='order_expiry_time' value=settings.orderExpiryTime min="1" max="60" step="1"}} +
+
\ No newline at end of file diff --git a/app/templates/components/forms/events/view/order-form.hbs b/app/templates/components/forms/events/view/order-form.hbs index 8197eb88567..593f5ca4c8a 100644 --- a/app/templates/components/forms/events/view/order-form.hbs +++ b/app/templates/components/forms/events/view/order-form.hbs @@ -55,18 +55,6 @@
-

- -
- {{t 'Registration Options'}} -
-

-
- -
- {{input type='number' id='orderExpiryTime' value=data.event.orderExpiryTime min="1" max="60" step="1"}} -
-
diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs index 8d25987d3d4..55119928c32 100644 --- a/app/templates/components/forms/orders/order-form.hbs +++ b/app/templates/components/forms/orders/order-form.hbs @@ -9,9 +9,9 @@ {{getRemainingTime}}
- {{t 'Please complete registration within '}} {{data.event.orderExpiryTime}} {{t 'minutes.'}} + {{t 'Please complete registration within '}} {{settings.orderExpiryTime}} {{t 'minutes.'}}
- {{t 'After '}} {{data.event.orderExpiryTime}} {{t 'minutes, the reservation we\'re holding will be released to others.'}} + {{t 'After '}} {{settings.orderExpiryTime}} {{t 'minutes, the reservation we\'re holding will be released to others.'}}
diff --git a/app/templates/components/forms/wizard/attendee-step.hbs b/app/templates/components/forms/wizard/attendee-step.hbs index ee6003a32fe..39e3f134699 100644 --- a/app/templates/components/forms/wizard/attendee-step.hbs +++ b/app/templates/components/forms/wizard/attendee-step.hbs @@ -81,18 +81,6 @@ -

- -
- {{t 'Registration Options'}} -
-

-
- -
- {{input type='number' id='orderExpiryTime' value=data.event.orderExpiryTime min="1" max="60" step="1"}} -
-
{{/if}}
diff --git a/app/templates/orders/new.hbs b/app/templates/orders/new.hbs index 8826d61f67b..8a4d301160f 100644 --- a/app/templates/orders/new.hbs +++ b/app/templates/orders/new.hbs @@ -28,7 +28,7 @@
- {{forms/orders/order-form save='save' data=model.order fields=model.form}} + {{forms/orders/order-form save='save' data=model.order fields=model.form settings=settings}}
{{#if model.order.event.organizerName}} From 3516c9f07b86ce5e661d64abf02994d5b1f49b2c Mon Sep 17 00:00:00 2001 From: kushthedude Date: Wed, 3 Jul 2019 13:29:33 +0530 Subject: [PATCH 2/6] Removing Block Letter --- .../forms/admin/settings/system/order-expiry-form.hbs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/components/forms/admin/settings/system/order-expiry-form.hbs b/app/templates/components/forms/admin/settings/system/order-expiry-form.hbs index c724039b2f9..b4d5d1ebb75 100644 --- a/app/templates/components/forms/admin/settings/system/order-expiry-form.hbs +++ b/app/templates/components/forms/admin/settings/system/order-expiry-form.hbs @@ -1,12 +1,12 @@

{{t 'Order Expiry Time'}}
- {{t 'Set registration time limit for your order'}} + {{t 'Set registration time limit for your order in minutes'}}

- -
+ +
{{input type='number' id='orderExpiryTime' name='order_expiry_time' value=settings.orderExpiryTime min="1" max="60" step="1"}}
\ No newline at end of file From 979d63bcd6d2bd1947e174740e34b0fa44ab38fb Mon Sep 17 00:00:00 2001 From: kushthedude Date: Wed, 3 Jul 2019 13:57:45 +0530 Subject: [PATCH 3/6] Travis Issue --- .../settings/system/order-expiry-form-test.js | 16 ++++++++++++++++ .../forms/events/view/order-form-test.js | 5 ++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 tests/integration/components/forms/admin/settings/system/order-expiry-form-test.js diff --git a/tests/integration/components/forms/admin/settings/system/order-expiry-form-test.js b/tests/integration/components/forms/admin/settings/system/order-expiry-form-test.js new file mode 100644 index 00000000000..48772518ee3 --- /dev/null +++ b/tests/integration/components/forms/admin/settings/system/order-expiry-form-test.js @@ -0,0 +1,16 @@ +import { module, test } from 'qunit'; +import { setupRenderingTest } from 'ember-qunit'; +import { render } from '@ember/test-helpers'; +import hbs from 'htmlbars-inline-precompile'; + +module('Integration | Component | forms/admin/settings/system/order-expiry-form', function(hooks) { + setupRenderingTest(hooks); + + test('it renders', async function(assert) { + + await render(hbs`{{forms/admin/settings/system/order-expiry-form}}`); + + assert.ok(this.element.innerHTML.trim().includes('Order Expiry Time')); + + }); +}); diff --git a/tests/integration/components/forms/events/view/order-form-test.js b/tests/integration/components/forms/events/view/order-form-test.js index 65b094eb8c5..f9984f5461b 100644 --- a/tests/integration/components/forms/events/view/order-form-test.js +++ b/tests/integration/components/forms/events/view/order-form-test.js @@ -10,9 +10,8 @@ module('Integration | Component | forms/events/view/order-form', function(hooks) test('it renders', async function(assert) { let event = EmberObject.create({ - id : 123, - identifier : 'abc123', - orderExpiryTime : 10 + id : 123, + identifier : 'abc123' }); let customForms = A(); From 395d2014e17bc9d15d07e216cefa3f796231fa7d Mon Sep 17 00:00:00 2001 From: kushthedude Date: Wed, 3 Jul 2019 18:55:26 +0530 Subject: [PATCH 4/6] Travis Issue --- .../integration/components/forms/events/view/order-form-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/components/forms/events/view/order-form-test.js b/tests/integration/components/forms/events/view/order-form-test.js index f9984f5461b..808a86a015d 100644 --- a/tests/integration/components/forms/events/view/order-form-test.js +++ b/tests/integration/components/forms/events/view/order-form-test.js @@ -32,6 +32,6 @@ module('Integration | Component | forms/events/view/order-form', function(hooks) await render(hbs`{{forms/events/view/order-form data=data}}`); - assert.ok(this.element.innerHTML.trim().includes('Registration')); + assert.ok(this.element.innerHTML.trim().includes('Information')); }); }); From eaf1b1ba4eabc72e81559167f00c560b6d865cf4 Mon Sep 17 00:00:00 2001 From: kushthedude Date: Wed, 3 Jul 2019 22:22:35 +0530 Subject: [PATCH 5/6] Defining settings --- app/controllers/admin/settings/index.js | 1 - app/routes/admin/settings/index.js | 3 --- app/routes/orders/new.js | 3 ++- app/templates/orders/new.hbs | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/settings/index.js b/app/controllers/admin/settings/index.js index da55f5ca4ea..71f90573c46 100644 --- a/app/controllers/admin/settings/index.js +++ b/app/controllers/admin/settings/index.js @@ -8,7 +8,6 @@ export default Controller.extend({ settings.save() .then(() => { this.notify.success(this.l10n.t('Settings have been saved successfully.')); - this.send('refreshRoute'); }) .catch(() => { this.notify.error(this.l10n.t('An unexpected error has occurred. Settings not saved.')); diff --git a/app/routes/admin/settings/index.js b/app/routes/admin/settings/index.js index de1567e08f5..7f559df5cfd 100644 --- a/app/routes/admin/settings/index.js +++ b/app/routes/admin/settings/index.js @@ -7,9 +7,6 @@ export default Route.extend({ actions: { willTransition() { this.get('controller.model').rollbackAttributes(); - }, - refreshRoute() { - this.refresh(); } } }); diff --git a/app/routes/orders/new.js b/app/routes/orders/new.js index cf8b8235e00..bfc585af279 100644 --- a/app/routes/orders/new.js +++ b/app/routes/orders/new.js @@ -35,7 +35,8 @@ export default Route.extend({ form : await eventDetails.query('customForms', { 'page[size]' : 50, sort : 'id' - }) + }), + settings: await this.store.queryRecord('setting', {}) }; }, diff --git a/app/templates/orders/new.hbs b/app/templates/orders/new.hbs index 8a4d301160f..b58716f5ea7 100644 --- a/app/templates/orders/new.hbs +++ b/app/templates/orders/new.hbs @@ -28,7 +28,7 @@
- {{forms/orders/order-form save='save' data=model.order fields=model.form settings=settings}} + {{forms/orders/order-form save='save' data=model.order fields=model.form settings=model.settings}}
{{#if model.order.event.organizerName}} From ef61d613b999533b432b0c78851d267f55327e1d Mon Sep 17 00:00:00 2001 From: kushthedude Date: Fri, 5 Jul 2019 15:51:31 +0530 Subject: [PATCH 6/6] Using already injected services --- app/components/forms/admin/settings/system/captcha-form.js | 4 ++-- .../forms/admin/settings/system/order-expiry-form.js | 5 +++-- app/routes/orders/new.js | 3 +-- app/templates/orders/new.hbs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/components/forms/admin/settings/system/captcha-form.js b/app/components/forms/admin/settings/system/captcha-form.js index 8be82b680ae..c9dedd35d0c 100644 --- a/app/components/forms/admin/settings/system/captcha-form.js +++ b/app/components/forms/admin/settings/system/captcha-form.js @@ -1,5 +1,5 @@ import Component from '@ember/component'; -export default Component.extend({ +export default class extends Component { -}); +} \ No newline at end of file diff --git a/app/components/forms/admin/settings/system/order-expiry-form.js b/app/components/forms/admin/settings/system/order-expiry-form.js index bb93d73f350..7822b3c17a3 100644 --- a/app/components/forms/admin/settings/system/order-expiry-form.js +++ b/app/components/forms/admin/settings/system/order-expiry-form.js @@ -1,4 +1,5 @@ import Component from '@ember/component'; -export default Component.extend({ -}); +export default class extends Component { + +} diff --git a/app/routes/orders/new.js b/app/routes/orders/new.js index bfc585af279..cf8b8235e00 100644 --- a/app/routes/orders/new.js +++ b/app/routes/orders/new.js @@ -35,8 +35,7 @@ export default Route.extend({ form : await eventDetails.query('customForms', { 'page[size]' : 50, sort : 'id' - }), - settings: await this.store.queryRecord('setting', {}) + }) }; }, diff --git a/app/templates/orders/new.hbs b/app/templates/orders/new.hbs index fc1fd200ca2..9576c2a3def 100644 --- a/app/templates/orders/new.hbs +++ b/app/templates/orders/new.hbs @@ -28,7 +28,7 @@
- {{forms/orders/order-form save='save' data=model.order fields=model.form settings=model.settings}} + {{forms/orders/order-form save='save' data=model.order fields=model.form settings=settings}}
{{#if model.order.event.ownerName}}