From b5c6774bb6df95d406e57ca1ccb42ea731ba7b81 Mon Sep 17 00:00:00 2001
From: kushthedude <kush@Kushs-MacBook-Pro.local>
Date: Mon, 24 Jun 2019 14:05:40 +0530
Subject: [PATCH 1/2] Gender as Dropdown in Attendee Form

---
 app/components/forms/orders/order-form.js         |  3 +++
 app/mixins/custom-form.js                         |  2 +-
 .../components/forms/orders/order-form.hbs        | 15 ++++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/components/forms/orders/order-form.js b/app/components/forms/orders/order-form.js
index afacef2ebb5..d7c4e166e6e 100644
--- a/app/components/forms/orders/order-form.js
+++ b/app/components/forms/orders/order-form.js
@@ -11,6 +11,7 @@ import {
   compulsoryProtocolValidUrlPattern, validTwitterProfileUrlPattern, validFacebookProfileUrlPattern,
   validGithubProfileUrlPattern
 } from 'open-event-frontend/utils/validators';
+import { genders } from 'open-event-frontend/utils/dictionary/genders';
 
 export default Component.extend(FormMixin, {
   router: service(),
@@ -466,6 +467,8 @@ export default Component.extend(FormMixin, {
     return orderBy(countries, 'name');
   }),
 
+  genders: orderBy(genders, 'name'),
+
   actions: {
     submit(data) {
       this.onValid(() => {
diff --git a/app/mixins/custom-form.js b/app/mixins/custom-form.js
index bf40ceff25f..f3efb745eb9 100644
--- a/app/mixins/custom-form.js
+++ b/app/mixins/custom-form.js
@@ -286,7 +286,7 @@ export default Mixin.create(MutableArray, {
       this.store.createRecord('custom-form', {
         fieldIdentifier : 'gender',
         form            : 'attendee',
-        type            : 'text',
+        type            : 'select',
         isRequired      : false,
         isIncluded      : false,
         event           : parent
diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs
index 8d25987d3d4..9335b29f635 100644
--- a/app/templates/components/forms/orders/order-form.hbs
+++ b/app/templates/components/forms/orders/order-form.hbs
@@ -47,7 +47,7 @@
           <i class="user icon"></i>
           <label>{{t 'Ticket Holder '}}{{inc index}}{{t ' -for- '}}{{holder.ticket.name}}</label>
         </div>
-        {{# each allFields.attendee as |field|}}
+        {{#each allFields.attendee as |field|}}
           {{#if field.isIncluded}}
             <div class="field {{if
               (and sameAsBuyer (eq index 0) (or (eq field.fieldIdentifier 'firstname') (eq field.fieldIdentifier 'lastname') (eq field.fieldIdentifier 'email')))
@@ -57,9 +57,22 @@
                 {{#if field.isLongText}}
                   {{widgets/forms/rich-text-editor value=(mut (get holder field.fieldIdentifier))
                                                    name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}}
+                {{else if (eq field.fieldIdentifier 'gender')}}
+                  {{#ui-dropdown class='search selection' selected=holder.gender onChange=(action (mut holder.gender)) as |execute mapper|}}
+                    <i class="dropdown icon"></i>
+                    <div class="default text">{{t 'Select your gender'}}</div>
+                    <div class="menu">
+                      {{#each genders as |gender|}}
+                        <div class="item" data-value="{{map-value mapper gender.name}}">
+                          {{gender.name}}
+                        </div>
+                      {{/each}}
+                    </div>
+                  {{/ui-dropdown}}
                 {{else}}
                   {{input type=field.type value=(mut (get holder field.fieldIdentifier))
                           name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}}
+
                 {{/if}}
               {{/if}}
             </div>

From 15a952d673c79d7257533357ae6d14488e384616 Mon Sep 17 00:00:00 2001
From: Kush Trivedi <kushthedude@gmail.com>
Date: Thu, 4 Jul 2019 00:03:07 +0530
Subject: [PATCH 2/2] Update order-form.hbs

---
 app/templates/components/forms/orders/order-form.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs
index 9335b29f635..a0ffdf4215b 100644
--- a/app/templates/components/forms/orders/order-form.hbs
+++ b/app/templates/components/forms/orders/order-form.hbs
@@ -58,7 +58,7 @@
                   {{widgets/forms/rich-text-editor value=(mut (get holder field.fieldIdentifier))
                                                    name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}}
                 {{else if (eq field.fieldIdentifier 'gender')}}
-                  {{#ui-dropdown class='search selection' selected=holder.gender onChange=(action (mut holder.gender)) as |execute mapper|}}
+                  {{#ui-dropdown class='search selection' value=(mut (get holder field.fieldIdentifier)) onChange=(action (mut holder.gender)) as |execute mapper|}}
                     <i class="dropdown icon"></i>
                     <div class="default text">{{t 'Select your gender'}}</div>
                     <div class="menu">