From c64b4473e4f6a8d7709562226117209c929c409b Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Thu, 27 Jul 2017 11:43:35 +0200
Subject: [PATCH] Add organizer_info_text

---
 src/pretix/base/settings.py                                | 4 ++++
 src/pretix/control/forms/organizer.py                      | 7 +++++++
 .../control/templates/pretixcontrol/organizers/edit.html   | 5 +++++
 .../static/pretixplugins/ticketoutputpdf/editor.js         | 2 ++
 .../templates/pretixplugins/ticketoutputpdf/index.html     | 2 ++
 src/pretix/plugins/ticketoutputpdf/ticketoutput.py         | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py
index f68e05d7b..bb99fc77b 100644
--- a/src/pretix/base/settings.py
+++ b/src/pretix/base/settings.py
@@ -415,6 +415,10 @@ Your {event} team"""))
         'default': '',
         'type': LazyI18nString
     },
+    'organizer_info_text': {
+        'default': '',
+        'type': LazyI18nString
+    },
     'update_check_ack': {
         'default': 'False',
         'type': bool
diff --git a/src/pretix/control/forms/organizer.py b/src/pretix/control/forms/organizer.py
index 833f6792f..fbd6f3a45 100644
--- a/src/pretix/control/forms/organizer.py
+++ b/src/pretix/control/forms/organizer.py
@@ -119,6 +119,13 @@ class OrganizerSettingsForm(SettingsForm):
         help_text=_('This will be displayed on the organizer homepage.')
     )
 
+    organizer_info_text = I18nFormField(
+        label=_('Info text'),
+        required=False,
+        widget=I18nTextarea,
+        help_text=_('Not displayed anywhere by default, but if you want to, you can use this e.g. in ticket templates.')
+    )
+
     organizer_logo_image = ExtFileField(
         label=_('Logo image'),
         ext_whitelist=(".png", ".jpg", ".svg", ".gif", ".jpeg"),
diff --git a/src/pretix/control/templates/pretixcontrol/organizers/edit.html b/src/pretix/control/templates/pretixcontrol/organizers/edit.html
index 8391d7fd3..5f8b3d05e 100644
--- a/src/pretix/control/templates/pretixcontrol/organizers/edit.html
+++ b/src/pretix/control/templates/pretixcontrol/organizers/edit.html
@@ -23,6 +23,11 @@
             {% bootstrap_field sform.organizer_homepage_text layout="horizontal" %}
             {% bootstrap_field sform.event_list_type layout="horizontal" %}
         </fieldset>
+        <fieldset>
+            <legend>{% trans "Other" %}</legend>
+            {% bootstrap_form_errors sform %}
+            {% bootstrap_field sform.organizer_info_text layout="horizontal" %}
+        </fieldset>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}
diff --git a/src/pretix/plugins/ticketoutputpdf/static/pretixplugins/ticketoutputpdf/editor.js b/src/pretix/plugins/ticketoutputpdf/static/pretixplugins/ticketoutputpdf/editor.js
index 247429ae3..218a6069b 100644
--- a/src/pretix/plugins/ticketoutputpdf/static/pretixplugins/ticketoutputpdf/editor.js
+++ b/src/pretix/plugins/ticketoutputpdf/static/pretixplugins/ticketoutputpdf/editor.js
@@ -175,6 +175,8 @@ var editor = {
         "event_begin": gettext("2017-05-31 20:00"),
         "event_admission": gettext("2017-05-31 19:00"),
         "event_location": gettext("Random City"),
+        "organizer": gettext("Event organizer company"),
+        "organizer_info_text": gettext("Event organizer info text"),
         "addons": gettext("Addon 1\nAddon 2"),
     },
 
diff --git a/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/index.html b/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/index.html
index 2a9bf2a11..b268fb6c5 100644
--- a/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/index.html
+++ b/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/index.html
@@ -300,6 +300,8 @@
                                 <option value="event_admission_time">{% trans "Event admission time" %}</option>
                                 <option value="event_location">{% trans "Event location" %}</option>
                                 <option value="addons">{% trans "List of Add-Ons" %}</option>
+                                <option value="organizer">{% trans "Organizer name" %}</option>
+                                <option value="organizer_info_text">{% trans "Organizer info text" %}</option>
                                 <option value="other">{% trans "Other…" %}</option>
                             </select>
                             <textarea type="text" value="" class="input-block-level form-control"
diff --git a/src/pretix/plugins/ticketoutputpdf/ticketoutput.py b/src/pretix/plugins/ticketoutputpdf/ticketoutput.py
index dd263ca98..9defee94b 100644
--- a/src/pretix/plugins/ticketoutputpdf/ticketoutput.py
+++ b/src/pretix/plugins/ticketoutputpdf/ticketoutput.py
@@ -72,6 +72,10 @@ class PdfTicketOutput(BaseTicketOutput):
             return str(op.item)
         elif o['content'] == 'item_description':
             return str(op.item.description)
+        elif o['content'] == 'organizer':
+            return str(order.event.organizer.name)
+        elif o['content'] == 'organizer_info_text':
+            return str(order.event.settings.organizer_info_text)
         elif o['content'] == 'secret':
             return op.secret
         elif o['content'] == 'variation':