Skip to content

Commit 6b3d80d

Browse files
maze-runnariamareebjamal
authored andcommitted
fix: make country as dropdown and add validation for gender
in attendee list changing `enter` to `select` in validation prompt adding validation for gender changing country type to select render select type fields in attendee-list and make country as a drop-down
1 parent cfe7baf commit 6b3d80d

File tree

4 files changed

+21
-5
lines changed

4 files changed

+21
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export default Component.extend(FormMixin, {
131131
rules: [
132132
{
133133
type : 'empty',
134-
prompt : this.l10n.t('Please enter your country')
134+
prompt : this.l10n.t('Please select your country')
135135
}
136136
]
137137
};
@@ -379,7 +379,7 @@ export default Component.extend(FormMixin, {
379379
rules : [
380380
{
381381
type : 'empty',
382-
prompt : this.l10n.t('Please enter your country')
382+
prompt : this.l10n.t('Please select your country')
383383
}
384384
]
385385
},

app/mixins/custom-form.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ export default Mixin.create(MutableArray, {
318318
this.store.createRecord('custom-form', {
319319
fieldIdentifier : 'country',
320320
form : 'attendee',
321-
type : 'text',
321+
type : 'select',
322322
isRequired : false,
323323
isIncluded : false,
324324
event : parent

app/templates/components/forms/orders/attendee-list.hbs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
</h4>
2323
{{#if (is-input-field field.type) }}
2424
<span>{{get holder field.fieldIdentifier}}</span>
25+
{{else if (eq field.type 'select')}}
26+
<span>{{get holder field.fieldIdentifier}}</span>
2527
{{/if}}
2628
</div>
2729
{{/if}}

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}}
6464

6565
{{/if}}
66-
{{/if}}
67-
{{#if (eq field.fieldIdentifier 'gender')}}
66+
{{else if (eq field.fieldIdentifier 'gender')}}
6867
{{#ui-dropdown class='search selection' value=(mut (get holder field.fieldIdentifier)) onChange=(action (mut holder.gender)) as |execute mapper|}}
68+
{{input type='hidden' name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}}
6969
<i class="dropdown icon"></i>
7070
<div class="default text">{{t 'Select your gender'}}</div>
7171
<div class="menu">
@@ -76,6 +76,20 @@
7676
{{/each}}
7777
</div>
7878
{{/ui-dropdown}}
79+
{{else if (eq field.fieldIdentifier 'country')}}
80+
{{#ui-dropdown class='search selection' value=(mut (get holder field.fieldIdentifier)) onChange=(action (mut holder.country)) as |execute mapper|}}
81+
{{input type='hidden' name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}}
82+
<i class="dropdown icon"></i>
83+
<div class="default text">{{t 'Select your country'}}</div>
84+
<div class="menu">
85+
{{#each countries as |country|}}
86+
<div class="item" data-value="{{map-value mapper country.name}}">
87+
<i class="{{lowercase country.code}} flag"></i>
88+
{{country.name}}
89+
</div>
90+
{{/each}}
91+
</div>
92+
{{/ui-dropdown}}
7993
{{/if}}
8094
</div>
8195
{{/if}}

0 commit comments

Comments
 (0)