fossasia
diff --git a/‎app/components/forms/orders/attendee-list.js‎
Lines changed: 22 additions & 0 deletions b/‎app/components/forms/orders/attendee-list.js‎
Lines changed: 22 additions & 0 deletions
diff --git a/‎app/components/forms/orders/order-form.js‎
Lines changed: 42 additions & 4 deletions b/‎app/components/forms/orders/order-form.js‎
Lines changed: 42 additions & 4 deletions
diff --git a/‎app/components/forms/wizard/attendee-step.js‎
Lines changed: 132 additions & 0 deletions b/‎app/components/forms/wizard/attendee-step.js‎
Lines changed: 132 additions & 0 deletions
diff --git a/‎app/components/forms/wizard/custom-form-input.hbs‎
Lines changed: 21 additions & 2 deletions b/‎app/components/forms/wizard/custom-form-input.hbs‎
Lines changed: 21 additions & 2 deletions
diff --git a/‎app/components/forms/wizard/custom-form-input.ts‎
Lines changed: 22 additions & 2 deletions b/‎app/components/forms/wizard/custom-form-input.ts‎
Lines changed: 22 additions & 2 deletions
@@ -4,6 +4,7 @@ import { action, computed } from '@ember/object';
 import { groupBy } from 'lodash-es';
 import { or } from '@ember/object/computed';
 import { tracked } from '@glimmer/tracking';
+import { languageForms } from 'open-event-frontend/utils/dictionary/language-form';
 
 @classic
 export default class AttendeeList extends Component {
@@ -17,9 +18,30 @@ export default class AttendeeList extends Component {
 
   @computed('data.attendees')
   get holders() {
+    this.data.attendees.forEach(attendee => {
+      if (attendee.language_form_1) {
+        this.languageFormMapCodeToName(attendee, 'language_form_1');
+      }
+      if (attendee.language_form_2) {
+        this.languageFormMapCodeToName(attendee, 'language_form_2');
+      }
+    });
     return this.data.attendees;
   }
 
+  languageFormMapCodeToName(attendee, key) {
+    const languageFormMap = [];
+    const languageFormList = attendee[key].split(',');
+    languageForms.forEach(languageForm => {
+      languageFormList.forEach(item => {
+        if (item === languageForm.code) {
+          languageFormMap.push(languageForm.name);
+        }
+      });
+    });
+    return attendee.set(key, languageFormMap.map(select => select).join(', '));
+  }
+
   @or('event.isBillingInfoMandatory', 'data.isBillingEnabled')
   showBillingInfo;
 
 
@@ -13,7 +13,9 @@ import {
 import { genders } from 'open-event-frontend/utils/dictionary/genders';
 import { ageGroups } from 'open-event-frontend/utils/dictionary/age-groups';
 import { countries } from 'open-event-frontend/utils/dictionary/demography';
-
+import { years } from 'open-event-frontend/utils/dictionary/year-list';
+import { languageForms } from 'open-event-frontend/utils/dictionary/language-form';
+import { homeWikis } from 'open-event-frontend/utils/dictionary/home-wikis';
 
 export default Component.extend(FormMixin, {
   router             : service(),
@@ -238,6 +240,15 @@ export default Component.extend(FormMixin, {
       ]
     };
 
+    const homeWikiValidation = {
+      rules: [
+        {
+          type   : 'empty',
+          prompt : this.l10n.t('Please enter your home wiki.')
+        }
+      ]
+    };
+
     const shippingAddressValidation = {
       rules: [
         {
@@ -449,6 +460,24 @@ export default Component.extend(FormMixin, {
       ]
     };
 
+    const languageForm1Validation = {
+      rules: [
+        {
+          type   : 'empty',
+          prompt : this.l10n.t('Please enter Language Form.')
+        }
+      ]
+    };
+
+    const languageForm2Validation = {
+      rules: [
+        {
+          type   : 'empty',
+          prompt : this.l10n.t('Please enter Language Form.')
+        }
+      ]
+    };
+
     const validationRules = {
       inline : true,
       delay  : false,
@@ -551,6 +580,7 @@ export default Component.extend(FormMixin, {
       validationRules.fields[`taxBusinessInfo_required_${  index}`] = taxBusinessInfoValidation;
       validationRules.fields[`billingAddress_required_${  index}`] = billingAddressValidation;
       validationRules.fields[`homeAddress_required_${  index}`] = homeAddressValidation;
+      validationRules.fields[`homeWiki_required_${  index}`] = homeWikiValidation;
       validationRules.fields[`shippingAddress_required_${  index}`] = shippingAddressValidation;
       validationRules.fields[`company_required_${  index}`] = companyValidation;
       validationRules.fields[`workAddress_required_${  index}`] = workAddressValidation;
@@ -569,6 +599,8 @@ export default Component.extend(FormMixin, {
       validationRules.fields[`instagram_required_${  index}`] = instagramRequiredValidation;
       validationRules.fields[`linkedin_${  index}`] = linkedinValidation;
       validationRules.fields[`linkedin_required_${  index}`] = linkedinRequiredValidation;
+      validationRules.fields[`language_form_1_required_${  index}`] = languageForm1Validation;
+      validationRules.fields[`language_form_2_required_${  index}`] = languageForm2Validation;
       this.allFields.attendee.filter(field => field.isComplex && field.isRequired).forEach(field => {
         validationRules.fields[`${field.fieldIdentifier}_required_${index}`] = {
           rules: [
@@ -590,9 +622,12 @@ export default Component.extend(FormMixin, {
     return groupBy(requiredFixed.concat(customFields), field => field.get('form'));
   }),
 
-  genders   : orderBy(genders, 'name'),
-  ageGroups : orderBy(ageGroups, 'age'),
-  countries : orderBy(countries, 'name'),
+  genders       : orderBy(genders, 'name'),
+  ageGroups     : orderBy(ageGroups, 'position'),
+  countries     : orderBy(countries, 'name'),
+  years         : orderBy(years, 'year'),
+  languageForms : orderBy(languageForms, 'item'),
+  homeWikis     : orderBy(homeWikis, 'item'),
 
   actions: {
     submit(data) {
@@ -613,6 +648,9 @@ export default Component.extend(FormMixin, {
         holder.set('lastname', '');
         holder.set('email', '');
       }
+    },
+    updateLanguageFormsSelection(checked, changed, selectedOptions, holder, field) {
+      holder.set(field.fieldIdentifier, selectedOptions.map(select => select.value).join(','));
     }
   }
 });
@@ -3,13 +3,98 @@ import { computed, observer } from '@ember/object';
 import FormMixin from 'open-event-frontend/mixins/form';
 import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';
 import { sortBy } from 'lodash-es';
+import { v4 } from 'ember-uuid';
+import { A } from '@ember/array';
 
 export default Component.extend(FormMixin, EventWizardMixin, {
+  tickets        : [],
+  excludeTickets : A(),
+  isOldFormMode  : false,
+  isInit         : false,
+
+  init() {
+    this._super(...arguments);
+    this.prepareCustomFormsForShow();
+  },
+
+  prepareCustomFormsForShow() {
+    const { tickets, customForms, forms } = this.data;
+    if (this.isInit || forms.length) {return}
+    this.isInit = true;
+    const noForm = tickets.filter(_ticket => _ticket.formID).length === 0;
+    if (noForm) {
+      const _formID = v4();
+      const _fields = customForms?.filter(field => {
+        if (!field.isFixed && !field.isDeleted) {
+          field.formID = _formID;
+          return true;
+        }
+        return false;
+      });
+      if (_fields.length > 0) {
+        tickets.forEach(_ticket => {
+          _ticket.formID = _formID;
+          this.excludeTickets.pushObject(_ticket);
+        });
+        forms.pushObject(this.store.createRecord('custom-form-ticket', {
+          formID         : _formID,
+          customForms    : _fields,
+          ticketsDetails : tickets
+        }));
+      }
+    } else {
+      const _forms = {};
+      tickets.forEach(ticket => {
+        const { formID } = ticket;
+        if (formID) {
+          if (_forms[formID]) {
+            _forms[formID].ticketsDetails.pushObject(ticket);
+          } else {
+            _forms[formID] = {
+              ticketsDetails: [ticket]
+            };
+          }
+          this.excludeTickets.pushObject(ticket);
+        }
+      });
+
+      Object.keys(_forms).forEach(_id => {
+        const selectedTicket = _forms[_id].ticketsDetails;
+        forms.pushObject({
+          formID         : _id,
+          ticketsDetails : selectedTicket,
+          customForms    : customForms.filter(_field => _field.formID === _id)
+        });
+      });
+    }
+  },
+
+  prepareCustomFormsForSave() {
+    this.data.forms.forEach(_form => {
+      const { formID, customForms, ticketsDetails } = _form;
+      customForms.forEach(field => {
+        if (!field.isDeleted) {
+          field.formID = formID;
+        }
+        if (!field.id) {
+          this.data.customForms.pushObject(field);
+        }
+      });
+
+      ticketsDetails.forEach(ticket => {
+        ticket.formID = formID;
+      });
+    });
+  },
 
   fixedFields: computed('data.customForms.@each', function() {
     return this.data.customForms?.filter(field => field.isFixed);
   }),
 
+  selectableTickets: computed('excludeTickets.@each', 'form.@each', function() {
+    return this.data.tickets.filter(ticket => !this.excludeTickets.includes(ticket));
+  }),
+
   editableFields: computed('data.customForms.@each', function() {
     const filteredFields = this.data.customForms?.filter(field => !field.isFixed);
     const fields = sortBy(filteredFields, ['isComplex', 'name']);
@@ -26,9 +111,56 @@ export default Component.extend(FormMixin, EventWizardMixin, {
     return this.editableFields?.some(field => field.isComplex);
   }),
 
+
   actions: {
     removeField(field) {
       field.deleteRecord();
+    },
+    addMoreForm(ticketsDetails = []) {
+      const _formID =  v4();
+      this.data.forms.pushObject(this.store.createRecord('custom-form-ticket', {
+        formID      : _formID,
+        customForms : this.getCustomAttendeeForm(this.data.event, _formID),
+        ticketsDetails
+      }));
+    },
+
+    onFormUpdateTicket(changedData) {
+      const { added, changed, formID } = changedData;
+      changed.forEach(ticket => {
+        ticket.formID = added ? formID : '';
+      });
+      if (added) {
+        this.excludeTickets.pushObjects(changed);
+      } else {
+        this.excludeTickets.removeObjects(changed);
+      }
+    },
+    saveDraft() {
+      this.prepareCustomFormsForSave();
+      this._super();
+    },
+    saveForm() {
+      this.prepareCustomFormsForSave();
+      this._super();
+    },
+    move(direction) {
+      this.prepareCustomFormsForSave();
+      this._super(direction);
+    },
+    onRemoveForm(_id) {
+      const deleteForm = this.data.forms.find(_form => _form.formID === _id);
+      if (deleteForm) {
+        const { ticketsDetails, customForms } = deleteForm;
+        ticketsDetails.forEach(ticket => {
+          ticket.formID = '';
+        });
+        customForms.forEach(field => {
+          field.deleteRecord();
+        });
+        this.excludeTickets.removeObjects(deleteForm.ticketsDetails);
+        this.data.forms.removeObject(deleteForm);
+      }
     }
   }
 });
 
@@ -6,8 +6,24 @@
   </span>
 </div>
 <div {{did-update this.updated @field}} class="ui action input" style="width: inherit;">
-  <Input type="text" placeholder={{t "Field Name"}} @value={{this.name}} />
-  <UiDropdown class="ui selection dropdown" @selected={{this.type}} @onChange={{action (mut this.type)}}>
+  <Input type="text" placeholder={{t "Field Name"}} @value={{this.name}} style="width: 25%"/>
+  {{#if (eq this.type "number")}}
+    <div class="ui action input input-attendee-custom-form">
+        <Input
+          @type="number"
+          @name="min_price"
+          placeholder={{t "Min"}}
+          @value={{this.min}} />
+    </div>
+    <div class="ui action input input-attendee-custom-form">
+      <Input
+        @type="number"
+        @name="max_price"
+        placeholder={{t "Max"}}
+        @value={{this.max}} />
+    </div>
+  {{/if}}
+  <UiDropdown class="ui selection dropdown custom-form-dropdown-attendee" @selected={{this.type}} @onChange={{action (mut this.type)}}>
     <div class="default text">
       {{ this.type }}
     </div>
@@ -16,6 +32,9 @@
       <div class="item" data-value="text">{{t "Short Answer"}}</div>
       <div class="item" data-value="paragraph">{{t "Paragraph"}}</div>
       <div class="item" data-value="number">{{t "Number"}}</div>
+      <div class="item" data-value="year">{{t "Year"}}</div>
+      <div class="item" data-value="boolean">{{t "Yes/No"}}</div>
+      <div class="item" data-value="richtextlink">{{t "Rich Text Links"}}</div>
     </div>
   </UiDropdown>
   <div>
 
@@ -5,7 +5,7 @@ import { inject as service } from '@ember/service';
 import DS from 'ember-data';
 import { tracked } from '@glimmer/tracking';
 
-interface CustomForm { fieldIdentifier: string, name: string, type: string }
+interface CustomForm { fieldIdentifier: string, name: string, type: string, min: number, max: number, formIdentifier: string}
 
 function getIdentifier(name: string, fields: CustomForm[]): string {
   const fieldIdentifiers = new Set(fields.map(field => field.fieldIdentifier));
@@ -22,6 +22,9 @@ interface Args {
   customForms: CustomForm[],
   form: string,
   event: any,
+  formIdentifier: string | '',
+  min: number | 0,
+  max: number | 10,
   onSave: (() => void) | null
 }
 
@@ -36,13 +39,23 @@ export default class CustomFormInput extends Component<Args> {
   @service
   store!: DS.Store;
 
+  @tracked
+  min = 0;
+
+  @tracked
+  max = 10;
+
   @action
   updated(): void {
     if (this.args.field) {
       this.name = this.args.field.name;
       this.type = this.args.field.type;
+      this.min = this.args.field.min;
+      this.max = this.args.field.max;
     } else {
       this.name = '';
+      this.min = 0;
+      this.max = 10;
     }
   }
 
@@ -66,7 +79,10 @@ export default class CustomFormInput extends Component<Args> {
       isRequired      : false,
       isIncluded      : false,
       isComplex       : true,
-      event           : this.args.event
+      event           : this.args.event,
+      formID          : this.args.formIdentifier,
+      min             : this.min,
+      max             : this.max
     });
   }
 
@@ -79,10 +95,14 @@ export default class CustomFormInput extends Component<Args> {
       this.args.field.name = this.name;
       this.args.field.type = this.type;
       this.args.field.fieldIdentifier = this.identifier;
+      this.args.field.min = this.min;
+      this.args.field.max = this.max;
     } else {
       this.args.customForms.pushObject(this.field);
     }
     this.name = '';
+    this.min = 0;
+    this.max = 10;
 
     this.args.onSave && this.args.onSave();
   }