From c970216e28393d56e5d869049df0e48450a4c993 Mon Sep 17 00:00:00 2001 From: kushthedude Date: Wed, 10 Jul 2019 21:56:37 +0530 Subject: [PATCH 1/3] Removal of Order Form from existence --- .../forms/events/view/order-form.js | 30 -------- app/routes/events/view/tickets/order-form.js | 46 ------------ .../forms/events/view/order-form.hbs | 72 ------------------- app/templates/events/view/tickets.hbs | 3 - .../events/view/tickets/order-form.hbs | 10 --- 5 files changed, 161 deletions(-) delete mode 100644 app/components/forms/events/view/order-form.js delete mode 100644 app/routes/events/view/tickets/order-form.js delete mode 100644 app/templates/components/forms/events/view/order-form.hbs delete mode 100644 app/templates/events/view/tickets/order-form.hbs diff --git a/app/components/forms/events/view/order-form.js b/app/components/forms/events/view/order-form.js deleted file mode 100644 index 021640ba701..00000000000 --- a/app/components/forms/events/view/order-form.js +++ /dev/null @@ -1,30 +0,0 @@ -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(() => { - this.save(data); - }); - } - } -}); diff --git a/app/routes/events/view/tickets/order-form.js b/app/routes/events/view/tickets/order-form.js deleted file mode 100644 index 1a7703541fa..00000000000 --- a/app/routes/events/view/tickets/order-form.js +++ /dev/null @@ -1,46 +0,0 @@ -import Route from '@ember/routing/route'; -import CustomFormMixin from 'open-event-frontend/mixins/custom-form'; -import { A } from '@ember/array'; - -export default Route.extend(CustomFormMixin, { - titleToken() { - return this.l10n.t('Order Form'); - }, - async model() { - let filterOptions = [{ - name : 'form', - op : 'eq', - val : 'attendee' - }]; - - let data = { - event: this.modelFor('events.view') - }; - data.customForms = await data.event.query('customForms', { - filter : filterOptions, - sort : 'id', - 'page[size]' : 50 - }); - - return data; - }, - afterModel(data) { - /** - * Create the additional custom forms if only the compulsory forms exist. - */ - if (data.customForms.length === 3) { - let customForms = A(); - for (const customForm of data.customForms ? data.customForms.toArray() : []) { - customForms.pushObject(customForm); - } - - const createdCustomForms = this.getCustomAttendeeForm(data.event); - - for (const customForm of createdCustomForms ? createdCustomForms : []) { - customForms.pushObject(customForm); - } - - data.customForms = customForms; - } - } -}); diff --git a/app/templates/components/forms/events/view/order-form.hbs b/app/templates/components/forms/events/view/order-form.hbs deleted file mode 100644 index 8197eb88567..00000000000 --- a/app/templates/components/forms/events/view/order-form.hbs +++ /dev/null @@ -1,72 +0,0 @@ -
-

- -
- {{t 'Information to Collect'}} -
-

-
-
- - - - {{#if device.isMobile}} - - {{else}} - - - - {{/if}} - - - - {{#each data.customForms as |field|}} - - - - - - {{/each}} - -
- {{t 'Options'}} - - {{t 'Option'}} - - {{t 'Include'}} - - {{t 'Require'}} -
- - - {{ui-checkbox class='slider' - checked=field.isIncluded - disabled=field.isFixed - onChange=(action (mut field.isIncluded)) - label=(if device.isMobile (t 'Include'))}} - - {{ui-checkbox class='slider' - checked=field.isRequired - disabled=field.isFixed - onChange=(action (mut field.isRequired)) - label=(if device.isMobile (t 'Require'))}} -
-
-
-

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

-
- -
- {{input type='number' id='orderExpiryTime' value=data.event.orderExpiryTime min="1" max="60" step="1"}} -
-
- - -
diff --git a/app/templates/events/view/tickets.hbs b/app/templates/events/view/tickets.hbs index 7f964e339fb..5c70b5f62f8 100644 --- a/app/templates/events/view/tickets.hbs +++ b/app/templates/events/view/tickets.hbs @@ -20,9 +20,6 @@ {{#link-to 'events.view.tickets.add-order' class='item'}} {{t 'Add order'}} {{/link-to}} - {{#link-to 'events.view.tickets.order-form' class='item'}} - {{t 'Order Form'}} - {{/link-to}} {{/tabbed-navigation}}
diff --git a/app/templates/events/view/tickets/order-form.hbs b/app/templates/events/view/tickets/order-form.hbs deleted file mode 100644 index aed6c170d3a..00000000000 --- a/app/templates/events/view/tickets/order-form.hbs +++ /dev/null @@ -1,10 +0,0 @@ -
-
-

{{t 'Order Form'}}

-
-
-
- {{forms/events/view/order-form save=(action 'save') data=model}} -
-
-
\ No newline at end of file From 27fa0ed4daf50bc0c848b0f2c3559c6684c59926 Mon Sep 17 00:00:00 2001 From: kushthedude Date: Wed, 10 Jul 2019 22:01:20 +0530 Subject: [PATCH 2/3] Travis Issues --- .../forms/events/view/order-form-test.js | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 tests/integration/components/forms/events/view/order-form-test.js diff --git a/tests/integration/components/forms/events/view/order-form-test.js b/tests/integration/components/forms/events/view/order-form-test.js deleted file mode 100644 index 65b094eb8c5..00000000000 --- a/tests/integration/components/forms/events/view/order-form-test.js +++ /dev/null @@ -1,38 +0,0 @@ -import { module, test } from 'qunit'; -import { setupRenderingTest } from 'ember-qunit'; -import { render } from '@ember/test-helpers'; -import hbs from 'htmlbars-inline-precompile'; -import EmberObject from '@ember/object'; -import { A } from '@ember/array'; - -module('Integration | Component | forms/events/view/order-form', function(hooks) { - setupRenderingTest(hooks); - - test('it renders', async function(assert) { - let event = EmberObject.create({ - id : 123, - identifier : 'abc123', - orderExpiryTime : 10 - }); - - let customForms = A(); - customForms.pushObject({ - fieldIdentifier : 'twitter', - form : 'speaker', - type : 'text', - isRequired : false, - isIncluded : true, - event - }); - - let data = EmberObject.create({ - event, customForms - }); - - this.set('data', data); - - await render(hbs`{{forms/events/view/order-form data=data}}`); - - assert.ok(this.element.innerHTML.trim().includes('Registration')); - }); -}); From 970e1735bf24f01c1ff04e89acb2fb9460454426 Mon Sep 17 00:00:00 2001 From: Kush Trivedi Date: Fri, 12 Jul 2019 05:08:04 +0530 Subject: [PATCH 3/3] Update tickets.hbs --- app/templates/events/view/tickets.hbs | 1 + 1 file changed, 1 insertion(+) diff --git a/app/templates/events/view/tickets.hbs b/app/templates/events/view/tickets.hbs index 5c70b5f62f8..910e8f511b7 100644 --- a/app/templates/events/view/tickets.hbs +++ b/app/templates/events/view/tickets.hbs @@ -27,3 +27,4 @@
+