+
+
diff --git a/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/index.html b/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/index.html
new file mode 100644
index 0000000000..2a9e423786
--- /dev/null
+++ b/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/index.html
@@ -0,0 +1,323 @@
+{% extends "pretixcontrol/event/base.html" %}
+{% load i18n %}
+{% load staticfiles %}
+{% block title %}{% trans "PDF Ticket Editor" %}{% endblock %}
+{% block content %}
+
+
++ {% blocktrans trimmed %} + You can customize the ticket design with our PDF ticket editor. There, you can upload a PDF file used + as a background for the tickets and then place various texts and QR codes on the background at the + positions of your choice. The editor is easy to use thanks to its drag-and-drop user interface, but it + requires a modern browser and a decent internet connection. + {% endblocktrans %} +
+ +{% trans "PDF Ticket Editor" %}
+ + +
+
+
+
+
+ {% for family, styles in fonts.items %}
+ {% for style, formats in styles.items %}
+
+ giItT1WQy@!-/#
+
+ {% endfor %}
+ {% endfor %}
+{% endblock %}
+
diff --git a/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/webfonts.css b/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/webfonts.css
new file mode 100644
index 0000000000..5224391b8c
--- /dev/null
+++ b/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/webfonts.css
@@ -0,0 +1,36 @@
+{% load staticfiles %}
+
+{% for family, styles in fonts.items %}
+{% for style, formats in styles.items %}
+@font-face {
+ font-family: '{{ family }}';
+ {% if style == "italic" or style == "bolditalic" %}
+ font-style: italic;
+ {% else %}
+ font-style: normal;
+ {% endif %}
+ {% if style == "bold" or style == "bolditalic" %}
+ font-weight: bold;
+ {% else %}
+ font-weight: normal;
+ {% endif %}
+ src: {% if "woff2" in formats %}url('{% static formats.woff2 %}') format('woff2'),{% endif %}
+ {% if "woff" in formats %}url('{% static formats.woff %}') format('woff'),{% endif %}
+ {% if "truetype" in formats %}url('{% static formats.truetype %}') format('truetype'){% endif %};
+}
+.preload-font[data-family="{{family}}"][data-style="{{style}}"] {
+ font-family: '{{ family }}';
+ {% if style == "italic" or style == "bolditalic" %}
+ font-style: italic;
+ {% else %}
+ font-style: normal;
+ {% endif %}
+ {% if style == "bold" or style == "bolditalic" %}
+ font-weight: bold;
+ {% else %}
+ font-weight: normal;
+ {% endif %}
+
+}
+{% endfor %}
+{% endfor %}
diff --git a/src/pretix/plugins/ticketoutputpdf/ticketoutput.py b/src/pretix/plugins/ticketoutputpdf/ticketoutput.py
index 8e428c004f..a95798aed9 100644
--- a/src/pretix/plugins/ticketoutputpdf/ticketoutput.py
+++ b/src/pretix/plugins/ticketoutputpdf/ticketoutput.py
@@ -1,17 +1,31 @@
import copy
import logging
-from collections import OrderedDict
+import uuid
from io import BytesIO
-from django import forms
from django.contrib.staticfiles import finders
from django.core.files import File
from django.core.files.storage import default_storage
+from django.http import HttpRequest
+from django.template.loader import get_template
+from django.utils.formats import localize
from django.utils.translation import ugettext_lazy as _
+from reportlab.graphics import renderPDF
+from reportlab.graphics.barcode.qr import QrCodeWidget
+from reportlab.graphics.shapes import Drawing
+from reportlab.lib.colors import Color
+from reportlab.lib.enums import TA_CENTER, TA_LEFT, TA_RIGHT
+from reportlab.lib.styles import ParagraphStyle
+from reportlab.lib.units import mm
+from reportlab.pdfbase import pdfmetrics
+from reportlab.pdfbase.pdfmetrics import getAscentDescent
+from reportlab.pdfbase.ttfonts import TTFont
+from reportlab.pdfgen.canvas import Canvas
+from reportlab.platypus import Paragraph
-from pretix.base.models import Order
+from pretix.base.models import Order, OrderPosition
from pretix.base.ticketoutput import BaseTicketOutput
-from pretix.control.forms import ExtFileField
+from pretix.plugins.ticketoutputpdf.signals import get_fonts
logger = logging.getLogger('pretix.plugins.ticketoutputpdf')
@@ -21,71 +35,97 @@ class PdfTicketOutput(BaseTicketOutput):
verbose_name = _('PDF output')
download_button_text = _('PDF')
- def _draw_page(self, p, op, order):
- from reportlab.graphics.shapes import Drawing
- from reportlab.lib import units
- from reportlab.graphics.barcode.qr import QrCodeWidget
- from reportlab.graphics import renderPDF
+ def __init__(self, event, override_layout=None, override_background=None):
+ self.override_layout = override_layout
+ self.override_background = override_background
+ super().__init__(event)
- event_s = self.settings.get('event_s', default=22, as_type=float)
- if event_s:
- p.setFont("Helvetica", event_s)
- event_x = self.settings.get('event_x', default=15, as_type=float)
- event_y = self.settings.get('event_y', default=235, as_type=float)
- p.drawString(event_x * units.mm, event_y * units.mm, str(self.event.name))
+ def _register_fonts(self):
+ pdfmetrics.registerFont(TTFont('Open Sans', finders.find('fonts/OpenSans-Regular.ttf')))
+ pdfmetrics.registerFont(TTFont('Open Sans I', finders.find('fonts/OpenSans-Italic.ttf')))
+ pdfmetrics.registerFont(TTFont('Open Sans B', finders.find('fonts/OpenSans-Bold.ttf')))
+ pdfmetrics.registerFont(TTFont('Open Sans B I', finders.find('fonts/OpenSans-BoldItalic.ttf')))
- order_s = self.settings.get('order_s', default=17, as_type=float)
- if order_s:
- p.setFont("Helvetica", order_s)
- order_x = self.settings.get('order_x', default=15, as_type=float)
- order_y = self.settings.get('order_y', default=220, as_type=float)
- p.drawString(order_x * units.mm, order_y * units.mm, _('Order code: {code}').format(code=order.code))
+ for family, styles in get_fonts().items():
+ print(family, finders.find(styles['regular']['truetype']))
+ pdfmetrics.registerFont(TTFont(family, finders.find(styles['regular']['truetype'])))
+ pdfmetrics.registerFont(TTFont(family + ' I', finders.find(styles['italic']['truetype'])))
+ pdfmetrics.registerFont(TTFont(family + ' B', finders.find(styles['bold']['truetype'])))
+ pdfmetrics.registerFont(TTFont(family + ' B I', finders.find(styles['bolditalic']['truetype'])))
- name_s = self.settings.get('name_s', default=17, as_type=float)
- if name_s:
- p.setFont("Helvetica", name_s)
- name_x = self.settings.get('name_x', default=15, as_type=float)
- name_y = self.settings.get('name_y', default=210, as_type=float)
- item = str(op.item.name)
- if op.variation:
- item += " – " + str(op.variation)
- p.drawString(name_x * units.mm, name_y * units.mm, item)
+ def _draw_barcodearea(self, canvas: Canvas, op: OrderPosition, o: dict):
+ reqs = float(o['size']) * mm
+ qrw = QrCodeWidget(op.secret, barLevel='H', barHeight=reqs, barWidth=reqs)
+ d = Drawing(reqs, reqs)
+ d.add(qrw)
+ qr_x = float(o['left']) * mm
+ qr_y = float(o['bottom']) * mm
+ renderPDF.draw(d, canvas, qr_x, qr_y)
- price_s = self.settings.get('price_s', default=17, as_type=float)
- if price_s:
- p.setFont("Helvetica", price_s)
- price_x = self.settings.get('price_x', default=15, as_type=float)
- price_y = self.settings.get('price_y', default=200, as_type=float)
- p.drawString(price_x * units.mm, price_y * units.mm, "%s %s" % (str(op.price), self.event.currency))
+ def _get_text_content(self, op: OrderPosition, order: Order, o: dict):
+ if o['content'] == 'other':
+ return o['text'].replace("\n", "
+
+
+
+
+
+
+
+ {% trans "Editor" %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + {% trans "Uploading new PDF background…" %} +
+
+
+
+
+
+ {% trans "Welcome to the PDF ticket editor!" %}
++ {% blocktrans trimmed %} + This editor allows you to create a design for the PDF tickets of your event. + You can upload a background PDF and then use this tool to place texts and + a QR code on the ticket. + {% endblocktrans %} +
++
+ +
++ {% blocktrans trimmed %} + Please note that the editor can only provide a rough preview. Some details, + for example in text rendering, might look slightly different in the final + tickets. You can use the "Preview" button on the right for a more precise + preview. + {% endblocktrans %} +
++
+ + + +
++ {% blocktrans trimmed %} + The editor is tested with recent versions of Google Chome, Mozilla Firefox + and Opera. Other browsers, especially Internet Explorer or Microsoft Edge, might + have problems displaying your background PDF or loading the correct fonts. + {% endblocktrans %} +
+ ++
+ + + {% trans "Loading…" %} + + +
+
+
+
+
+
+
+
+ {% trans "Loading…" %}
+
+
+
+
+
+
+
+
+ +
+ + +
+
+ +
+ + +
+
+
+
+ +
+ + +
+
+
+
+ +
+ + +
+
+ +
+ + +
+
+
+
+ +
+ + +
+
+
+
+ + {% blocktrans trimmed %} + The final QR code will be slightly smaller because some whitespace is required + for proper scanning. + {% endblocktrans %} +
+
+
+
+
+ +
+ + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+ + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+ + +
+
+
+
+ +
+ + +
+
+
+
+ + +
+ + + +
+
+
+
+
+ {% trans "Add a new object" %}
+
+
+ \n") + elif o['content'] == 'order': + return order.code + elif o['content'] == 'item': + return str(op.item) + elif o['content'] == 'secret': + return op.secret + elif o['content'] == 'variation': + return str(op.variation) if op.variation else '' + elif o['content'] == 'itemvar': + return '{} - {}'.format(op.item, op.variation) if op.variation else str(op.item) + elif o['content'] == 'price': + return '{} {}'.format(order.event.currency, localize(op.price)) + elif o['content'] == 'attendee_name': + return op.attendee_name or (op.addon_to.attendee_name if op.addon_to else '') + elif o['content'] == 'event_name': + return str(order.event) + elif o['content'] == 'event_location': + return str(order.event.location) + elif o['content'] == 'event_date': + return order.event.get_date_from_display(show_times=False) + elif o['content'] == 'event_begin_time': + return order.event.get_date_from_display(show_times=False) + return '' - qr_s = self.settings.get('qr_s', default=80, as_type=float) - if qr_s: - reqs = qr_s * units.mm - qrw = QrCodeWidget(op.secret, barLevel='H') - b = qrw.getBounds() - w = b[2] - b[0] - h = b[3] - b[1] - d = Drawing(reqs, reqs, transform=[reqs / w, 0, 0, reqs / h, 0, 0]) - d.add(qrw) - qr_x = self.settings.get('qr_x', default=10, as_type=float) - qr_y = self.settings.get('qr_y', default=120, as_type=float) - renderPDF.draw(d, p, qr_x * units.mm, qr_y * units.mm) + def _draw_textarea(self, canvas: Canvas, op: OrderPosition, order: Order, o: dict): + font = o['fontfamily'] + if o['bold']: + font += ' B' + if o['italic']: + font += ' I' - code_s = self.settings.get('code_s', default=11, as_type=float) - if code_s: - p.setFont("Helvetica", code_s) - code_x = self.settings.get('code_x', default=15, as_type=float) - code_y = self.settings.get('code_y', default=120, as_type=float) - p.drawString(code_x * units.mm, code_y * units.mm, op.secret) + align_map = { + 'left': TA_LEFT, + 'center': TA_CENTER, + 'right': TA_RIGHT + } + style = ParagraphStyle( + name=uuid.uuid4().hex, + fontName=font, + fontSize=float(o['fontsize']), + leading=float(o['fontsize']), + autoLeading="max", + textColor=Color(o['color'][0] / 255, o['color'][1] / 255, o['color'][2] / 255), + alignment=align_map[o['align']] + ) - attendee_s = self.settings.get('attendee_s', default=0, as_type=float) - if attendee_s and op.attendee_name: - p.setFont("Helvetica", attendee_s) - attendee_x = self.settings.get('attendee_x', default=15, as_type=float) - attendee_y = self.settings.get('attendee_y', default=90, as_type=float) - p.drawString(attendee_x * units.mm, attendee_y * units.mm, op.attendee_name) + p = Paragraph(self._get_text_content(op, order, o), style=style) + p.wrapOn(canvas, float(o['width']) * mm, 1000 * mm) + # p_size = p.wrap(float(o['width']) * mm, 1000 * mm) + ad = getAscentDescent(font, float(o['fontsize'])) + p.drawOn(canvas, float(o['left']) * mm, float(o['bottom']) * mm - ad[1]) - p.showPage() + def _draw_page(self, canvas: Canvas, op: OrderPosition, order: Order): + objs = self.override_layout or self.settings.get('layout', as_type=list) or self._legacy_layout() + for o in objs: + if o['type'] == "barcodearea": + self._draw_barcodearea(canvas, op, o) + elif o['type'] == "textarea": + self._draw_textarea(canvas, op, order, o) + + canvas.showPage() def generate_order(self, order: Order): buffer = BytesIO() @@ -113,97 +153,198 @@ class PdfTicketOutput(BaseTicketOutput): from reportlab.pdfgen import canvas from reportlab.lib import pagesizes - pagesize = self.settings.get('pagesize', default='A4') - if hasattr(pagesizes, pagesize): - pagesize = getattr(pagesizes, pagesize) - else: - pagesize = pagesizes.A4 - orientation = self.settings.get('orientation', default='portrait') - if hasattr(pagesizes, orientation): - pagesize = getattr(pagesizes, orientation)(pagesize) + # Doesn't matter as we'll overpaint it over a background later + pagesize = pagesizes.A4 + self._register_fonts() return canvas.Canvas(buffer, pagesize=pagesize) - def _render_with_background(self, buffer): + def _render_with_background(self, buffer, title=_('Ticket')): from PyPDF2 import PdfFileWriter, PdfFileReader buffer.seek(0) new_pdf = PdfFileReader(buffer) output = PdfFileWriter() bg_file = self.settings.get('background', as_type=File) - if isinstance(bg_file, File): + if self.override_background: + bgf = default_storage.open(self.override_background.name, "rb") + elif isinstance(bg_file, File): bgf = default_storage.open(bg_file.name, "rb") else: bgf = open(finders.find('pretixpresale/pdf/ticket_default_a4.pdf'), "rb") bg_pdf = PdfFileReader(bgf) + for page in new_pdf.pages: bg_page = copy.copy(bg_pdf.getPage(0)) bg_page.mergePage(page) output.addPage(bg_page) + output.addMetadata({ + '/Title': str(title), + '/Creator': 'pretix', + }) outbuffer = BytesIO() output.write(outbuffer) outbuffer.seek(0) return outbuffer - @property - def settings_form_fields(self) -> dict: - return OrderedDict( - list(super().settings_form_fields.items()) + [ - ('paper_size', - forms.ChoiceField( - label=_('Paper size'), - choices=( - ('A4', 'A4'), - ('A5', 'A5'), - ('B4', 'B4'), - ('B5', 'B5'), - ('letter', 'Letter'), - ('legal', 'Legal'), - ), - required=False - )), - ('orientation', - forms.ChoiceField( - label=_('Paper orientation'), - choices=( - ('portrait', _('Portrait')), - ('landscape', _('Landscape')), - ), - required=False - )), - ('background', - ExtFileField( - label=_('Background PDF'), - ext_whitelist=(".pdf", ), - required=False - )), - ('qr_x', forms.FloatField(label=_('QR-Code x position (mm)'), required=False)), - ('qr_y', forms.FloatField(label=_('QR-Code y position (mm)'), required=False)), - ('qr_s', forms.FloatField(label=_('QR-Code size (mm)'), required=False)), - ('code_x', forms.FloatField(label=_('Ticket code x position (mm)'), required=False)), - ('code_y', forms.FloatField(label=_('Ticket code y position (mm)'), required=False)), - ('code_s', forms.FloatField(label=_('Ticket code size (mm)'), required=False, - help_text=_('Visible by default, set this to 0 to hide the element.'))), - ('order_x', forms.FloatField(label=_('Order x position (mm)'), required=False)), - ('order_y', forms.FloatField(label=_('Order y position (mm)'), required=False)), - ('order_s', forms.FloatField(label=_('Order size (mm)'), required=False, - help_text=_('Visible by default, set this to 0 to hide the element.'))), - ('name_x', forms.FloatField(label=_('Product name x position (mm)'), required=False)), - ('name_y', forms.FloatField(label=_('Product name y position (mm)'), required=False)), - ('name_s', forms.FloatField(label=_('Product name size (mm)'), required=False, - help_text=_('Visible by default, set this to 0 to hide the element.'))), - ('price_x', forms.FloatField(label=_('Price x position (mm)'), required=False)), - ('price_y', forms.FloatField(label=_('Price y position (mm)'), required=False)), - ('price_s', forms.FloatField(label=_('Price size (mm)'), required=False, - help_text=_('Visible by default, set this to 0 to hide the element.'))), - ('event_x', forms.FloatField(label=_('Event name x position (mm)'), required=False)), - ('event_y', forms.FloatField(label=_('Event name y position (mm)'), required=False)), - ('event_s', forms.FloatField(label=_('Event name size (mm)'), required=False, - help_text=_('Visible by default, set this to 0 to hide the element.'))), - ('attendee_x', forms.FloatField(label=_('Attendee name x position (mm)'), required=False)), - ('attendee_y', forms.FloatField(label=_('Attendee name y position (mm)'), required=False)), - ('attendee_s', forms.FloatField(label=_('Attendee name size (mm)'), required=False, - help_text=_('Invisible by default, set this to a number greater than 0 ' - 'to show.'))) - ] - ) + def settings_content_render(self, request: HttpRequest) -> str: + """ + When the event's administrator visits the event configuration + page, this method is called. It may return HTML containing additional information + that is displayed below the form fields configured in ``settings_form_fields``. + """ + template = get_template('pretixplugins/ticketoutputpdf/form.html') + return template.render({ + 'request': request + }) + + def _legacy_layout(self): + if self.settings.get('ticketoutput_pdf_background'): + return self._migrate_from_old_settings() + else: + return self._default_layout() + + def _default_layout(self): + return [ + {"type": "textarea", "left": "17.50", "bottom": "274.60", "fontsize": "16.0", "color": [0, 0, 0, 1], + "fontfamily": "Open Sans", "bold": False, "italic": False, "width": "175.00", "content": "event_name", + "text": "Sample event name", "align": "left"}, + {"type": "textarea", "left": "17.50", "bottom": "262.90", "fontsize": "13.0", "color": [0, 0, 0, 1], + "fontfamily": "Open Sans", "bold": False, "italic": False, "width": "110.00", "content": "itemvar", + "text": "Sample product – sample variation", "align": "left"}, + {"type": "textarea", "left": "17.50", "bottom": "252.50", "fontsize": "13.0", "color": [0, 0, 0, 1], + "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"}, + {"type": "textarea", "left": "17.50", "bottom": "234.30", "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"}, + {"type": "textarea", "left": "17.50", "bottom": "194.50", "fontsize": "13.0", "color": [0, 0, 0, 1], + "fontfamily": "Open Sans", "bold": False, "italic": False, "width": "30.00", "content": "order", + "text": "A1B2C", "align": "left"}, + {"type": "textarea", "left": "52.50", "bottom": "194.50", "fontsize": "13.0", "color": [0, 0, 0, 1], + "fontfamily": "Open Sans", "bold": False, "italic": False, "width": "45.00", "content": "price", + "text": "123.45 EUR", "align": "right"}, + {"type": "textarea", "left": "102.50", "bottom": "194.50", "fontsize": "13.0", "color": [0, 0, 0, 1], + "fontfamily": "Open Sans", "bold": False, "italic": False, "width": "90.00", "content": "secret", + "text": "tdmruoekvkpbv1o2mv8xccvqcikvr58u", "align": "left"}, + {"type": "barcodearea", "left": "130.40", "bottom": "204.50", "size": "64.00"} + ] + + def _migrate_from_old_settings(self): + l = [] + + event_s = self.settings.get('event_s', default=22, as_type=float) + if event_s: + l.append({ + 'type': 'textarea', + 'fontfamily': 'Helvetica', + 'left': self.settings.get('event_x', default=15, as_type=float), + 'bottom': self.settings.get('event_y', default=235, as_type=float), + 'fontsize': event_s, + 'color': [0, 0, 0, 1], + 'bold': False, + 'italic': False, + 'width': 150, + 'content': 'event_name', + 'text': 'Sample event', + 'align': 'left' + }) + + order_s = self.settings.get('order_s', default=17, as_type=float) + if order_s: + l.append({ + 'type': 'textarea', + 'fontfamily': 'Helvetica', + 'left': self.settings.get('order_x', default=15, as_type=float), + 'bottom': self.settings.get('order_y', default=220, as_type=float), + 'fontsize': order_s, + 'color': [0, 0, 0, 1], + 'bold': False, + 'italic': False, + 'width': 150, + 'content': 'order', + 'text': 'AB1C2', + 'align': 'left' + }) + + name_s = self.settings.get('name_s', default=17, as_type=float) + if name_s: + l.append({ + 'type': 'textarea', + 'fontfamily': 'Helvetica', + 'left': self.settings.get('name_x', default=15, as_type=float), + 'bottom': self.settings.get('name_y', default=210, as_type=float), + 'fontsize': name_s, + 'color': [0, 0, 0, 1], + 'bold': False, + 'italic': False, + 'width': 150, + 'content': 'itemvar', + 'text': 'Sample Producs - XS', + 'align': 'left' + }) + + price_s = self.settings.get('price_s', default=17, as_type=float) + if price_s: + l.append({ + 'type': 'textarea', + 'fontfamily': 'Helvetica', + 'left': self.settings.get('price_x', default=15, as_type=float), + 'bottom': self.settings.get('price_y', default=200, as_type=float), + 'fontsize': price_s, + 'color': [0, 0, 0, 1], + 'bold': False, + 'italic': False, + 'width': 150, + 'content': 'price', + 'text': 'EUR 12,34', + 'align': 'left' + }) + + qr_s = self.settings.get('qr_s', default=80, as_type=float) + if qr_s: + l.append({ + 'type': 'barcodearea', + 'left': self.settings.get('qr_x', default=10, as_type=float), + 'bottom': self.settings.get('qr_y', default=120, as_type=float), + 'size': qr_s, + }) + + code_s = self.settings.get('code_s', default=11, as_type=float) + if code_s: + l.append({ + 'type': 'textarea', + 'fontfamily': 'Helvetica', + 'left': self.settings.get('code_x', default=15, as_type=float), + 'bottom': self.settings.get('code_y', default=120, as_type=float), + 'fontsize': code_s, + 'color': [0, 0, 0, 1], + 'bold': False, + 'italic': False, + 'width': 150, + 'content': 'secret', + 'text': 'asdsdgjfgbgkjdastjrxfdg', + 'align': 'left' + }) + + attendee_s = self.settings.get('attendee_s', default=0, as_type=float) + if attendee_s: + l.append({ + 'type': 'textarea', + 'fontfamily': 'Helvetica', + 'left': self.settings.get('attendee_x', default=15, as_type=float), + 'bottom': self.settings.get('attendee_y', default=90, as_type=float), + 'fontsize': attendee_s, + 'color': [0, 0, 0, 1], + 'bold': False, + 'italic': False, + 'width': 150, + 'content': 'attendee_name', + 'text': 'John Doe', + 'align': 'left' + }) + + return l diff --git a/src/pretix/plugins/ticketoutputpdf/urls.py b/src/pretix/plugins/ticketoutputpdf/urls.py new file mode 100644 index 0000000000..10a3de0e81 --- /dev/null +++ b/src/pretix/plugins/ticketoutputpdf/urls.py @@ -0,0 +1,11 @@ +from django.conf.urls import url + +from . import views + +urlpatterns = [ + url(r'^control/event/(?P
",
+ options: {
+ disabled: false,
+
+ // callbacks
+ create: null
+ },
+ _createWidget: function( options, element ) {
+ element = $( element || this.defaultElement || this )[ 0 ];
+ this.element = $( element );
+ this.uuid = widget_uuid++;
+ this.eventNamespace = "." + this.widgetName + this.uuid;
+
+ this.bindings = $();
+ this.hoverable = $();
+ this.focusable = $();
+
+ if ( element !== this ) {
+ $.data( element, this.widgetFullName, this );
+ this._on( true, this.element, {
+ remove: function( event ) {
+ if ( event.target === element ) {
+ this.destroy();
+ }
+ }
+ });
+ this.document = $( element.style ?
+ // element within the document
+ element.ownerDocument :
+ // element is window or document
+ element.document || element );
+ this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
+ }
+
+ this.options = $.widget.extend( {},
+ this.options,
+ this._getCreateOptions(),
+ options );
+
+ this._create();
+ this._trigger( "create", null, this._getCreateEventData() );
+ this._init();
+ },
+ _getCreateOptions: $.noop,
+ _getCreateEventData: $.noop,
+ _create: $.noop,
+ _init: $.noop,
+
+ destroy: function() {
+ this._destroy();
+ // we can probably remove the unbind calls in 2.0
+ // all event bindings should go through this._on()
+ this.element
+ .unbind( this.eventNamespace )
+ .removeData( this.widgetFullName )
+ // support: jquery <1.6.3
+ // http://bugs.jquery.com/ticket/9413
+ .removeData( $.camelCase( this.widgetFullName ) );
+ this.widget()
+ .unbind( this.eventNamespace )
+ .removeAttr( "aria-disabled" )
+ .removeClass(
+ this.widgetFullName + "-disabled " +
+ "ui-state-disabled" );
+
+ // clean up events and states
+ this.bindings.unbind( this.eventNamespace );
+ this.hoverable.removeClass( "ui-state-hover" );
+ this.focusable.removeClass( "ui-state-focus" );
+ },
+ _destroy: $.noop,
+
+ widget: function() {
+ return this.element;
+ },
+
+ option: function( key, value ) {
+ var options = key,
+ parts,
+ curOption,
+ i;
+
+ if ( arguments.length === 0 ) {
+ // don't return a reference to the internal hash
+ return $.widget.extend( {}, this.options );
+ }
+
+ if ( typeof key === "string" ) {
+ // handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
+ options = {};
+ parts = key.split( "." );
+ key = parts.shift();
+ if ( parts.length ) {
+ curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
+ for ( i = 0; i < parts.length - 1; i++ ) {
+ curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
+ curOption = curOption[ parts[ i ] ];
+ }
+ key = parts.pop();
+ if ( arguments.length === 1 ) {
+ return curOption[ key ] === undefined ? null : curOption[ key ];
+ }
+ curOption[ key ] = value;
+ } else {
+ if ( arguments.length === 1 ) {
+ return this.options[ key ] === undefined ? null : this.options[ key ];
+ }
+ options[ key ] = value;
+ }
+ }
+
+ this._setOptions( options );
+
+ return this;
+ },
+ _setOptions: function( options ) {
+ var key;
+
+ for ( key in options ) {
+ this._setOption( key, options[ key ] );
+ }
+
+ return this;
+ },
+ _setOption: function( key, value ) {
+ this.options[ key ] = value;
+
+ if ( key === "disabled" ) {
+ this.widget()
+ .toggleClass( this.widgetFullName + "-disabled", !!value );
+
+ // If the widget is becoming disabled, then nothing is interactive
+ if ( value ) {
+ this.hoverable.removeClass( "ui-state-hover" );
+ this.focusable.removeClass( "ui-state-focus" );
+ }
+ }
+
+ return this;
+ },
+
+ enable: function() {
+ return this._setOptions({ disabled: false });
+ },
+ disable: function() {
+ return this._setOptions({ disabled: true });
+ },
+
+ _on: function( suppressDisabledCheck, element, handlers ) {
+ var delegateElement,
+ instance = this;
+
+ // no suppressDisabledCheck flag, shuffle arguments
+ if ( typeof suppressDisabledCheck !== "boolean" ) {
+ handlers = element;
+ element = suppressDisabledCheck;
+ suppressDisabledCheck = false;
+ }
+
+ // no element argument, shuffle and use this.element
+ if ( !handlers ) {
+ handlers = element;
+ element = this.element;
+ delegateElement = this.widget();
+ } else {
+ element = delegateElement = $( element );
+ this.bindings = this.bindings.add( element );
+ }
+
+ $.each( handlers, function( event, handler ) {
+ function handlerProxy() {
+ // allow widgets to customize the disabled handling
+ // - disabled as an array instead of boolean
+ // - disabled class as method for disabling individual parts
+ if ( !suppressDisabledCheck &&
+ ( instance.options.disabled === true ||
+ $( this ).hasClass( "ui-state-disabled" ) ) ) {
+ return;
+ }
+ return ( typeof handler === "string" ? instance[ handler ] : handler )
+ .apply( instance, arguments );
+ }
+
+ // copy the guid so direct unbinding works
+ if ( typeof handler !== "string" ) {
+ handlerProxy.guid = handler.guid =
+ handler.guid || handlerProxy.guid || $.guid++;
+ }
+
+ var match = event.match( /^([\w:-]*)\s*(.*)$/ ),
+ eventName = match[1] + instance.eventNamespace,
+ selector = match[2];
+ if ( selector ) {
+ delegateElement.delegate( selector, eventName, handlerProxy );
+ } else {
+ element.bind( eventName, handlerProxy );
+ }
+ });
+ },
+
+ _off: function( element, eventName ) {
+ eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) +
+ this.eventNamespace;
+ element.unbind( eventName ).undelegate( eventName );
+
+ // Clear the stack to avoid memory leaks (#10056)
+ this.bindings = $( this.bindings.not( element ).get() );
+ this.focusable = $( this.focusable.not( element ).get() );
+ this.hoverable = $( this.hoverable.not( element ).get() );
+ },
+
+ _delay: function( handler, delay ) {
+ function handlerProxy() {
+ return ( typeof handler === "string" ? instance[ handler ] : handler )
+ .apply( instance, arguments );
+ }
+ var instance = this;
+ return setTimeout( handlerProxy, delay || 0 );
+ },
+
+ _hoverable: function( element ) {
+ this.hoverable = this.hoverable.add( element );
+ this._on( element, {
+ mouseenter: function( event ) {
+ $( event.currentTarget ).addClass( "ui-state-hover" );
+ },
+ mouseleave: function( event ) {
+ $( event.currentTarget ).removeClass( "ui-state-hover" );
+ }
+ });
+ },
+
+ _focusable: function( element ) {
+ this.focusable = this.focusable.add( element );
+ this._on( element, {
+ focusin: function( event ) {
+ $( event.currentTarget ).addClass( "ui-state-focus" );
+ },
+ focusout: function( event ) {
+ $( event.currentTarget ).removeClass( "ui-state-focus" );
+ }
+ });
+ },
+
+ _trigger: function( type, event, data ) {
+ var prop, orig,
+ callback = this.options[ type ];
+
+ data = data || {};
+ event = $.Event( event );
+ event.type = ( type === this.widgetEventPrefix ?
+ type :
+ this.widgetEventPrefix + type ).toLowerCase();
+ // the original event may come from any element
+ // so we need to reset the target on the new event
+ event.target = this.element[ 0 ];
+
+ // copy original event properties over to the new event
+ orig = event.originalEvent;
+ if ( orig ) {
+ for ( prop in orig ) {
+ if ( !( prop in event ) ) {
+ event[ prop ] = orig[ prop ];
+ }
+ }
+ }
+
+ this.element.trigger( event, data );
+ return !( $.isFunction( callback ) &&
+ callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
+ event.isDefaultPrevented() );
+ }
+};
+
+$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
+ $.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
+ if ( typeof options === "string" ) {
+ options = { effect: options };
+ }
+ var hasOptions,
+ effectName = !options ?
+ method :
+ options === true || typeof options === "number" ?
+ defaultEffect :
+ options.effect || defaultEffect;
+ options = options || {};
+ if ( typeof options === "number" ) {
+ options = { duration: options };
+ }
+ hasOptions = !$.isEmptyObject( options );
+ options.complete = callback;
+ if ( options.delay ) {
+ element.delay( options.delay );
+ }
+ if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
+ element[ method ]( options );
+ } else if ( effectName !== method && element[ effectName ] ) {
+ element[ effectName ]( options.duration, options.easing, callback );
+ } else {
+ element.queue(function( next ) {
+ $( this )[ method ]();
+ if ( callback ) {
+ callback.call( element[ 0 ] );
+ }
+ next();
+ });
+ }
+ };
+});
+
+var widget = $.widget;
+
+
+
+}));
diff --git a/src/pretix/static/fonts/OpenSans-BoldItalic.ttf b/src/pretix/static/fonts/OpenSans-BoldItalic.ttf
new file mode 100644
index 0000000000..9bc800958a
Binary files /dev/null and b/src/pretix/static/fonts/OpenSans-BoldItalic.ttf differ
diff --git a/src/pretix/static/pretixcontrol/js/ui/main.js b/src/pretix/static/pretixcontrol/js/ui/main.js
index 6892a5eff6..05d11418be 100644
--- a/src/pretix/static/pretixcontrol/js/ui/main.js
+++ b/src/pretix/static/pretixcontrol/js/ui/main.js
@@ -83,7 +83,7 @@ $(function () {
});
$('.collapsible').collapse();
-
+
$('[data-toggle="tooltip"]').tooltip();
var url = document.location.toString();
@@ -190,7 +190,19 @@ $(function () {
$(".colorpickerfield").colorpicker({
format: 'hex',
align: 'left',
- customClass: 'colorpicker-2x'
+ customClass: 'colorpicker-2x',
+ sliders: {
+ saturation: {
+ maxLeft: 200,
+ maxTop: 200
+ },
+ hue: {
+ maxTop: 200
+ },
+ alpha: {
+ maxTop: 200
+ }
+ }
});
$("input[data-checkbox-dependency]").each(function () {
diff --git a/src/pretix/static/pretixcontrol/scss/main.scss b/src/pretix/static/pretixcontrol/scss/main.scss
index 772e8aa500..8f7a85c7df 100644
--- a/src/pretix/static/pretixcontrol/scss/main.scss
+++ b/src/pretix/static/pretixcontrol/scss/main.scss
@@ -11,6 +11,7 @@
@import "_orders.scss";
@import "_dashboard.scss";
@import "../../pretixbase/scss/webfont.scss";
+@import "../../fileupload/jquery.fileupload.scss";
@import "../../colorpicker/bootstrap-colorpicker.scss";
footer {
diff --git a/src/pretix/static/pretixpresale/pdf/ticket_default_a4.pdf b/src/pretix/static/pretixpresale/pdf/ticket_default_a4.pdf
index bf1774f9a5..2ac04cf1d6 100644
Binary files a/src/pretix/static/pretixpresale/pdf/ticket_default_a4.pdf and b/src/pretix/static/pretixpresale/pdf/ticket_default_a4.pdf differ
diff --git a/src/pretix/static/pretixpresale/pdf/ticket_default_a4.svg b/src/pretix/static/pretixpresale/pdf/ticket_default_a4.svg
index d5dc1fe66f..d9a9d1359f 100644
--- a/src/pretix/static/pretixpresale/pdf/ticket_default_a4.svg
+++ b/src/pretix/static/pretixpresale/pdf/ticket_default_a4.svg
@@ -14,7 +14,7 @@
viewBox="0 0 744.09448819 1052.3622047"
id="svg2"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.1 r"
sodipodi:docname="ticket_default_a4.svg">
+
Your Ticket