Skip to content

fix: Choosing Ticket holder same as ticket buyer not makes the text light gray #4008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 7, 2020
Merged

fix: Choosing Ticket holder same as ticket buyer not makes the text light gray #4008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
718f60a
Update order-form.hbs
maze-runnar Feb 5, 2020
0ced297
updating message to 15 minutes
maze-runnar Feb 5, 2020
8866fe8
Update index.js
maze-runnar Feb 6, 2020
ee8a583
Update index.js
maze-runnar Feb 6, 2020
02fa1a8
Merge branch 'development' into patch-7
kushthedude Feb 7, 2020
934260c
Merge branch 'development' into patch-7
kushthedude Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/public/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export default Controller.extend({
order.set('attendees', attendees);
await order.save()
.then(order => {
this.notify.success(this.l10n.t('Order details saved. Please fill further details within 10 minutes.'));
this.notify.success(this.l10n.t(`Order details saved. Please fill further details within ${this.settings.orderExpiryTime} minutes.`));
this.transitionToRoute('orders.new', order.identifier);
})
.catch(async e => {
Expand Down
14 changes: 8 additions & 6 deletions app/templates/components/forms/orders/order-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,21 @@
</div>
{{#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')))
'disabled'}}">
<div class="field">
<label class="{{if field.isRequired 'required'}}" for="name">{{field.name}}</label>
{{#if (is-input-field field.type) }}
{{#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}}
{{input type=field.type value=(mut (get holder field.fieldIdentifier))
name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}}

{{#if (and sameAsBuyer (eq index 0) (or (eq field.fieldIdentifier 'firstname') (eq field.fieldIdentifier 'lastname') (eq field.fieldIdentifier 'email')))}}
{{input type=field.type value=(mut (get holder field.fieldIdentifier))
name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index)) readonly=""}}
{{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}}
{{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|}}
Expand Down