Merge pull request #3308 from kushthedude/7

fix: rendering of gender field

Author: uds5501

app/templates/components/forms/orders/order-form.hbs

@@ -57,24 +57,26 @@
                 {{#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' 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">
-                      {{#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}}
+              {{#if (eq field.fieldIdentifier 'gender')}}
+                {{#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">
+                    {{#each genders as |gender|}}
+                      <div class="item" data-value="{{map-value mapper gender.name}}">
+                        {{gender.name}}
+                      </div>
+                    {{/each}}
+                  </div>
+                {{/ui-dropdown}}
+              {{/if}}
             </div>
           {{/if}}
         {{/each}}