diff --git a/app/components/widgets/forms/ticket-input.js b/app/components/widgets/forms/ticket-input.js index 7fbe4194b3a..656223ebd81 100644 --- a/app/components/widgets/forms/ticket-input.js +++ b/app/components/widgets/forms/ticket-input.js @@ -25,4 +25,10 @@ export default class TicketInput extends Component { super.willDestroyElement(...arguments); $('.icon.buttons', this.element).find('.button').popup('destroy'); } + + @action + hideTicket() { + this.toggleProperty('ishidden'); + } + } diff --git a/app/helpers/confirm.js b/app/helpers/confirm.js index c397caf16f9..9ba37c62d5d 100644 --- a/app/helpers/confirm.js +++ b/app/helpers/confirm.js @@ -9,7 +9,12 @@ export default Helper.extend({ compute(params) { return () => { - if (params.length >= 2) { + if (params.length >= 6) { + this.confirm.prompt('Are You Sure?', { 'denyText': params[2], 'approveText': params[3], 'denyColor': params[4], 'approveColor': params[5], 'extra': params[0] }) + .then(() => { + params[1](); + }); + } else if (params.length >= 2) { this.confirm.prompt(params[0]) .then(() => { params[1](); diff --git a/app/templates/components/forms/wizard/basic-details-step.hbs b/app/templates/components/forms/wizard/basic-details-step.hbs index c6434b66282..d426075403d 100644 --- a/app/templates/components/forms/wizard/basic-details-step.hbs +++ b/app/templates/components/forms/wizard/basic-details-step.hbs @@ -169,7 +169,6 @@ @value={{this.data.event.ownerDescription}} /> {{/if}} -
@@ -200,7 +199,8 @@ @canMoveDown={{not-eq ticket.position (dec this.data.event.tickets.length)}} @moveTicketUp={{action "moveTicket" ticket "up"}} @moveTicketDown={{action "moveTicket" ticket "down"}} - @removeTicket={{confirm "Are you sure you wish to delete this ticket ?" (action "removeTicket" ticket)}} /> + @removeTicket={{confirm "Are you sure you wish to delete this ticket ?" (action "removeTicket" ticket)}} + @ishidden = {{false}} /> {{/each}} {{else}}

@@ -273,8 +273,7 @@ {{/if}}

--}} - -
+

{{t 'Add Payment Details'}}

@@ -328,7 +327,7 @@
-
+

{{t 'Choose payment methods'}}

{{#if this.canAcceptPayPal}} @@ -529,9 +528,7 @@ />
{{/if}} - -
- +
{{#if this.data.event.isTaxEnabled}}
diff --git a/app/templates/components/widgets/forms/ticket-input.hbs b/app/templates/components/widgets/forms/ticket-input.hbs index 30dab8c6fe8..48f343bda09 100644 --- a/app/templates/components/widgets/forms/ticket-input.hbs +++ b/app/templates/components/widgets/forms/ticket-input.hbs @@ -83,7 +83,6 @@ {{#if this.isExpanded}}
-

Settings