Fix issues introduced in rebase

Dockerfile

@@ -35,7 +35,6 @@ WORKDIR /pretix/src
 ADD deployment/docker/production_settings.py /pretix/src/production_settings.py
 ENV DJANGO_SETTINGS_MODULE production_settings
 
-RUN pip3 install -U pip wheel setuptools
 RUN pip3 install -r requirements.txt -r requirements/mysql.txt -r requirements/postgres.txt \
 	-r requirements/memcached.txt -r requirements/redis.txt \
 	-r requirements/py34.txt gunicorn

README.md

@@ -1,14 +1,9 @@
 pretix
 ======
 
-.. image:: https://readthedocs.org/projects/pretix/badge/?version=latest
-   :target: https://docs.pretix.eu/en/latest/
-
-.. image:: https://travis-ci.org/pretix/pretix.svg?branch=master
-   :target: https://travis-ci.org/pretix/pretix
-
-.. image:: https://coveralls.io/repos/github/pretix/pretix/badge.svg?branch=master
-   :target: https://coveralls.io/r/pretix/pretix
+[![Docs](https://readthedocs.org/projects/pretix/badge/?version=latest)](http://docs.pretix.eu/en/latest/)
+[![Build Status](https://travis-ci.org/pretix/pretix.svg?branch=master)](https://travis-ci.org/pretix/pretix)
+[![Coverage Status](https://img.shields.io/coveralls/pretix/pretix.svg)](https://coveralls.io/r/pretix/pretix)
 
 
 Reinventing ticket presales, one bit at a time.
@@ -25,11 +20,12 @@ like, but we try to keep the changes to documented APIs as small as possible. If
 in production or develop a plugin now, I invite you to send me an email so that I can notify you of changes
 and bugs that require your attention.
 
-Since very recently we now have an `installation guide`_ in our documentation.
+Since very recently we now have an [installation guide](https://docs.pretix.eu/en/latest/admin/installation/index.html)
+in our documentation.
 
 Contributing
 ------------
-If you want to contribute to pretix, please read the `developer documentation`_
+If you want to contribute to pretix, please read the [developer documentation](https://docs.pretix.eu/en/latest/development/index.html)
 in our documentation. If you have any further questions, please do not hesitate to ask!
 
 License
@@ -42,8 +38,4 @@ AUTHORS file for a list of all the awesome folks who contributed to this project
 
 This project is 100 percent free and open source software. If you are interested in
 commercial support, hosting services or supporting this project financially, please 
-go to `pretix.eu`_ or contact Raphael directly.
-
-.. _installation guide: https://docs.pretix.eu/en/latest/admin/installation/index.html
-.. _developer documentation: https://docs.pretix.eu/en/latest/development/index.html
-.. _pretix.eu: https://pretix.eu
+go to [pretix.eu](https://pretix.eu) or contact Raphael directly.

doc/admin/config.rst

@@ -16,9 +16,7 @@ the files found before.
 
 The file is expected to be in the INI format as specified in the `Python documentation`_.
 
-The config file may contain the following sections (all settings are optional and have
-default values). We suggest that you start from the examples given in one of the
-installation tutorials.
+The config file may contain the following sections (all settings are optional and have default values).
 
 pretix settings
 ---------------
@@ -203,9 +201,6 @@ You can use an existing memcached server as pretix's caching backend::
 
 If no memcached is configured, pretix will use Django's built-in local-memory caching method.
 
-.. note:: If you use memcached and you deploy pretix across multiple servers, you should use *one*
-          shared memcached instance, not multiple ones, because cache invalidations would not be
-          propagated otherwise.
 
 Redis
 -----
@@ -243,19 +238,6 @@ RabbitMQ might be the better choice if you have a complex, multi-server, high-pe
 but as you already should have a redis instance ready for session and lock storage, we recommend
 redis for convenience. See the `Celery documentation`_ for more details.
 
-Sentry
-------
-
-pretix has native support for sentry, a tool that you can use to track errors in the
-application. If you want to use sentry, you need to set a DSN in the configuration file.
-
-    [sentry]
-    dsn=https://<key>:<secret>@sentry.io/<project>
-
-``dsn``
-    You will be given this value by your sentry installation.
-
-
 Secret length
 -------------
 

doc/admin/installation/docker_smallscale.rst

@@ -74,7 +74,7 @@ redis instance to be running on the same host. To avoid the hassle with network
 recommend connecting to redis via a unix socket. To enable redis on unix sockets, add the following to your
 ``/etc/redis/redis.conf``::
 
-    unixsocket /var/run/redis/redis.sock
+    unixsocket /tmp/redis.sock
     unixsocketperm 777
 
 Now restart redis-server::
@@ -127,14 +127,14 @@ Fill the configuration file ``/etc/pretix/pretix.cfg`` with the following conten
     host=172.17.0.1
 
     [redis]
-    location=unix:///var/run/redis/redis.sock?db=0
+    location=unix:///tmp/redis.sock?db=0
     ; Remove the following line if you are unsure about your redis' security
     ; to reduce impact if redis gets compromised.
     sessions=true
 
     [celery]
-    backend=redis+socket:///var/run/redis/redis.sock?virtual_host=1
-    broker=redis+socket:///var/run/redis/redis.sock?virtual_host=2
+    backend=redis+socket:///tmp/redis.sock?virtual_host=1
+    broker=redis+socket:///tmp/redis.sock?virtual_host=2
 
 See :ref:`email configuration <mail-settings>` to learn more about configuring mail features.
 
@@ -160,7 +160,7 @@ named ``/etc/systemd/system/pretix.service`` with the following content::
     ExecStart=/usr/bin/docker run --name %n -p 8345:80 \
         -v /var/pretix-data:/data \
         -v /etc/pretix:/etc/pretix \
-        -v /var/run/redis:/var/run/redis \
+        -v /tmp/redis.sock:/tmp/redis.sock \
         -v /var/run/mysqld:/var/run/mysqld \
         pretix/standalone all
     ExecStop=/usr/bin/docker stop %n
@@ -168,7 +168,7 @@ named ``/etc/systemd/system/pretix.service`` with the following content::
     [Install]
     WantedBy=multi-user.target
 
-You can leave the MySQL socket volume out if you're using PostgreSQL. You can now run the following commands
+You can leave the MySQL socket volume out if you're using PostgreSQL. You can now run the following comamnds
 to enable and start the service::
 
     # systemctl daemon-reload

doc/admin/installation/general.rst

@@ -5,33 +5,51 @@ General remarks
 
 Requirements
 ------------
-To use pretix, you wull need the following things:
+To use pretix, the most minimal setup consists of:
 
 * **pretix** and the python packages it depends on
-
 * An **WSGI application server** (we recommend gunicorn)
-
 * A periodic task runner, e.g. ``cron``
 
-* **A database**. This needs to be a SQL-based that is supported by Django. We highly recommend to either
-  go for **PostgreSQL** or **MySQL/MariaDB**. If you do not provide one, pretix will run on SQLite, which is useful
-  for evaluation and development purposes.
+To run pretix, you will need **at least Python 3.4**. We only recommend installations on **Linux**, Windows is not
+officially supported (but might work).
 
-  .. warning:: Do not ever use SQLite in production. It will break.
+Optional requirements
+---------------------
 
-* A **reverse proxy**. pretix needs to deliver some static content to your users (e.g. CSS, images, ...). While pretix
-  is capable of doing this, having this handled by a proper web server like **nginx** or **Apache** will be much
-  faster. Also, you need a proxying web server in front to provide SSL encryption.
+pretix is built in a way that makes many of the following requirements optional. However, performance or security might
+be very low if you skip some of them, therefore they are only partly optional.
 
-  .. warning:: Do not ever run without SSL in production. Your users deserve encrypted connections and thanks to
-               `Let's Encrypt`_ SSL certificates can be obtained for free these days.
+Database
+    A good SQL-based database to run on that is supported by Django. We highly recommend to either go for **PostgreSQL**
+    or **MySQL/MariaDB**.
+    If you do not provide one, pretix will run on SQLite, which is useful for evaluation and development purposes.
 
-* A **redis** server. This will be used for caching, session storage and task queuing.
+    .. warning:: Do not ever use SQLite in production. It will break.
 
-  .. warning:: pretix can run without redis, however this is only intended for development and should never be
-               used in production.
+Reverse proxy
+    pretix needs to deliver some static content to your users (e.g. CSS, images, ...). While pretix is capable of
+    doing this, having this handled by a proper web server like **nginx** or **Apache** will be much faster. Also, you
+    need a proxying web server in front to provide SSL encryption.
 
-* Optionally: RabbitMQ or memcached. Both of them might provide speedups, but if they are not present,
-  redis will take over their job.
+    .. warning:: Do not ever run without SSL in production. Your users deserve encrypted connections and thanks to
+                 `Let's Encrypt`_ SSL certificates can be obtained for free these days.
+
+Task worker
+    When pretix has to do heavy stuff, it is better to offload it into a background process instead of having the
+    users connection wait. Therefore pretix provides a background service that can be used to work on those
+    longer-running tasks.
+
+    This requires at least Redis (and optionally RabbitMQ).
+
+Redis
+    If you provide a redis instance, pretix is able to make use of it in the three following ways:
+
+    * Caching
+    * Fast session storage
+    * Queuing and result storage for the task worker queue
+
+RabbitMQ
+    RabbitMQ can be used as a more advanced queue manager for the task workers if necessary.
 
 .. _Let's Encrypt: https://letsencrypt.org/

doc/conf.py

@@ -38,7 +38,6 @@ extensions = [
     'sphinx.ext.doctest',
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
-    'sphinxcontrib.httpdomain',
 ]
 
 # Add any paths that contain templates here, relative to this directory.

doc/development/api/general.rst

@@ -51,7 +51,7 @@ Backend
 
 
 .. automodule:: pretix.base.signals
-   :members: logentry_display, requiredaction_display
+   :members: logentry_display
 
 Vouchers
 """"""""

doc/development/api/payment.rst

@@ -70,6 +70,8 @@ The provider class
 
    .. automethod:: is_allowed
 
+   .. automethod:: is_allowed_for_order
+
    .. autoattribute:: payment_form_fields
 
    .. automethod:: checkout_prepare

doc/development/api/ticketoutput.rst

@@ -65,3 +65,5 @@ The output class
    .. automethod:: generate
 
    .. autoattribute:: download_button_text
+
+   .. autoattribute:: download_button_icon

doc/development/contribution/style.rst

@@ -8,12 +8,12 @@ Python code
 
   Use `flake8`_ to check for conformance problems. The project includes a setup.cfg file
   with a default configuration for flake8 that excludes migrations and other non-relevant
-  code parts. It also silences a few checks, e.g. ``N802`` (function names should be lowercase)
-  and increases the maximum line length to more than 79 characters. **However** you should
+  code parts. It also silences a few checks, e.g. ``N802`` (function names should be lowercase) 
+  and increases the maximum line length to more than 79 characters. **However** you should 
   still name all your functions lowercase [#f1]_ and keep your lines short when possible.
 
 * Our build server will reject all code violating other flake8 checks than the following:
-
+  
   * E123: closing bracket does not match indentation of opening bracket’s line
   * F403: ``from module import *`` used; unable to detect undefined names
   * F401: module imported but unused

doc/development/implementation/models.rst

@@ -29,9 +29,6 @@ Organizers and events
 .. autoclass:: pretix.base.models.EventPermission
    :members:
 
-.. autoclass:: pretix.base.models.RequiredAction
-   :members:
-
 
 Items
 -----
@@ -67,9 +64,6 @@ Carts and Orders
    :members:
 
 .. autoclass:: pretix.base.models.QuestionAnswer
-:members:
-
-.. autoclass:: pretix.base.models.Checkin
    :members:
 
 Logging

doc/development/setup.rst

@@ -17,9 +17,6 @@ External Dependencies
 * ``pyvenv`` for Python 3 (Debian package: ``python3-venv``)
 * ``libffi`` (Debian package: ``libffi-dev``)
 * ``libssl`` (Debian package: ``libssl-dev``)
-* ``libxml2`` (Debian package ``libxml2-dev``)
-* ``libxslt`` (Debian package ``libxslt1-dev``)
-* ``msgfmt`` (Debian package ``gettext``)
 * ``git``
 
 Your local python environment
@@ -80,7 +77,7 @@ and head to http://localhost:8000/
 
 As we did not implement an overall front page yet, you need to go directly to
 http://localhost:8000/control/ for the admin view or, if you imported the test
-data as suggested above, to the event page at http://localhost:8000/bigevents/2017/
+data as suggested above, to the event page at http://localhost:8000/mrmcd/2015/
 
 .. _`checksandtests`:
 
@@ -121,8 +118,8 @@ Then execute ``python -m smtpd -n -c DebuggingServer localhost:1025``.
 
 Working with translations
 ^^^^^^^^^^^^^^^^^^^^^^^^^
-If you want to translate new strings that are not yet known to the translation system,
-you can use the following command to scan the source code for strings to be translated
+If you want to translate new strings that are not yet known to the translation system, 
+you can use the following command to scan the source code for strings to be translated 
 and update the ``*.po`` files accordingly::
 
     make localegen

doc/index.rst

@@ -8,5 +8,4 @@ Contents:
 
    admin/index
    development/index
-   plugins/index
 

doc/plugins/index.rst

@@ -1,13 +0,0 @@
-Plugin documentation
-====================
-
-This part of the documentation contains information about available plugins
-that can be used to extend pretix's functionality.
-If you want to **create** a plugin, please go to the
-:ref:`Developer documentation <pluginsetup>` instead.
-
-.. toctree::
-   :maxdepth: 2
-
-   list
-   pretixdroid

doc/plugins/list.rst

@@ -1,30 +0,0 @@
-List of plugins
-===============
-
-The following plugins are shipped with pretix and are supported in the same
-ways that pretix itself is:
-
-* Bank transfer
-* PayPal
-* Stripe
-* Check-in lists
-* pretixdroid
-* Report exporter
-* Send out emails
-* Statistics
-* PDF ticket output
-
-The following plugins are not shipped with pretix but are maintained by the
-same team:
-
-* `Passbook/Wallet ticket output`_
-* `Cartshare`_
-
-The following plugins are from independent third-party authors, so we can make
-no statements about their stability:
-
-* `esPass ticket output`_
-
-.. _Passbook/Wallet ticket output: https://github.com/pretix/pretix-passbook
-.. _Cartshare: https://github.com/pretix/pretix-cartshare
-.. _esPass ticket output: https://github.com/esPass/pretix-espass

doc/plugins/pretixdroid.rst

@@ -1,174 +0,0 @@
-pretixdroid HTTP API
-====================
-
-The pretixdroid plugin provides a HTTP API that the `pretixdroid Android app`_
-uses to communicate with the pretix server.
-
-.. http:post:: /pretixdroid/api/(organizer)/(event)/redeem/
-
-   Redeems a ticket, i.e. checks the user in.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /pretixdroid/api/demoorga/democon/redeem/?key=ABCDEF HTTP/1.1
-      Host: demo.pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/x-www-form-urlencoded
-
-      secret=az9u4mymhqktrbupmwkvv6xmgds5dk3
-
-   **Example successful response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Content-Type: text/json
-
-      {
-        "status": "ok"
-        "version": 2
-      }
-
-   **Example error response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Content-Type: text/json
-
-      {
-        "status": "error",
-        "reason": "already_redeemed",
-        "version": 2
-      }
-
-   Possible error reasons:
-
-   * ``unpaid`` - Ticket is not paid for or has been refunded
-   * ``already_redeemed`` - Ticket already has been redeemed
-   * ``unknown_ticket`` - Secret does not match a ticket in the database
-
-   :query key: Secret API key
-         :statuscode 200: Valid request
-         :statuscode 404: Unknown organizer or event
-         :statuscode 403: Invalid authorization key
-
-.. http:get:: /pretixdroid/api/(organizer)/(event)/search/
-
-   Searches for a ticket.
-   At most 25 results will be returned. **Queries with less than 4 characters will always return an empty result set.**
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /pretixdroid/api/demoorga/democon/search/?key=ABCDEF&query=Peter HTTP/1.1
-      Host: demo.pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Content-Type: text/json
-
-      {
-        "results": [
-          {
-            "secret": "az9u4mymhqktrbupmwkvv6xmgds5dk3",
-            "order": "ABCE6",
-            "item": "Standard ticket",
-            "variation": null,
-            "attendee_name": "Peter Higgs",
-            "redeemed": false,
-            "paid": true
-          },
-          ...
-        ],
-        "version": 2
-      }
-
-   :query query: Search query
-         :query key: Secret API key
-         :statuscode 200: Valid request
-         :statuscode 404: Unknown organizer or event
-         :statuscode 403: Invalid authorization key
-
-.. http:get:: /pretixdroid/api/(organizer)/(event)/status/
-
-   Returns status information, such as the total number of tickets and the
-   number of performed checkins.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /pretixdroid/api/demoorga/democon/status/?key=ABCDEF HTTP/1.1
-      Host: demo.pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Content-Type: text/json
-
-      {
-        "checkins": 17,
-        "total": 42,
-        "version": 2,
-        "event": {
-          "name": "Demo Converence",
-          "slug": "democon",
-          "date_from": "2016-12-27T17:00:00Z",
-          "date_to": "2016-12-30T18:00:00Z",
-          "timezone": "UTC",
-          "url": "https://demo.pretix.eu/demoorga/democon/",
-          "organizer": {
-            "name": "Demo Organizer",
-            "slug": "demoorga"
-          },
-        },
-        "items": [
-          {
-            "name": "T-Shirt",
-            "id": 1,
-            "checkins": 1,
-            "admission": False,
-            "total": 1,
-            "variations": [
-              {
-                "name": "Red",
-                "id": 1,
-                "checkins": 1,
-                "total": 12
-              },
-              {
-               "name": "Blue",
-                "id": 2,
-                "checkins": 4,
-                "total": 8
-              }
-            ]
-          },
-          {
-            "name": "Ticket",
-            "id": 2,
-            "checkins": 15,
-            "admission": True,
-            "total": 22,
-            "variations": []
-          }
-        ]
-      }
-
-   :query key: Secret API key
-   :statuscode 200: Valid request
-   :statuscode 404: Unknown organizer or event
-   :statuscode 403: Invalid authorization key
-
-.. _pretixdroid Android app: https://github.com/pretix/pretixdroid

doc/requirements.txt

@@ -1,4 +1,3 @@
 -r ../src/requirements.txt
 sphinx
 sphinx-rtd-theme
-sphinxcontrib-httpdomain

src/.gitignore

@@ -7,4 +7,5 @@ build/
 dist/
 *.egg-info/
 *.bak
-pretix/static/jsi18n/
+static/jsi18n/
+

src/MANIFEST.in

@@ -1,13 +1,11 @@
 include LICENSE
 include README.rst
-recursive-include pretix/static *
 recursive-include pretix/static.dist *
 recursive-include pretix/locale *
 recursive-include pretix/base/templates *
 recursive-include pretix/control/templates *
 recursive-include pretix/presale/templates *
 recursive-include pretix/plugins/banktransfer/templates *
-recursive-include pretix/plugins/banktransfer/static *
 recursive-include pretix/plugins/paypal/templates *
 recursive-include pretix/plugins/pretixdroid/templates *
 recursive-include pretix/plugins/pretixdroid/static *

src/Makefile

@@ -6,7 +6,7 @@ localecompile:
 
 localegen:
 	./manage.py makemessages --all --ignore "pretix/helpers/*"
-	./manage.py makemessages --all -d djangojs --ignore "pretix/helpers/*" --ignore "static/jsi18n/*"
+	./manage.py makemessages --all -d djangojs --ignore "pretix/helpers/*"
 
 staticfiles: jsi18n
 	./manage.py collectstatic --noinput

src/pretix/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.0b1"
+__version__ = "0.0.0"

src/pretix/base/__init__.py

@@ -12,7 +12,7 @@ class PretixBaseConfig(AppConfig):
         from .services import export, mail, tickets, cart, orders, cleanup  # NOQA
 
         try:
-            from .celery_app import app as celery_app  # NOQA
+            from .celery import app as celery_app  # NOQA
         except ImportError:
             pass
 

src/pretix/base/forms/__init__.py

@@ -23,12 +23,11 @@ class BaseI18nModelForm(BaseModelForm):
     """
     def __init__(self, *args, **kwargs):
         event = kwargs.pop('event', None)
-        locales = kwargs.pop('locales', None)
         super().__init__(*args, **kwargs)
-        if event or locales:
+        if event:
             for k, field in self.fields.items():
                 if isinstance(field, I18nFormField):
-                    field.widget.enabled_langcodes = event.settings.get('locales') if event else locales
+                    field.widget.enabled_langcodes = event.settings.get('locales')
 
 
 class I18nModelForm(six.with_metaclass(ModelFormMetaclass, BaseI18nModelForm)):
@@ -98,14 +97,12 @@ class SettingsForm(forms.Form):
     )
 
     def __init__(self, *args, **kwargs):
-        self.obj = kwargs.pop('obj', None)
-        self.locales = kwargs.pop('locales', None)
+        self.obj = kwargs.pop('obj')
         kwargs['initial'] = self.obj.settings.freeze()
         super().__init__(*args, **kwargs)
-        if self.obj or self.locales:
-            for k, field in self.fields.items():
-                if isinstance(field, I18nFormField):
-                    field.widget.enabled_langcodes = self.obj.settings.get('locales') if self.obj else self.locales
+        for k, field in self.fields.items():
+            if isinstance(field, I18nFormField):
+                field.widget.enabled_langcodes = self.obj.settings.get('locales')
 
     def save(self):
         """

src/pretix/base/i18n.py

@@ -69,16 +69,14 @@ class LazyI18nString:
 
         if isinstance(self.data, dict):
             firstpart = lng.split('-')[0]
-            similar = [l for l in self.data.keys() if (l.startswith(firstpart + "-") or firstpart == l) and l != lng]
-            if self.data.get(lng):
+            similar = [l for l in self.data.keys() if l.startswith(firstpart + "-") or firstpart == l]
+            if lng in self.data and self.data[lng]:
                 return self.data[lng]
-            elif self.data.get(firstpart):
+            elif firstpart in self.data:
                 return self.data[firstpart]
-            elif similar and any([self.data.get(s) for s in similar]):
-                for s in similar:
-                    if self.data.get(s):
-                        return self.data.get(s)
-            elif self.data.get(settings.LANGUAGE_CODE):
+            elif similar:
+                return self.data[similar[0]]
+            elif settings.LANGUAGE_CODE in self.data and self.data[settings.LANGUAGE_CODE]:
                 return self.data[settings.LANGUAGE_CODE]
             elif len(self.data):
                 return list(self.data.items())[0][1]
@@ -147,7 +145,6 @@ class I18nWidget(forms.MultiWidget):
         data = []
         first_enabled = None
         any_filled = False
-        any_enabled_filled = False
         if not isinstance(value, LazyI18nString):
             value = LazyI18nString(value)
         for i, lng in enumerate(self.langcodes):
@@ -161,13 +158,9 @@ class I18nWidget(forms.MultiWidget):
             any_filled = any_filled or (lng in self.enabled_langcodes and dataline)
             if not first_enabled and lng in self.enabled_langcodes:
                 first_enabled = i
-                if dataline:
-                    any_enabled_filled = True
             data.append(dataline)
         if value and not isinstance(value.data, dict):
             data[first_enabled] = value.data
-        elif value and not any_enabled_filled:
-            data[first_enabled] = value.localize(self.enabled_langcodes[0])
         return data
 
     def render(self, name, value, attrs=None):

src/pretix/base/migrations/0048_auto_20161129_1330.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2016-11-29 13:30
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0047_auto_20161126_1300'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='voucher',
-            name='price_mode',
-            field=models.CharField(choices=[('none', 'No effect'), ('set', 'Set product price to'), ('subtract', 'Subtract from product price'), ('percent', 'Reduce product price by (%)')], default='set', max_length=100, verbose_name='Price mode'),
-        ),
-        migrations.RenameField(
-            model_name='voucher',
-            old_name='price',
-            new_name='value',
-        ),
-        migrations.AlterField(
-            model_name='voucher',
-            name='value',
-            field=models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True, verbose_name='Voucher value'),
-        ),
-    ]

src/pretix/base/migrations/0049_checkin.py

@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.4 on 2016-12-08 16:47
-from __future__ import unicode_literals
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0048_auto_20161129_1330'),
-        ('pretixdroid', '0002_auto_20161208_1644'),
-    ]
-
-    state_operations = [
-        migrations.CreateModel(
-            name='Checkin',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('datetime', models.DateTimeField(auto_now_add=True)),
-                ('position', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pretixdroid_checkins', to='pretixbase.OrderPosition')),
-            ],
-        ),
-    ]
-
-    operations = [
-        migrations.SeparateDatabaseAndState(state_operations=state_operations)
-    ]

src/pretix/base/migrations/0050_orderposition_positionid.py

@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.4 on 2016-12-21 17:05
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-def forwards(apps, schema_editor):
-    Order = apps.get_model('pretixbase', 'Order')
-    for o in Order.objects.all():
-        for i, p in enumerate(o.positions.all()):
-            p.positionid = i + 1
-            p.save()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0049_checkin'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='orderposition',
-            name='positionid',
-            field=models.PositiveIntegerField(default=1),
-        ),
-        migrations.RunPython(
-            forwards, migrations.RunPython.noop
-        ),
-    ]

src/pretix/base/migrations/0051_auto_20161221_1720.py

@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.4 on 2016-12-21 17:20
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-import pretix.base.models.orders
-
-
-def invalidate_ticket_cache(apps, schema_editor):
-    CachedTicket = apps.get_model('pretixbase', 'CachedTicket')
-    for ct in CachedTicket.objects.all():
-        try:
-            if ct.cachedfile:
-                ct.cachedfile.delete()
-                if ct.cachedfile.file:
-                    ct.cachedfile.file.delete(False)
-        except models.Model.DoesNotExist:
-            pass
-        ct.delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0050_orderposition_positionid'),
-    ]
-
-    operations = [
-        migrations.RunPython(
-            invalidate_ticket_cache, migrations.RunPython.noop
-        ),
-        migrations.RemoveField(
-            model_name='cachedticket',
-            name='cachedfile',
-        ),
-        migrations.AddField(
-            model_name='cachedticket',
-            name='extension',
-            field=models.CharField(default='', max_length=255),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='cachedticket',
-            name='file',
-            field=models.FileField(blank=True, null=True, upload_to=pretix.base.models.orders.cachedticket_name),
-        ),
-        migrations.AddField(
-            model_name='cachedticket',
-            name='type',
-            field=models.CharField(default='', max_length=255),
-            preserve_default=False,
-        ),
-    ]

src/pretix/base/migrations/0052_auto_20161231_1533.py

@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.4 on 2016-12-31 15:33
-from __future__ import unicode_literals
-
-import django.db.models.deletion
-import django.utils.timezone
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0051_auto_20161221_1720'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='checkin',
-            name='datetime',
-            field=models.DateTimeField(default=django.utils.timezone.now),
-        ),
-        migrations.AlterField(
-            model_name='checkin',
-            name='position',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checkins', to='pretixbase.OrderPosition'),
-        ),
-        migrations.AlterField(
-            model_name='voucher',
-            name='price_mode',
-            field=models.CharField(choices=[('none', 'No effect'), ('set', 'Set product price to'), ('subtract', 'Subtract from product price'), ('percent', 'Reduce product price by (%)')], default='none', max_length=100, verbose_name='Price mode'),
-        ),
-    ]

src/pretix/base/migrations/0053_auto_20170104_1252.py

@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.4 on 2017-01-04 12:52
-from __future__ import unicode_literals
-
-import django.core.validators
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-import pretix.base.validators
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0052_auto_20161231_1533'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='RequiredAction',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('datetime', models.DateTimeField(auto_now_add=True, db_index=True)),
-                ('done', models.BooleanField(default=False)),
-                ('action_type', models.CharField(max_length=255)),
-                ('data', models.TextField(default='{}')),
-            ],
-            options={
-                'ordering': ('datetime',),
-            },
-        ),
-        migrations.AlterField(
-            model_name='event',
-            name='slug',
-            field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This will be used in order codes, invoice numbers, links and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBlacklistValidator()], verbose_name='Short form'),
-        ),
-        migrations.AddField(
-            model_name='requiredaction',
-            name='event',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='pretixbase.Event'),
-        ),
-        migrations.AddField(
-            model_name='requiredaction',
-            name='user',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
-        ),
-    ]

src/pretix/base/models/__init__.py

@@ -1,9 +1,6 @@
 from .auth import U2FDevice, User
 from .base import CachedFile, LoggedModel, cachedfile_name
-from .checkin import Checkin
-from .event import (
-    Event, EventLock, EventPermission, EventSetting, RequiredAction,
-)
+from .event import Event, EventLock, EventPermission, EventSetting
 from .invoices import Invoice, InvoiceLine, invoice_filename
 from .items import (
     Item, ItemCategory, ItemVariation, Question, QuestionOption, Quota,

src/pretix/base/models/base.py

@@ -71,4 +71,4 @@ class LoggedModel(models.Model, LoggingMixin):
 
         :return: A QuerySet of LogEntry objects
         """
-        return self.logentries.all().select_related('user', 'event')
+        return self.logentries.all().select_related('user')

src/pretix/base/models/checkin.py

@@ -1,10 +0,0 @@
-from django.db import models
-from django.utils.timezone import now
-
-
-class Checkin(models.Model):
-    """
-    A checkin object is created when a person enters the event.
-    """
-    position = models.ForeignKey('pretixbase.OrderPosition', related_name='checkins')
-    datetime = models.DateTimeField(default=now)

src/pretix/base/models/event.py

@@ -1,17 +1,14 @@
 import uuid
-from datetime import date, datetime, time
 
 import pytz
 from django.conf import settings
 from django.core.exceptions import ValidationError
-from django.core.files.storage import default_storage
 from django.core.mail import get_connection
 from django.core.validators import RegexValidator
 from django.db import models
 from django.template.defaultfilters import date as _date
-from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
-from django.utils.timezone import make_aware, now
+from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
 
 from pretix.base.email import CustomSMTPBackend
@@ -19,7 +16,6 @@ from pretix.base.i18n import I18nCharField
 from pretix.base.models.base import LoggedModel
 from pretix.base.settings import SettingsProxy
 from pretix.base.validators import EventSlugBlacklistValidator
-from pretix.helpers.daterange import daterange
 
 from .auth import User
 from .organizer import Organizer
@@ -65,7 +61,7 @@ class Event(LoggedModel):
         max_length=50, db_index=True,
         help_text=_(
             "Should be short, only contain lowercase letters and numbers, and must be unique among your events. "
-            "This will be used in order codes, invoice numbers, links and bank transfer references."),
+            "This is being used in addresses and bank transfer references."),
         validators=[
             RegexValidator(
                 regex="^[a-zA-Z0-9.-]+$",
@@ -73,7 +69,7 @@ class Event(LoggedModel):
             ),
             EventSlugBlacklistValidator()
         ],
-        verbose_name=_("Short form"),
+        verbose_name=_("Slug"),
     )
     live = models.BooleanField(default=False, verbose_name=_("Shop is live"))
     permitted = models.ManyToManyField(User, through='EventPermission',
@@ -156,12 +152,6 @@ class Event(LoggedModel):
             "DATETIME_FORMAT" if self.settings.show_times else "DATE_FORMAT"
         )
 
-    def get_date_range_display(self, tz=None) -> str:
-        tz = tz or pytz.timezone(self.settings.timezone)
-        if not self.settings.show_date_to or not self.date_to:
-            return _date(self.date_from.astimezone(tz), "DATE_FORMAT")
-        return daterange(self.date_from.astimezone(tz), self.date_to.astimezone(tz))
-
     def get_cache(self) -> "pretix.base.cache.ObjectRelatedCache":
         """
         Returns an :py:class:`ObjectRelatedCache` object. This behaves equivalent to
@@ -218,81 +208,6 @@ class Event(LoggedModel):
         else:
             return get_connection(fail_silently=False)
 
-    @property
-    def payment_term_last(self):
-        tz = pytz.timezone(self.settings.timezone)
-        return make_aware(datetime.combine(
-            self.settings.get('payment_term_last', as_type=date),
-            time(hour=23, minute=59, second=59)
-        ), tz)
-
-    def copy_data_from(self, other):
-        from . import ItemCategory, Item, Question, Quota
-        self.plugins = other.plugins
-        self.save()
-
-        category_map = {}
-        for c in ItemCategory.objects.filter(event=other):
-            category_map[c.pk] = c
-            c.pk = None
-            c.event = self
-            c.save()
-
-        item_map = {}
-        variation_map = {}
-        for i in Item.objects.filter(event=other).prefetch_related('variations'):
-            vars = list(i.variations.all())
-            item_map[i.pk] = i
-            i.pk = None
-            i.event = self
-            if i.picture:
-                i.picture.save(i.picture.name, i.picture)
-            if i.category_id:
-                i.category = category_map[i.category_id]
-            i.save()
-            for v in vars:
-                variation_map[v.pk] = v
-                v.pk = None
-                v.item = i
-                v.save()
-
-        for q in Quota.objects.filter(event=other).prefetch_related('items', 'variations'):
-            items = list(q.items.all())
-            vars = list(q.variations.all())
-            q.pk = None
-            q.event = self
-            q.save()
-            for i in items:
-                q.items.add(item_map[i.pk])
-            for v in vars:
-                q.variations.add(variation_map[v.pk])
-
-        for q in Question.objects.filter(event=other).prefetch_related('items', 'options'):
-            items = list(q.items.all())
-            opts = list(q.options.all())
-            q.pk = None
-            q.event = self
-            q.save()
-            for i in items:
-                q.items.add(item_map[i.pk])
-            for o in opts:
-                o.pk = None
-                o.question = q
-                o.save()
-
-        for s in EventSetting.objects.filter(object=other):
-            s.object = self
-            s.pk = None
-            if s.value.startswith('file://'):
-                fi = default_storage.open(s.value[7:], 'rb')
-                nonce = get_random_string(length=8)
-                fname = '%s/%s/%s.%s.%s' % (
-                    self.organizer.slug, self.slug, s.key, nonce, s.value.split('.')[-1]
-                )
-                newname = default_storage.save(fname, fi)
-                s.value = 'file://' + newname
-            s.save()
-
 
 class EventPermission(models.Model):
     """
@@ -359,42 +274,3 @@ class EventLock(models.Model):
     event = models.CharField(max_length=36, primary_key=True)
     date = models.DateTimeField(auto_now=True)
     token = models.UUIDField(default=uuid.uuid4)
-
-
-class RequiredAction(models.Model):
-    """
-    Represents an action that is to be done by an admin. The admin will be
-    displayed a list of actions to do.
-
-    :param datatime: The timestamp of the required action
-    :type datetime: datetime
-    :param user: The user that performed the action
-    :type user: User
-    :param done: If this action has been completed or dismissed
-    :type done: bool
-    :param action_type: The type of action that has to be performed. This is
-       used to look up the renderer used to describe the action in a human-
-       readable way. This should be some namespaced value using dotted
-       notation to avoid duplicates, e.g.
-       ``"pretix.plugins.banktransfer.incoming_transfer"``.
-    :type action_type: str
-    :param data: Arbitrary data that can be used by the log action renderer
-    :type data: str
-    """
-    datetime = models.DateTimeField(auto_now_add=True, db_index=True)
-    done = models.BooleanField(default=False)
-    user = models.ForeignKey('User', null=True, blank=True, on_delete=models.PROTECT)
-    event = models.ForeignKey('Event', null=True, blank=True, on_delete=models.CASCADE)
-    action_type = models.CharField(max_length=255)
-    data = models.TextField(default='{}')
-
-    class Meta:
-        ordering = ('datetime',)
-
-    def display(self, request):
-        from ..signals import requiredaction_display
-
-        for receiver, response in requiredaction_display.send(self.event, action=self, request=request):
-            if response:
-                return response
-        return self.action_type

src/pretix/base/models/log.py

@@ -1,11 +1,6 @@
-import json
-
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
-from django.urls import reverse
-from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
 
 
 class LogEntry(models.Model):
@@ -37,7 +32,7 @@ class LogEntry(models.Model):
     data = models.TextField(default='{}')
 
     class Meta:
-        ordering = ('-datetime',)
+        ordering = ('-datetime', )
 
     def display(self):
         from ..signals import logentry_display
@@ -46,87 +41,3 @@ class LogEntry(models.Model):
             if response:
                 return response
         return self.action_type
-
-    @cached_property
-    def display_object(self):
-        from . import Order, Voucher, Quota, Item, ItemCategory, Question, Event
-
-        if self.content_type.model_class() is Event:
-            return ''
-
-        co = self.content_object
-        a_map = None
-        a_text = None
-
-        if isinstance(co, Order):
-            a_text = _('Order {val}')
-            a_map = {
-                'href': reverse('control:event.order', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
-                    'code': co.code
-                }),
-                'val': co.code,
-            }
-        elif isinstance(co, Voucher):
-            a_text = _('Voucher {val}…')
-            a_map = {
-                'href': reverse('control:event.voucher', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
-                    'voucher': co.id
-                }),
-                'val': co.code[:6],
-            }
-        elif isinstance(co, Item):
-            a_text = _('Product {val}')
-            a_map = {
-                'href': reverse('control:event.item', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
-                    'item': co.id
-                }),
-                'val': co.name,
-            }
-        elif isinstance(co, Quota):
-            a_text = _('Quota {val}')
-            a_map = {
-                'href': reverse('control:event.items.quotas.show', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
-                    'quota': co.id
-                }),
-                'val': co.name,
-            }
-        elif isinstance(co, ItemCategory):
-            a_text = _('Category {val}')
-            a_map = {
-                'href': reverse('control:event.items.categories.show', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
-                    'category': co.id
-                }),
-                'val': co.name,
-            }
-        elif isinstance(co, Question):
-            a_text = _('Question {val}')
-            a_map = {
-                'href': reverse('control:event.items.questions.show', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
-                    'question': co.id
-                }),
-                'val': co.question,
-            }
-
-        if a_text and a_map:
-            a_map['val'] = '<a href="{href}">{val}</a>'.format_map(a_map)
-            return a_text.format_map(a_map)
-        elif a_text:
-            return a_text
-        else:
-            return ''
-
-    @cached_property
-    def parsed_data(self):
-        return json.loads(self.data)

src/pretix/base/models/orders.py

@@ -1,20 +1,19 @@
 import copy
 import string
-from datetime import datetime
+from datetime import date, datetime, time
 from decimal import Decimal
 from typing import List, Union
 
+import pytz
 from django.conf import settings
 from django.db import models
 from django.db.models import F
-from django.db.models.signals import post_delete
-from django.dispatch import receiver
 from django.utils.crypto import get_random_string
-from django.utils.timezone import now
+from django.utils.timezone import make_aware, now
 from django.utils.translation import ugettext_lazy as _
 
 from ..decimal import round_decimal
-from .base import LoggedModel
+from .base import CachedFile, LoggedModel
 from .event import Event
 from .items import Item, ItemVariation, Question, QuestionOption, Quota
 
@@ -272,14 +271,21 @@ class Order(LoggedModel):
         }
 
         if self.event.settings.get('payment_term_last'):
-            if now() > self.event.payment_term_last:
+            tz = pytz.timezone(self.event.settings.timezone)
+            last_date = make_aware(datetime.combine(
+                self.event.settings.get('payment_term_last', as_type=date),
+                time(hour=23, minute=59, second=59)
+            ), tz)
+
+            if now() > last_date:
                 return error_messages['late']
-        if self.status == self.STATUS_PENDING:
-            return True
         if not self.event.settings.get('payment_term_accept_late'):
             return error_messages['late']
 
-        return self._is_still_available()
+        if self.status == self.STATUS_PENDING:
+            return True
+        else:
+            return self._is_still_available()
 
     def _is_still_available(self, now_dt: datetime=None) -> Union[bool, str]:
         error_messages = {
@@ -433,7 +439,6 @@ class OrderPosition(AbstractPosition):
     :param order: The order this position is a part of
     :type order: Order
     """
-    positionid = models.PositiveIntegerField(default=1)
     order = models.ForeignKey(
         Order,
         verbose_name=_("Order"),
@@ -459,12 +464,11 @@ class OrderPosition(AbstractPosition):
         from . import Voucher
 
         ops = []
-        for i, cartpos in enumerate(cp):
+        for cartpos in cp:
             op = OrderPosition(order=order)
             for f in AbstractPosition._meta.fields:
                 setattr(op, f.name, getattr(cartpos, f.name))
             op._calculate_tax()
-            op.positionid = i + 1
             op.save()
             for answ in cartpos.answers.all():
                 answ.orderposition = op
@@ -472,10 +476,6 @@ class OrderPosition(AbstractPosition):
                 answ.save()
             if cartpos.voucher:
                 Voucher.objects.filter(pk=cartpos.voucher.pk).update(redeemed=F('redeemed') + 1)
-                cartpos.voucher.log_action('pretix.voucher.redeemed', {
-                    'order_code': order.code
-                })
-
             cartpos.delete()
         return ops
 
@@ -494,9 +494,6 @@ class OrderPosition(AbstractPosition):
     def save(self, *args, **kwargs):
         if self.tax_rate is None:
             self._calculate_tax()
-        if self.pk is None:
-            while OrderPosition.objects.filter(secret=self.secret).exists():
-                self.secret = generate_position_secret()
         return super().save(*args, **kwargs)
 
 
@@ -563,28 +560,7 @@ class InvoiceAddress(models.Model):
     vat_id = models.CharField(max_length=255, blank=True, verbose_name=_('VAT ID'))
 
 
-def cachedticket_name(instance, filename: str) -> str:
-    secret = get_random_string(length=16, allowed_chars=string.ascii_letters + string.digits)
-    return 'tickets/{org}/{ev}/{code}-{no}-{prov}-{secret}.pdf'.format(
-        org=instance.order_position.order.event.organizer.slug,
-        ev=instance.order_position.order.event.slug,
-        prov=instance.provider,
-        no=instance.order_position.positionid,
-        code=instance.order_position.order.code,
-        secret=secret
-    )
-
-
 class CachedTicket(models.Model):
     order_position = models.ForeignKey(OrderPosition, on_delete=models.CASCADE)
+    cachedfile = models.ForeignKey(CachedFile, on_delete=models.CASCADE, null=True)
     provider = models.CharField(max_length=255)
-    type = models.CharField(max_length=255)
-    extension = models.CharField(max_length=255)
-    file = models.FileField(null=True, blank=True, upload_to=cachedticket_name)
-
-
-@receiver(post_delete, sender=CachedTicket)
-def cachedticket_delete(sender, instance, **kwargs):
-    if instance.file:
-        # Pass false so FileField doesn't save the model.
-        instance.file.delete(False)

src/pretix/base/models/vouchers.py

@@ -1,5 +1,3 @@
-from decimal import Decimal
-
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import models
@@ -7,7 +5,6 @@ from django.utils.crypto import get_random_string
 from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
 
-from ..decimal import round_decimal
 from .base import LoggedModel
 from .event import Event
 from .items import Item, ItemVariation, Quota
@@ -43,11 +40,8 @@ class Voucher(LoggedModel):
     :type block_quota: bool
     :param allow_ignore_quota: If set to true, this voucher can be redeemed even if the event is sold out
     :type allow_ignore_quota: bool
-    :param price_mode: Sets how this voucher affects a product's price. Can be ``none``, ``set``, ``subtract``
-                       or ``percent``.
-    :type price_mode: str
-    :param value: The value by which the price should be modified in the way specified by ``price_mode``.
-    :type value: decimal.Decimal
+    :param price: If set, the voucher will allow the sale of associated items for this price
+    :type price: decimal.Decimal
     :param item: If set, the item to sell
     :type item: Item
     :param variation: If set, the variation to sell
@@ -65,13 +59,6 @@ class Voucher(LoggedModel):
     * You need to either select a quota or an item
     * If you select an item that has variations but do not select a variation, you cannot set block_quota
     """
-    PRICE_MODES = (
-        ('none', _('No effect')),
-        ('set', _('Set product price to')),
-        ('subtract', _('Subtract from product price')),
-        ('percent', _('Reduce product price by (%)')),
-    )
-
     event = models.ForeignKey(
         Event,
         on_delete=models.CASCADE,
@@ -111,15 +98,10 @@ class Voucher(LoggedModel):
             "If activated, a holder of this voucher code can buy tickets, even if there are none left."
         )
     )
-    price_mode = models.CharField(
-        verbose_name=_("Price mode"),
-        max_length=100,
-        choices=PRICE_MODES,
-        default='none'
-    )
-    value = models.DecimalField(
-        verbose_name=_("Voucher value"),
+    price = models.DecimalField(
+        verbose_name=_("Set product price to"),
         decimal_places=2, max_digits=10, null=True, blank=True,
+        help_text=_('If empty, the product will cost its normal price.')
     )
     item = models.ForeignKey(
         Item, related_name='vouchers',
@@ -226,19 +208,3 @@ class Voucher(LoggedModel):
         if self.valid_until and self.valid_until < now():
             return False
         return True
-
-    def calculate_price(self, original_price: Decimal) -> Decimal:
-        """
-        Returns how the price given in original_price would be modified if this
-        voucher is applied, i.e. replaced by a different price or reduced by a
-        certain percentage. If the voucher does not modify the price, the
-        original price will be returned.
-        """
-        if self.value is not None:
-            if self.price_mode == 'set':
-                return self.value
-            elif self.price_mode == 'subtract':
-                return original_price - self.value
-            elif self.price_mode == 'percent':
-                return round_decimal(original_price * (Decimal('100.00') - self.value) / Decimal('100.00'))
-        return original_price

src/pretix/base/payment.py

@@ -365,12 +365,8 @@ class BasePaymentProvider:
         whether the user should be presented with an option to retry the payment. The default
         implementation always returns False.
 
-        If you want to enable retrials for your payment method, the best is to just return
-        ``self._is_still_available()`` from this method to disable it as soon as the method
-        gets disabled or the methods end date is reached.
-
         The retry workflow is also used if a user switches to this payment method for an existing
-        order!
+        order! Therefore, they can only switch to your p
 
         :param order: The order object
         """

src/pretix/base/services/async.py

@@ -15,10 +15,11 @@ import time
 from django.conf import settings
 from django.db import transaction
 
-from pretix.celery_app import app
+from pretix.celery import app
 
 
 class ProfiledTask(app.Task):
+    abstract = True
 
     def __call__(self, *args, **kwargs):
 
@@ -42,6 +43,7 @@ class TransactionAwareTask(ProfiledTask):
     Task class which is aware of django db transactions and only executes tasks
     after transaction has been committed
     """
+    abstract = True
 
     def apply_async(self, *args, **kwargs):
         """

src/pretix/base/services/cart.py

@@ -1,9 +1,11 @@
+from collections import Counter
 from datetime import datetime, timedelta
 from decimal import Decimal
-from typing import List, Optional
+from typing import List
 
 from celery.exceptions import MaxRetriesExceededError
 from django.db.models import Q
+from django.utils.timezone import now
 from django.utils.translation import ugettext as _
 
 from pretix.base.i18n import LazyLocaleException
@@ -12,7 +14,7 @@ from pretix.base.models import (
 )
 from pretix.base.services.async import ProfiledTask
 from pretix.base.services.locking import LockTimeoutException
-from pretix.celery_app import app
+from pretix.celery import app
 
 
 class CartError(LazyLocaleException):
@@ -35,8 +37,6 @@ error_messages = {
     'voucher_invalid': _('This voucher code is not known in our database.'),
     'voucher_redeemed': _('This voucher code has already been used the maximum number of times allowed.'),
     'voucher_redeemed_partial': _('This voucher code can only be redeemed %d more times.'),
-    'voucher_double': _('You already used this voucher code. Remove the associated line from your '
-                        'cart if you want to use it for a different product.'),
     'voucher_expired': _('This voucher is expired.'),
     'voucher_invalid_item': _('This voucher is not valid for this product.'),
     'voucher_required': _('You need a valid voucher code to order this product.'),
@@ -65,7 +65,7 @@ def _re_add_expired_positions(items: List[dict], event: Event, cart_id: str, now
             'variation': cp.variation_id,
             'count': 1,
             'price': cp.price,
-            'cp': cp,
+            '_cp': cp,
             'voucher': cp.voucher.code if cp.voucher else None
         })
         positions.add(cp)
@@ -74,7 +74,7 @@ def _re_add_expired_positions(items: List[dict], event: Event, cart_id: str, now
 
 def _delete_expired(expired: List[CartPosition], now_dt: datetime) -> None:
     for cp in expired:
-        if cp.expires <= now_dt:
+        if cp.expires <= now_dt:  # Has not been extended
             cp.delete()
 
 
@@ -85,8 +85,17 @@ def _check_date(event: Event, now_dt: datetime) -> None:
         raise CartError(error_messages['ended'])
 
 
-def _add_new_items(event: Event, items: List[dict],
-                   cart_id: str, expiry: datetime, now_dt: datetime) -> Optional[str]:
+def _parse_items_and_check_constraints(event: Event, items: List[dict], cart_id: str,
+                                       now_dt: datetime) -> Counter:
+    """
+    This method does three things:
+
+    * Extend the item list with the database objects for the item, variation, etc.
+
+    * Check all constraints that are placed on the items, vouchers etc. to be valid and calculates the correct prices
+
+    * Return a counter object that contains the quota changes that are required to perform the operation
+    """
     err = None
 
     # Fetch items from the database
@@ -99,6 +108,9 @@ def _add_new_items(event: Event, items: List[dict],
     ).select_related("item", "item__event").prefetch_related("quotas")
     variations_cache = {v.id: v for v in variations_query}
 
+    quotadiff = Counter()
+    vouchers = Counter()
+
     for i in items:
         # Check whether the specified items are part of what we just fetched from the database
         # If they are not, the user supplied item IDs which either do not exist or belong to
@@ -116,109 +128,162 @@ def _add_new_items(event: Event, items: List[dict],
             try:
                 voucher = Voucher.objects.get(code=i.get('voucher').strip(), event=event)
                 if voucher.redeemed >= voucher.max_usages:
-                    return error_messages['voucher_redeemed']
+                    raise CartError(error_messages['voucher_redeemed'])
                 if voucher.valid_until is not None and voucher.valid_until < now_dt:
-                    return error_messages['voucher_expired']
+                    raise CartError(error_messages['voucher_expired'])
                 if not voucher.applies_to(item, variation):
-                    return error_messages['voucher_invalid_item']
+                    raise CartError(error_messages['voucher_invalid_item'])
 
                 redeemed_in_carts = CartPosition.objects.filter(
-                    Q(voucher=voucher) & Q(event=event) &
-                    (Q(expires__gte=now_dt) | Q(cart_id=cart_id))
+                    Q(voucher=voucher) & Q(event=event) & Q(expires__gte=now_dt)
                 )
                 if 'cp' in i:
-                    redeemed_in_carts = redeemed_in_carts.exclude(pk=i['cp'].pk)
+                    redeemed_in_carts = redeemed_in_carts.exclude(pk=i['_cp'].pk)
                 v_avail = voucher.max_usages - voucher.redeemed - redeemed_in_carts.count()
 
                 if v_avail < 1:
-                    return error_messages['voucher_redeemed']
-                if i['count'] > v_avail:
-                    return error_messages['voucher_redeemed_partial'] % v_avail
+                    raise CartError(error_messages['voucher_redeemed'])
+                if i['count'] > v_avail - vouchers[voucher]:
+                    raise CartError(error_messages['voucher_redeemed_partial'] % v_avail)
 
+                vouchers[voucher] += i['count']
             except Voucher.DoesNotExist:
-                return error_messages['voucher_invalid']
+                raise CartError(error_messages['voucher_invalid'])
 
         # Fetch all quotas. If there are no quotas, this item is not allowed to be sold.
         quotas = list(item.quotas.all()) if variation is None else list(variation.quotas.all())
 
         if voucher and voucher.quota and voucher.quota.pk not in [q.pk for q in quotas]:
-            return error_messages['voucher_invalid_item']
+            raise CartError(error_messages['voucher_invalid_item'])
 
         if item.require_voucher and voucher is None:
-            return error_messages['voucher_required']
+            raise CartError(error_messages['voucher_required'])
 
         if item.hide_without_voucher and (voucher is None or voucher.item is None or voucher.item.pk != item.pk):
-            return error_messages['voucher_required']
+            raise CartError(error_messages['voucher_required'])
 
         if len(quotas) == 0 or not item.is_available() or (variation and not variation.active):
             err = err or error_messages['unavailable']
             continue
 
-        # Check that all quotas allow us to buy i['count'] instances of the object
-        quota_ok = i['count']
-        if not voucher or (not voucher.allow_ignore_quota and not voucher.block_quota):
-            for quota in quotas:
-                avail = quota.availability()
-                if avail[1] is not None and avail[1] < i['count']:
-                    # This quota is not available or less than i['count'] items are left, so we have to
-                    # reduce the number of bought items
-                    if avail[0] != Quota.AVAILABILITY_OK:
-                        err = err or error_messages['unavailable']
-                    else:
-                        err = err or error_messages['in_part']
-                    quota_ok = min(quota_ok, avail[1])
-
-        price = item.default_price if variation is None else (
-            variation.default_price if variation.default_price is not None else item.default_price)
-        if voucher:
-            price = voucher.calculate_price(price)
+        if voucher and voucher.price is not None:
+            price = voucher.price
+        else:
+            price = item.default_price if variation is None else (
+                variation.default_price if variation.default_price is not None else item.default_price)
 
         if item.free_price and 'price' in i and i['price'] is not None and i['price'] != "":
             custom_price = i['price']
             if not isinstance(custom_price, Decimal):
                 custom_price = Decimal(custom_price.replace(",", "."))
             if custom_price > 100000000:
-                return error_messages['price_too_high']
+                raise CartError(error_messages['price_too_high'])
             price = max(custom_price, price)
 
-        # Create a CartPosition for as much items as we can
-        for k in range(quota_ok):
-            if 'cp' in i and i['count'] == 1:
-                # Recreating
-                cp = i['cp']
-                cp.expires = expiry
-                cp.price = price
-                cp.save()
+        # Check that all quotas allow us to buy i['count'] instances of the object
+        if not voucher or (not voucher.allow_ignore_quota and not voucher.block_quota):
+            for quota in quotas:
+                quotadiff[quota] += i['count']
+            i['_quotas'] = quotas
+        else:
+            i['_quotas'] = []
+
+        i['_price'] = price
+        i['_item'] = item
+        i['_variation'] = variation
+        i['_voucher'] = voucher
+
+    if err:
+        raise CartError(err)
+
+    return quotadiff
+
+
+def _check_quota_and_create_positions(event: Event, items: List[dict], cart_id: str, now_dt: datetime,
+                                      expiry: datetime, quotadiff: Counter):
+    """
+    This method takes the modified items and the quotadiff from _parse_items_and_check_constraints
+    and then
+
+    * checks that the given quotas are available
+
+    * creates as many cart positions as possible
+    """
+    err = None
+    quotas_ok = {}
+    cartpositions = []
+
+    with event.lock():
+        for quota, count in quotadiff.items():
+            avail = quota.availability(now_dt)
+            if avail[1] is not None and avail[1] < count:
+                # This quota is not available or less than i['count'] items are left, so we have to
+                # reduce the number of bought items
+                if avail[0] != Quota.AVAILABILITY_OK:
+                    err = err or error_messages['unavailable']
+                else:
+                    err = err or error_messages['in_part']
+                quotas_ok[quota] = min(count, avail[1])
             else:
-                CartPosition.objects.create(
-                    event=event, item=item, variation=variation,
-                    price=price,
-                    expires=expiry,
-                    cart_id=cart_id, voucher=voucher
-                )
-    return err
+                quotas_ok[quota] = count
+
+        for i in items:
+            # Create a CartPosition for as much items as we can
+            requested_count = i['count']
+            available_count = requested_count
+            if i['_quotas']:
+                available_count = min(requested_count, min(quotas_ok[q] for q in i['_quotas']))
+
+            for q in i['_quotas']:
+                quotas_ok[q] -= available_count
+
+            for k in range(available_count):
+                if '_cp' in i and i['count'] == 1:
+                    # Recreating an existing position
+                    cp = i['_cp']
+                    cp.expires = expiry
+                    cp.price = i['_price']
+                    cp.save()
+                else:
+                    cartpositions.append(CartPosition(
+                        event=event, item=i['_item'], variation=i['_variation'],
+                        price=i['_price'],
+                        expires=expiry,
+                        cart_id=cart_id, voucher=i['_voucher']
+                    ))
+
+        CartPosition.objects.bulk_create(cartpositions)
+
+    if err:
+        raise CartError(err)
 
 
 def _add_items_to_cart(event: Event, items: List[dict], cart_id: str=None) -> None:
-    with event.lock() as now_dt:
-        _check_date(event, now_dt)
-        existing = CartPosition.objects.filter(Q(cart_id=cart_id) & Q(event=event)).count()
-        if sum(i['count'] for i in items) + existing > int(event.settings.max_items_per_order):
-            # TODO: i18n plurals
-            raise CartError(error_messages['max_items'], (event.settings.max_items_per_order,))
+    now_dt = now()
+    _check_date(event, now_dt)
 
-        expiry = now_dt + timedelta(minutes=event.settings.get('reservation_time', as_type=int))
-        _extend_existing(event, cart_id, expiry, now_dt)
+    existing = CartPosition.objects.filter(Q(cart_id=cart_id) & Q(event=event)).count()
+    if sum(i['count'] for i in items) + existing > int(event.settings.max_items_per_order):
+        # TODO: i18n plurals
+        raise CartError(error_messages['max_items'], (event.settings.max_items_per_order,))
 
-        expired = _re_add_expired_positions(items, event, cart_id, now_dt)
+    expiry = now_dt + timedelta(minutes=event.settings.get('reservation_time', as_type=int))
+    _extend_existing(event, cart_id, expiry, now_dt)
+
+    expired = _re_add_expired_positions(items, event, cart_id, now_dt)
+
+    try:
         if items:
-            err = _add_new_items(event, items, cart_id, expiry, now_dt)
-            _delete_expired(expired, now_dt)
-            if err:
-                raise CartError(err)
+            quotadiff = _parse_items_and_check_constraints(event, items, cart_id, now_dt)
+            _check_quota_and_create_positions(event, items, cart_id, now_dt, expiry, quotadiff)
+    except CartError as e:
+        _delete_expired(expired, now_dt)
+        raise e
+    else:
+        _delete_expired(expired, now_dt)
 
 
-@app.task(base=ProfiledTask, bind=True, max_retries=5, default_retry_delay=1, throws=(CartError,))
+@app.task(base=ProfiledTask, bind=True, max_retries=5, default_retry_delay=1)
 def add_items_to_cart(self, event: int, items: List[dict], cart_id: str=None) -> None:
     """
     Adds a list of items to a user's cart.
@@ -259,7 +324,7 @@ def _remove_items_from_cart(event: Event, items: List[dict], cart_id: str) -> No
                     cp.delete()
 
 
-@app.task(base=ProfiledTask, bind=True, max_retries=5, default_retry_delay=1, throws=(CartError,))
+@app.task(base=ProfiledTask, bind=True, max_retries=5, default_retry_delay=1)
 def remove_items_from_cart(self, event: int, items: List[dict], cart_id: str=None) -> None:
     """
     Removes a list of items from a user's cart.

src/pretix/base/services/export.py

@@ -6,7 +6,7 @@ from pretix.base.i18n import language
 from pretix.base.models import CachedFile, Event, cachedfile_name
 from pretix.base.services.async import ProfiledTask
 from pretix.base.signals import register_data_exporters
-from pretix.celery_app import app
+from pretix.celery import app
 
 
 @app.task(base=ProfiledTask)

src/pretix/base/services/invoices.py

@@ -25,7 +25,7 @@ from pretix.base.i18n import LazyI18nString, language
 from pretix.base.models import Invoice, InvoiceAddress, InvoiceLine, Order
 from pretix.base.services.async import TransactionAwareTask
 from pretix.base.signals import register_payment_providers
-from pretix.celery_app import app
+from pretix.celery import app
 from pretix.helpers.database import rolledback_transaction
 
 

src/pretix/base/services/mail.py

@@ -1,23 +1,18 @@
 import logging
 from typing import Any, Dict
 
-import bleach
-import cssutils
-import markdown
 from django.conf import settings
-from django.core.mail import EmailMultiAlternatives, get_connection
+from django.core.mail import EmailMessage, get_connection
 from django.template.loader import get_template
 from django.utils.translation import ugettext as _
-from inlinestyler.utils import inline_css
 
 from pretix.base.i18n import LazyI18nString, language
 from pretix.base.models import Event, Order
-from pretix.celery_app import app
+from pretix.celery import app
 from pretix.multidomain.urlreverse import build_absolute_uri
 
 logger = logging.getLogger('pretix.base.mail')
 INVALID_ADDRESS = 'invalid-pretix-mail-address'
-cssutils.log.setLevel(logging.CRITICAL)
 
 
 class TolerantDict(dict):
@@ -68,63 +63,37 @@ def mail(email: str, subject: str, template: str,
             body = str(template)
             if context:
                 body = body.format_map(TolerantDict(context))
-            body_md = bleach.linkify(bleach.clean(markdown.markdown(body), tags=bleach.ALLOWED_TAGS + [
-                'p',
-            ]))
         else:
             tpl = get_template(template)
             body = tpl.render(context)
-            body_md = bleach.linkify(markdown.markdown(body))
 
         sender = event.settings.get('mail_from') if event else settings.MAIL_FROM
 
         subject = str(subject)
-        body_plain = body
-
-        htmlctx = {
-            'site': settings.PRETIX_INSTANCE_NAME,
-            'site_url': settings.SITE_URL,
-            'body': body_md,
-            'color': '#8E44B3'
-        }
-
         if event:
-            htmlctx['event'] = event
-            htmlctx['color'] = event.settings.primary_color
-
             prefix = event.settings.get('mail_prefix')
             if prefix:
                 subject = "[%s] %s" % (prefix, subject)
 
-            body_plain += "\r\n\r\n-- \r\n"
-            body_plain += _(
+            body += "\r\n\r\n-- \r\n"
+            body += _(
                 "You are receiving this email because you placed an order for {event}."
             ).format(event=event.name)
             if order:
-                htmlctx['order'] = order
-                body_plain += "\r\n"
-                body_plain += _(
-                    "You can view your order details at the following URL:\n{orderurl}."
-                ).replace("\n", "\r\n").format(
-                    event=event.name, orderurl=build_absolute_uri(
-                        order.event, 'presale:event.order', kwargs={
-                            'order': order.code,
-                            'secret': order.secret
-                        }
-                    )
-                )
-            body_plain += "\r\n"
-
-        tpl = get_template('pretixbase/email/plainwrapper.html')
-        body_html = tpl.render(htmlctx)
-        return mail_send([email], subject, body_plain, body_html, sender, event.id if event else None, headers)
+                body += "\r\n"
+                body += _(
+                    "You can view your order details at the following URL:\r\n{orderurl}."
+                ).format(event=event.name, orderurl=build_absolute_uri(order.event, 'presale:event.order', kwargs={
+                    'order': order.code,
+                    'secret': order.secret
+                }))
+            body += "\r\n"
+        return mail_send([email], subject, body, sender, event.id if event else None, headers)
 
 
 @app.task
-def mail_send_task(to: str, subject: str, body: str, html: str, sender: str,
-                   event: int=None, headers: dict=None) -> bool:
-    email = EmailMultiAlternatives(subject, body, sender, to=to, headers=headers)
-    email.attach_alternative(inline_css(html), "text/html")
+def mail_send_task(to: str, subject: str, body: str, sender: str, event: int=None, headers: dict=None) -> bool:
+    email = EmailMessage(subject, body, sender, to=to, headers=headers)
     if event:
         event = Event.objects.get(id=event)
         backend = event.get_mail_backend()

src/pretix/base/services/orders.py

@@ -1,3 +1,4 @@
+import contextlib
 import json
 import logging
 from collections import Counter, namedtuple
@@ -21,7 +22,7 @@ from pretix.base.models import (
     CartPosition, Event, Item, ItemVariation, Order, OrderPosition, Quota,
     User, Voucher,
 )
-from pretix.base.models.orders import CachedTicket, InvoiceAddress
+from pretix.base.models.orders import InvoiceAddress
 from pretix.base.payment import BasePaymentProvider
 from pretix.base.services.async import ProfiledTask
 from pretix.base.services.invoices import (
@@ -32,7 +33,7 @@ from pretix.base.services.mail import SendMailException, mail
 from pretix.base.signals import (
     order_paid, order_placed, periodic_task, register_payment_providers,
 )
-from pretix.celery_app import app
+from pretix.celery import app
 from pretix.multidomain.urlreverse import build_absolute_uri
 
 error_messages = {
@@ -43,7 +44,6 @@ error_messages = {
     'price_changed': _('The price of some of the items in your cart has changed in the '
                        'meantime. Please see below for details.'),
     'internal': _("An internal error occured, please try again."),
-    'empty': _("Your cart is empty."),
     'busy': _('We were not able to process your request completely as the '
               'server was too busy. Please try again.'),
     'not_started': _('The presale period for this event has not yet started.'),
@@ -51,6 +51,8 @@ error_messages = {
     'voucher_invalid': _('The voucher code used for one of the items in your cart is not known in our database.'),
     'voucher_redeemed': _('The voucher code used for one of the items in your cart has already been used the maximum '
                           'number of times allowed. We removed this item from your cart.'),
+    'voucher_redeemed_partial': _('The voucher code used for one of the items in your cart can only be redeemed %d '
+                                  'more times. We removed this item from your cart.'),
     'voucher_expired': _('The voucher code used for one of the items in your cart is expired. We removed this item '
                          'from your cart.'),
     'voucher_invalid_item': _('The voucher code used for one of the items in your cart is not valid for this item. We '
@@ -83,7 +85,15 @@ def mark_order_paid(order: Order, provider: str=None, info: str=None, date: date
     :param user: The user that performed the change
     :raises Quota.QuotaExceededException: if the quota is exceeded and ``force`` is ``False``
     """
-    with order.event.lock() as now_dt:
+    lock_func = order.event.lock
+    if order.status == order.STATUS_PENDING and order.expires > now() + timedelta(minutes=10):
+        # No lock necessary in this case. The 10 minute offset is just to be safe and prevent
+        # collisions with the cronjob.
+        @contextlib.contextmanager
+        def lock_func():
+            yield now()
+
+    with lock_func() as now_dt:
         can_be_paid = order._can_be_paid()
         if not force and can_be_paid is not True:
             raise Quota.QuotaExceededException(can_be_paid)
@@ -186,6 +196,9 @@ def _check_date(event: Event, now_dt: datetime):
 
 
 def _check_positions(event: Event, now_dt: datetime, positions: List[CartPosition]):
+    """
+    Checks constraints on all positions except quota
+    """
     err = None
     _check_date(event, now_dt)
 
@@ -194,17 +207,7 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
             err = err or error_messages['unavailable']
             cp.delete()
             continue
-        quotas = list(cp.item.quotas.all()) if cp.variation is None else list(cp.variation.quotas.all())
-
-        if cp.voucher:
-            redeemed_in_carts = CartPosition.objects.filter(
-                Q(voucher=cp.voucher) & Q(event=event) & Q(expires__gte=now_dt)
-            ).exclude(pk=cp.pk)
-            v_avail = cp.voucher.max_usages - cp.voucher.redeemed - redeemed_in_carts.count()
-            if v_avail < 1:
-                err = err or error_messages['voucher_redeemed']
-                cp.delete()  # Sorry!
-                continue
+        cp._quotas = list(cp.item.quotas.all()) if cp.variation is None else list(cp.variation.quotas.all())
 
         if cp.item.require_voucher and cp.voucher is None:
             cp.delete()
@@ -224,7 +227,7 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
         price = cp.item.default_price if cp.variation is None else (
             cp.variation.default_price if cp.variation.default_price is not None else cp.item.default_price)
 
-        if price is False or len(quotas) == 0:
+        if price is False or len(cp._quotas) == 0:
             err = err or error_messages['unavailable']
             cp.delete()
             continue
@@ -234,7 +237,8 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
                 err = err or error_messages['voucher_expired']
                 cp.delete()
                 continue
-            price = cp.voucher.calculate_price(price)
+            if cp.voucher.price is not None:
+                price = cp.voucher.price
 
         if price != cp.price and not (cp.item.free_price and cp.price > price):
             positions[i] = cp
@@ -242,63 +246,19 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
             cp.save()
             err = err or error_messages['price_changed']
             continue
-
-        quota_ok = True
-
-        ignore_all_quotas = cp.expires >= now_dt or (
-            cp.voucher and (cp.voucher.allow_ignore_quota or (cp.voucher.block_quota and cp.voucher.quota is None)))
-
-        if not ignore_all_quotas:
-            for quota in quotas:
-                if cp.voucher and cp.voucher.block_quota and cp.voucher.quota_id == quota.pk:
-                    continue
-                avail = quota.availability(now_dt)
-                if avail[0] != Quota.AVAILABILITY_OK:
-                    # This quota is sold out/currently unavailable, so do not sell this at all
-                    err = err or error_messages['unavailable']
-                    quota_ok = False
-                    break
-
-        if quota_ok:
-            positions[i] = cp
-            cp.expires = now_dt + timedelta(
-                minutes=event.settings.get('reservation_time', as_type=int))
-            cp.save()
-        else:
-            cp.delete()  # Sorry!
     if err:
         raise OrderError(err)
 
 
 @transaction.atomic
 def _create_order(event: Event, email: str, positions: List[CartPosition], now_dt: datetime,
-                  payment_provider: BasePaymentProvider, locale: str=None, address: int=None,
+                  payment_provider: BasePaymentProvider, expires: datetime, locale: str=None, address: int=None,
                   meta_info: dict=None):
-    from datetime import date, time
 
     total = sum([c.price for c in positions])
     payment_fee = payment_provider.calculate_fee(total)
     total += payment_fee
 
-    tz = pytz.timezone(event.settings.timezone)
-    exp_by_date = now_dt.astimezone(tz) + timedelta(days=event.settings.get('payment_term_days', as_type=int))
-    exp_by_date = exp_by_date.astimezone(tz).replace(hour=23, minute=59, second=59, microsecond=0)
-    if event.settings.get('payment_term_weekdays'):
-        if exp_by_date.weekday() == 5:
-            exp_by_date += timedelta(days=2)
-        elif exp_by_date.weekday() == 6:
-            exp_by_date += timedelta(days=1)
-
-    expires = exp_by_date
-
-    if event.settings.get('payment_term_last'):
-        last_date = make_aware(datetime.combine(
-            event.settings.get('payment_term_last', as_type=date),
-            time(hour=23, minute=59, second=59)
-        ), tz)
-        if last_date < expires:
-            expires = last_date
-
     order = Order.objects.create(
         status=Order.STATUS_PENDING,
         event=event,
@@ -330,6 +290,94 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
     return order
 
 
+def _check_quota_on_expired_positions(event: Event, positions: List[CartPosition], now_dt: datetime):
+    err = None
+    quotadiff = Counter()
+    vouchers = Counter()
+    for cp in positions:
+        if not cp.id:
+            continue
+
+        ignore_all_quotas = cp.expires >= now_dt or (
+            cp.voucher and (cp.voucher.allow_ignore_quota or (cp.voucher.block_quota and cp.voucher.quota is None)))
+
+        if ignore_all_quotas:
+            cp._quotas = []
+        elif cp.voucher and cp.voucher.block_quota and cp.voucher.quota_id:
+            cp._quotas = [q for q in cp._quotas if cp.voucher.quota_id != q.pk]
+
+        for quota in cp._quotas:
+            quotadiff[quota] += 1
+
+    quotas_ok = {}
+    for quota, count in quotadiff.items():
+        avail = quota.availability(now_dt)
+        if avail[1] is not None and avail[1] < count:
+            # This quota is not available or less than items are than requested left, so we have to
+            # reduce the number of bought items
+            if avail[0] != Quota.AVAILABILITY_OK:
+                err = err or error_messages['unavailable']
+            else:
+                err = err or error_messages['in_part']
+            quotas_ok[quota] = min(count, avail[1])
+        else:
+            quotas_ok[quota] = count
+
+    for cp in positions:
+        if not cp.id:
+            continue
+
+        if cp.voucher:
+            redeemed_in_carts = CartPosition.objects.filter(
+                Q(voucher=cp.voucher) & Q(event=event) & Q(expires__gte=now_dt)
+            ).exclude(pk__in=[cp2.pk for cp2 in positions])
+            v_avail = cp.voucher.max_usages - cp.voucher.redeemed - redeemed_in_carts.count()
+            if v_avail < 1:
+                err = err or error_messages['voucher_redeemed']
+                cp.delete()  # Sorry!
+                continue
+            if v_avail - vouchers[cp.voucher] < 1:
+                err = err or (error_messages['voucher_redeemed_partial'] % v_avail)
+                cp.delete()  # Sorry!
+                continue
+            vouchers[cp.voucher] += 1
+
+        if cp._quotas:
+            if min(quotas_ok[q] for q in cp._quotas) > 0:
+                cp.expires = now_dt + timedelta(minutes=event.settings.get('reservation_time', as_type=int))
+                cp.save()
+                for q in cp._quotas:
+                    quotas_ok[q] -= 1
+            else:
+                cp.delete()
+
+    if err:
+        raise OrderError(err)
+
+
+def _calculate_expiry(event: Event, now_dt: datetime):
+    from datetime import date, time
+
+    tz = pytz.timezone(event.settings.timezone)
+    expires = now_dt.astimezone(tz) + timedelta(days=event.settings.get('payment_term_days', as_type=int))
+    expires = expires.replace(hour=23, minute=59, second=59, microsecond=0)
+    if event.settings.get('payment_term_weekdays'):
+        if expires.weekday() == 5:
+            expires += timedelta(days=2)
+        elif expires.weekday() == 6:
+            expires += timedelta(days=1)
+
+    if event.settings.get('payment_term_last'):
+        last_date = make_aware(datetime.combine(
+            event.settings.get('payment_term_last', as_type=date),
+            time(hour=23, minute=59, second=59)
+        ), tz)
+        if last_date < expires:
+            expires = last_date
+
+    return expires
+
+
 def _perform_order(event: str, payment_provider: str, position_ids: List[str],
                    email: str, locale: str, address: int, meta_info: dict=None):
 
@@ -343,15 +391,18 @@ def _perform_order(event: str, payment_provider: str, position_ids: List[str],
     if not pprov:
         raise OrderError(error_messages['internal'])
 
+    now_dt = now()
+
+    positions = list(CartPosition.objects.filter(id__in=position_ids).select_related('item', 'variation'))
+    if set(str(p) for p in position_ids) != set(str(p.id) for p in positions):
+        raise OrderError(error_messages['internal'])
+
+    _check_positions(event, now_dt, positions)
+    expires = _calculate_expiry(event, now_dt)
+
     with event.lock() as now_dt:
-        positions = list(CartPosition.objects.filter(
-            id__in=position_ids).select_related('item', 'variation'))
-        if len(positions) == 0:
-            raise OrderError(error_messages['empty'])
-        if len(position_ids) != len(positions):
-            raise OrderError(error_messages['internal'])
-        _check_positions(event, now_dt, positions)
-        order = _create_order(event, email, positions, now_dt, pprov,
+        _check_quota_on_expired_positions(event, positions, now_dt)
+        order = _create_order(event, email, positions, now_dt, pprov, expires,
                               locale=locale, address=address, meta_info=meta_info)
 
     if event.settings.get('invoice_generate') == 'True' and invoice_qualified(order):
@@ -500,7 +551,6 @@ class OrderChangeManager:
             if isinstance(op, self.ItemOperation):
                 self.order.log_action('pretix.event.order.changed.item', user=self.user, data={
                     'position': op.position.pk,
-                    'positionid': op.position.positionid,
                     'old_item': op.position.item.pk,
                     'old_variation': op.position.variation.pk if op.position.variation else None,
                     'new_item': op.item.pk,
@@ -516,7 +566,6 @@ class OrderChangeManager:
             elif isinstance(op, self.PriceOperation):
                 self.order.log_action('pretix.event.order.changed.price', user=self.user, data={
                     'position': op.position.pk,
-                    'positionid': op.position.positionid,
                     'old_price': op.position.price,
                     'new_price': op.price
                 })
@@ -526,7 +575,6 @@ class OrderChangeManager:
             elif isinstance(op, self.CancelOperation):
                 self.order.log_action('pretix.event.order.changed.cancel', user=self.user, data={
                     'position': op.position.pk,
-                    'positionid': op.position.positionid,
                     'old_item': op.position.item.pk,
                     'old_variation': op.position.variation.pk if op.position.variation else None,
                     'old_price': op.position.price,
@@ -575,22 +623,18 @@ class OrderChangeManager:
             # Do nothing
             return
         with transaction.atomic():
+            self._check_free_to_paid()
+            self._check_complete_cancel()
             with self.order.event.lock():
                 if self.order.status != Order.STATUS_PENDING:
                     raise OrderError(self.error_messages['not_pending'])
-                self._check_free_to_paid()
                 self._check_quotas()
-                self._check_complete_cancel()
                 self._perform_operations()
             self._recalculate_total_and_payment_fee()
             self._reissue_invoice()
-            self._clear_tickets_cache()
         self._check_paid_to_free()
         self._notify_user()
 
-    def _clear_tickets_cache(self):
-        CachedTicket.objects.filter(order_position__order=self.order).delete()
-
     def _get_payment_provider(self):
         responses = register_payment_providers.send(self.order.event)
         pprov = None
@@ -602,7 +646,7 @@ class OrderChangeManager:
             raise OrderError(error_messages['internal'])
 
 
-@app.task(base=ProfiledTask, bind=True, max_retries=5, default_retry_delay=1, throws=(OrderError,))
+@app.task(base=ProfiledTask, bind=True, max_retries=5, default_retry_delay=1)
 def perform_order(self, event: str, payment_provider: str, positions: List[str],
                   email: str=None, locale: str=None, address: int=None, meta_info: dict=None):
     try:
@@ -614,7 +658,7 @@ def perform_order(self, event: str, payment_provider: str, positions: List[str],
         return OrderError(error_messages['busy'])
 
 
-@app.task(base=ProfiledTask, bind=True, max_retries=5, default_retry_delay=1, throws=(OrderError,))
+@app.task(base=ProfiledTask, bind=True, max_retries=5, default_retry_delay=1)
 def cancel_order(self, order: int, user: int=None):
     try:
         try:

src/pretix/base/services/tickets.py

@@ -1,40 +1,39 @@
-import os
+from datetime import timedelta
 
 from django.core.files.base import ContentFile
 from django.utils.timezone import now
 from django.utils.translation import ugettext as _
 
 from pretix.base.i18n import language
-from pretix.base.models import CachedTicket, Event, Order, OrderPosition
+from pretix.base.models import (
+    CachedFile, CachedTicket, Event, Order, OrderPosition, cachedfile_name,
+)
 from pretix.base.services.async import ProfiledTask
 from pretix.base.signals import register_ticket_outputs
-from pretix.celery_app import app
+from pretix.celery import app
 from pretix.helpers.database import rolledback_transaction
 
 
 @app.task(base=ProfiledTask)
 def generate(order_position: str, provider: str):
     order_position = OrderPosition.objects.select_related('order', 'order__event').get(id=order_position)
-    try:
-        ct = CachedTicket.objects.get(order_position=order_position, provider=provider)
-    except CachedTicket.MultipleObjectsReturned:
-        CachedTicket.objects.filter(order_position=order_position, provider=provider).delete()
-        ct = CachedTicket.objects.create(order_position=order_position, provider=provider, extension='',
-                                         type='', file=None)
-    except CachedTicket.DoesNotExist:
-        ct = CachedTicket.objects.create(order_position=order_position, provider=provider, extension='',
-                                         type='', file=None)
+    ct = CachedTicket.objects.get_or_create(order_position=order_position, provider=provider)[0]
+    if not ct.cachedfile:
+        cf = CachedFile()
+        cf.date = now()
+        cf.expires = order_position.order.event.date_from + timedelta(days=30)
+        cf.save()
+        ct.cachedfile = cf
+        ct.save()
 
     with language(order_position.order.locale):
         responses = register_ticket_outputs.send(order_position.order.event)
         for receiver, response in responses:
             prov = response(order_position.order.event)
             if prov.identifier == provider:
-                filename, ct.type, data = prov.generate(order_position)
-                path, ext = os.path.splitext(filename)
-                ct.extension = ext
-                ct.save()
-                ct.file.save(filename, ContentFile(data))
+                ct.cachedfile.filename, ct.cachedfile.type, data = prov.generate(order_position)
+                ct.cachedfile.file.save(cachedfile_name(ct.cachedfile, ct.cachedfile.filename), ContentFile(data))
+                ct.cachedfile.save()
 
 
 class DummyRollbackException(Exception):

src/pretix/base/signals.py

@@ -110,21 +110,7 @@ To display an instance of the ``LogEntry`` model to a human user,
 ``pretix.base.signals.logentry_display`` will be sent out with a ``logentry`` argument.
 
 The first received response that is not ``None`` will be used to display the log entry
-to the user. The receivers are expected to return plain text.
-
-As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
-"""
-
-requiredaction_display = EventPluginSignal(
-    providing_args=["action", "request"]
-)
-"""
-To display an instance of the ``RequiredAction`` model to a human user,
-``pretix.base.signals.requiredaction_display`` will be sent out with a ``action`` argument.
-You will also get the current ``request`` in a different argument.
-
-The first received response that is not ``None`` will be used to display the log entry
-to the user. The receivers are expected to return HTML code.
+to the user.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """

src/pretix/base/templates/pretixbase/email/plainwrapper.html

@@ -1,166 +0,0 @@
-{% load eventurl %}
-{% load i18n %}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, user-scalable=false">
-</head>
-<style type="text/css">
-    body {
-        background-color: #e8e8e8;
-        background-position: top;
-        background-repeat: repeat-x;
-        font-family: "Open Sans", "OpenSans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-        font-size: 14px;
-        line-height: 20px;
-        color: #333;
-        margin: 0;
-    }
-
-    .header h1 {
-        margin-top: 20px;
-        margin-bottom: 5px;
-    }
-
-    .header h1 a {
-        text-decoration: none;
-    }
-
-    a {
-        color: {{ color }};
-        font-weight: bold;
-    }
-
-    a:hover, a:focus {
-        color: {{ color }};
-        text-decoration: underline;
-    }
-
-    a:hover, a:active {
-        outline: 0;
-    }
-
-    p {
-        margin: 0 0 10px;
-
-        /* These are technically the same, but use both */
-        overflow-wrap: break-word;
-        word-wrap: break-word;
-
-        -ms-word-break: break-all;
-        /* This is the dangerous one in WebKit, as it breaks things wherever */
-        word-break: break-all;
-        /* Instead use this non-standard one: */
-        word-break: break-word;
-
-        /* Adds a hyphen where the word breaks, if supported (No Blink) */
-        -ms-hyphens: auto;
-        -moz-hyphens: auto;
-        -webkit-hyphens: auto;
-        hyphens: auto;
-    }
-
-    .footer {
-        padding: 10px;
-        text-align: center;
-        font-size: 12px;
-    }
-
-    .content {
-        padding: 8px 18px 8px;
-    }
-
-    ::selection {
-        background: {{ color }};
-        color: #FFF;
-    }
-
-    table {
-        width: 90%;
-        max-width: 900px;
-        border-spacing: 0px;
-        border-collapse: separate;
-        margin: auto;
-    }
-
-    @media (max-width: 480px) {
-        .header h1 {
-            font-size: 19px;
-            line-height: 24px;
-            margin: 0 9px 3px 0;
-            border-radius: 5px 5px;
-            -webkit-border-radius: 5px 5px;
-            -moz-border-radius: 5px 5px;
-        }
-
-        .header h1 a {
-            padding: 3px 9px;
-            display: block;
-        }
-
-        .header {
-            margin: 0;
-            padding: 12px 0 8px;
-        }
-    }
-
-    td.containertd {
-        background-color: #FFFFFF;
-        border: 1px solid #cccccc;
-    }
-
-    {% block addcss %}{% endblock %}
-</style>
-<body>
-    <table>
-        <tr>
-            <td class="header" background="">
-                {% if event %}
-                    <h1><a href="{% eventurl event "presale:event.index" %}" target="_blank">{{ event.name }}</a></h1>
-                {% else %}
-                    <h1><a href="{{ site_url }}" target="_blank">{{ site }}</a></h1>
-                {% endif %}
-            </td>
-        </tr>
-        <tr>
-            <td class="containertd">
-                <div class="content">
-                    {{ body|safe }}
-                </div>
-            </td>
-        </tr>
-        {% if order %}
-            <tr>
-                <td class="gap"></td>
-            </tr>
-            <tr>
-                <td class="order containertd">
-                    <div class="content">
-                        {% trans "You are receiving this email because you placed an order for the following event:" %}<br>
-                        <strong>{% trans "Event:" %}</strong> {{ event.name }}<br>
-                        <strong>{% trans "Order code:" %}</strong> {{ order.code }}<br>
-                        <strong>{% trans "Order date:" %}</strong> {{ order.datetime|date:"SHORT_DATE_FORMAT" }}<br>
-                        <a href="{% eventurl event "presale:event.order" order=order.code secret=order.secret %}">
-                            {% trans "View order details" %}
-                        </a>
-                    </div>
-                </td>
-            </tr>
-        {% endif %}
-        <tr>
-            <td class="footer">
-                <div>
-                    {% with 'target="blank" href="https://pretix.eu"'|safe as a_attr %}
-                        {% blocktrans trimmed %}
-                            powered by <a {{ a_attr }}>pretix</a>
-                        {% endblocktrans %}
-                    {% endwith %}
-                </div>
-            </td>
-        </tr>
-    </table>
-    <br/>
-    <br/>
-</body>
-</html>

src/pretix/base/ticketoutput.py

@@ -32,8 +32,7 @@ class BaseTicketOutput:
     def generate(self, order: OrderPosition) -> Tuple[str, str, str]:
         """
         This method should generate the download file and return a tuple consisting of a
-        filename, a file type and file content. The extension will be taken from the filename
-        which is otherwise ignored.
+        filename, a file type and file content.
         """
         raise NotImplementedError()
 

src/pretix/base/views/async.py

@@ -8,7 +8,7 @@ from django.http import JsonResponse
 from django.shortcuts import redirect, render
 from django.utils.translation import ugettext as _
 
-from pretix.celery_app import app
+from pretix.celery import app
 
 logger = logging.getLogger('pretix.base.async')
 
@@ -17,7 +17,6 @@ class AsyncAction:
     task = None
     success_url = None
     error_url = None
-    known_errortypes = []
 
     def do(self, *args):
         if not isinstance(self.task, app.Task):
@@ -54,7 +53,7 @@ class AsyncAction:
     def _return_ajax_result(self, res, timeout=.5):
         if not res.ready():
             try:
-                res.get(timeout=timeout, propagate=False)
+                res.get(timeout=timeout)
             except celery.exceptions.TimeoutError:
                 pass
 
@@ -119,13 +118,8 @@ class AsyncAction:
         return redirect(self.get_error_url())
 
     def get_error_message(self, exception):
-        if isinstance(exception, dict) and exception['exc_type'] in self.known_errortypes:
-            return exception['exc_message']
-        elif exception.__class__.__name__ in self.known_errortypes:
-            return str(exception)
-        else:
-            logger.error('Unexpected exception: %r' % exception)
-            return _('An unexpected error has occured.')
+        logger.error('Unexpected exception: %r' % exception)
+        return _('An unexpected error has occured.')
 
     def get_success_message(self, value):
         return _('The task has been completed.')

src/pretix/base/views/cachedfiles.py

@@ -1,4 +1,6 @@
-from django.http import FileResponse, Http404, HttpRequest, HttpResponse
+import os
+
+from django.http import FileResponse, HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404
 from django.utils.functional import cached_property
 from django.views.generic import TemplateView
@@ -11,17 +13,15 @@ class DownloadView(TemplateView):
 
     @cached_property
     def object(self) -> CachedFile:
-        try:
-            return get_object_or_404(CachedFile, id=self.kwargs['id'])
-        except ValueError:   # Invalid URLs
-            raise Http404()
+        return get_object_or_404(CachedFile, id=self.kwargs['id'])
 
     def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
         if 'ajax' in request.GET:
             return HttpResponse('1' if self.object.file else '0')
         elif self.object.file:
             resp = FileResponse(self.object.file.file, content_type=self.object.type)
-            resp['Content-Disposition'] = 'attachment; filename="{}"'.format(self.object.filename)
+            _, ext = os.path.splitext(self.object.filename)
+            resp['Content-Disposition'] = 'attachment; filename="{}{}"'.format(self.object.id, ext)
             return resp
         else:
             return super().get(request, *args, **kwargs)

src/pretix/base/views/metrics.py

@@ -1,5 +1,3 @@
-import hmac
-
 from django.conf import settings
 from django.http import HttpResponse
 
@@ -28,9 +26,9 @@ def serve_metrics(request):
 
     user, passphrase = credentials.strip().decode("base64").split(":", 1)
 
-    if not hmac.compare_digest(user, settings.METRICS_USER):
+    if user != settings.METRICS_USER:
         return unauthed_response()
-    if not hmac.compare_digest(passphrase, settings.METRICS_PASSPHRASE):
+    if passphrase != settings.METRICS_PASSPHRASE:
         return unauthed_response()
 
     # ok, the request passed the authentication-barrier, let's hand out the metrics:

src/pretix/celery.py

@@ -0,0 +1,29 @@
+import os
+
+from celery import Celery
+from celery.utils.mail import ErrorMail
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pretix.settings")
+
+from django.conf import settings
+
+app = Celery('pretix')
+
+
+class MyErrorMail(ErrorMail):
+
+    def should_send(self, context, exc):
+        from pretix.base.services.orders import OrderError
+        from pretix.base.services.cart import CartError
+
+        blacklist = (OrderError, CartError)
+        return not isinstance(exc, blacklist)
+
+
+app.config_from_object('django.conf:settings')
+app.conf.CELERY_ANNOTATIONS = {
+    '*': {
+        'ErrorMail': MyErrorMail,
+    }
+}
+app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)

src/pretix/celery_app.py

@@ -1,18 +0,0 @@
-import os
-
-from celery import Celery
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pretix.settings")
-
-from django.conf import settings
-
-app = Celery('pretix')
-app.config_from_object('django.conf:settings', namespace='CELERY')
-app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
-
-
-if hasattr(settings, 'RAVEN_CONFIG'):
-    # Celery signal registration
-    from raven.contrib.celery import register_signal
-    from raven.contrib.django.models import client
-    register_signal(client, ignore_expected=True)

src/pretix/control/forms/event.py

@@ -2,50 +2,19 @@ from django import forms
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.validators import RegexValidator
-from django.utils.timezone import get_current_timezone_name
 from django.utils.translation import ugettext_lazy as _
 from pytz import common_timezones
 
 from pretix.base.forms import I18nModelForm, SettingsForm
 from pretix.base.i18n import I18nFormField, I18nTextarea
-from pretix.base.models import Event, Organizer
+from pretix.base.models import Event
 from pretix.control.forms import ExtFileField
 
 
-class EventWizardFoundationForm(forms.Form):
-    locales = forms.MultipleChoiceField(
-        choices=settings.LANGUAGES,
-        label=_("Use languages"),
-        widget=forms.CheckboxSelectMultiple,
-        help_text=_('Choose all languages that your event should be available in.')
-    )
-
-    def __init__(self, *args, **kwargs):
-        self.user = kwargs.pop('user')
-        super().__init__(*args, **kwargs)
-        self.fields['organizer'] = forms.ModelChoiceField(
-            label=_("Organizer"),
-            queryset=Organizer.objects.filter(
-                id__in=self.user.organizer_perms.filter(can_create_events=True).values_list('organizer', flat=True)
-            ),
-            widget=forms.RadioSelect,
-            empty_label=None,
-            required=True
-        )
-
-
-class EventWizardBasicsForm(I18nModelForm):
+class EventCreateForm(I18nModelForm):
     error_messages = {
         'duplicate_slug': _("You already used this slug for a different event. Please choose a new one."),
     }
-    timezone = forms.ChoiceField(
-        choices=((a, a) for a in common_timezones),
-        label=_("Default timezone"),
-    )
-    locale = forms.ChoiceField(
-        choices=settings.LANGUAGES,
-        label=_("Default language"),
-    )
 
     class Meta:
         model = Event
@@ -67,19 +36,7 @@ class EventWizardBasicsForm(I18nModelForm):
 
     def __init__(self, *args, **kwargs):
         self.organizer = kwargs.pop('organizer')
-        self.locales = kwargs.get('locales')
-        kwargs.pop('user')
         super().__init__(*args, **kwargs)
-        self.initial['timezone'] = get_current_timezone_name()
-        self.fields['locale'].choices = [(a, b) for a, b in settings.LANGUAGES if a in self.locales]
-
-    def clean(self):
-        data = super().clean()
-        if data['locale'] not in self.locales:
-            raise ValidationError({
-                'locale': _('Your default locale must also be enabled for your event (see box above).')
-            })
-        return data
 
     def clean_slug(self):
         slug = self.cleaned_data['slug']
@@ -91,24 +48,27 @@ class EventWizardBasicsForm(I18nModelForm):
         return slug
 
 
-class EventWizardCopyForm(forms.Form):
+class EventCreateSettingsForm(SettingsForm):
+    timezone = forms.ChoiceField(
+        choices=((a, a) for a in common_timezones),
+        label=_("Default timezone"),
+    )
+    locales = forms.MultipleChoiceField(
+        choices=settings.LANGUAGES,
+        label=_("Available langauges"),
+    )
+    locale = forms.ChoiceField(
+        choices=settings.LANGUAGES,
+        label=_("Default language"),
+    )
 
-    def __init__(self, *args, **kwargs):
-        kwargs.pop('organizer')
-        kwargs.pop('locales')
-        self.user = kwargs.pop('user')
-        super().__init__(*args, **kwargs)
-        self.fields['copy_from_event'] = forms.ModelChoiceField(
-            label=_("Copy configuration from"),
-            queryset=Event.objects.filter(
-                id__in=self.user.event_perms.filter(
-                    can_change_items=True, can_change_settings=True
-                ).values_list('event', flat=True)
-            ),
-            widget=forms.RadioSelect,
-            empty_label=_('Do not copy'),
-            required=True
-        )
+    def clean(self):
+        data = super().clean()
+        if data['locale'] not in data['locales']:
+            raise ValidationError({
+                'locale': _('Your default locale must also be enabled for your event (see box above).')
+            })
+        return data
 
 
 class EventUpdateForm(I18nModelForm):

src/pretix/control/forms/item.py

@@ -1,12 +1,10 @@
 import copy
 
 from django import forms
-from django.core.exceptions import ValidationError
 from django.forms import BooleanField, ModelMultipleChoiceField
-from django.forms.formsets import DELETION_FIELD_NAME
 from django.utils.translation import ugettext as __, ugettext_lazy as _
 
-from pretix.base.forms import I18nFormSet, I18nModelForm
+from pretix.base.forms import I18nModelForm
 from pretix.base.i18n import I18nFormField, I18nTextarea
 from pretix.base.models import (
     Item, ItemCategory, ItemVariation, Question, QuestionOption, Quota,
@@ -155,28 +153,6 @@ class ItemUpdateForm(I18nModelForm):
         }
 
 
-class ItemVariationsFormSet(I18nFormSet):
-
-    def clean(self):
-        super().clean()
-        for f in self.forms:
-            if hasattr(f, '_delete_fail'):
-                f.fields['DELETE'].initial = False
-                f.fields['DELETE'].disabled = True
-                raise ValidationError(
-                    message=_('The variation "%s" cannot be deleted because it has already been ordered by a user or '
-                              'currently is in a users\'s cart. Please set the variation as "inactive" instead.'),
-                    params=(str(f.instance),)
-                )
-
-    def _should_delete_form(self, form):
-        should_delete = super()._should_delete_form(form)
-        if should_delete and (form.instance.orderposition_set.exists() or form.instance.cartposition_set.exists()):
-            form._delete_fail = True
-            return False
-        return form.cleaned_data.get(DELETION_FIELD_NAME, False)
-
-
 class ItemVariationForm(I18nModelForm):
     class Meta:
         model = ItemVariation

src/pretix/control/forms/orders.py

@@ -21,9 +21,9 @@ class ExtendForm(I18nModelForm):
 
     def clean(self):
         data = super().clean()
-        data['expires'] = data['expires'].replace(hour=23, minute=59, second=59)
         if data['expires'] < now():
             raise ValidationError(_('The new expiry date needs to be in the future.'))
+        data['expires'] = data['expires'].replace(hour=23, minute=59, second=59)
         return data
 
 
@@ -105,12 +105,6 @@ class OrderPositionChangeForm(forms.Form):
 
 
 class OrderContactForm(forms.ModelForm):
-    regenerate_secrets = forms.BooleanField(required=False, label=_('Invalidate secrets'),
-                                            help_text=_('Regenerates the order and ticket secrets. You will '
-                                                        'need to re-send the link to the order page to the user and '
-                                                        'the user will need to download his tickets again. The old '
-                                                        'versions will be invalid.'))
-
     class Meta:
         model = Order
         fields = ['email']

src/pretix/control/forms/vouchers.py

@@ -22,8 +22,8 @@ class VoucherForm(I18nModelForm):
         model = Voucher
         localized_fields = '__all__'
         fields = [
-            'code', 'valid_until', 'block_quota', 'allow_ignore_quota', 'value', 'tag',
-            'comment', 'max_usages', 'price_mode'
+            'code', 'valid_until', 'block_quota', 'allow_ignore_quota', 'price', 'tag',
+            'comment', 'max_usages'
         ]
         widgets = {
             'valid_until': forms.DateTimeInput(attrs={'class': 'datetimepicker'}),
@@ -187,8 +187,8 @@ class VoucherBulkForm(VoucherForm):
         model = Voucher
         localized_fields = '__all__'
         fields = [
-            'valid_until', 'block_quota', 'allow_ignore_quota', 'value', 'tag', 'comment',
-            'max_usages', 'price_mode'
+            'valid_until', 'block_quota', 'allow_ignore_quota', 'price', 'tag', 'comment',
+            'max_usages'
         ]
         widgets = {
             'valid_until': forms.DateTimeInput(attrs={'class': 'datetimepicker'}),

src/pretix/control/logdisplay.py

@@ -5,14 +5,9 @@ from django.dispatch import receiver
 from django.utils import formats
 from django.utils.translation import ugettext_lazy as _
 
-from pretix.base.i18n import LazyI18nString
 from pretix.base.models import Event, ItemVariation, LogEntry
 from pretix.base.signals import logentry_display
 
-OVERVIEW_BLACKLIST = [
-    'pretix.plugins.sendmail.order.email.sent'
-]
-
 
 def _display_order_changed(event: Event, logentry: LogEntry):
     data = json.loads(logentry.data)
@@ -25,18 +20,14 @@ def _display_order_changed(event: Event, logentry: LogEntry):
         new_item = str(event.items.get(pk=data['new_item']))
         if data['new_variation']:
             new_item += ' - ' + str(event.itemvariations.get(pk=data['new_variation']))
-        return text + ' ' + _('Position #{posid}: {old_item} ({old_price} {currency}) changed '
-                              'to {new_item} ({new_price} {currency}).').format(
-            posid=data.get('positionid', '?'),
+        return text + ' ' + _('{old_item} ({old_price} {currency}) changed to {new_item} ({new_price} {currency}).').format(
             old_item=old_item, new_item=new_item,
             old_price=formats.localize(Decimal(data['old_price'])),
             new_price=formats.localize(Decimal(data['new_price'])),
             currency=event.currency
         )
     elif logentry.action_type == 'pretix.event.order.changed.price':
-        return text + ' ' + _('Price of position #{posid} changed from {old_price} {currency} '
-                              'to {new_price} {currency}.').format(
-            posid=data.get('positionid', '?'),
+        return text + ' ' + _('Price of a position changed from {old_price} {currency} to {new_price} {currency}.').format(
             old_price=formats.localize(Decimal(data['old_price'])),
             new_price=formats.localize(Decimal(data['new_price'])),
             currency=event.currency
@@ -45,8 +36,7 @@ def _display_order_changed(event: Event, logentry: LogEntry):
         old_item = str(event.items.get(pk=data['old_item']))
         if data['old_variation']:
             old_item += ' - ' + str(ItemVariation.objects.get(pk=data['old_variation']))
-        return text + ' ' + _('Position #{posid} ({old_item}, {old_price} {currency}) removed.').format(
-            posid=data.get('positionid', '?'),
+        return text + ' ' + _('{old_item} ({old_price} {currency}) removed.').format(
             old_item=old_item,
             old_price=formats.localize(Decimal(data['old_price'])),
             currency=event.currency
@@ -59,84 +49,44 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
         'pretix.event.order.modified': _('The order details have been modified.'),
         'pretix.event.order.unpaid': _('The order has been marked as unpaid.'),
         'pretix.event.order.resend': _('The link to the order detail page has been resent to the user.'),
-        'pretix.event.order.secret.changed': _('The order\'s secret has been changed.'),
         'pretix.event.order.expirychanged': _('The order\'s expiry date has been changed.'),
         'pretix.event.order.expired': _('The order has been marked as expired.'),
         'pretix.event.order.paid': _('The order has been marked as paid.'),
         'pretix.event.order.refunded': _('The order has been refunded.'),
         'pretix.event.order.canceled': _('The order has been canceled.'),
         'pretix.event.order.placed': _('The order has been created.'),
-        'pretix.event.order.contact.changed': _('The email address has been changed from "{old_email}" '
-                                                'to "{new_email}".'),
         'pretix.event.order.invoice.generated': _('The invoice has been generated.'),
         'pretix.event.order.invoice.regenerated': _('The invoice has been regenerated.'),
         'pretix.event.order.invoice.reissued': _('The invoice has been reissued.'),
         'pretix.event.order.comment': _('The order\'s internal comment has been updated.'),
+        'pretix.event.order.contact.changed': _('The email address has been changed.'),
         'pretix.event.order.payment.changed': _('The payment method has been changed.'),
-        'pretix.event.order.expire_warning_sent': _('An email has been sent with a warning that the order is about '
-                                                    'to expire.'),
+        'pretix.event.order.expire_warning_sent': _('An email has been sent with a warning that the order is about to expire.'),
         'pretix.user.settings.2fa.enabled': _('Two-factor authentication has been enabled.'),
         'pretix.user.settings.2fa.disabled': _('Two-factor authentication has been disabled.'),
         'pretix.user.settings.2fa.regenemergency': _('Your two-factor emergency codes have been regenerated.'),
-        'pretix.user.settings.2fa.device.added': _('A new two-factor authentication device "{name}" has been added to '
-                                                   'your account.'),
-        'pretix.user.settings.2fa.device.deleted': _('The two-factor authentication device "{name}" has been removed '
-                                                     'from your account.'),
         'pretix.control.auth.user.forgot_password.mail_sent': _('Password reset mail sent.'),
-        'pretix.control.auth.user.forgot_password.recovered': _('The password has been reset.'),
-        'pretix.voucher.added': _('The voucher has been created.'),
-        'pretix.voucher.changed': _('The voucher has been modified.'),
-        'pretix.voucher.deleted': _('The voucher has been deleted.'),
-        'pretix.voucher.redeemed': _('The voucher has been redeemed in order {order_code}.'),
-        'pretix.event.item.added': _('The product has been created.'),
-        'pretix.event.item.changed': _('The product has been modified.'),
-        'pretix.event.item.deleted': _('The product has been deleted.'),
-        'pretix.event.item.variation.added': _('The variation "{value}" has been created.'),
-        'pretix.event.item.variation.deleted': _('The variation "{value}" has been deleted.'),
-        'pretix.event.item.variation.changed': _('The variation "{value}" has been modified.'),
-        'pretix.event.quota.added': _('The quota has been added.'),
-        'pretix.event.quota.deleted': _('The quota has been deleted.'),
-        'pretix.event.quota.changed': _('The quota has been modified.'),
-        'pretix.event.category.added': _('The category has been added.'),
-        'pretix.event.category.deleted': _('The category has been deleted.'),
-        'pretix.event.category.changed': _('The category has been modified.'),
-        'pretix.event.question.added': _('The question has been added.'),
-        'pretix.event.question.deleted': _('The question has been deleted.'),
-        'pretix.event.question.changed': _('The question has been modified.'),
-        'pretix.event.settings': _('The event settings have been changed.'),
-        'pretix.event.tickets.settings': _('The ticket download settings have been changed.'),
-        'pretix.event.plugins.enabled': _('A plugin has been enabled.'),
-        'pretix.event.plugins.disabled': _('A plugin has been disabled.'),
-        'pretix.event.live.activated': _('The shop has been taken live.'),
-        'pretix.event.live.deactivated': _('The shop has been taken offline.'),
+        'pretix.control.auth.user.forgot_password.recovered': _('The password has been reset.')
+
     }
-
-    data = json.loads(logentry.data)
-
-    if logentry.action_type.startswith('pretix.event.item.variation'):
-        if 'value' not in data:
-            # Backwards compatibility
-            var = ItemVariation.objects.filter(id=data['id']).first()
-            if var:
-                data['value'] = str(var.value)
-            else:
-                data['value'] = '?'
-        else:
-            data['value'] = LazyI18nString(data['value'])
-
     if logentry.action_type in plains:
-        return plains[logentry.action_type].format_map(data)
+        return plains[logentry.action_type]
 
     if logentry.action_type.startswith('pretix.event.order.changed'):
         return _display_order_changed(sender, logentry)
 
-    if logentry.action_type.startswith('pretix.event.payment.provider.'):
-        return _('The settings of a payment provider have been changed.')
-
-    if logentry.action_type.startswith('pretix.event.tickets.provider.'):
-        return _('The settings of a ticket output provider have been changed.')
-
+    if logentry.action_type == 'pretix.user.settings.2fa.device.added':
+        data = json.loads(logentry.data)
+        return _('A new two-factor authentication device "{name}" has been added to your account.').format(
+            name=data['name']
+        )
+    if logentry.action_type == 'pretix.user.settings.2fa.device.deleted':
+        data = json.loads(logentry.data)
+        return _('The two-factor authentication device "{name}" has been removed from your account.').format(
+            name=data['name']
+        )
     if logentry.action_type == 'pretix.user.settings.changed':
+        data = json.loads(logentry.data)
         text = str(_('Your account settings have been changed.'))
         if 'email' in data:
             text = text + ' ' + str(_('Your email address has been changed to {email}.').format(email=data['email']))

src/pretix/control/middleware.py

@@ -30,11 +30,9 @@ class PermissionMiddleware(MiddlewareMixin):
     def process_request(self, request):
         url = resolve(request.path_info)
         url_name = url.url_name
-
         if not request.path.startswith(get_script_prefix() + 'control'):
             # This middleware should only touch the /control subpath
             return
-
         if hasattr(request, 'organizer'):
             # If the user is on a organizer's subdomain, he should be redirected to pretix
             return redirect(urljoin(settings.SITE_URL, request.get_full_path()))

src/pretix/control/signals.py

@@ -50,8 +50,8 @@ This signal is sent out to include widgets in the event dashboard. Receivers
 should return a list of dictionaries, where each dictionary can have the keys:
 
 * content (str, containing HTML)
-* display_size (str, one of "full" (whole row), "big" (half a row) or "small"
-  (quarter of a row). May be ignored on small displays, default is "small")
+* minimal width (int, widget width in 1/12ths of the page, default ist 3, can be
+  ignored on small displays)
 * priority (int, used for ordering, higher comes first, default is 1)
 * link (str, optional, if the full widget should be a link)
 
@@ -66,8 +66,8 @@ This signal is sent out to include widgets in the personal user dashboard. Recei
 should return a list of dictionaries, where each dictionary can have the keys:
 
 * content (str, containing HTML)
-* display_size (str, one of "full" (whole row), "big" (half a row) or "small"
-  (quarter of a row). May be ignored on small displays, default is "small")
+* minimal width (int, widget width in 1/12ths of the page, default ist 3, can be
+  ignored on small displays)
 * priority (int, used for ordering, higher comes first, default is 1)
 * link (str, optional, if the full widget should be a link)
 

src/pretix/control/templates/pretixcontrol/base.html

@@ -24,9 +24,7 @@
             <script type="text/javascript" src="{% static "datetimepicker/bootstrap-datetimepicker.js" %}"></script>
             <script type="text/javascript" src="{% static "charts/raphael-min.js" %}"></script>
             <script type="text/javascript" src="{% static "charts/morris.js" %}"></script>
-            <script type="text/javascript" src="{% static "clipboard/clipboard.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/jquery.qrcode.min.js" %}"></script>
-            <script type="text/javascript" src="{% static "pretixcontrol/js/clipboard.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/menu.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/sb-admin-2.js" %}"></script>
 		    <script type="text/javascript" src="{% static "pretixcontrol/js/ui/main.js" %}"></script>

src/pretix/control/templates/pretixcontrol/dashboard.html

@@ -5,7 +5,7 @@
 	<h1>{% trans "Dashboard" %}</h1>
     <div class="row dashboard">
         {% for w in widgets %}
-            <div class="widget-container widget-{{ w.display_size|default:"small" }}">
+            <div class="col-xs-12 col-sm-{% if w.width > 6 %}12{% else %}6{% endif %} col-md-{{ w.width }}">
                 {% if w.url %}
                     <a href="{{ w.url }}" class="widget">
                         {{ w.content|safe }}

src/pretix/control/templates/pretixcontrol/event/actions.html

@@ -1,25 +0,0 @@
-{% extends "pretixcontrol/items/base.html" %}
-{% load i18n %}
-{% block title %}{% trans "Current issues" %}{% endblock %}
-{% block inside %}
-    <h1>{% trans "Current issues" %}</h1>
-    <ul class="list-group">
-        {% for action in actions %}
-            <li class="list-group-item logentry">
-                <p>
-                    <a href="{% url "control:event.requiredaction.discard" event=request.event.slug organizer=request.event.organizer.slug id=action.id %}"
-                            class="btn btn-default btn-xs pull-right">
-                        {% trans "Hide message" %}
-                    </a>
-                    <small><span class="fa fa-clock-o"></span> {{ action.datetime|date:"SHORT_DATETIME_FORMAT" }}</small>
-                </p>
-                {{ action.display|safe }}
-            </li>
-        {% empty %}
-            <div class="list-group-item">
-                <em>{% trans "No issues. Awesome!" %}</em>
-            </div>
-        {% endfor %}
-    </ul>
-    {% include "pretixcontrol/pagination.html" %}
-{% endblock %}

src/pretix/control/templates/pretixcontrol/event/base.html

@@ -98,28 +98,12 @@
     {% endif %}
     {% for nav in nav_event %}
         <li>
-            <a href="{{ nav.url }}" {% if nav.active %}class="active"{% endif %}
-            {% if nav.children %}class="has-children"{% endif %}>
+            <a href="{{ nav.url }}" {% if nav.active %}class="active"{% endif %}>
                 {% if nav.icon %}
                     <i class="fa fa-{{ nav.icon }} fa-fw"></i>
                 {% endif %}
                 {{ nav.label }}
             </a>
-            {% if nav.children %}
-                <a href="#" class="arrow">
-                    <span class="fa arrow"></span>
-                </a>
-                <ul class="nav nav-second-level">
-                {% for item in nav.children %}
-                    <li>
-                        <a href="{{ item.url }}"
-                        {% if item.active %}class="active"{% endif %}>
-                            {{ item.label }}
-                        </a>
-                    </li>
-                {% endfor %}
-                </ul>
-            {% endif %}
         </li>
     {% endfor %}
 {% endblock %}

src/pretix/control/templates/pretixcontrol/event/index.html

@@ -9,39 +9,9 @@
             {% trans "Go to shop" %}
         </a>
     </h1>
-
-    {% if actions|length > 0 %}
-        <div class="panel panel-danger">
-            <div class="panel-heading">
-                <h3 class="panel-title">
-                    {% trans "Your attention is required to resolve the following issues" %}
-                </h3>
-            </div>
-            <ul class="list-group">
-                {% for action in actions %}
-                    <li class="list-group-item logentry">
-                        <p>
-                            <a href="{% url "control:event.requiredaction.discard" event=request.event.slug organizer=request.event.organizer.slug id=action.id %}"
-                                    class="btn btn-default btn-xs pull-right">
-                                {% trans "Hide message" %}
-                            </a>
-                            <small><span class="fa fa-clock-o"></span> {{ action.datetime|date:"SHORT_DATETIME_FORMAT" }}</small>
-                        </p>
-                        {{ action.display|safe }}
-                    </li>
-                {% endfor %}
-            </ul>
-            <div class="panel-footer">
-                <a href="{% url "control:event.requiredactions" event=request.event.slug organizer=request.event.organizer.slug %}">
-                    {% trans "Show more" %}
-                </a>
-            </div>
-        </div>
-    {% endif %}
-
     <div class="row dashboard">
         {% for w in widgets %}
-            <div class="widget-container widget-{{ w.display_size|default:"small" }}">
+            <div class="col-xs-12 col-sm-{% if w.width > 6 %}12{% else %}6{% endif %} col-md-{{ w.width }}">
                 {% if w.url %}
                     <a href="{{ w.url }}" class="widget">
                         {{ w.content|safe }}
@@ -54,43 +24,4 @@
             </div>
         {% endfor %}
     </div>
-
-    <p>&nbsp;</p>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">
-                {% trans "Event logs" %}
-            </h3>
-        </div>
-        <ul class="list-group">
-            {% for log in logs %}
-                <li class="list-group-item logentry">
-                    <div class="row">
-                        <div class="col-lg-2 col-sm-6 col-xs-12">
-                            <span class="fa fa-clock-o"></span> {{ log.datetime|date:"SHORT_DATETIME_FORMAT" }}
-                        </div>
-                        <div class="col-lg-2 col-sm-6 col-xs-12">
-                            {% if log.user %}
-                                <span class="fa fa-user"></span> {{ log.user.get_full_name }}
-                            {% endif %}
-                        </div>
-                        <div class="col-lg-2 col-sm-12 col-xs-12">
-                            {% if log.display_object %}
-                                <span class="fa fa-flag"></span> {{ log.display_object|safe }}
-                            {% endif %}
-                        </div>
-                        <div class="col-lg-6 col-sm-12 col-xs-12">
-                            {{ log.display }}
-                        </div>
-                    </div>
-                </li>
-            {% endfor %}
-        </ul>
-        <div class="panel-footer">
-            <a href="{% url "control:event.log" event=request.event.slug organizer=request.event.organizer.slug %}">
-                {% trans "Show more logs" %}
-            </a>
-        </div>
-    </div>
-
 {% endblock %}

src/pretix/control/templates/pretixcontrol/event/logs.html

@@ -1,54 +0,0 @@
-{% extends "pretixcontrol/items/base.html" %}
-{% load i18n %}
-{% block title %}{% trans "Event logs" %}{% endblock %}
-{% block inside %}
-    <h1>{% trans "Event logs" %}</h1>
-    <form class="form-inline helper-display-inline" action="" method="get">
-        <p>
-            <select name="user" class="form-control">
-                <option value="">{% trans "All actions" %}</option>
-                <option value="yes" {% if request.GET.user == "yes" %}selected="selected"{% endif %}>
-                    {% trans "Team actions" %}
-                </option>
-                <option value="no" {% if request.GET.user == "no" %}selected="selected"{% endif %}>
-                    {% trans "Customer actions" %}
-                </option>
-                {% for up in userlist %}
-                    <option value="{{ up.user_id }}" {% if request.GET.user == up.user_id %}selected="selected"{% endif %}>
-                        {{ up.user }}
-                    </option>
-                {% endfor %}
-            </select>
-            <button class="btn btn-primary" type="submit">{% trans "Filter" %}</button>
-        </p>
-    </form>
-    <ul class="list-group">
-        {% for log in logs %}
-            <li class="list-group-item logentry">
-                <div class="row">
-                    <div class="col-lg-2 col-sm-6 col-xs-12">
-                        <span class="fa fa-clock-o"></span> {{ log.datetime|date:"SHORT_DATETIME_FORMAT" }}
-                    </div>
-                    <div class="col-lg-2 col-sm-6 col-xs-12">
-                        {% if log.user %}
-                            <span class="fa fa-user"></span> {{ log.user.get_full_name }}
-                        {% endif %}
-                    </div>
-                    <div class="col-lg-2 col-sm-12 col-xs-12">
-                        {% if log.display_object %}
-                            <span class="fa fa-flag"></span> {{ log.display_object|safe }}
-                        {% endif %}
-                    </div>
-                    <div class="col-lg-6 col-sm-12 col-xs-12">
-                        {{ log.display }}
-                    </div>
-                </div>
-            </li>
-        {% empty %}
-            <div class="list-group-item">
-                <em>{% trans "No results" %}</em>
-            </div>
-        {% endfor %}
-    </ul>
-    {% include "pretixcontrol/pagination.html" %}
-{% endblock %}

src/pretix/control/templates/pretixcontrol/event/tickets.html

@@ -13,8 +13,7 @@
                 <div class="panel panel-default ticketoutput-panel">
                     <div class="panel-heading">
                         <a href="{% url "control:event.settings.tickets.preview" event=request.event.slug organizer=request.organizer.slug output=provider.identifier %}"
-                                class="btn btn-default btn-sm pull-right {% if not provider.preview_allowed %}disabled{% endif %}"
-                                target="_blank">
+                            class="btn btn-default btn-sm pull-right" target="_blank">
                             {% trans "Preview" %}
                         </a>
                         <h3 class="panel-title">{{ provider.verbose_name }}</h3>

src/pretix/control/templates/pretixcontrol/events/create.html

@@ -0,0 +1,40 @@
+{% extends "pretixcontrol/base.html" %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% block title %}{% trans "Create a new event" %}{% endblock %}
+{% block content %}
+	<h1>{% trans "Create a new event" %}</h1>
+    <form action="" method="post" class="form-horizontal">
+        {% csrf_token %}
+        {% bootstrap_form_errors form %}
+        <fieldset>
+            <legend>{% trans "General information" %}</legend>
+            {% bootstrap_field form.name layout="horizontal" %}
+            {% bootstrap_field form.slug layout="horizontal" %}
+            {% bootstrap_field form.date_from layout="horizontal" %}
+            {% bootstrap_field form.date_to layout="horizontal" %}
+            {% bootstrap_field form.currency layout="horizontal" %}
+        </fieldset>
+        <fieldset>
+            <legend>{% trans "Display settings" %}</legend>
+            {% bootstrap_field sform.locales layout="horizontal" %}
+            {% bootstrap_field sform.locale layout="horizontal" %}
+            {% bootstrap_field sform.timezone layout="horizontal" %}
+        </fieldset>
+        <fieldset>
+            <legend>{% trans "Timeline" %}</legend>
+            {% bootstrap_field form.presale_start layout="horizontal" %}
+            {% bootstrap_field form.presale_end layout="horizontal" %}
+        </fieldset>
+        <p>
+            {% blocktrans trimmed %}
+                You will be able to adjust further settings in the next step.
+            {% endblocktrans %}
+        </p>
+        <div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
+        </div>
+    </form>
+{% endblock %}

src/pretix/control/templates/pretixcontrol/events/create_base.html

@@ -1,27 +0,0 @@
-{% extends "pretixcontrol/base.html" %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% block title %}{% trans "Create a new event" %}{% endblock %}
-{% block content %}
-	<h1>{% trans "Create a new event" %} <small>{% blocktrans trimmed with step=wizard.steps.step1 %}
-        Step {{ step }}
-    {% endblocktrans %}</small></h1>
-    <form action="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {{ wizard.management_form }}
-        {% bootstrap_form_errors form %}
-        {% block form %}
-        {% endblock %}
-        <div class="form-group submit-group">
-            {% if wizard.steps.prev %}
-                <button name="wizard_goto_step" type="submit" value="{{ wizard.steps.prev }}"
-                        class="btn btn-default btn-lg pull-left">
-                    {% trans "Back" %}
-                </button>
-            {% endif %}
-            <button type="submit" class="btn btn-primary btn-save">
-                {% trans "Continue" %}
-            </button>
-        </div>
-    </form>
-{% endblock %}

src/pretix/control/templates/pretixcontrol/events/create_basics.html

@@ -1,23 +0,0 @@
-{% extends "pretixcontrol/events/create_base.html" %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% block form %}
-    <fieldset>
-        <legend>{% trans "General information" %}</legend>
-        {% bootstrap_field form.name layout="horizontal" %}
-        {% bootstrap_field form.slug layout="horizontal" %}
-        {% bootstrap_field form.date_from layout="horizontal" %}
-        {% bootstrap_field form.date_to layout="horizontal" %}
-        {% bootstrap_field form.currency layout="horizontal" %}
-    </fieldset>
-    <fieldset>
-        <legend>{% trans "Display settings" %}</legend>
-        {% bootstrap_field form.locale layout="horizontal" %}
-        {% bootstrap_field form.timezone layout="horizontal" %}
-    </fieldset>
-    <fieldset>
-        <legend>{% trans "Timeline" %}</legend>
-        {% bootstrap_field form.presale_start layout="horizontal" %}
-        {% bootstrap_field form.presale_end layout="horizontal" %}
-    </fieldset>
-{% endblock %}

src/pretix/control/templates/pretixcontrol/events/create_copy.html

@@ -1,20 +0,0 @@
-{% extends "pretixcontrol/events/create_base.html" %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% block form %}
-    <p>
-        {% blocktrans trimmed %}
-            Do you want to copy over your configuration from a different event? We will copy all
-			products, categories, quotas, and questions as well as general event settings.
-        {% endblocktrans %}
-    </p>
-    <div class="alert alert-info">
-        <strong>
-            {% blocktrans trimmed %}
-                Please make sure to review all settings extensively. You will probably still need to change some
-                settings manually, e.g. date and time settings and texts that contain the event name.
-            {% endblocktrans %}
-        </strong>
-    </div>
-    {% bootstrap_field form.copy_from_event layout="horizontal" %}
-{% endblock %}

src/pretix/control/templates/pretixcontrol/events/create_foundation.html

@@ -1,7 +0,0 @@
-{% extends "pretixcontrol/events/create_base.html" %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% block form %}
-    {% bootstrap_field form.organizer layout="horizontal" %}
-    {% bootstrap_field form.locales layout="horizontal" %}
-{% endblock %}

src/pretix/control/templates/pretixcontrol/events/start.html

@@ -0,0 +1,30 @@
+{% extends "pretixcontrol/base.html" %}
+{% load i18n %}
+{% block title %}{% trans "Create a new event" %}{% endblock %}
+{% block content %}
+	<h1>{% trans "Create a new event" %}</h1>
+    {% if organizers|length == 0 %}
+        <div class="alert alert-info">
+            {% trans "You are not permitted to create new events in the name of any organizer." %}
+        </div>
+    {% else %}
+        <p>{% trans "Please choose the organizer of this event from the list below." %}</p>
+        <table class="table table-condensed table-hover">
+            <thead>
+                <tr>
+                    <th>{% trans "Organizer name" %}</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for o in organizers %}
+                <tr>
+                    <td><strong>
+                        <a href="{% url "control:events.create" organizer=o.slug %}">{{ o.name }}</a>
+                    </strong></td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+        {% include "pretixcontrol/pagination.html" %}
+    {% endif %}
+{% endblock %}

src/pretix/control/templates/pretixcontrol/item/index.html

@@ -4,43 +4,29 @@
 {% block inside %}
     <form action="" method="post" class="form-horizontal" enctype="multipart/form-data">
         {% csrf_token %}
-        <div class="row">
-            <div class="col-xs-12 col-lg-10">
-                <fieldset>
-                    <legend>{% trans "General information" %}</legend>
-                    {% bootstrap_field form.name layout="horizontal" %}
-                    {% bootstrap_field form.active layout="horizontal" %}
-                    {% bootstrap_field form.category layout="horizontal" %}
-                    {% bootstrap_field form.admission layout="horizontal" %}
-                    {% bootstrap_field form.description layout="horizontal" %}
-                    {% bootstrap_field form.picture layout="horizontal" %}
-                </fieldset>
-                <fieldset>
-                    <legend>{% trans "Price settings" %}</legend>
-                    {% bootstrap_field form.default_price layout="horizontal" %}
-                    {% bootstrap_field form.tax_rate layout="horizontal" %}
-                    {% bootstrap_field form.free_price layout="horizontal" %}
-                </fieldset>
-                <fieldset>
-                    <legend>{% trans "Availability" %}</legend>
-                    {% bootstrap_field form.available_from layout="horizontal" %}
-                    {% bootstrap_field form.available_until layout="horizontal" %}
-                    {% bootstrap_field form.require_voucher layout="horizontal" %}
-                    {% bootstrap_field form.hide_without_voucher layout="horizontal" %}
-                    {% bootstrap_field form.allow_cancel layout="horizontal" %}
-                </fieldset>
-            </div>
-            <div class="col-xs-12 col-lg-2">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">
-                            {% trans "Product history" %}
-                        </h3>
-                    </div>
-                    {% include "pretixcontrol/includes/logs.html" with obj=item %}
-                </div>
-            </div>
-        </div>
+        <fieldset>
+            <legend>{% trans "General information" %}</legend>
+            {% bootstrap_field form.name layout="horizontal" %}
+            {% bootstrap_field form.active layout="horizontal" %}
+            {% bootstrap_field form.category layout="horizontal" %}
+            {% bootstrap_field form.admission layout="horizontal" %}
+            {% bootstrap_field form.description layout="horizontal" %}
+            {% bootstrap_field form.picture layout="horizontal" %}
+        </fieldset>
+        <fieldset>
+            <legend>{% trans "Price settings" %}</legend>
+            {% bootstrap_field form.default_price layout="horizontal" %}
+            {% bootstrap_field form.tax_rate layout="horizontal" %}
+            {% bootstrap_field form.free_price layout="horizontal" %}
+        </fieldset>
+        <fieldset>
+            <legend>{% trans "Availability" %}</legend>
+            {% bootstrap_field form.available_from layout="horizontal" %}
+            {% bootstrap_field form.available_until layout="horizontal" %}
+            {% bootstrap_field form.require_voucher layout="horizontal" %}
+            {% bootstrap_field form.hide_without_voucher layout="horizontal" %}
+            {% bootstrap_field form.allow_cancel layout="horizontal" %}
+        </fieldset>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}

src/pretix/control/templates/pretixcontrol/items/category.html

@@ -7,25 +7,11 @@
 	<form action="" method="post" class="form-horizontal">
 		{% csrf_token %}
         {% bootstrap_form_errors form %}
-        <div class="row">
-            <div class="col-xs-12 col-lg-10">
-                <fieldset>
-                    <legend>{% trans "General information" %}</legend>
-                    {% bootstrap_field form.name layout="horizontal" %}
-                    {% bootstrap_field form.description layout="horizontal" %}
-                </fieldset>
-            </div>
-            <div class="col-xs-12 col-lg-2">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">
-                            {% trans "Category history" %}
-                        </h3>
-                    </div>
-                    {% include "pretixcontrol/includes/logs.html" with obj=category %}
-                </div>
-            </div>
-        </div>
+		<fieldset>
+			<legend>{% trans "General information" %}</legend>
+			{% bootstrap_field form.name layout="horizontal" %}
+			{% bootstrap_field form.description layout="horizontal" %}
+		</fieldset>
 		<div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}

src/pretix/control/templates/pretixcontrol/items/question.html

@@ -36,31 +36,31 @@
             <button class="btn btn-primary" type="submit">{% trans "Filter" %}</button>
         </p>
     </form>
-    <div class="row" id="question-stats">
-        {% if not stats %}
-            <div class="empty-collection col-md-10 col-xs-12">
+    {% if not stats %}
+        <div class="empty-collection">
+            <p>
+                {% blocktrans trimmed %}
+                    No matching answers found.
+                {% endblocktrans %}
+            </p>
+            {% if not items %}
                 <p>
-                    {% blocktrans trimmed %}
-                        No matching answers found.
-                    {% endblocktrans %}
+                    {% trans "You need to assign the question to a product to collect answers." %}
                 </p>
-                {% if not items %}
-                    <p>
-                        {% trans "You need to assign the question to a product to collect answers." %}
-                    </p>
 
-                    <a href="{% url "control:event.items.questions.edit" event=request.event.slug organizer=request.event.organizer.slug question=question.pk %}"
-                            class="btn btn-primary btn-lg"><i class="fa fa-edit"></i> {% trans "Edit question" %}</a>
-                {% endif %}
-            </div>
-        {% else %}
-            <div class="col-md-5 col-xs-12">
+                <a href="{% url "control:event.items.questions.edit" event=request.event.slug organizer=request.event.organizer.slug question=question.pk %}"
+                        class="btn btn-primary btn-lg"><i class="fa fa-edit"></i> {% trans "Edit question" %}</a>
+            {% endif %}
+        </div>
+    {% else %}
+        <div class="row" id="question-stats">
+            <div class="col-md-6 col-xs-12">
                 <div class="chart" id="question_chart" data-type="{{ question.type }}">
 
                 </div>
                 <script type="application/json" id="question-chart-data">{{ stats_json|safe }}</script>
             </div>
-            <div class="col-md-5 col-xs-12">
+            <div class="col-md-6 col-xs-12">
                 <table class="table table-bordered table-hover">
                     <thead>
                     <tr>
@@ -80,16 +80,6 @@
                     </tbody>
                 </table>
             </div>
-        {% endif %}
-        <div class="col-xs-12 col-lg-2">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        {% trans "Question history" %}
-                    </h3>
-                </div>
-                {% include "pretixcontrol/includes/logs.html" with obj=question %}
-            </div>
         </div>
-    </div>
+    {% endif %}
 {% endblock %}

src/pretix/control/templates/pretixcontrol/items/quota.html

@@ -15,14 +15,14 @@
         {% endif %}
     </h1>
     <div class="row" id="quota-stats">
-        <div class="col-md-5 col-xs-12">
+        <div class="col-md-6 col-xs-12">
             <legend>{% trans "Usage overview" %}</legend>
             <div class="chart" id="quota_chart">
 
             </div>
             <script type="application/json" id="quota-chart-data">{{ quota_chart_data|safe }}</script>
         </div>
-        <div class="col-md-5 col-xs-12">
+        <div class="col-md-6 col-xs-12">
             <legend>{% trans "Availability calculation" %}</legend>
 
             <div class="row">
@@ -43,31 +43,6 @@
                     {% if quota.size == None %}{% trans "Infinite" %}{% else %}{{ avail.1 }}{% endif %}
                 </div>
             </div>
-            {% if quota_overbooked > 0 %}
-                <div class="alert alert-warning">
-                    {% blocktrans trimmed with num=quota_overbooked %}
-                        This quota is currently overbooked by {{ num }} tickets.
-                    {% endblocktrans %}
-                </div>
-            {% endif %}
-            {% if has_ignore_vouchers %}
-                <div class="alert alert-warning">
-                    {% blocktrans trimmed %}
-                        Your event contains vouchers that affect products covered by this quota and that
-                        allow a user to buy products even if this quota is sold out.
-                    {% endblocktrans %}
-                </div>
-            {% endif %}
-        </div>
-        <div class="col-md-2 col-xs-12">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        {% trans "Quota history" %}
-                    </h3>
-                </div>
-                {% include "pretixcontrol/includes/logs.html" with obj=quota %}
-            </div>
         </div>
     </div>
     {% eventsignal request.event "pretix.control.signals.quota_detail_html" quota=quota %}

src/pretix/control/templates/pretixcontrol/order/change.html

@@ -43,7 +43,6 @@
             <div class="panel panel-default items">
                 <div class="panel-heading">
                     <h3 class="panel-title">
-                        #{{ position.positionid }} –
                         <strong>{{ position.item.name }}</strong>
                         {% if position.variation %}
                             – {{ position.variation }}

src/pretix/control/templates/pretixcontrol/order/index.html

@@ -158,15 +158,11 @@
                 <div class="panel-body">
                     {% for line in items.positions %}
                         <div class="row-fluid product-row">
-                            <div class="col-md-9 col-xs-6">
-                                #{{ line.positionid }} –
+                            <div class="col-md-4 col-xs-6">
                                 <strong>{{ line.item.name }}</strong>
                                 {% if line.variation %}
                                     – {{ line.variation }}
                                 {% endif %}
-                                {% if line.checkins.all %}
-                                    <span class="fa fa-check" data-toggle="tooltip" title="{% blocktrans trimmed with date=line.checkins.all.0.datetime|date:'d.m.Y H:i' %}First scanned: {{ date }}{% endblocktrans %}"></span>
-                                {% endif %}
                                 {% if line.voucher %}
                                     <br/><span class="fa fa-tags"></span> {% trans "Voucher code used:" %}
                                     <a href="{% url "control:event.voucher" event=request.event.slug organizer=request.event.organizer.slug voucher=line.voucher.pk %}">
@@ -188,8 +184,14 @@
                                     </dl>
                                 {% endif %}
                             </div>
+                            <div class="col-md-2 col-xs-6 count">
+                                {{ line.count }}
+                            </div>
                             <div class="col-md-3 col-xs-6 price">
-                                <strong>{{ event.currency }} {{ line.price|floatformat:2 }}</strong>
+                                {{ event.currency }} {{ line.price|floatformat:2 }}
+                            </div>
+                            <div class="col-md-3 col-xs-6 price">
+                                <strong>{{ event.currency }} {{ line.total|floatformat:2 }}</strong>
                                 {% if line.tax_rate %}
                                     <br/>
                                     <small>{% blocktrans trimmed with rate=line.tax_rate %}

src/pretix/control/templates/pretixcontrol/orders/overview.html

@@ -99,8 +99,8 @@
                     <th>{{ total.num_canceled|togglesum }}</th>
                     <th>{{ total.num_refunded|togglesum }}</th>
                     <th>{{ total.num_expired|togglesum }}</th>
-                    <th>{{ total.num_pending|togglesum }}</th>
                     <th>{{ total.num_paid|togglesum }}</th>
+                    <th>{{ total.num_pending|togglesum }}</th>
                     <th>{{ total.num_total|togglesum }}</th>
                 </tr>
             </tfoot>

src/pretix/control/templates/pretixcontrol/vouchers/bulk.html

@@ -11,7 +11,7 @@
         <fieldset>
             <legend>{% trans "Voucher codes" %}</legend>
             <div class="form-group">
-                <div class="col-md-7 col-sm-12 col-md-offset-3">
+                <div class="col-md-6 col-md-offset-3">
                     <div class="input-group">
                         <input type="text" class="form-control input-xs"
                                id="voucher-bulk-codes-num"
@@ -21,16 +21,11 @@
                                     data-rng-url="{% url 'control:event.vouchers.rng' organizer=request.event.organizer.slug event=request.event.slug %}">
                                 {% trans "Generate random codes" %}
                             </button>
-                            <button type="button" class="btn btn-default btn-clipboard" data-clipboard-target="#id_codes">
-                                <i class="fa fa-clipboard" aria-hidden="true"></i>
-                                {% trans "Copy codes" %}
-                            </button>
                         </div>
                     </div>
                 </div>
             </div>
             {% bootstrap_field form.codes layout="horizontal" %}
-
             {% bootstrap_field form.max_usages layout="horizontal" %}
         </fieldset>
         <fieldset>
@@ -38,15 +33,7 @@
             {% bootstrap_field form.valid_until layout="horizontal" %}
             {% bootstrap_field form.block_quota layout="horizontal" %}
             {% bootstrap_field form.allow_ignore_quota layout="horizontal" %}
-            <div class="form-group">
-                <label class="col-md-3 control-label" for="id_tag">{% trans "Price effect" %}</label>
-                <div class="col-md-5">
-                    {% bootstrap_field form.price_mode show_label=False form_group_class="" %}
-                </div>
-                <div class="col-md-4">
-                    {% bootstrap_field form.value show_label=False form_group_class="" %}
-                </div>
-            </div>
+            {% bootstrap_field form.price layout="horizontal" %}
             {% bootstrap_field form.itemvar layout="horizontal" %}
             <div class="form-group">
                 <div class="col-md-9 col-md-offset-3">

src/pretix/control/templates/pretixcontrol/vouchers/detail.html

@@ -20,54 +20,32 @@
     <form action="" method="post" class="form-horizontal">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
-        <div class="row">
-            <div class="col-xs-12 col-lg-10">
-                <fieldset>
-                    <legend>{% trans "Voucher details" %}</legend>
-                    {% bootstrap_field form.code layout="horizontal" %}
-                    {% bootstrap_field form.max_usages layout="horizontal" %}
-                    {% bootstrap_field form.valid_until layout="horizontal" %}
-                    {% bootstrap_field form.block_quota layout="horizontal" %}
-                    {% bootstrap_field form.allow_ignore_quota layout="horizontal" %}
-                    <div class="form-group">
-                        <label class="col-md-3 control-label" for="id_tag">{% trans "Price effect" %}</label>
-                        <div class="col-md-5">
-                            {% bootstrap_field form.price_mode show_label=False form_group_class="" %}
-                        </div>
-                        <div class="col-md-4">
-                            {% bootstrap_field form.value show_label=False form_group_class="" %}
+        <fieldset>
+            <legend>{% trans "Voucher details" %}</legend>
+            {% bootstrap_field form.code layout="horizontal" %}
+            {% bootstrap_field form.max_usages layout="horizontal" %}
+            {% bootstrap_field form.valid_until layout="horizontal" %}
+            {% bootstrap_field form.block_quota layout="horizontal" %}
+            {% bootstrap_field form.allow_ignore_quota layout="horizontal" %}
+            {% bootstrap_field form.price layout="horizontal" %}
+            {% bootstrap_field form.itemvar layout="horizontal" %}
+            <div class="form-group">
+                <div class="col-md-9 col-md-offset-3">
+                    <div class="controls">
+                        <div class="alert alert-info">
+                            {% blocktrans trimmed %}
+                                If you choose "any product" for a specific quota and choose to reserve quota for this
+                                voucher above, the product can still be unavailable to the voucher holder if another quota
+                                associated with the product is sold out!
+                            {% endblocktrans %}
                         </div>
                     </div>
-                    {% bootstrap_field form.itemvar layout="horizontal" %}
-                    <div class="form-group">
-                        <div class="col-md-9 col-md-offset-3">
-                            <div class="controls">
-                                <div class="alert alert-info">
-                                    {% blocktrans trimmed %}
-                                        If you choose "any product" for a specific quota and choose to reserve quota for this
-                                        voucher above, the product can still be unavailable to the voucher holder if another quota
-                                        associated with the product is sold out!
-                                    {% endblocktrans %}
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    {% bootstrap_field form.tag layout="horizontal" %}
-                    {% bootstrap_field form.comment layout="horizontal" %}
-                </fieldset>
-                {% eventsignal request.event "pretix.control.signals.voucher_form_html" form=form %}
-            </div>
-            <div class="col-xs-12 col-lg-2">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">
-                            {% trans "Voucher history" %}
-                        </h3>
-                    </div>
-                    {% include "pretixcontrol/includes/logs.html" with obj=voucher %}
                 </div>
             </div>
-        </div>
+            {% bootstrap_field form.tag layout="horizontal" %}
+            {% bootstrap_field form.comment layout="horizontal" %}
+        </fieldset>
+        {% eventsignal request.event "pretix.control.signals.voucher_form_html" form=form %}
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}

src/pretix/control/urls.py

@@ -33,14 +33,11 @@ urlpatterns = [
     url(r'^organizers/add$', organizer.OrganizerCreate.as_view(), name='organizers.add'),
     url(r'^organizer/(?P<organizer>[^/]+)/edit$', organizer.OrganizerUpdate.as_view(), name='organizer.edit'),
     url(r'^events/$', main.EventList.as_view(), name='events'),
-    url(r'^events/add$', main.EventWizard.as_view(), name='events.add'),
+    url(r'^events/add$', main.EventCreateStart.as_view(), name='events.add'),
+    url(r'^event/(?P<organizer>[^/]+)/add', main.EventCreate.as_view(), name='events.create'),
     url(r'^event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include([
         url(r'^$', dashboards.event_index, name='event.index'),
         url(r'^live/$', event.EventLive.as_view(), name='event.live'),
-        url(r'^logs/$', event.EventLog.as_view(), name='event.log'),
-        url(r'^requiredactions/$', event.EventActions.as_view(), name='event.requiredactions'),
-        url(r'^requiredactions/(?P<id>\d+)/discard$', event.EventActionDiscard.as_view(),
-            name='event.requiredaction.discard'),
         url(r'^settings/$', event.EventUpdate.as_view(), name='event.settings'),
         url(r'^settings/plugins$', event.EventPlugins.as_view(), name='event.settings.plugins'),
         url(r'^settings/permissions$', event.EventPermissions.as_view(), name='event.settings.permissions'),

src/pretix/control/views/dashboards.py

@@ -1,6 +1,5 @@
 from decimal import Decimal
 
-from django.contrib.contenttypes.models import ContentType
 from django.core.urlresolvers import reverse
 from django.db.models import Sum
 from django.dispatch import receiver
@@ -10,13 +9,11 @@ from django.utils import formats
 from django.utils.formats import date_format
 from django.utils.translation import ugettext_lazy as _
 
-from pretix.base.models import Event, Item, Order, OrderPosition, Voucher
+from pretix.base.models import Event, Item, Order, OrderPosition
 from pretix.control.signals import (
     event_dashboard_widgets, user_dashboard_widgets,
 )
 
-from ..logdisplay import OVERVIEW_BLACKLIST
-
 NUM_WIDGET = '<div class="numwidget"><span class="num">{num}</span><span class="text">{text}</span></div>'
 
 
@@ -44,7 +41,7 @@ def base_widgets(sender, **kwargs):
     return [
         {
             'content': NUM_WIDGET.format(num=tickc, text=_('Attendees (ordered)')),
-            'display_size': 'small',
+            'width': 3,
             'priority': 100,
             'url': reverse('control:event.orders', kwargs={
                 'event': sender.slug,
@@ -53,7 +50,7 @@ def base_widgets(sender, **kwargs):
         },
         {
             'content': NUM_WIDGET.format(num=paidc, text=_('Attendees (paid)')),
-            'display_size': 'small',
+            'width': 3,
             'priority': 100,
             'url': reverse('control:event.orders.overview', kwargs={
                 'event': sender.slug,
@@ -63,7 +60,7 @@ def base_widgets(sender, **kwargs):
         {
             'content': NUM_WIDGET.format(
                 num=formats.localize(rev), text=_('Total revenue ({currency})').format(currency=sender.currency)),
-            'display_size': 'small',
+            'width': 3,
             'priority': 100,
             'url': reverse('control:event.orders.overview', kwargs={
                 'event': sender.slug,
@@ -72,7 +69,7 @@ def base_widgets(sender, **kwargs):
         },
         {
             'content': NUM_WIDGET.format(num=prodc, text=_('Active products')),
-            'display_size': 'small',
+            'width': 3,
             'priority': 100,
             'url': reverse('control:event.items', kwargs={
                 'event': sender.slug,
@@ -90,7 +87,7 @@ def quota_widgets(sender, **kwargs):
         widgets.append({
             'content': NUM_WIDGET.format(num='{}/{}'.format(left, q.size) if q.size is not None else '\u221e',
                                          text=_('{quota} left').format(quota=q.name)),
-            'display_size': 'small',
+            'width': 3,
             'priority': 50,
             'url': reverse('control:event.items.quotas.show', kwargs={
                 'event': sender.slug,
@@ -104,7 +101,7 @@ def quota_widgets(sender, **kwargs):
 @receiver(signal=event_dashboard_widgets)
 def shop_state_widget(sender, **kwargs):
     return [{
-        'display_size': 'small',
+        'width': 3,
         'priority': 1000,
         'content': '<div class="shopstate">{t1}<br><span class="{cls}"><span class="fa {icon}"></span> {state}</span>{t2}</div>'.format(
             t1=_('Your ticket shop is'), t2=_('Click here to change'),
@@ -147,7 +144,7 @@ def welcome_wizard_widget(sender, **kwargs):
     else:
         return []
     return [{
-        'display_size': 'full',
+        'width': 12,
         'priority': 2000,
         'content': template.render(ctx)
     }]
@@ -157,24 +154,9 @@ def event_index(request, organizer, event):
     widgets = []
     for r, result in event_dashboard_widgets.send(sender=request.event):
         widgets.extend(result)
-
-    qs = request.event.logentry_set.all().select_related('user', 'content_type').order_by('-datetime')
-    qs = qs.exclude(action_type__in=OVERVIEW_BLACKLIST)
-    if not request.eventperm.can_view_orders:
-        qs = qs.exclude(content_type=ContentType.objects.get_for_model(Order))
-    if not request.eventperm.can_view_vouchers:
-        qs = qs.exclude(content_type=ContentType.objects.get_for_model(Voucher))
-
-    a_qs = request.event.requiredaction_set.filter(done=False)
-
     ctx = {
         'widgets': rearrange(widgets),
-        'logs': qs[:5],
-        'actions': a_qs[:5] if request.eventperm.can_change_orders else []
     }
-    for a in ctx['actions']:
-        a.display = a.display(request)
-
     return render(request, 'pretixcontrol/event/index.html', ctx)
 
 
@@ -189,7 +171,7 @@ def user_event_widgets(**kwargs):
                 event=event.name, df=date_format(event.date_from, 'SHORT_DATE_FORMAT') if event.date_from else '',
                 dt=date_format(event.date_to, 'SHORT_DATE_FORMAT') if event.date_to else ''
             ),
-            'display_size': 'small',
+            'width': 3,
             'priority': 100,
             'url': reverse('control:event.index', kwargs={
                 'event': event.slug,
@@ -206,7 +188,7 @@ def new_event_widgets(**kwargs):
             'content': '<div class="newevent"><span class="fa fa-plus-circle"></span>{t}</div>'.format(
                 t=_('Create a new event')
             ),
-            'display_size': 'small',
+            'width': 3,
             'priority': 50,
             'url': reverse('control:events.add')
         }
@@ -225,18 +207,22 @@ def user_index(request):
 
 def rearrange(widgets: list):
     """
-    Sort widget boxes according to priority.
+    Small and stupid algorithm to arrange widget boxes without too many gaps while respecting
+    priority. Doing this siginificantly better might be *really* hard.
     """
-    mapping = {
-        'small': 1,
-        'big': 2,
-        'full': 3,
-    }
+    oldlist = sorted(widgets, key=lambda w: -1 * w.get('priority', 1))
+    newlist = []
+    cpos = 0
+    while len(oldlist) > 0:
+        max_prio = max([w.get('priority', 1) for w in oldlist])
+        try:
+            best = max([w for w in oldlist if w.get('priority', 1) == max_prio and cpos + w.get('width', 3) <= 12],
+                       key=lambda w: w.get('width', 3))
+            cpos = (cpos + best.get('width', 3)) % 12
+        except ValueError:  # max() arg is an empty sequence
+            best = [w for w in oldlist if w.get('priority', 1) == max_prio][0]
+            cpos = best.get('width', 3)
+        oldlist.remove(best)
+        newlist.append(best)
 
-    def sort_key(element):
-        return (
-            element.get('priority', 1),
-            mapping.get(element.get('display_size', 'small'), 1),
-        )
-
-    return sorted(widgets, key=sort_key, reverse=True)
+    return newlist

src/pretix/control/views/event.py

@@ -2,23 +2,21 @@ from collections import OrderedDict
 
 from django import forms
 from django.contrib import messages
-from django.contrib.contenttypes.models import ContentType
 from django.core.files import File
 from django.core.urlresolvers import reverse
 from django.db import transaction
 from django.forms import modelformset_factory
 from django.http import HttpResponse
-from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import redirect
 from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
-from django.views.generic import FormView, ListView
+from django.views.generic import FormView
 from django.views.generic.base import TemplateView, View
 from django.views.generic.detail import SingleObjectMixin
 
 from pretix.base.forms import I18nModelForm
 from pretix.base.models import (
-    CachedTicket, Event, EventPermission, Item, ItemVariation, LogEntry, Order,
-    RequiredAction, User, Voucher,
+    Event, EventPermission, Item, ItemVariation, User,
 )
 from pretix.base.services import tickets
 from pretix.base.services.invoices import build_preview_invoice_pdf
@@ -34,7 +32,6 @@ from pretix.control.permissions import EventPermissionRequiredMixin
 from pretix.presale.style import regenerate_css
 
 from . import UpdateView
-from ..logdisplay import OVERVIEW_BLACKLIST
 
 
 class EventUpdate(EventPermissionRequiredMixin, UpdateView):
@@ -453,9 +450,6 @@ class TicketSettings(EventPermissionRequiredMixin, FormView):
                             for k in provider.form.changed_data
                         }
                     )
-                    CachedTicket.objects.filter(
-                        order_position__order__event=self.request.event, provider=provider.identifier
-                    ).delete()
             else:
                 success = False
         form = self.get_form(self.get_form_class())
@@ -492,13 +486,6 @@ class TicketSettings(EventPermissionRequiredMixin, FormView):
             )
             provider.settings_content = provider.settings_content_render(self.request)
             provider.form.prepare_fields()
-
-            provider.preview_allowed = True
-            for k, v in provider.settings_form_fields.items():
-                if v.required and not self.request.event.settings.get('ticketoutput_%s_%s' % (provider.identifier, k)):
-                    provider.preview_allowed = False
-                    break
-
             providers.append(provider)
         return providers
 
@@ -634,16 +621,10 @@ class EventLive(EventPermissionRequiredMixin, TemplateView):
         if request.POST.get("live") == "true" and not self.issues:
             request.event.live = True
             request.event.save()
-            self.request.event.log_action(
-                'pretix.event.live.activated', user=self.request.user, data={}
-            )
             messages.success(self.request, _('Your shop is live now!'))
         elif request.POST.get("live") == "false":
             request.event.live = False
             request.event.save()
-            self.request.event.log_action(
-                'pretix.event.live.deactivated', user=self.request.user, data={}
-            )
             messages.success(self.request, _('We\'ve taken your shop down. You can re-enable it whenever you want!'))
         return redirect(self.get_success_url())
 
@@ -652,68 +633,3 @@ class EventLive(EventPermissionRequiredMixin, TemplateView):
             'organizer': self.request.event.organizer.slug,
             'event': self.request.event.slug
         })
-
-
-class EventLog(EventPermissionRequiredMixin, ListView):
-    template_name = 'pretixcontrol/event/logs.html'
-    model = LogEntry
-    context_object_name = 'logs'
-    paginate_by = 20
-
-    def get_queryset(self):
-        qs = self.request.event.logentry_set.all().select_related('user', 'content_type').order_by('-datetime')
-        qs = qs.exclude(action_type__in=OVERVIEW_BLACKLIST)
-        if not self.request.eventperm.can_view_orders:
-            qs = qs.exclude(content_type=ContentType.objects.get_for_model(Order))
-        if not self.request.eventperm.can_view_vouchers:
-            qs = qs.exclude(content_type=ContentType.objects.get_for_model(Voucher))
-
-        if self.request.GET.get('user') == 'yes':
-            qs = qs.filter(user__isnull=False)
-        elif self.request.GET.get('user') == 'no':
-            qs = qs.filter(user__isnull=True)
-        elif self.request.GET.get('user'):
-            qs = qs.filter(user_id=self.request.GET.get('user'))
-
-        return qs
-
-    def get_context_data(self, **kwargs):
-        ctx = super().get_context_data()
-        ctx['userlist'] = self.request.event.user_perms.select_related('user')
-        return ctx
-
-
-class EventActions(EventPermissionRequiredMixin, ListView):
-    template_name = 'pretixcontrol/event/actions.html'
-    model = RequiredAction
-    context_object_name = 'actions'
-    paginate_by = 20
-    permission = 'can_change_orders'
-
-    def get_queryset(self):
-        qs = self.request.event.requiredaction_set.filter(done=False)
-        return qs
-
-    def get_context_data(self, **kwargs):
-        ctx = super().get_context_data()
-        for a in ctx['actions']:
-            a.display = a.display(self.request)
-        return ctx
-
-
-class EventActionDiscard(EventPermissionRequiredMixin, View):
-    permission = 'can_change_orders'
-
-    def get(self, request, **kwargs):
-        action = get_object_or_404(RequiredAction, event=request.event, pk=kwargs.get('id'))
-        action.done = True
-        action.user = request.user
-        action.save()
-        messages.success(self.request, _('The issue has been marked as resolved!'))
-        return redirect(self.get_success_url())
-
-    def get_success_url(self) -> str:
-        return reverse('control:event.index', kwargs={
-            'organizer': self.request.event.organizer.slug,
-            'event': self.request.event.slug
-        })

src/pretix/control/views/item.py

@@ -4,7 +4,7 @@ from django.contrib import messages
 from django.core.files import File
 from django.core.urlresolvers import resolve, reverse
 from django.db import transaction
-from django.db.models import Count, F, Q
+from django.db.models import Count
 from django.forms.models import ModelMultipleChoiceField, inlineformset_factory
 from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import redirect
@@ -18,12 +18,12 @@ from django.views.generic.edit import DeleteView
 
 from pretix.base.forms import I18nFormSet
 from pretix.base.models import (
-    CachedTicket, Item, ItemCategory, ItemVariation, Order, Question,
-    QuestionAnswer, QuestionOption, Quota, Voucher,
+    Item, ItemCategory, ItemVariation, Order, Question, QuestionAnswer,
+    QuestionOption, Quota,
 )
 from pretix.control.forms.item import (
     CategoryForm, ItemCreateForm, ItemUpdateForm, ItemVariationForm,
-    ItemVariationsFormSet, QuestionForm, QuestionOptionForm, QuotaForm,
+    QuestionForm, QuestionOptionForm, QuotaForm,
 )
 from pretix.control.permissions import (
     EventPermissionRequiredMixin, event_permission_required,
@@ -624,24 +624,12 @@ class QuotaView(ChartContainingView, DetailView):
         ]
         ctx['quota_table_rows'] = list(data)
 
-        sum_values = sum([d['value'] for d in data])
-
         if self.object.size is not None:
             data.append({
                 'label': ugettext('Current availability'),
                 'value': avail[1]
             })
-
         ctx['quota_chart_data'] = json.dumps(data)
-        ctx['quota_overbooked'] = sum_values - self.object.size if self.object.size is not None else 0
-
-        ctx['has_ignore_vouchers'] = Voucher.objects.filter(
-            Q(allow_ignore_quota=True) &
-            Q(Q(valid_until__isnull=True) | Q(valid_until__gte=now())) &
-            Q(Q(self.object._position_lookup) | Q(quota=self.object)) &
-            Q(redeemed__lt=F('max_usages'))
-        ).exists()
-
         return ctx
 
     def get_object(self, queryset=None) -> Quota:
@@ -684,10 +672,9 @@ class QuotaUpdate(EventPermissionRequiredMixin, QuotaEditorMixin, UpdateView):
         return super().form_valid(form)
 
     def get_success_url(self) -> str:
-        return reverse('control:event.items.quotas.show', kwargs={
+        return reverse('control:event.items.quotas', kwargs={
             'organizer': self.request.event.organizer.slug,
             'event': self.request.event.slug,
-            'quota': self.object.pk
         })
 
 
@@ -800,7 +787,6 @@ class ItemUpdateGeneral(ItemDetailMixin, EventPermissionRequiredMixin, UpdateVie
                     for k in form.changed_data
                 }
             )
-            CachedTicket.objects.filter(order_position__item=self.item).delete()
         return super().form_valid(form)
 
 
@@ -816,7 +802,7 @@ class ItemVariations(ItemDetailMixin, EventPermissionRequiredMixin, TemplateView
     def formset(self):
         formsetclass = inlineformset_factory(
             Item, ItemVariation,
-            form=ItemVariationForm, formset=ItemVariationsFormSet,
+            form=ItemVariationForm, formset=I18nFormSet,
             can_order=True, can_delete=True, extra=0
         )
         return formsetclass(self.request.POST if self.request.method == "POST" else None,
@@ -831,7 +817,6 @@ class ItemVariations(ItemDetailMixin, EventPermissionRequiredMixin, TemplateView
                         continue
                     self.get_object().log_action(
                         'pretix.event.item.variation.deleted', user=self.request.user, data={
-                            'value': form.instance.value,
                             'id': form.instance.pk
                         }
                     )
@@ -849,7 +834,6 @@ class ItemVariations(ItemDetailMixin, EventPermissionRequiredMixin, TemplateView
                     form.save()
                     if form.has_changed():
                         change_data = {k: form.cleaned_data.get(k) for k in form.changed_data}
-                        change_data['value'] = form.instance.value
                         change_data['id'] = form.instance.pk
                         self.get_object().log_action(
                             'pretix.event.item.variation.changed' if not created else

src/pretix/control/views/main.py

@@ -2,15 +2,13 @@ from django.conf import settings
 from django.contrib import messages
 from django.core.urlresolvers import reverse
 from django.db import transaction
-from django.shortcuts import redirect
+from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
-from django.views.generic import ListView
-from formtools.wizard.views import SessionWizardView
+from django.views.generic import CreateView, ListView, TemplateView
 
-from pretix.base.models import Event, EventPermission
-from pretix.control.forms.event import (
-    EventWizardBasicsForm, EventWizardCopyForm, EventWizardFoundationForm,
-)
+from pretix.base.models import Event, EventPermission, OrganizerPermission
+from pretix.control.forms.event import EventCreateForm, EventCreateSettingsForm
+from pretix.control.permissions import OrganizerPermissionRequiredMixin
 
 
 class EventList(ListView):
@@ -27,69 +25,76 @@ class EventList(ListView):
         )
 
 
-def condition_copy(wizard):
-    return EventPermission.objects.filter(
-        user=wizard.request.user, can_change_settings=True, can_change_items=True
-    ).exists()
+class EventCreateStart(TemplateView):
+    template_name = 'pretixcontrol/events/start.html'
+
+    def get_context_data(self, **kwargs):
+        ctx = super().get_context_data(**kwargs)
+        ctx['organizers'] = [
+            p.organizer for p in OrganizerPermission.objects.filter(
+                user=self.request.user, can_create_events=True
+            ).select_related("organizer")
+        ]
+        return ctx
 
 
-class EventWizard(SessionWizardView):
-    form_list = [
-        ('foundation', EventWizardFoundationForm),
-        ('basics', EventWizardBasicsForm),
-        ('copy', EventWizardCopyForm),
-    ]
-    templates = {
-        'foundation': 'pretixcontrol/events/create_foundation.html',
-        'basics': 'pretixcontrol/events/create_basics.html',
-        'copy': 'pretixcontrol/events/create_copy.html',
-    }
-    condition_dict = {
-        'copy': condition_copy
-    }
+class EventCreate(OrganizerPermissionRequiredMixin, CreateView):
+    model = Event
+    form_class = EventCreateForm
+    template_name = 'pretixcontrol/events/create.html'
+    context_object_name = 'event'
+    permission = 'can_create_events'
 
-    def get_form_kwargs(self, step=None):
-        kwargs = {
-            'user': self.request.user
-        }
-        if step != 'foundation':
-            fdata = self.get_cleaned_data_for_step('foundation')
-            kwargs.update(fdata)
+    @cached_property
+    def sform(self):
+        return EventCreateSettingsForm(
+            obj=Event(),
+            prefix='settings',
+            data=self.request.POST if self.request.method == 'POST' else None
+        )
+
+    def post(self, request, *args, **kwargs):
+        form = self.get_form()
+        if form.is_valid() and self.sform.is_valid():
+            return self.form_valid(form)
+        else:
+            return self.form_invalid(form)
+
+    def get_context_data(self, *args, **kwargs) -> dict:
+        context = super().get_context_data(*args, **kwargs)
+        context['sform'] = self.sform
+        return context
+
+    def dispatch(self, request, *args, **kwargs):
+        self.object = Event()
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs['organizer'] = self.request.organizer
         return kwargs
 
-    def get_template_names(self):
-        return [self.templates[self.steps.current]]
+    @transaction.atomic
+    def form_valid(self, form):
+        messages.success(self.request, _('The new event has been created.'))
+        form.instance.organizer = self.request.organizer
+        ret = super().form_valid(form)
+        EventPermission.objects.create(
+            event=form.instance, user=self.request.user,
+        )
+        self.object = form.instance
+        self.object.plugins = settings.PRETIX_PLUGINS_DEFAULT
+        self.object.save()
 
-    def done(self, form_list, form_dict, **kwargs):
-        foundation_data = self.get_cleaned_data_for_step('foundation')
-        basics_data = self.get_cleaned_data_for_step('basics')
-        copy_data = self.get_cleaned_data_for_step('copy')
+        self.sform.obj = form.instance
+        self.sform.save()
+        form.instance.log_action('pretix.event.settings', user=self.request.user, data={
+            k: form.instance.settings.get(k) for k in self.sform.changed_data
+        })
+        return ret
 
-        with transaction.atomic():
-            event = form_dict['basics'].instance
-            event.organizer = foundation_data['organizer']
-            event.plugins = settings.PRETIX_PLUGINS_DEFAULT
-            form_dict['basics'].save()
-            EventPermission.objects.create(event=event, user=self.request.user)
-
-            logdata = {}
-            for f in form_list:
-                logdata.update({
-                    k: v for k, v in f.cleaned_data.items()
-                })
-            event.log_action('pretix.event.settings', user=self.request.user, data=logdata)
-
-            if copy_data and copy_data['copy_from_event']:
-                from_event = copy_data['copy_from_event']
-                event.copy_data_from(from_event)
-
-            event.settings.set('timezone', basics_data['timezone'])
-            event.settings.set('locale', basics_data['locale'])
-            event.settings.set('locales', foundation_data['locales'])
-
-        messages.success(self.request, _('The new event has been created. You can now adjust the event settings in '
-                                         'detail.'))
-        return redirect(reverse('control:event.settings', kwargs={
-            'organizer': event.organizer.slug,
-            'event': event.slug,
-        }))
+    def get_success_url(self) -> str:
+        return reverse('control:event.settings', kwargs={
+            'organizer': self.request.organizer.slug,
+            'event': self.object.slug,
+        })

src/pretix/control/views/orders.py

@@ -1,4 +1,5 @@
 from datetime import timedelta
+from itertools import groupby
 
 from django.contrib import messages
 from django.core.urlresolvers import reverse
@@ -12,8 +13,7 @@ from django.views.generic import DetailView, ListView, TemplateView, View
 
 from pretix.base.i18n import language
 from pretix.base.models import (
-    CachedFile, CachedTicket, Invoice, Item, ItemVariation, Order, Quota,
-    generate_position_secret, generate_secret,
+    CachedFile, Invoice, Item, ItemVariation, Order, Quota,
 )
 from pretix.base.services.export import export
 from pretix.base.services.invoices import (
@@ -99,13 +99,10 @@ class OrderView(EventPermissionRequiredMixin, DetailView):
     model = Order
 
     def get_object(self, queryset=None):
-        try:
-            return Order.objects.get(
-                event=self.request.event,
-                code=self.kwargs['code'].upper()
-            )
-        except Order.DoesNotExist:
-            raise Http404()
+        return Order.objects.get(
+            event=self.request.event,
+            code=self.kwargs['code'].upper()
+        )
 
     def _redirect_back(self):
         return redirect('control:event.order',
@@ -162,17 +159,27 @@ class OrderDetail(OrderView):
         ).select_related(
             'item', 'variation'
         ).prefetch_related(
-            'item__questions', 'answers', 'answers__question', 'checkins'
-        ).order_by('positionid')
+            'item__questions', 'answers', 'answers__question'
+        )
+
+        # Group items of the same variation
+        # We do this by list manipulations instead of a GROUP BY query, as
+        # Django is unable to join related models in a .values() query
+        def keyfunc(pos):
+            if (pos.item.admission and self.request.event.settings.attendee_names_asked) \
+                    or pos.item.questions.all():
+                return pos.id, 0, 0, 0, 0, 0
+            return 0, pos.item_id, pos.variation_id, pos.price, pos.tax_rate, (pos.voucher_id or 0)
 
         positions = []
-        for p in cartpos:
-            p.has_questions = (
-                (p.item.admission and self.request.event.settings.attendee_names_asked) or
-                p.item.questions.all()
-            )
-            p.cache_answers()
-            positions.append(p)
+        for k, g in groupby(sorted(list(cartpos), key=keyfunc), key=keyfunc):
+            g = list(g)
+            group = g[0]
+            group.count = len(g)
+            group.total = group.count * group.price
+            group.has_questions = k[0] != ""
+            group.cache_answers()
+            positions.append(group)
 
         return {
             'positions': positions,
@@ -518,24 +525,11 @@ class OrderContactChange(OrderView):
         )
 
     def post(self, *args, **kwargs):
-        old_email = self.order.email
         if self.form.is_valid():
-            self.order.log_action(
-                'pretix.event.order.contact.changed',
-                data={
-                    'old_email': old_email,
-                    'new_email': self.form.cleaned_data['email'],
-                },
-                user=self.request.user,
-            )
-            if self.form.cleaned_data['regenerate_secrets']:
-                self.order.secret = generate_secret()
-                for op in self.order.positions.all():
-                    op.secret = generate_position_secret()
-                    op.save()
-                CachedTicket.objects.filter(order_position__order=self.order).delete()
-                self.order.log_action('pretix.event.order.secret.changed', user=self.request.user)
-
+            self.order.log_action('pretix.event.order.contact.changed', {
+                'old_email': self.order.email,
+                'new_email': self.form.cleaned_data['email']
+            })
             self.form.save()
             messages.success(self.request, _('The order has been changed.'))
             return redirect(self.get_order_url())

src/pretix/control/views/vouchers.py

@@ -33,7 +33,7 @@ class VoucherList(EventPermissionRequiredMixin, ListView):
     def get_queryset(self):
         qs = self.request.event.vouchers.all().select_related('item', 'variation')
         if self.request.GET.get("search", "") != "":
-            s = self.request.GET.get("search", "").strip()
+            s = self.request.GET.get("search", "")
             qs = qs.filter(Q(code__icontains=s) | Q(tag__icontains=s) | Q(comment__icontains=s))
         if self.request.GET.get("tag", "") != "":
             s = self.request.GET.get("tag", "")
@@ -59,7 +59,7 @@ class VoucherList(EventPermissionRequiredMixin, ListView):
 
         headers = [
             _('Voucher code'), _('Valid until'), _('Product'), _('Reserve quota'), _('Bypass quota'),
-            _('Price effect'), _('Value'), _('Tag'), _('Redeemed'), _('Maximum usages')
+            _('Price'), _('Tag'), _('Redeemed'), _('Maximum usages')
         ]
         writer.writerow(headers)
 
@@ -77,8 +77,7 @@ class VoucherList(EventPermissionRequiredMixin, ListView):
                 prod,
                 _("Yes") if v.block_quota else _("No"),
                 _("Yes") if v.allow_ignore_quota else _("No"),
-                v.get_price_mode_display(),
-                str(v.value) if v.value is not None else "",
+                str(v.price) if v.price else "",
                 v.tag,
                 str(v.redeemed),
                 str(v.max_usages)

src/pretix/helpers/daterange.py

@@ -1,21 +0,0 @@
-from django.template.defaultfilters import date as _date
-from django.utils.translation import get_language, ugettext_lazy as _
-
-
-def daterange(df, dt):
-    lng = get_language()
-
-    if lng.startswith("de"):
-        if df.year == dt.year and df.month == dt.month:
-            return "{}.–{}".format(_date(df, "j"), _date(dt, "j. F Y"))
-        elif df.year == dt.year:
-            return "{} – {}".format(_date(df, "j. F"), _date(dt, "j. F Y"))
-    elif lng.startswith("en"):
-        if df.year == dt.year and df.month == dt.month:
-            return "{} – {}".format(_date(df, "N jS"), _date(dt, "jS, Y"))
-        elif df.year == dt.year:
-            return "{} – {}".format(_date(df, "N jS"), _date(dt, "N jS, Y"))
-
-    return _("{date_from} – {date_to}").format(
-        date_from=_date(df, "DATE_FORMAT"), date_to=_date(dt, "DATE_FORMAT")
-    )

src/pretix/locale/de/LC_MESSAGES/djangojs.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-03 23:46+0000\n"
-"PO-Revision-Date: 2017-01-01 20:40+0100\n"
+"POT-Creation-Date: 2016-11-08 19:21+0000\n"
+"PO-Revision-Date: 2016-11-08 20:23+0100\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: \n"
 "Language: de\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 1.8.9\n"
 
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:53
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:59
@@ -46,15 +46,7 @@ msgstr "Gesamtumsatz"
 msgid "Contacting Stripe …"
 msgstr "Kontaktiere Stripe …"
 
-#: static/pretixcontrol/js/clipboard.js:23
-msgid "Copied!"
-msgstr "Kopiert!"
-
-#: static/pretixcontrol/js/clipboard.js:29
-msgid "Press Ctrl-C to copy!"
-msgstr "Drücken Sie Strg+C zum Kopieren!"
-
-#: static/pretixcontrol/js/ui/main.js:28 static/pretixpresale/js/ui/main.js:99
+#: static/pretixcontrol/js/ui/main.js:28 static/pretixpresale/js/ui/main.js:57
 msgid "Close message"
 msgstr "Schließen"
 
@@ -70,41 +62,18 @@ msgstr "Sonstige"
 msgid "Count"
 msgstr "Anzahl"
 
-#: static/pretixpresale/js/ui/asyncdownload.js:27
 #: static/pretixpresale/js/ui/asynctask.js:27
-#: static/pretixpresale/js/ui/asynctask.js:64
-msgid ""
-"Your request has been queued on the server and will now be processed. If "
-"this takes longer than two minutes, please contact us or go back in your "
-"browser and try again."
+msgid "Your request has been queued on the server and will now be processed."
 msgstr ""
-"Ihre Anfrage ist auf dem Server angekommen und wird nun verarbeitet. Wenn "
-"dies länger als zwei Minuten dauert, kontaktieren Sie uns bitte oder gehen "
-"Sie in Ihrem Browser einen Schritt zurück und versuchen es erneut."
+"Ihre Anfrage befindet sich beim Server in der Warteschlange und wird nun "
+"verarbeitet."
 
-#: static/pretixpresale/js/ui/asyncdownload.js:40
-#: static/pretixpresale/js/ui/asynctask.js:43
-#: static/pretixpresale/js/ui/asynctask.js:85
+#: static/pretixpresale/js/ui/asynctask.js:40
+#: static/pretixpresale/js/ui/asynctask.js:74
 msgid "An error of type {code} occured."
 msgstr "Ein Fehler ist aufgetreten. Fehlercode: {code}"
 
-#: static/pretixpresale/js/ui/asyncdownload.js:53
-#: static/pretixpresale/js/ui/asynctask.js:103
-msgid "We are processing your request …"
-msgstr "Wir verarbeiten deine Anfrage …"
-
-#: static/pretixpresale/js/ui/asyncdownload.js:54
-#: static/pretixpresale/js/ui/asynctask.js:104
-msgid ""
-"We are currently sending your request to the server. If this takes longer "
-"than one minute, please check your internet connection and then reload this "
-"page and try again."
-msgstr ""
-"Ihre Anfrage wird an den Server gesendet. Wenn dies länger als eine Minute "
-"dauert, prüfen Sie bitte Ihre Internetverbindung. Danach können Sie diese "
-"Seite neu laden und es erneut versuchen."
-
-#: static/pretixpresale/js/ui/asynctask.js:46
+#: static/pretixpresale/js/ui/asynctask.js:43
 msgid ""
 "We currenctly cannot reach the server, but we keep trying. Last error code: "
 "{code}"
@@ -112,17 +81,17 @@ msgstr ""
 "Wir können den Server aktuell nicht erreichen, versuchen es aber weiter. "
 "Letzter Fehlercode: {code}"
 
-#: static/pretixpresale/js/ui/asynctask.js:76
-msgid "The request took to long. Please try again."
-msgstr "Diese Anfrage hat zu lange gedauert. Bitte erneut versuchen."
-
-#: static/pretixpresale/js/ui/asynctask.js:88
+#: static/pretixpresale/js/ui/asynctask.js:77
 msgid ""
 "We currenctly cannot reach the server. Please try again. Error code: {code}"
 msgstr ""
 "Wir können den Server aktuell nicht erreichen. Bitte versuchen Sie es noch "
 "einmal. Fehlercode: {code}"
 
+#: static/pretixpresale/js/ui/asynctask.js:92
+msgid "We are processing your request …"
+msgstr "Wir verarbeiten deine Anfrage …"
+
 #: static/pretixpresale/js/ui/cart.js:10
 msgid "The items in your cart are no longer reserved for you."
 msgstr "Die Produkte in Ihrem Warenkorb sind nicht mehr für Sie reserviert."
@@ -134,9 +103,3 @@ msgstr[0] ""
 "Die Produkte in Ihrem Warenkorb sind noch eine Minute für Sie reserviert."
 msgstr[1] ""
 "Die Produkte in Ihrem Warenkorb sind noch {num} Minuten für Sie reserviert."
-
-#~ msgid ""
-#~ "Your request has been queued on the server and will now be processed."
-#~ msgstr ""
-#~ "Ihre Anfrage befindet sich beim Server in der Warteschlange und wird nun "
-#~ "verarbeitet."

src/pretix/locale/de_Informal/LC_MESSAGES/djangojs.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-03 23:46+0000\n"
-"PO-Revision-Date: 2017-01-01 20:41+0100\n"
+"POT-Creation-Date: 2016-11-08 19:21+0000\n"
+"PO-Revision-Date: 2016-11-08 20:22+0100\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: \n"
 "Language: de\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 1.8.9\n"
 
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:53
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:59
@@ -46,15 +46,7 @@ msgstr "Gesamtumsatz"
 msgid "Contacting Stripe …"
 msgstr "Kontaktiere Stripe …"
 
-#: static/pretixcontrol/js/clipboard.js:23
-msgid "Copied!"
-msgstr "Kopiert!"
-
-#: static/pretixcontrol/js/clipboard.js:29
-msgid "Press Ctrl-C to copy!"
-msgstr "Drücke Strg+C zum kopieren!"
-
-#: static/pretixcontrol/js/ui/main.js:28 static/pretixpresale/js/ui/main.js:99
+#: static/pretixcontrol/js/ui/main.js:28 static/pretixpresale/js/ui/main.js:57
 msgid "Close message"
 msgstr "Schließen"
 
@@ -70,41 +62,18 @@ msgstr "Sonstige"
 msgid "Count"
 msgstr "Anzahl"
 
-#: static/pretixpresale/js/ui/asyncdownload.js:27
 #: static/pretixpresale/js/ui/asynctask.js:27
-#: static/pretixpresale/js/ui/asynctask.js:64
-msgid ""
-"Your request has been queued on the server and will now be processed. If "
-"this takes longer than two minutes, please contact us or go back in your "
-"browser and try again."
+msgid "Your request has been queued on the server and will now be processed."
 msgstr ""
-"Deine Anfrage ist auf dem Server angekommen und wird nun verarbeitet. Wenn "
-"dies länger als zwei Minuten dauert, kontaktiere uns bitte oder gehe in "
-"deinem Browser einen Schritt zurück und versuche es erneut."
+"Deine Anfrage befindet sich beim Server in der Warteschlange und wird nun "
+"verarbeitet."
 
-#: static/pretixpresale/js/ui/asyncdownload.js:40
-#: static/pretixpresale/js/ui/asynctask.js:43
-#: static/pretixpresale/js/ui/asynctask.js:85
+#: static/pretixpresale/js/ui/asynctask.js:40
+#: static/pretixpresale/js/ui/asynctask.js:74
 msgid "An error of type {code} occured."
 msgstr "Ein Fehler ist aufgetreten. Fehlercode: {code}"
 
-#: static/pretixpresale/js/ui/asyncdownload.js:53
-#: static/pretixpresale/js/ui/asynctask.js:103
-msgid "We are processing your request …"
-msgstr "Wir verarbeiten deine Anfrage …"
-
-#: static/pretixpresale/js/ui/asyncdownload.js:54
-#: static/pretixpresale/js/ui/asynctask.js:104
-msgid ""
-"We are currently sending your request to the server. If this takes longer "
-"than one minute, please check your internet connection and then reload this "
-"page and try again."
-msgstr ""
-"Deine Anfrage wird an den Server gesendet. Wenn dies länger als eine Minute "
-"dauert, prüfe bitte deine Internetverbindung. Danach kannst du diese Seite "
-"neu laden und es erneut versuchen."
-
-#: static/pretixpresale/js/ui/asynctask.js:46
+#: static/pretixpresale/js/ui/asynctask.js:43
 msgid ""
 "We currenctly cannot reach the server, but we keep trying. Last error code: "
 "{code}"
@@ -112,17 +81,17 @@ msgstr ""
 "Wir können den Server aktuell nicht erreichen, versuchen es aber weiter. "
 "Letzter Fehlercode: {code}"
 
-#: static/pretixpresale/js/ui/asynctask.js:76
-msgid "The request took to long. Please try again."
-msgstr "Diese Anfrage hat zu lange gedauert. Bitte erneut versuchen."
-
-#: static/pretixpresale/js/ui/asynctask.js:88
+#: static/pretixpresale/js/ui/asynctask.js:77
 msgid ""
 "We currenctly cannot reach the server. Please try again. Error code: {code}"
 msgstr ""
 "Wir können den Server aktuell nicht erreichen. Bitte versuche es noch "
 "einmal. Fehlercode: {code}"
 
+#: static/pretixpresale/js/ui/asynctask.js:92
+msgid "We are processing your request …"
+msgstr "Wir verarbeiten deine Anfrage …"
+
 #: static/pretixpresale/js/ui/cart.js:10
 msgid "The items in your cart are no longer reserved for you."
 msgstr "Die Produkte in deinem Warenkorb sind nicht mehr für dich reserviert."
@@ -134,9 +103,3 @@ msgstr[0] ""
 "Die Produkte in deinem Warenkorb sind noch eine Minute für dich reserviert."
 msgstr[1] ""
 "Die Produkte in deinem Warenkorb sind noch {num} Minuten für dich reserviert."
-
-#~ msgid ""
-#~ "Your request has been queued on the server and will now be processed."
-#~ msgstr ""
-#~ "Deine Anfrage befindet sich beim Server in der Warteschlange und wird nun "
-#~ "verarbeitet."

src/pretix/plugins/banktransfer/tasks.py

@@ -14,7 +14,7 @@ from pretix.base.services.async import TransactionAwareTask
 from pretix.base.services.locking import LockTimeoutException
 from pretix.base.services.mail import SendMailException
 from pretix.base.services.orders import mark_order_paid
-from pretix.celery_app import app
+from pretix.celery import app
 
 from .models import BankImportJob, BankTransaction
 

src/pretix/plugins/banktransfer/views.py

@@ -215,8 +215,6 @@ class ImportView(EventPermissionRequiredMixin, ListView):
             q = self.request.GET.get('search')
             qs = qs.filter(
                 Q(payer__icontains=q) | Q(reference__icontains=q) | Q(comment__icontains=q)
-            ).order_by(
-                '-import_job__created'
             )
 
         return qs
@@ -230,22 +228,17 @@ class ImportView(EventPermissionRequiredMixin, ListView):
             self.discard_all()
             return self.redirect_back()
 
-        elif ('file' in self.request.FILES and 'csv' in self.request.FILES.get('file').name.lower()) \
+        if ('file' in self.request.FILES and 'csv' in self.request.FILES.get('file').name.lower()) \
                 or 'amount' in self.request.POST:
             # Process CSV
             return self.process_csv()
 
-        elif 'file' in self.request.FILES and 'txt' in self.request.FILES.get('file').name.lower():
+        if 'file' in self.request.FILES and 'txt' in self.request.FILES.get('file').name.lower():
             return self.process_mt940()
 
-        elif self.request.FILES.get('file') is None:
-            messages.error(self.request, _('You must choose a file to import.'))
-            return self.redirect_back()
-
-        else:
-            messages.error(self.request, _('We were unable to detect the file type of this import. Please '
-                           'contact support for help.'))
-            return self.redirect_back()
+        messages.error(self.request, _('We were unable to detect the file type of this import. Please '
+                                       'contact support for help.'))
+        return self.redirect_back()
 
     @cached_property
     def settings(self):

src/pretix/plugins/paypal/payment.py

@@ -8,7 +8,7 @@ from django.contrib import messages
 from django.template.loader import get_template
 from django.utils.translation import ugettext as __, ugettext_lazy as _
 
-from pretix.base.models import Quota, RequiredAction
+from pretix.base.models import Quota
 from pretix.base.payment import BasePaymentProvider
 from pretix.base.services.mail import SendMailException
 from pretix.base.services.orders import mark_order_paid, mark_order_refunded
@@ -47,13 +47,6 @@ class Paypal(BasePaymentProvider):
             ]
         )
 
-    def settings_content_render(self, request):
-        return "<div class='alert alert-info'>%s<br /><code>%s</code></div>" % (
-            _('Please configure a PayPal Webhook to the following endpoint in order to automatically cancel orders '
-              'when payments are refunded externally.'),
-            build_absolute_uri(self.event, 'plugins:paypal:webhook')
-        )
-
     def init_api(self):
         paypalrestsdk.set_config(
             mode="sandbox" if "sandbox" in self.settings.get('endpoint') else 'live',
@@ -71,6 +64,23 @@ class Paypal(BasePaymentProvider):
 
     def checkout_prepare(self, request, cart):
         self.init_api()
+        items = []
+        for cp in cart['positions']:
+            items.append({
+                "name": str(cp.item.name),
+                "description": str(cp.variation) if cp.variation else "",
+                "quantity": cp.count,
+                "price": str(cp.price),
+                "currency": request.event.currency
+            })
+        if cart['payment_fee']:
+            items.append({
+                "name": __('Payment method fee'),
+                "description": "",
+                "quantity": 1,
+                "currency": request.event.currency,
+                "price": str(cart['payment_fee'])
+            })
         payment = paypalrestsdk.Payment({
             'intent': 'sale',
             'payer': {
@@ -83,20 +93,13 @@ class Paypal(BasePaymentProvider):
             "transactions": [
                 {
                     "item_list": {
-                        "items": [
-                            {
-                                "name": __('Order for %s') % str(request.event),
-                                "quantity": 1,
-                                "price": str(cart['total']),
-                                "currency": request.event.currency
-                            }
-                        ]
+                        "items": items
                     },
                     "amount": {
                         "currency": request.event.currency,
                         "total": str(cart['total'])
                     },
-                    "description": __('Event tickets for {event}').format(event=request.event.name)
+                    "description": __('Event tickets for %s') % request.event.name
                 }
             ]
         })
@@ -111,6 +114,7 @@ class Paypal(BasePaymentProvider):
                     logger.error('Invalid payment state: ' + str(payment))
                     return
                 request.session['payment_paypal_id'] = payment.id
+                request.session['payment_paypal_event'] = self.event.id
                 for link in payment.links:
                     if link.method == "REDIRECT" and link.rel == "approval_url":
                         return str(link.href)
@@ -160,30 +164,6 @@ class Paypal(BasePaymentProvider):
         return self._execute_payment(payment, request, order)
 
     def _execute_payment(self, payment, request, order):
-        payment.replace([
-            {
-                "op": "replace",
-                "path": "/transactions/0/item_list",
-                "value": {
-                    "items": [
-                        {
-                            "name": __('Order {slug}-{code}').format(slug=self.event.slug.upper(), code=order.code),
-                            "quantity": 1,
-                            "price": str(order.total),
-                            "currency": order.event.currency
-                        }
-                    ]
-                }
-            },
-            {
-                "op": "replace",
-                "path": "/transactions/0/description",
-                "value": __('Order {order} for {event}').format(
-                    event=request.event.name,
-                    order=order.code
-                )
-            }
-        ])
         payment.execute({"payer_id": request.session.get('payment_paypal_payer')})
 
         if payment.state == 'pending':
@@ -203,12 +183,6 @@ class Paypal(BasePaymentProvider):
             mark_order_paid(order, 'paypal', json.dumps(payment.to_dict()))
         except Quota.QuotaExceededException as e:
             messages.error(request, str(e))
-            RequiredAction.objects.create(
-                event=request.event, action_type='pretix.plugins.paypal.overpaid', data=json.dumps({
-                    'order': order.code,
-                    'payment': payment.id
-                })
-            )
         except SendMailException:
             messages.warning(request, _('There was an error sending the confirmation mail.'))
         return None
@@ -270,7 +244,7 @@ class Paypal(BasePaymentProvider):
             order.save()
 
     def order_can_retry(self, order):
-        return self._is_still_available()
+        return True
 
     def order_prepare(self, request, order):
         self.init_api()
@@ -288,7 +262,7 @@ class Paypal(BasePaymentProvider):
                     "item_list": {
                         "items": [
                             {
-                                "name": __('Order {slug}-{code}').format(slug=self.event.slug.upper(), code=order.code),
+                                "name": 'Order %s' % order.code,
                                 "quantity": 1,
                                 "price": str(order.total),
                                 "currency": order.event.currency
@@ -299,10 +273,7 @@ class Paypal(BasePaymentProvider):
                         "currency": request.event.currency,
                         "total": str(order.total)
                     },
-                    "description": __('Order {order} for {event}').format(
-                        event=request.event.name,
-                        order=order.code
-                    )
+                    "description": __('Event tickets for %s') % request.event.name
                 }
             ]
         })

src/pretix/plugins/paypal/signals.py

@@ -1,53 +1,9 @@
-import json
-
 from django.dispatch import receiver
-from django.template.loader import get_template
-from django.utils.translation import ugettext_lazy as _
 
-from pretix.base.signals import (
-    logentry_display, register_payment_providers, requiredaction_display,
-)
+from pretix.base.signals import register_payment_providers
 
 
 @receiver(register_payment_providers, dispatch_uid="payment_paypal")
 def register_payment_provider(sender, **kwargs):
     from .payment import Paypal
     return Paypal
-
-
-@receiver(signal=logentry_display, dispatch_uid="paypal_logentry_display")
-def pretixcontrol_logentry_display(sender, logentry, **kwargs):
-    if logentry.action_type != 'pretix.plugins.paypal.event':
-        return
-
-    data = json.loads(logentry.data)
-    event_type = data.get('event_type')
-    text = None
-    plains = {
-        'PAYMENT.SALE.COMPLETED': _('Payment completed.'),
-        'PAYMENT.SALE.DENIED': _('Payment denied.'),
-        'PAYMENT.SALE.REFUNDED': _('Payment refunded.'),
-        'PAYMENT.SALE.REVERSED': _('Payment reversed.'),
-    }
-
-    if event_type in plains:
-        text = plains[event_type]
-
-    if text:
-        return _('PayPal reported an event: {}').format(text)
-
-
-@receiver(signal=requiredaction_display, dispatch_uid="paypal_requiredaction_display")
-def pretixcontrol_action_display(sender, action, request, **kwargs):
-    if not action.action_type.startswith('pretix.plugins.paypal'):
-        return
-
-    data = json.loads(action.data)
-
-    if action.action_type == 'pretix.plugins.paypal.refund':
-        template = get_template('pretixplugins/paypal/action_refund.html')
-    elif action.action_type == 'pretix.plugins.paypal.overpaid':
-        template = get_template('pretixplugins/paypal/action_overpaid.html')
-
-    ctx = {'data': data, 'event': sender, 'action': action}
-    return template.render(ctx, request)

src/pretix/plugins/paypal/templates/pretixplugins/paypal/action_overpaid.html

@@ -1,10 +0,0 @@
-{% load i18n %}
-
-<p>
-    {% url "control:event.order" organizer=event.organizer.slug event=event.slug code=data.order as ourl %}
-    {% blocktrans trimmed with payment=data.payment order="<a href='"|add:ourl|add:"'>"|add:data.order|add:"</a>"|safe %}
-        The PayPal transaction {{ payment }} has succeeded, but the order {{ order }} is expired and the product
-        was sold out in the meantime. Therefore, the payment could not be acceped. Please contact the user and refund
-        the money via PayPal's interface.
-    {% endblocktrans %}
-</p>

src/pretix/plugins/paypal/templates/pretixplugins/paypal/action_refund.html

@@ -1,20 +0,0 @@
-{% load i18n %}
-
-<p>
-    {% url "control:event.order" organizer=event.organizer.slug event=event.slug code=data.order as ourl %}
-    {% blocktrans trimmed with payment=data.resource.id order="<a href='"|add:ourl|add:"'>"|add:data.order|add:"</a>"|safe %}
-        PayPal reported that the payment {{ payment }} has been refunded or reversed.
-        Do you want to mark the matching order ({{ order }}) as refunded?
-    {% endblocktrans %}
-</p>
-<form class="form-inline" method="post" action="{% url "plugins:paypal:refund"  event=event.slug organizer=event.organizer.slug id=action.id %}">
-    {% csrf_token %}
-    <a href="{% url "control:event.requiredaction.discard" event=event.slug organizer=event.organizer.slug id=action.id %}"
-            class="btn btn-default">
-        {% trans "No" %}
-    </a>
-    <button type="submit" class="btn btn-default btn-danger">
-        {% trans "Yes, mark order as refunded" %}
-    </button>&nbsp;
-    {% trans "This action cannot be undone." %}
-</form>