fix for #8842: selected genders are displayed in the ticket confirmation overview (#8885)

Co-authored-by: Rebekka Rossberg <[email protected]>

Author: Bekka592

app/components/forms/orders/attendee-list.js

@@ -25,6 +25,9 @@ export default class AttendeeList extends Component {
       if (attendee.language_form_2) {
         this.languageFormMapCodeToName(attendee, 'language_form_2');
       }
+      if (attendee.gender) {
+        this.genderAddSpaces(attendee);
+      }
     });
     return this.data.attendees;
   }
@@ -42,6 +45,10 @@ export default class AttendeeList extends Component {
     return attendee.set(key.concat('_name_mapping'), languageFormMap.map(select => select).join(', '));
   }
 
+  genderAddSpaces(attendee) {
+    return attendee.set('gender'.concat('_name_mapping'), attendee.gender.split(',').join(', '));
+  }
+
   @or('event.isBillingInfoMandatory', 'data.isBillingEnabled')
   showBillingInfo;
 

app/components/forms/orders/order-form.js

@@ -701,8 +701,8 @@ export default Component.extend(FormMixin, {
     updateLanguageFormsSelection(checked, changed, selectedOptions, holder, field) {
       holder.set(field.fieldIdentifier, selectedOptions.map(select => select.value).join(','));
     },
-    updateGendersSelection(checked, changed, selectedOptions, entity, field) {
-      entity.set(field.fieldIdentifier, selectedOptions.map(select => select.value).join(','));
+    updateGendersSelection(checked, changed, selectedOptions, holder, field) {
+      holder.set(field.fieldIdentifier, selectedOptions.map(select => select.value).join(','));
     }
   }
 });

app/components/forms/session-speaker-form.js

@@ -383,7 +383,7 @@ export default Component.extend(FormMixin, {
 
   languages: orderBy(languages, 'name'),
 
-  genders: orderBy(genders, 'name'),
+  genders: orderBy(genders, 'position'),
 
   levels: orderBy(levels, 'position'),
 

app/components/forms/speaker-section.js

@@ -6,5 +6,5 @@ import { orderBy } from 'lodash-es';
 
 export default Component.extend(FormMixin, {
   countries : orderBy(countries, 'name'),
-  genders   : orderBy(genders, 'name')
+  genders   : orderBy(genders, 'position')
 });

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

@@ -125,7 +125,7 @@
                   <Widgets::Forms::UiCheckboxGroup 
                     @options={{genders}}
                     @onChange={{action "updateGendersSelection"}}
-                    @entity={{holder}}
+                    @holder={{holder}}
                     @field={{field}}
                   />
                 {{else if (eq field.fieldIdentifier 'country')}}