Skip to content

Commit 128cfed

Browse files
mrsaicharan1mariobehling
authored andcommitted
Added support for donation tickets (#3069)
updated ticket input list Made the ticket price variable
1 parent 1a6bac6 commit 128cfed

File tree

4 files changed

+61
-22
lines changed

4 files changed

+61
-22
lines changed

app/models/ticket.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ export default ModelBase.extend({
2121
salesEndsAt : attr('moment', { defaultValue: () => moment().add(10, 'days').startOf('day') }),
2222
minOrder : attr('number', { defaultValue: 1 }),
2323
maxOrder : attr('number', { defaultValue: 10 }),
24+
minPrice : attr('number'),
25+
maxPrice : attr('number'),
2426
isFeeAbsorbed : attr('boolean', { defaultValue: true }),
2527
position : attr('number'),
2628

app/templates/components/forms/wizard/basic-details-step.hbs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@
162162
<div class="six wide column">
163163
<label class="required">{{t 'Ticket Name'}}</label>
164164
</div>
165-
<div class="column">
165+
<div class="two wide column">
166166
<label class="required">{{t 'Price'}}</label>
167167
</div>
168-
<div class="column">
168+
<div class="four wide column">
169169
<label class="required">{{t 'Quantity'}}</label>
170170
</div>
171171
<div class="column">
@@ -209,6 +209,18 @@
209209
</div>
210210
{{/if}} --}}
211211
</div>
212+
<button type="button" class="ui blue small button" {{action 'addTicket' 'donation' data.event.tickets.length}}>
213+
<i class="large icons basic-details">
214+
<i class="heart icon"></i>
215+
<i class="inverted corner add icon"></i>
216+
</i>
217+
{{t 'Donation Ticket'}}
218+
</button>
219+
{{else}}
220+
<div class="field">
221+
<label for="ticket_url">{{t 'Ticket URL'}}</label>
222+
{{widgets/forms/link-input inputId='ticket_url' segmentedLink=data.event.segmentedTicketUrl}}
223+
</div>
212224
{{/if}}
213225
{{#if hasPaidTickets}}
214226
{{!-- Hiding discount code temporarily, till we get this feature ready to apply discount codes for events.

app/templates/components/public/ticket-list.hbs

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,23 @@
2222
{{/if}}
2323
</td>
2424
<td>{{moment-format ticket.salesEndsAt 'ddd, DD MMMM YY, h:mm A'}}</td>
25-
{{#if ticket.discount}}
26-
<td>
27-
<div id="{{ticket.id}}_price" class="strike text">
28-
{{currency-symbol eventCurrency}} {{format-number ticket.price}}
29-
</div>
30-
<div id="{{ticket.id}}_discount">
31-
{{currency-symbol eventCurrency}} {{format-number (sub ticket.price ticket.discount)}}
32-
</div>
33-
</td>
25+
{{#if (eq ticket.type 'donation') }}
26+
<div class="three wide column">
27+
<td id="{{ticket.id}}_price">{{input type='number' value=ticket.price}}</td>
28+
</div>
3429
{{else}}
35-
<td id="{{ticket.id}}_price">{{currency-symbol eventCurrency}} {{format-number ticket.price}}</td>
30+
{{#if ticket.discount}}
31+
<td>
32+
<div id="{{ticket.id}}_price" class="strike text">
33+
{{currency-symbol eventCurrency}} {{format-number ticket.price}}
34+
</div>
35+
<div id="{{ticket.id}}_discount">
36+
{{currency-symbol eventCurrency}} {{format-number (sub ticket.price ticket.discount)}}
37+
</div>
38+
</td>
39+
{{else}}
40+
<td id="{{ticket.id}}_price">{{currency-symbol eventCurrency}} {{format-number ticket.price}}</td>
41+
{{/if}}
3642
{{/if}}
3743
<td>
3844
<div class="field">

app/templates/components/widgets/forms/ticket-input.hbs

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,41 @@
44
{{input type='text' name='ticket_name' placeholder=(t 'Ticket Name') value=ticket.name}}
55
</div>
66
</div>
7-
<div class="column">
8-
{{#if (eq ticket.type 'paid')}}
7+
<div class="two wide column">
8+
{{#if (eq ticket.type 'paid') }}
99
<div class="field">
1010
{{input type='number' name='ticket_price' placeholder=(t 'Price') value=ticket.price min=1}}
1111
</div>
12-
{{else}}
13-
<span class="text muted ticket-input">
14-
{{t 'This is a'}} {{ticket.type}} {{t 'Ticket'}}
15-
</span>
12+
{{else if (eq ticket.type 'donation')}}
13+
<div class="two fields">
14+
<div class="field">
15+
{{input type='number' name='min_price' placeholder=(t 'Min') value=ticket.minOrder}}
16+
</div>
17+
<div class="field">
18+
{{input type='number' name='max_price' placeholder=(t 'Max') value=ticket.maxOrder}}
19+
</div>
20+
</div>
21+
{{else if (eq ticket.type 'free')}}
22+
<div class="four wide column">
23+
<span class="text muted ticket-input">
24+
{{t 'This is a free Ticket'}}
25+
</span>
26+
</div>
1627
{{/if}}
1728
</div>
18-
<div class="column">
19-
<div class="field">
20-
{{input type='number' name='ticket_quantity' placeholder=(t 'Quantity') value=ticket.quantity min=1}}
29+
{{#if (eq ticket.type 'donation')}}
30+
<div class="four wide column">
31+
<span class="text muted ticket-input">
32+
{{t 'This is a Donation Ticket'}}
33+
</span>
2134
</div>
22-
</div>
35+
{{else}}
36+
<div class="four wide column">
37+
<div class="field">
38+
{{input type='number' name='ticket_quantity' placeholder=(t 'Quantity') value=ticket.maxOrder min=1}}
39+
</div>
40+
</div>
41+
{{/if}}
2342
<div class="column {{unless device.isLargeMonitor 'less right padding'}}">
2443
<div class="field">
2544
<div class="ui icon buttons">

0 commit comments

Comments
 (0)