enh: Moving Order_Expiry_Time into Admin/Settings (#3283)

kushthedude · shreyanshdwivedi · commit b0bcbf236834 · 2019-08-14T23:24:19.000+05:30
* Order Expiry in Settings Model

* Update setting.js

* Update setting.js
diff --git 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      : [
@@ -216,4 +225,4 @@ export default Component.extend(FormMixin, {
       });
     }
   }
-});
+});
diff --git 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 {
+
+}
diff --git a/app/components/forms/admin/settings/system/order-expiry-form.js 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/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'));
   }),
@@ -490,4 +490,4 @@ export default Component.extend(FormMixin, {
       }
     }
   }
-});
+});
diff --git a/app/models/event.js b/app/models/event.js
@@ -67,7 +67,7 @@ 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
@@ -8,8 +8,10 @@ export default ModelBase.extend({
    * Attributes
    */
 
+
   appEnvironment             : attr('string'),
   appName                    : attr('string'),
+  orderExpiryTime            : attr('number', { defaultValue: 15 }),
   tagline                    : attr('string'),
   secret                     : attr('string'),
   storagePlace               : attr('string'),
@@ -94,6 +96,7 @@ export default ModelBase.extend({
   isGoogleRecaptchaEnabled   : attr('boolean', { defaultValue: false }),
   googleRecaptchaSite        : attr('string'),
   googleRecaptchaSecret      : attr('string'),
+
   /**
    * Computed properties
    */
diff --git a/app/templates/components/forms/admin/settings/system-form.hbs b/app/templates/components/forms/admin/settings/system-form.hbs
@@ -41,6 +41,8 @@
   <div class="ui hidden divider"></div>
   {{forms/admin/settings/system/mail-settings settings=settings}}
   <div class="ui hidden divider"></div>
+  {{forms/admin/settings/system/order-expiry-form settings=settings}}
+  <div class="ui hidden divider"></div>
   <h3 class="ui header">
     {{t 'App secret key'}}
     <div class="sub header">
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
@@ -0,0 +1,12 @@
+<h3 class="ui header">
+  {{t 'Order Expiry Time'}}
+  <div class="sub header">
+    {{t 'Set registration time limit for your order in minutes'}}
+  </div>
+</h3>
+<div class="field">
+  <label class="required">{{t 'Registration Time Limit'}}</label>
+  <div class="two wide computer four wide mobile field">
+    {{input type='number' id='orderExpiryTime' name='order_expiry_time' value=settings.orderExpiryTime min="1" max="60" step="1"}}
+  </div>
+</div> 
diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs
@@ -9,9 +9,9 @@
           {{getRemainingTime}}
         </div>
         <div class="label">
-          {{t 'Please complete registration within '}} {{data.event.orderExpiryTime}} {{t 'minutes.'}}
+          {{t 'Please complete registration within '}} {{settings.orderExpiryTime}} {{t 'minutes.'}}
           <br>
-          {{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.'}}
         </div>
       </div>
     </div>
diff --git a/app/templates/components/forms/wizard/attendee-step.hbs b/app/templates/components/forms/wizard/attendee-step.hbs
@@ -81,18 +81,6 @@
         </table>
       </div>
     </div>
-    <h3 class="ui dividing header">
-      <i class="options box icon"></i>
-      <div class="content">
-        {{t 'Registration Options'}}
-      </div>
-    </h3>
-    <div class="field">
-      <label>{{t 'REGISTRATION TIME LIMIT'}}</label>
-      <div class="{{unless device.isMobile 'two wide'}} field">
-        {{input type='number' id='orderExpiryTime' value=data.event.orderExpiryTime min="1" max="60" step="1"}}
-      </div>
-    </div>
   {{/if}}
   <div class="spacer-50"></div>
   <div class="{{if device.isMobile 'mini four' 'right floated large'}} ui fields buttons">
diff --git a/app/templates/orders/new.hbs b/app/templates/orders/new.hbs
@@ -28,7 +28,7 @@
     </div>
     <div class="row">
       <div class="ten wide column">
-        {{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}}
       </div>
       <div class="six wide column">
         {{#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
@@ -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'));
+
+  });
+});

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +import Component from '@ember/component';
++
 +export default class extends Component {
++
 +}
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ export default Component.extend(FormMixin, {`
`38`	`38`	`}),`
`39`	`39`	`sameAsBuyer: false,`
`40`	`40`
`41`		`- getRemainingTime: computed('data', function() {`
`42`		`- let orderExpiryTime = this.get('data.event.orderExpiryTime');`
	`41`	`+ getRemainingTime: computed('settings', function() {`
	`42`	`+ let orderExpiryTime = this.get('settings.orderExpiryTime');`
`43`	`43`	`let willExpireAt = this.get('data.createdAt').add(orderExpiryTime, 'minutes');`
`44`	`44`	`this.timer(willExpireAt, this.get('data.identifier'));`
`45`	`45`	`}),`
`@@ -490,4 +490,4 @@ export default Component.extend(FormMixin, {`
`490`	`490`	`}`
`491`	`491`	`}`
`492`	`492`	`}`
`493`		`-});`
	`493`	`+});`