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..c9dedd35d0c 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({ -}); +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 new file mode 100644 index 00000000000..7822b3c17a3 --- /dev/null +++ b/app/components/forms/admin/settings/system/order-expiry-form.js @@ -0,0 +1,5 @@ +import Component from '@ember/component'; + +export default class extends Component { + +} 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 d7c4e166e6e..b2519350e17 100644 --- a/app/components/forms/orders/order-form.js +++ b/app/components/forms/orders/order-form.js @@ -38,8 +38,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/models/event.js b/app/models/event.js index 7efe42b80f4..8825b85ae63 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/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..b4d5d1ebb75 --- /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 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 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 a0ffdf4215b..00b51ef2d29 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 cc43ccc6eaf..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}} + {{forms/orders/order-form save='save' data=model.order fields=model.form settings=settings}}
{{#if model.order.event.ownerName}} 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..808a86a015d 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(); @@ -33,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')); }); });