Add event date range to ticket editor

This commit is contained in:
Raphael Michel
2017-05-30 17:18:03 +02:00
parent c3097b12c3
commit b946010bdb
5 changed files with 14 additions and 2 deletions

View File

@@ -7982,6 +7982,10 @@ msgstr "Veranstaltungsdatum"
msgid "Event begin date and time"
msgstr "Veranstaltungsdatum und Uhrzeit"
#: pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/index.html:270
msgid "Event date range"
msgstr "Veranstaltungsdatum Beginn und Ende"
#: pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/index.html:271
msgid "Event begin time"
msgstr "Veranstaltungsuhrzeit"

View File

@@ -7960,6 +7960,10 @@ msgstr "Veranstaltungsdatum"
msgid "Event begin date and time"
msgstr "Veranstaltungsdatum und Uhrzeit"
#: pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/index.html:270
msgid "Event date range"
msgstr "Veranstaltungsdatum Beginn und Ende"
#: pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/index.html:271
msgid "Event begin time"
msgstr "Veranstaltungsuhrzeit"

View File

@@ -161,6 +161,7 @@ var editor = {
"attendee_name": gettext("John Doe"),
"event_name": gettext("Sample event name"),
"event_date": gettext("May 31st, 2017"),
"event_date_range": gettext("May 31st June 4th, 2017"),
"event_begin_time": gettext("20:00"),
"event_admission_time": gettext("19:00"),
"event_begin": gettext("2017-05-31 20:00"),

View File

@@ -267,6 +267,7 @@
<option value="attendee_name">{% trans "Attendee name" %}</option>
<option value="event_name">{% trans "Event name" %}</option>
<option value="event_date">{% trans "Event date" %}</option>
<option value="event_date_range">{% trans "Event date range" %}</option>
<option value="event_begin">{% trans "Event begin date and time" %}</option>
<option value="event_begin_time">{% trans "Event begin time" %}</option>
<option value="event_admission">{% trans "Event admission date and time" %}</option>

View File

@@ -85,6 +85,8 @@ class PdfTicketOutput(BaseTicketOutput):
return str(order.event.location).replace("\n", "<br/>\n")
elif o['content'] == 'event_date':
return order.event.get_date_from_display(show_times=False)
elif o['content'] == 'event_date_range':
return order.event.get_date_range_display()
elif o['content'] == 'event_begin':
return order.event.get_date_from_display(show_times=True)
elif o['content'] == 'event_begin_time':
@@ -231,8 +233,8 @@ class PdfTicketOutput(BaseTicketOutput):
"fontfamily": "Open Sans", "bold": False, "italic": False, "width": "110.00", "content": "attendee_name",
"text": "John Doe", "align": "left"},
{"type": "textarea", "left": "17.50", "bottom": "242.10", "fontsize": "13.0", "color": [0, 0, 0, 1],
"fontfamily": "Open Sans", "bold": False, "italic": False, "width": "110.00", "content": "event_date",
"text": "May 31st, 2017", "align": "left"},
"fontfamily": "Open Sans", "bold": False, "italic": False, "width": "110.00",
"content": "event_date_range", "text": "May 31st, 2017", "align": "left"},
{"type": "textarea", "left": "17.50", "bottom": "204.80", "fontsize": "13.0", "color": [0, 0, 0, 1],
"fontfamily": "Open Sans", "bold": False, "italic": False, "width": "110.00", "content": "event_location",
"text": "Random City", "align": "left"},