Don't cache files globally

.travis.sh

@@ -14,18 +14,18 @@ if [ "$PRETIX_CONFIG_FILE" == "tests/travis_postgres.cfg" ]; then
 fi
 
 if [ "$1" == "style" ]; then
-	XDG_CACHE_HOME=/cache pip3 install --no-use-pep517 -Ur src/requirements.txt -r src/requirements/dev.txt
+	XDG_CACHE_HOME=/cache pip3 install -Ur src/requirements.txt -r src/requirements/dev.txt
 	cd src
     flake8 .
     isort -c -rc -df .
 fi
 if [ "$1" == "doctests" ]; then
-	XDG_CACHE_HOME=/cache pip3 install --no-use-pep517 -Ur doc/requirements.txt
+	XDG_CACHE_HOME=/cache pip3 install -Ur doc/requirements.txt
 	cd doc
 	make doctest
 fi
 if [ "$1" == "doc-spelling" ]; then
-	XDG_CACHE_HOME=/cache pip3 install --no-use-pep517 -Ur doc/requirements.txt
+	XDG_CACHE_HOME=/cache pip3 install -Ur doc/requirements.txt
 	cd doc
 	make spelling
 	if [ -s _build/spelling/output.txt ]; then
@@ -33,26 +33,26 @@ if [ "$1" == "doc-spelling" ]; then
 	fi
 fi
 if [ "$1" == "translation-spelling" ]; then
-	XDG_CACHE_HOME=/cache pip3 install --no-use-pep517 -Ur src/requirements/dev.txt
+	XDG_CACHE_HOME=/cache pip3 install -Ur src/requirements/dev.txt
 	cd src
 	potypo
 fi
 if [ "$1" == "tests" ]; then
-	pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt
+	pip3 install -r src/requirements.txt -Ur src/requirements/dev.txt
 	cd src
 	python manage.py check
 	make all compress
 	py.test --reruns 5 -n 3 tests
 fi
 if [ "$1" == "tests-cov" ]; then
-	pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt
+	pip3 install -r src/requirements.txt -Ur src/requirements/dev.txt
 	cd src
 	python manage.py check
 	make all compress
 	coverage run -m py.test --reruns 5 tests && codecov
 fi
 if [ "$1" == "plugins" ]; then
-	pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt
+	pip3 install -r src/requirements.txt -Ur src/requirements/dev.txt
 	cd src
 	python setup.py develop
 	make all compress

.travis.yml

@@ -1,5 +1,4 @@
 language: python
-dist: xenial
 sudo: false
 install:
   - pip install -U pip wheel setuptools
@@ -13,21 +12,23 @@ services:
   - postgresql
 matrix:
   include:
-    - python: 3.7
+    - python: 3.6
       env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_sqlite.cfg
-    - python: 3.7
+    - python: 3.6
       env: JOB=tests-cov PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
-    - python: 3.7
+    - python: 3.6
       env: JOB=style
-    - python: 3.7
+    - python: 3.6
       env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_mysql.cfg
-    - python: 3.7
+    - python: 3.6
       env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
     - python: 3.5
       env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
-    - python: 3.7
+    - python: 3.6
+      env: JOB=plugins
+    - python: 3.6
       env: JOB=doc-spelling
-    - python: 3.7
+    - python: 3.6
       env: JOB=translation-spelling
 addons:
   postgresql: "9.4"

CONTRIBUTING.md

@@ -3,7 +3,7 @@ Contributing to pretix
 
 Hey there and welcome to pretix!
 
-We've got a contributors guide in [our documentation](https://docs.pretix.eu/en/latest/development/contribution/)
+We've got an contributors guide in [our documentation](https://docs.pretix.eu/en/latest/development/contribution/)
 together with notes on the [development setup](https://docs.pretix.eu/en/latest/development/setup.html).
 
 Please note that we have a [Code of Conduct](https://docs.pretix.eu/en/latest/development/contribution/codeofconduct.html)

Dockerfile

@@ -57,8 +57,6 @@ COPY deployment/docker/nginx.conf /etc/nginx/nginx.conf
 COPY deployment/docker/production_settings.py /pretix/src/production_settings.py
 COPY src /pretix/src
 
-RUN cd /pretix/src && pip3 install .
-
 RUN chmod +x /usr/local/bin/pretix && \
     rm /etc/nginx/sites-enabled/default && \
     cd /pretix/src && \

doc/admin/config.rst

@@ -57,9 +57,6 @@ Example::
     A comma-separated list of plugins that are not available even though they are installed.
     Defaults to an empty string.
 
-``auth_backends``
-    A comma-separated list of available auth backends. Defaults to ``pretix.base.auth.NativeAuthBackend``.
-
 ``cookie_domain``
     The cookie domain to be set. Defaults to ``None``.
 
@@ -81,15 +78,6 @@ Example::
     Enables or disables nagging staff users for leaving comments on their sessions for auditability.
     Defaults to ``off``.
 
-``obligatory_2fa``
-    Enables or disables obligatory usage of Two-Factor Authentication for users of the pretix backend.
-    Defaults to ``False``
-
-``trust_x_forwarded_for``
-    Specifies whether the ``X-Forwarded-For`` header can be trusted. Only set to ``on`` if you have a reverse
-    proxy that actively removes and re-adds the header to make sure the correct client IP is the first value.
-    Defaults to ``off``.
-
 
 Locale settings
 ---------------
@@ -137,8 +125,6 @@ Example::
     Indicates if the database backend is a MySQL/MariaDB Galera cluster and
     turns on some optimizations/special case handlers. Default: ``False``
 
-.. _`config-replica`:
-
 Database replica settings
 -------------------------
 
@@ -156,8 +142,6 @@ Example::
     [replica]
     host=192.168.0.2
 
-.. _`config-urls`:
-
 URLs
 ----
 
@@ -285,24 +269,6 @@ to speed up various operations::
 If redis is not configured, pretix will store sessions and locks in the database. If memcached
 is configured, memcached will be used for caching instead of redis.
 
-Translations
-------------
-
-pretix comes with a number of translations. Some of them are marked as "incubating", which means
-they can usually only be selected in development mode. If you want to use them nevertheless, you
-can activate them like this::
-
-    [languages]
-    allow_incubating=pt-br,da
-
-You can also tell pretix about additional paths where it will search for translations::
-
-    [languages]
-    path=/path/to/my/translations
-
-For a given language (e.g. ``pt-br``), pretix will then look in the
-specific sub-folder, e.g. ``/path/to/my/translations/pt_BR/LC_MESSAGES/django.po``.
-
 Celery task queue
 -----------------
 

doc/admin/index.rst

@@ -11,4 +11,3 @@ This documentation is for everyone who wants to install pretix on a server.
    installation/index
    config
    maintainance
-   scaling

doc/admin/installation/docker_smallscale.rst

@@ -58,29 +58,16 @@ Database
 --------
 
 Next, we need a database and a database user. We can create these with any kind of database managing tool or directly on
-our database's shell. For PostgreSQL, we would do::
+our database's shell, e.g. for MySQL::
 
-    # sudo -u postgres createuser -P pretix
-    # sudo -u postgres createdb -O pretix pretix
+    $ mysql -u root -p
+    mysql> CREATE DATABASE pretix DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
+    mysql> GRANT ALL PRIVILEGES ON pretix.* TO pretix@'localhost' IDENTIFIED BY '*********';
+    mysql> FLUSH PRIVILEGES;
 
-Make sure that your database listens on the network. If PostgreSQL on the same same host as docker, but not inside a docker container, we recommend that you just listen on the Docker interface by changing the following line in ``/etc/postgresql/<version>/main/postgresql.conf``::
-
-    listen_addresses = 'localhost,172.17.0.1'
-
-You also need to add a new line to ``/etc/postgresql/<version>/main/pg_hba.conf`` to allow network connections to this user and database::
-
-    host    pretix          pretix          172.17.0.1/16           md5
-
-Restart PostgreSQL after you changed these files::
-
-    # systemctl restart postgresql
-
-If you have a firewall running, you should also make sure that port 5432 is reachable from the ``172.17.0.1/16`` subnet.
-
-For MySQL, you can either also use network-based connections or mount the ``/var/run/mysqld/mysqld.sock`` socket into the docker container.
-When using MySQL, make sure you set the character set of the database to ``utf8mb4``, e.g. like this::
-
-    mysql > CREATE DATABASE pretix DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
+Replace the asterisks with a password of your own. For MySQL, we will use a unix domain socket to connect to the
+database. For PostgreSQL, be sure to configure the interface binding and your firewall so that the docker container
+can reach PostgreSQL.
 
 Redis
 -----
@@ -127,16 +114,13 @@ Fill the configuration file ``/etc/pretix/pretix.cfg`` with the following conten
     datadir=/data
 
     [database]
-    ; Replace postgresql with mysql for MySQL
-    backend=postgresql
+    ; Replace mysql with postgresql_psycopg2 for PostgreSQL
+    backend=mysql
     name=pretix
     user=pretix
-    ; Replace with the password you chose above
     password=*********
-    ; In most docker setups, 172.17.0.1 is the address of the docker host. Adjuts
-    ; this to wherever your database is running, e.g. the name of a linked container
-    ; or of a mounted MySQL socket.
-    host=172.17.0.1
+    ; Replace with host IP address for PostgreSQL
+    host=/var/run/mysqld/mysqld.sock
 
     [mail]
     ; See config file documentation for more options
@@ -180,15 +164,14 @@ named ``/etc/systemd/system/pretix.service`` with the following content::
         -v /var/pretix-data:/data \
         -v /etc/pretix:/etc/pretix \
         -v /var/run/redis:/var/run/redis \
+        -v /var/run/mysqld:/var/run/mysqld \
         pretix/standalone:stable all
     ExecStop=/usr/bin/docker stop %n
 
     [Install]
     WantedBy=multi-user.target
 
-When using MySQL and socket mounting, you'll need the additional flag ``-v /var/run/mysqld:/var/run/mysqld`` in the command.
-
-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 commands
 to enable and start the service::
 
     # systemctl daemon-reload
@@ -276,7 +259,7 @@ choice)::
 
 Then, go to that directory and build the image::
 
-    $ docker build . -t mypretix
+    $ docker build -t mypretix
 
 You can now use that image ``mypretix`` instead of ``pretix/standalone`` in your service file (see above). Be sure
 to re-build your custom image after you pulled ``pretix/standalone`` if you want to perform an update.

doc/admin/installation/enterprise.rst

@@ -68,7 +68,7 @@ generated key and installs the plugin from the URL we told you::
         mkdir -p /etc/ssh && \
         ssh-keyscan -t rsa -p 10022 code.rami.io >> /root/.ssh/known_hosts && \
         echo StrictHostKeyChecking=no >> /root/.ssh/config && \
-        DJANGO_SETTINGS_MODULE=pretix.settings pip3 install -U "git+ssh://git@code.rami.io:10022/pretix/pretix-slack.git@stable#egg=pretix-slack" && \
+        pip3 install -Ue "git+ssh://git@code.rami.io:10022/pretix/pretix-slack.git@stable#egg=pretix-slack" && \
         cd /pretix/src && \
         sudo -u pretixuser make production
     USER pretixuser

doc/admin/installation/index.rst

@@ -1,5 +1,3 @@
-.. _`installation`:
-
 Installation guide
 ==================
 

doc/admin/installation/manual_smallscale.rst

@@ -50,23 +50,21 @@ Database
 --------
 
 Having the database server installed, we still need a database and a database user. We can create these with any kind
-of database managing tool or directly on our database's shell. For PostgreSQL, we would do::
+of database managing tool or directly on our database's shell, e.g. for MySQL::
 
-    # sudo -u postgres createuser pretix
-    # sudo -u postgres createdb -O pretix pretix
-
-When using MySQL, make sure you set the character set of the database to ``utf8mb4``, e.g. like this::
-
-    mysql > CREATE DATABASE pretix DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
+    $ mysql -u root -p
+    mysql> CREATE DATABASE pretix DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
+    mysql> GRANT ALL PRIVILEGES ON pretix.* TO pretix@'localhost' IDENTIFIED BY '*********';
+    mysql> FLUSH PRIVILEGES;
 
 Package dependencies
 --------------------
 
 To build and run pretix, you will need the following debian packages::
 
-    # apt-get install git build-essential python-dev python3-venv python3 python3-pip \
+    # apt-get install git build-essential python-dev python-virtualenv python3 python3-pip \
                       python3-dev libxml2-dev libxslt1-dev libffi-dev zlib1g-dev libssl-dev \
-                      gettext libpq-dev libmariadbclient-dev libjpeg-dev libopenjp2-7-dev
+                      gettext libpq-dev libmysqlclient-dev libjpeg-dev libopenjp2-7-dev
 
 Config file
 -----------
@@ -87,18 +85,13 @@ Fill the configuration file ``/etc/pretix/pretix.cfg`` with the following conten
     datadir=/var/pretix/data
 
     [database]
-    ; For MySQL, replace with "mysql"
-    backend=postgresql
+    ; Replace mysql with postgresql_psycopg2 for PostgreSQL
+    backend=mysql
     name=pretix
     user=pretix
-    ; For MySQL, enter the user password. For PostgreSQL on the same host,
-    ; we don't need one because we can use peer authentification if our
-    ; PostgreSQL user matches our unix user.
-    password=
-    ; For MySQL, use local socket, e.g. /var/run/mysqld/mysqld.sock
-    ; For a remote host, supply an IP address
-    ; For local postgres authentication, you can leave it empty
-    host=
+    password=*********
+    ; Replace with host IP address for PostgreSQL
+    host=/var/run/mysqld/mysqld.sock
 
     [mail]
     ; See config file documentation for more options
@@ -122,14 +115,14 @@ Now we will install pretix itself. The following steps are to be executed as the
 actually install pretix, we will create a virtual environment to isolate the python packages from your global
 python installation::
 
-    $ python3 -m venv /var/pretix/venv
+    $ virtualenv -p python3 /var/pretix/venv
     $ source /var/pretix/venv/bin/activate
     (venv)$ pip3 install -U pip setuptools wheel
 
-We now install pretix, its direct dependencies and gunicorn. Replace ``postgres`` with ``mysql`` in the following
-command if you're running MySQL::
+We now install pretix, its direct dependencies and gunicorn. Replace ``mysql`` with ``postgres`` in the following
+command if you're running PostgreSQL::
 
-    (venv)$ pip3 install "pretix[postgres]" gunicorn
+    (venv)$ pip3 install "pretix[mysql]" gunicorn
 
 Note that you need Python 3.5 or newer. You can find out your Python version using ``python -V``.
 
@@ -275,10 +268,10 @@ Updates
 .. warning:: While we try hard not to break things, **please perform a backup before every upgrade**.
 
 To upgrade to a new pretix release, pull the latest code changes and run the following commands (again, replace
-``postgres`` with ``mysql`` if necessary)::
+``mysql`` with ``postgres`` if necessary)::
 
     $ source /var/pretix/venv/bin/activate
-    (venv)$ pip3 install -U pretix[postgres] gunicorn
+    (venv)$ pip3 install -U pretix[mysql] gunicorn
     (venv)$ python -m pretix migrate
     (venv)$ python -m pretix rebuild
     (venv)$ python -m pretix updatestyles

doc/admin/scaling.rst

@@ -1,236 +0,0 @@
-.. _`scaling`:
-
-Scaling guide
-=============
-
-Our :ref:`installation guide <installation>` only covers "small-scale" setups, by which we mostly mean
-setups that run on a **single (virtual) machine** and do not encounter large traffic peaks.
-
-We do not offer an installation guide for larger-scale setups of pretix, mostly because we believe that
-there is no one-size-fits-all solution for this and the desired setup highly depends on your use case,
-the platform you run pretix on, and your technical capabilities. We do not recommend trying set up pretix
-in a multi-server environment if you do not already have experience with managing server clusters.
-
-This document is intended to give you a general idea on what issues you will encounter when you scale up
-and what you should think of.
-
-.. tip::
-
-   If you require more help on this, we're happy to help. Our pretix Enterprise support team has built
-   and helped building, scaling and load-testing pretix installations at any scale and we're looking
-   forward to work with you on fine-tuning your system. If you intend to sell **more than a thousand
-   tickets in a very short amount of time**, we highly recommend reaching out and at least talking this
-   through. Just get in touch at sales@pretix.eu!
-
-Scaling reasons
----------------
-
-There's mainly two reasons to scale up a pretix installation beyond a single server:
-
-* **Availability:** Distributing pretix over multiple servers can allow you to survive failure of one or more single machines, leading to a higher uptime and reliability of your system.
-
-* **Traffic and throughput:** Distributing pretix over multiple servers can allow you to process more web requests and ticket sales at the same time.
-
-You are very unlikely to require scaling for other reasons, such as having too much data in your database.
-
-Components
-----------
-
-A pretix installation usually consists of the following components which run performance-relevant processes:
-
-* ``pretix-web`` is the Django-based web application that serves all user interaction.
-
-* ``pretix-worker`` is a Celery-based application that processes tasks that should be run asynchronously outside of the web application process.
-
-* A **SQL database** keeps all the important data and processes the actual transactions. We recommend using PostgreSQL, but MySQL/MariaDB works as well.
-
-* A **web server** that terminates TLS and HTTP connections and forwards them to ``pretix-web``. In some cases, e.g. when serving static files, the web servers might return a response directly. We recommend using ``nginx``.
-
-* A **redis** server responsible for the communication between ``pretix-web`` and ``pretix-worker``, as well as for caching.
-
-* A directory of **media files** such as user-uploaded files or generated files (tickets, invoices, …) that are created and used by ``pretix-web``, ``pretix-worker`` and the web server.
-
-In the following, we will discuss the scaling behavior of every component individually. In general, you can run all of the components
-on the same server, but you can just as well distribute every component to its own server, or even use multiple servers for some single
-components.
-
-.. warning::
-
-   When setting up your system, don't forget about security. In a multi-server environment,
-   you need to take special care to ensure that no unauthorized access to your database
-   is possible through the network and that it's not easy to wiretap your connections. We
-   recommend a rigorous use of firewalls and encryption on all communications. You can
-   ensure this either on an application level (such as using the TLS support in your
-   database) or on a network level with a VPN solution.
-
-Web server
-""""""""""
-
-Your web server is at the very front of your installation. It will need to absorb all of the traffic, and it should be able to
-at least show a decent error message, even when everything else fails. Luckily, web servers are really fast these days, so this
-can be achieved without too much work.
-
-We recommend reading up on tuning your web server for high concurrency. For nginx, this means thinking about the number of worker
-processes and the number of connections each worker process accepts. Double-check that TLS session caching works, because TLS
-handshakes can get really expensive.
-
-During a traffic peak, your web server will be able to make us of more CPU resources, while memory usage will stay comparatively low,
-so if you invest in more hardware here, invest in more and faster CPU cores.
-
-Make sure that pretix' static files (such as CSS and JavaScript assets) as well as user-uploaded media files (event logos, etc)
-are served directly by your web server and your web server caches them in-memory (nginx does it by default) and sets useful
-headers for client-side caching. As an additional performance improvement, you can turn of access logging for these types of files.
-If you want, you can even farm out serving static files to a different web server entirely and :ref:`configure pretix to reference
-them from a different URL <config-urls>`.
-
-.. tip::
-
-   If you expect *really high traffic* for your very popular event, you might want to do some rate limiting on this layer, or,
-   if you want to ensure a fair and robust first-come-first-served experience and prefer letting users wait over showing them
-   errors, consider a queuing solution. We're happy to provide you with such systems, just get in touch at sales@pretix.eu.
-
-pretix-web
-""""""""""
-
-The ``pretix-web`` process does not carry any internal state can be easily started on as many machines as you like, and you can
-use the load balancing features of your frontend web server to redirect to all of them.
-
-You can adjust the number of processes in the ``gunicorn`` command line, and we recommend choosing roughly two times the number
-of CPU cores available. Under load, the memory consumption of ``pretix-web`` will stay comparatively constant, while the CPU usage
-will increase a lot. Therefore, if you can add more or faster CPU cores, you will be able to serve more users.
-
-pretix-worker
-"""""""""""""
-
-The ``pretix-worker`` process performs all operations that are not directly executed in the request-response-cycle of ``pretix-web``.
-Just like ``pretix-web`` you can easily start up as many instances as you want on different machines to share the work. As long as they
-all talk to the same redis server, they will all receive tasks from ``pretix-web``, work on them and post their result back.
-You can configure the number of threads that run tasks in parallel through the ``--concurrency`` command line option of ``celery``.
-
-Just like ``pretix-web``, this process is mostly heavy on CPU, disk IO and network IO, although memory peaks can occur e.g. during the
-generation of large PDF files, so we recommend having some reserves here.
-
-``pretix-worker`` performs a variety of tasks which are of different importance.
-Some of them are mission-critical and need to be run quickly even during high load (such as
-creating a cart or an order), others are irrelevant and can easily run later (such as
-distributing tickets on the waiting list). You can fine-tune the capacity you assign to each
-of these tasks by running ``pretix-worker`` processes that only work on a specific **queue**.
-For example, you could have three servers dedicated only to process order creations and one
-server dedicated only to sending emails. This allows you to set priorities and also protects
-you from e.g. a slow email server lowering your ticket throughput.
-
-You can do so by specifying one or more queues on the ``celery`` command line of this process, such as ``celery -A pretix.celery_app worker -Q notifications,mail``. Currently,
-the following queues exist:
-
-* ``checkout`` -- This queue handles everything related to carts and orders and thereby everything required to process a sale. This includes adding and deleting items from carts as well as creating and canceling orders.
-
-* ``mail`` -- This queue handles sending of outgoing emails.
-
-* ``notifications`` -- This queue handles the processing of any outgoing notifications, such as email notifications to admin users (except for the actual sending) or API notifications to registered webhooks.
-
-* ``background`` -- This queue handles tasks that are expected to take long or have no human waiting for their result immediately, such as refreshing caches, re-generating CSS files, assigning tickets on the waiting list or parsing bank data files.
-
-* ``default`` -- This queue handles everything else with "medium" or unassigned priority, most prominently the generation of files for tickets, invoices, badges, admin exports, etc.
-
-Media files
-"""""""""""
-
-Both ``pretix-web``, ``pretix-worker`` and in some cases your webserver need to work with
-media files. Media files are all files generated *at runtime* by the software. This can
-include files uploaded by the event organizers, such as the event logo, files uploaded by
-ticket buyers (if you use such features) or files generated by the software, such as
-ticket files, invoice PDFs, data exports or customized CSS files.
-
-Those files are by default stored to the ``media/`` sub-folder of the data directory given
-in the ``pretix.cfg`` configuration file. Inside that ``media/`` folder, you will find a
-``pub/`` folder containing the subset of files that should be publicly accessible through
-the web server. Everything else only needs to be accessible by ``pretix-web`` and
-``pretix-worker`` themselves.
-
-If you distribute ``pretix-web`` or ``pretix-worker`` across more than one machine, you
-**must** make sure that they all have access to a shared storage to read and write these
-files, otherwise you **will** run into errors with the user interface.
-
-The easiest solution for this is probably to store them on a NFS server that you mount
-on each of the other servers.
-
-Since we use Django's file storage mechanism internally, you can in theory also use a object-storage solution like Amazon S3, Ceph, or Minio to store these files, although we currently do not expose this through pretix' configuration file and this would require you to ship your own variant of ``pretix/settings.py`` and reference it through the ``DJANGO_SETTINGS_MODULE`` environment variable.
-
-At pretix.eu, we use a custom-built `object storage cluster`_.
-
-SQL database
-""""""""""""
-
-One of the most critical parts of the whole setup is the SQL database -- and certainly the
-hardest to scale. Tuning relational databases is an art form, and while there's lots of
-material on it on the internet, there's not a single recipe that you can apply to every case.
-
-As a general rule of thumb, the more resources you can give your databases, the better.
-Most databases will happily use all CPU cores available, but only use memory up to an amount
-you configure, so make sure to set this memory usage as high as you can afford. Having more
-memory available allows your database to make more use of caching, which is usually good.
-
-Scaling your database to multiple machines needs to be treated with great caution. It's a
-good to have a replica of your database for availability reasons. In case your primary
-database server fails, you can easily switch over to the replica and continue working.
-
-However, using database replicas for performance gains is much more complicated. When using
-replicated database systems, you are always trading in consistency or availability to get
-additional performance and the consequences of this can be subtle and it is important
-that you have a deep understanding of the semantics of your replication mechanism.
-
-.. warning::
-
-   Using an off-the-shelf database proxy solution that redirects read queries to your
-   replicas and write queries to your primary database **will lead to very nasty bugs.**
-
-   As an example, if you buy a ticket, pretix first needs to calculate how many tickets
-   are left to sell. If this calculation is done on a database replica that lags behind
-   even for fractions of a second, the decision to allow selling the ticket will be made
-   on out-of-data data and you can end up with more tickets sold than configured. Similarly,
-   you could imagine situations leading to double payments etc.
-
-If you do have a replica, you *can* tell pretix about it :ref:`in your configuration <config-replica>`.
-This way, pretix can offload complex read-only queries to the replica when it is safe to do so.
-As of pretix 2.7, this is mainly used for search queries in the backend and for rendering the
-product list and event lists in the frontend, but we plan on expanding this in the future.
-
-Therefore, for now our clear recommendation is: Try to scale your database vertically and put
-it on the most powerful machine you have available.
-
-redis
-"""""
-
-While redis is a very important part that glues together some of the components, it isn't used
-heavily and can usually handle a fairly large pretix installation easily on a single modern
-CPU core.
-Having some memory available is good in case of e.g. lots of tasks queuing up during a traffic peak, but we wouldn't expect ever needing more than a gigabyte of it.
-
-Feel free to set up a redis cluster for availability – but you won't need it for performance in a long time.
-
-The limitations
----------------
-
-Up to a certain point, pretix scales really well. However, there are a few things that we consider
-even more important than scalability, and those are correctness and reliability. We want you to be
-able to trust that pretix will not sell more tickets than you intended or run into similar error
-cases.
-
-Combined with pretix' flexibility and complexity, especially around vouchers and quotas, this creates
-some hard issues. In many cases, we need to fall back to event-global locking for some actions which
-are likely to run with high concurrency and cause harm.
-
-For every event, only one of these locking actions can be run at the same time. Examples for this are
-adding products limited by a quota to a cart, adding items to a cart using a voucher or placing an order
-consisting of cart positions that don't have a valid reservation for much longer. In these cases, it is
-currently not realistically possible to exceed selling **approx. 500 orders per minute per event**, even
-if you add more hardware.
-If you have an unlimited number of tickets, we can apply fewer locking and we've reached **approx.
-1500 orders per minute per event** in benchmarks, although even more should be possible.
-
-We're working to reduce the number of cases in which this is relevant and thereby improve the possible
-throughput. If you want to use pretix for an event with 10,000+ tickets that are likely to be sold out
-within minutes, please get in touch to discuss possible solutions. We'll work something out for you!
-
-
-.. _object storage cluster: https://behind.pretix.eu/2018/03/20/high-available-cdn/

doc/api/fundamentals.rst

@@ -181,37 +181,4 @@ as the string values ``true`` and ``false``.
 If the ``ordering`` parameter is documented for a resource, you can use it to sort the result set by one of the allowed
 fields. Prepend a ``-`` to the field name to reverse the sort order.
 
-
-Idempotency
------------
-
-Our API supports an idempotency mechanism to make sure you can safely retry operations without accidentally performing
-them twice. This is useful if an API call experiences interruptions in transit, e.g. due to a network failure, and you
-do not know if it completed successfully.
-
-To perform an idempotent request, add a ``X-Idempotency-Key`` header with a random string value (we recommend a version
-4 UUID) to your request. If we see a second request with the same ``X-Idempotency-Key`` and the same ``Authorization``
-and ``Cookie`` headers, we will not perform the action for a second time but return the exact same response instead.
-
-Please note that this also goes for most error responses. For example, if we returned you a ``403 Permission Denied``
-error and you retry with the same ``X-Idempotency-Key``, you will get the same error again, even if you were granted
-permission in the meantime! This includes internal server errors on our side that might have been fixed in the meantime.
-
-There are only three exceptions to the rule:
-
-* Responses with status code ``409 Conflict`` are not cached. If you send the request again, it will be executed as a
-  new request, since these responses are intended to be retried.
-
-* Rate-limited responses with status code ``429 Too Many Requests`` are not cached and you can safely retry them.
-
-* Responses with status code ``503 Service Unavailable`` are not cached and you can safely retry them.
-
-If you send a request with an ``X-Idempotency-Key`` header that we have seen before but that has not yet received a
-response, you will receive a response with status code ``409 Conflict`` and are asked to retry after five seconds.
-
-We store idempotency keys for 24 hours, so you should never retry a request after a longer time period.
-
-All ``POST``, ``PUT``, ``PATCH``, or ``DELETE`` api calls support idempotency keys. Adding an idempotency key to a
-``GET``, ``HEAD``, or ``OPTIONS`` request has no effect.
-
 .. _CSRF policies: https://docs.djangoproject.com/en/1.11/ref/csrf/#ajax

doc/api/guides/custom_checkout.rst

@@ -1,132 +0,0 @@
-Creating an external checkout process
-=====================================
-
-Occasionally, we get asked whether it is possible to just use pretix' powerful backend as a ticketing engine but use
-a fully-customized checkout process that only communicates via the API. This is possible, but with a few limitations.
-If you go down this route, you will miss out on many of pretix features and safeguards, as well as the added flexibility
-by most of pretix' plugins. We strongly recommend to talk this through with us before you decide this is the way to go.
-
-However, this is really useful if you need to tightly integrate pretix into existing web applications that e.g. control
-the pricing of your products in a way that cannot be mapped to pretix' product structures.
-
-Creating orders
----------------
-
-After letting your user select the products to  buy in your application, you should create a new order object inside
-pretix. Below, you can see an example of such an order, but most fields are optional and there are some more features
-supported. Read :ref:`rest-orders-create` to learn more about this endpoint.
-
-Please note that this endpoint assumes trustworthy input for the most part. By default, the endpoint checks that
-you do not exceed any quotas, do not sell any seats twice, or do not use any redeemed vouchers. However, it will not
-complain about violation of any other availability constraints, such as violation of time frames or minimum/maximum
-amounts of either your product or event. Bundled products will not be added in automatically and fees will not be
-calculated automatically.
-
-.. sourcecode:: http
-
-    POST /api/v1/organizers/democon/events/3vjrh/orders/ HTTP/1.1
-    Host: test.pretix.eu
-    Accept: application/json, text/javascript
-    Content-Type: application/json
-    Authorization: …
-
-    {
-      "email": "dummy@example.org",
-      "locale": "en",
-      "sales_channel": "web",
-      "payment_provider": "banktransfer",
-      "invoice_address": {
-        "is_business": false,
-        "company": "Sample company",
-        "name_parts": {"full_name": "John Doe"},
-        "street": "Sesam Street 12",
-        "zipcode": "12345",
-        "city": "Sample City",
-        "country": "US",
-        "state": "NY",
-        "internal_reference": "",
-        "vat_id": ""
-      },
-      "positions": [
-        {
-          "item": 21,
-          "variation": null,
-          "attendee_name_parts": {
-            "full_name": "Peter"
-          },
-          "answers": [
-            {
-              "question": 1,
-              "answer": "23",
-              "options": []
-            }
-          ],
-          "subevent": null
-        }
-      ],
-      "fees": []
-    }
-
-You will be returned a full order object that you can inspect, store, or use to build emails or confirmation pages for
-the user. If you don't want to do that yourself, it will also contain the URL to our confirmation page in the ``url``
-attribute. If you pass the ``"send_mail": true`` option, pretix will also send order confirmations for you.
-
-Handling payments yourself
---------------------------
-
-If you want to handle payments in your application, you can either just create the orders with status "paid" or you can
-create them in "pending" state (the default) and later confirm the payment. We strongly advise to use the payment
-provider ``"manual"`` in this case to avoid interference with payment code with pretix.
-
-However, it is often unfeasible to implement the payment process yourself, and it also requires you to give up a
-lot of pretix functionality, such as automatic refunds. Therefore, it is also possible to utilize pretix' native
-payment process even in this case:
-
-Using pretix payment providers
-------------------------------
-
-If you passed a ``payment_provider`` during order creation above, pretix will have created a payment object with state
-``created`` that you can see in the returned order object. This payment object will have an attribute ``payment_url``
-that you can use to let the user pay. For example, you could link or redirect to this page.
-
-If you want the user to return to your application after the payment is complete, you can pass a query parameter
-``return_url``. To prepare your event for this, open your event in the pretix backend and go to "Settings", then
-"Plugins". Enable the plugin "Redirection from order page". Then, go to the new page "Settings", then "Redirection".
-Enter the base URL of your web application. This will allow you to redirect to pages under this base URL later on.
-For example, if you want users to be redirected to ``https://example.org/order/return?tx_id=1234``, you could now
-either enter ``https://example.org`` or ``https://example.org/order/``.
-
-The user will be redirected back to your page instead of pretix' order confirmation page after the payment,
-**regardless of whether it was successful or not**. Make sure you use our API to check if the payment actually
-worked! Your final URL could look like this::
-
-    https://test.pretix.eu/democon/3vjrh/order/NSLEZ/ujbrnsjzbq4dzhck/pay/123/?return_url=https%3A%2F%2Fexample.org%2Forder%2Freturn%3Ftx_id%3D1234
-
-You can also embed this page in an ``<iframe>`` instead. Note, however, that this causes problems with some payment
-methods such as PayPal which do not allow being opened in an iframe. pretix can partly work around these issues by
-opening a new window, but will only to so if you also append an ``iframe=1`` parameter to the URL::
-
-    https://test.pretix.eu/democon/3vjrh/order/NSLEZ/ujbrnsjzbq4dzhck/pay/123/?return_url=https%3A%2F%2Fexample.org%2Forder%2Freturn%3Ftx_id%3D1234&iframe=1
-
-If you did **not** pass a payment method since you want us to ask the user which payment method they want to use, you
-need to construct the URL from the ``url`` attribute of the order and the sub-path ``pay/change```. For example, you
-would end up with the following URL::
-
-    https://test.pretix.eu/democon/3vjrh/order/NSLEZ/ujbrnsjzbq4dzhck/pay/change
-
-Of course, you can also use the ``iframe`` and ``return_url`` parameters here.
-
-Optional: Cart reservations
----------------------------
-
-Creating orders is an atomic operation: The order is either created as a whole or not at all. However, pretix'
-built-in checkout automatically reserves tickets in a user's cart for a configurable amount of time to ensure users
-will actually get their tickets once they started entering all their details. If you want a similar behavior in your
-application, you need to create :ref:`rest-carts` through the API.
-
-When creating your order, you can pass a ``consume_carts`` parameter with the cart ID(s) of your user. This way, the
-quota reserved by the cart will be credited towards the order and the carts will be destroyed if (and only if) the
-order creation succeeds.
-
-Cart creation is currently even more limited than the order creation endpoints, as cart creation currently does not
-support vouchers or automatic price calculation. If you require these features, please get in touch with us.

doc/api/guides/index.rst

@@ -1,11 +0,0 @@
-.. _`rest-api-guides`:
-
-API Usage Guides
-================
-
-This part of the documentation contains how-to guides on some special use cases of our API.
-
-.. toctree::
-   :maxdepth: 2
-
-   custom_checkout

doc/api/index.rst

@@ -18,4 +18,3 @@ in functionality over time.
    resources/index
    ratelimit
    webhooks
-   guides/index

doc/api/resources/billing_invoices.rst

@@ -1,131 +0,0 @@
-pretix Hosted billing invoices
-==============================
-
-This endpoint allows you to access invoices you received for pretix Hosted. It only contains invoices created starting
-November 2017.
-
-.. note:: Only available on pretix Hosted, not on self-hosted pretix instances.
-
-Resource description
---------------------
-
-The resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-invoice_number                        string                     Invoice number
-date_issued                           date                       Invoice date
-===================================== ========================== =======================================================
-
-
-Endpoints
----------
-
-.. http:get:: /api/v1/organizers/(organizer)/billing_invoices/
-
-   Returns a list of all invoices to a given organizer.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/billing_invoices/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "count": 1,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "invoice_number": "R2019002",
-            "date_issued": "2019-06-03"
-          }
-        ]
-      }
-
-   :query integer page: The page number in case of a multi-page result set, default is 1
-   :query string ordering: Manually set the ordering of results. Valid fields to be used are ``date_issued`` and
-                           its reverse, ``-date_issued``. Default: ``date_issued``.
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:get:: /api/v1/organizers/(organizer)/billing_invoices/(invoice_number)/
-
-   Returns information on one invoice, identified by its invoice number.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/billing_invoices/R2019002/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "invoice_number": "R2019002",
-        "date_issued": "2019-06-03"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param invoice_number: The ``invoice_number`` field of the invoice to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:get:: /api/v1/organizers/(organizer)/billing_invoices/(invoice_number)/download/
-
-   Download an invoice in PDF format.
-
-   .. warning:: After we created the invoices, they are placed in review with our accounting department. You will
-                already see them in the API at this point, but you are not able to download them until they completed
-                review and are sent to you via email. This usually takes a few hours. If you try to download them
-                in this time frame, you will receive a status code :http:statuscode:`423`.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/billing_invoices/R2019002/download/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/pdf
-
-      ...
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param invoice_number: The ``invoice_number`` field of the invoice to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-   :statuscode 423: The file is not yet ready and will now be prepared. Retry the request after waiting for a few
-                    seconds.

doc/api/resources/carts.rst

@@ -36,20 +36,12 @@ answers                               list of objects            Answers to user
 ├ question_identifier                 string                     The question's ``identifier`` field
 ├ options                             list of integers           Internal IDs of selected option(s)s (only for choice types)
 └ option_identifiers                  list of strings            The ``identifier`` fields of the selected option(s)s
-seat                                  objects                    The assigned seat. Can be ``null``.
-├ id                                  integer                    Internal ID of the seat instance
-├ name                                string                     Human-readable seat name
-└ seat_guid                           string                     Identifier of the seat within the seating plan
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.17
 
    This resource has been added.
 
-.. versionchanged:: 3.0
-
-   This ``seat`` attribute has been added.
-
 
 Cart position endpoints
 -----------------------
@@ -95,7 +87,6 @@ Cart position endpoints
             "datetime": "2018-06-11T10:00:00Z",
             "expires": "2018-06-11T10:00:00Z",
             "includes_tax": true,
-            "seat": null,
             "answers": []
           }
         ]
@@ -141,7 +132,6 @@ Cart position endpoints
         "datetime": "2018-06-11T10:00:00Z",
         "expires": "2018-06-11T10:00:00Z",
         "includes_tax": true,
-        "seat": null,
         "answers": []
       }
 
@@ -188,7 +178,6 @@ Cart position endpoints
    * ``item``
    * ``variation`` (optional)
    * ``price``
-   * ``seat`` (The ``seat_guid`` attribute of a seat. Required when the specified ``item`` requires a seat, otherwise must be ``null``.)
    * ``attendee_name`` **or** ``attendee_name_parts`` (optional)
    * ``attendee_email`` (optional)
    * ``subevent`` (optional)
@@ -207,7 +196,7 @@ Cart position endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/cartpositions/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content-Type: application/json
+      Content: application/json
 
       {
         "item": 1,

doc/api/resources/categories.rst

@@ -20,7 +20,7 @@ internal_name                         string                     An optional nam
 description                           multi-lingual string       A public description (might include markdown, can
                                                                  be ``null``)
 position                              integer                    An integer, used for sorting the categories
-is_addon                              boolean                    If ``true``, items within this category are not on sale
+is_addon                              boolean                    If ``True``, items within this category are not on sale
                                                                  on their own but the category provides a source for
                                                                  defining add-ons for other products.
 ===================================== ========================== =======================================================
@@ -131,7 +131,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/categories/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content-Type: application/json
+      Content: application/json
 
       {
         "name": {"en": "Tickets"},

doc/api/resources/checkinlists.rst

@@ -1,5 +1,3 @@
-.. spelling:: checkin
-
 Check-in lists
 ==============
 
@@ -29,7 +27,6 @@ subevent                              integer                    ID of the date
 position_count                        integer                    Number of tickets that match this list (read-only).
 checkin_count                         integer                    Number of check-ins performed on this list (read-only).
 include_pending                       boolean                    If ``true``, the check-in list also contains tickets from orders in pending state.
-auto_checkin_sales_channels           list of strings            All items on the check-in list will be automatically marked as checked-in when purchased through any of the listed sales channels.
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.10
@@ -44,10 +41,6 @@ auto_checkin_sales_channels           list of strings            All items on th
 
    The ``include_pending`` field has been added.
 
-.. versionchanged:: 3.2
-
-    The ``auto_checkin_sales_channels`` field has been added.
-
 Endpoints
 ---------
 
@@ -88,10 +81,7 @@ Endpoints
             "all_products": true,
             "limit_products": [],
             "include_pending": false,
-            "subevent": null,
-            "auto_checkin_sales_channels": [
-              "pretixpos"
-            ]
+            "subevent": null
           }
         ]
       }
@@ -132,10 +122,7 @@ Endpoints
         "all_products": true,
         "limit_products": [],
         "include_pending": false,
-        "subevent": null,
-        "auto_checkin_sales_channels": [
-          "pretixpos"
-        ]
+        "subevent": null
       }
 
    :param organizer: The ``slug`` field of the organizer to fetch
@@ -169,14 +156,14 @@ Endpoints
         "checkin_count": 17,
         "position_count": 42,
         "event": {
-          "name": "Demo Conference"
+          "name": "Demo Converence",
         },
         "items": [
           {
             "name": "T-Shirt",
             "id": 1,
             "checkin_count": 1,
-            "admission": false,
+            "admission": False,
             "position_count": 1,
             "variations": [
               {
@@ -197,7 +184,7 @@ Endpoints
             "name": "Ticket",
             "id": 2,
             "checkin_count": 15,
-            "admission": true,
+            "admission": True,
             "position_count": 22,
             "variations": []
           }
@@ -222,16 +209,13 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/checkinlists/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content-Type: application/json
+      Content: application/json
 
       {
         "name": "VIP entry",
         "all_products": false,
         "limit_products": [1, 2],
-        "subevent": null,
-        "auto_checkin_sales_channels": [
-          "pretixpos"
-        ]
+        "subevent": null
       }
 
    **Example response**:
@@ -250,10 +234,7 @@ Endpoints
         "all_products": false,
         "limit_products": [1, 2],
         "include_pending": false,
-        "subevent": null,
-        "auto_checkin_sales_channels": [
-          "pretixpos"
-        ]
+        "subevent": null
       }
 
    :param organizer: The ``slug`` field of the organizer of the event/item to create a list for
@@ -302,10 +283,7 @@ Endpoints
         "all_products": false,
         "limit_products": [1, 2],
         "include_pending": false,
-        "subevent": null,
-        "auto_checkin_sales_channels": [
-          "pretixpos"
-        ]
+        "subevent": null
       }
 
    :param organizer: The ``slug`` field of the organizer to modify
@@ -358,29 +336,11 @@ Order position endpoints
 
    The order positions endpoint has been extended by the filter queries ``voucher`` and ``voucher__code``.
 
-.. versionchanged:: 2.7
-
-   The resource now contains the new attributes ``require_attention`` and ``order__status`` and accepts the new
-   ``ignore_status`` filter. The ``attendee_name`` field is now "smart" (see below) and the redemption endpoint
-   returns ``400`` instead of ``404`` on tickets which are known but not paid.
-
-.. versionchanged:: 3.2
-
-    The ``checkins`` dict now also contains a ``auto_checked_in`` value to indicate if the check-in has been performed
-    automatically by the system.
-
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/checkinlists/(list)/positions/
 
    Returns a list of all order positions within a given event. The result is the same as
-   the :ref:`order-position-resource`, with the following differences:
-
-   * The ``checkins`` value will only include check-ins for the selected list.
-
-   * An additional boolean property ``require_attention`` will inform you whether either the order or the item
-     have the ``checkin_attention`` flag set.
-
-   * If ``attendee_name`` is empty, it will automatically fall back to values from a parent product or from invoice
-     addresses.
+   the :ref:`order-position-resource`, with one important difference: the ``checkins`` value will only include
+   check-ins for the selected list.
 
    **Example request**:
 
@@ -423,12 +383,10 @@ Order position endpoints
             "addon_to": null,
             "subevent": null,
             "pseudonymization_id": "MQLJvANO3B",
-            "seat": null,
             "checkins": [
               {
                 "list": 1,
-                "datetime": "2017-12-25T12:45:23Z",
-                "auto_checked_in": true
+                "datetime": "2017-12-25T12:45:23Z"
               }
             ],
             "answers": [
@@ -449,8 +407,6 @@ Order position endpoints
       }
 
    :query integer page: The page number in case of a multi-page result set, default is 1
-   :query string ignore_status: If set to ``true``, results will be returned regardless of the state of
-                                 the order they belong to and you will need to do your own filtering by order status.
    :query string ordering: Manually set the ordering of results. Valid fields to be used are ``order__code``,
                            ``order__datetime``, ``positionid``, ``attendee_name``, ``last_checked_in`` and ``order__email``. Default:
                            ``attendee_name,positionid``
@@ -486,15 +442,8 @@ Order position endpoints
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/checkinlists/(list)/positions/(id)/
 
    Returns information on one order position, identified by its internal ID.
-   The result is the same as the :ref:`order-position-resource`, with the following differences:
-
-   * The ``checkins`` value will only include check-ins for the selected list.
-
-   * An additional boolean property ``require_attention`` will inform you whether either the order or the item
-     have the ``checkin_attention`` flag set.
-
-   * If ``attendee_name`` is empty, it will automatically fall back to values from a parent product or from invoice
-     addresses.
+   The result format is the same as the :ref:`order-position-resource`, with one important difference: the
+   ``checkins`` value will only include check-ins for the selected list.
 
    **Instead of an ID, you can also use the ``secret`` field as the lookup parameter.**
 
@@ -534,12 +483,10 @@ Order position endpoints
         "addon_to": null,
         "subevent": null,
         "pseudonymization_id": "MQLJvANO3B",
-        "seat": null,
         "checkins": [
           {
             "list": 1,
-            "datetime": "2017-12-25T12:45:23Z",
-            "auto_checked_in": true
+            "datetime": "2017-12-25T12:45:23Z"
           }
         ],
         "answers": [
@@ -577,14 +524,11 @@ Order position endpoints
                                        you do not implement question handling in your user interface, you **must**
                                        set this to ``false``. In that case, questions will just be ignored. Defaults
                                        to ``true``.
-   :<json boolean canceled_supported: When this parameter is set to ``true``, the response code ``canceled`` may be
-                                      returned. Otherwise, canceled orders will return ``unpaid``.
    :<json datetime datetime: Specifies the datetime of the check-in. If not supplied, the current time will be used.
    :<json boolean force: Specifies that the check-in should succeed regardless of previous check-ins or required
                          questions that have not been filled. Defaults to ``false``.
    :<json boolean ignore_unpaid: Specifies that the check-in should succeed even if the order is in pending state.
-                                 Defaults to ``false`` and only works when ``include_pending`` is set on the check-in
-                                 list.
+                                 Defaults to ``false``.
    :<json string nonce: You can set this parameter to a unique random value to identify this check-in. If you're sending
                         this request twice with the same nonce, the second request will also succeed but will always
                         create only one check-in object even when the previous request was successful as well. This
@@ -607,7 +551,6 @@ Order position endpoints
         "nonce": "Pvrk50vUzQd0DhdpNRL4I4OcXsvg70uA",
         "datetime": null,
         "questions_supported": true,
-        "canceled_supported": true,
         "answers": {
           "4": "XS"
         }
@@ -691,9 +634,7 @@ Order position endpoints
 
    Possible error reasons:
 
-   * ``unpaid`` - Ticket is not paid for
-   * ``canceled`` – Ticket is canceled or expired. This reason is only sent when your request sets
-     ``canceled_supported`` to ``true``, otherwise these orders return ``unpaid``.
+   * ``unpaid`` - Ticket is not paid for or has been refunded
    * ``already_redeemed`` - Ticket already has been redeemed
    * ``product`` - Tickets with this product may not be scanned at this device
 

doc/api/resources/events.rst

@@ -1,9 +1,3 @@
-.. spelling::
-
-   geo
-   lat
-   lon
-
 Events
 ======
 
@@ -31,17 +25,11 @@ is_public                             boolean                    If ``true``, th
 presale_start                         datetime                   The date at which the ticket shop opens (or ``null``)
 presale_end                           datetime                   The date at which the ticket shop closes (or ``null``)
 location                              multi-lingual string       The event location (or ``null``)
-geo_lat                               float                      Latitude of the location (or ``null``)
-geo_lon                               float                      Longitude of the location (or ``null``)
-has_subevents                         boolean                    ``true`` if the event series feature is active for this
+has_subevents                         boolean                    ``True`` if the event series feature is active for this
                                                                  event. Cannot change after event is created.
-meta_data                             object                     Values set for organizer-specific meta data parameters.
+meta_data                             dict                       Values set for organizer-specific meta data parameters.
 plugins                               list                       A list of package names of the enabled plugins for this
                                                                  event.
-seating_plan                          integer                    If reserved seating is in use, the ID of a seating
-                                                                 plan. Otherwise ``null``.
-seat_category_mapping                 object                     An object mapping categories of the seating plan
-                                                                 (strings) to items in the event (integers or ``null``).
 ===================================== ========================== =======================================================
 
 
@@ -62,25 +50,9 @@ seat_category_mapping                 object                     An object mappi
 
    The ``testmode`` attribute has been added.
 
-.. versionchanged:: 2.8
-
-    When cloning events, the ``testmode`` attribute will now be cloned, too.
-
-.. versionchanged:: 3.0
-
-   The attributes ``seating_plan`` and ``seat_category_mapping`` have been added.
-
-.. versionchanged:: 3.3
-
-   The attributes ``geo_lat`` and ``geo_lon`` have been added.
-
 Endpoints
 ---------
 
-.. versionchanged:: 3.3
-
-    The events resource can now be filtered by meta data attributes.
-
 .. http:get:: /api/v1/organizers/(organizer)/events/
 
    Returns a list of all events within a given organizer the authenticated user/token has access to.
@@ -121,12 +93,8 @@ Endpoints
             "presale_start": null,
             "presale_end": null,
             "location": null,
-            "geo_lat": null,
-            "geo_lon": null,
             "has_subevents": false,
             "meta_data": {},
-            "seating_plan": null,
-            "seat_category_mapping": {},
             "plugins": [
               "pretix.plugins.banktransfer"
               "pretix.plugins.stripe"
@@ -144,13 +112,6 @@ Endpoints
    :query is_future: If set to ``true`` (``false``), only events that happen currently or in the future are (not) returned. Event series are never (always) returned.
    :query is_past: If set to ``true`` (``false``), only events that are over are (not) returned. Event series are never (always) returned.
    :query ends_after: If set to a date and time, only events that happen during of after the given time are returned. Event series are never returned.
-   :query string ordering: Manually set the ordering of results. Valid fields to be used are ``date_from`` and
-                           ``slug``. Keep in mind that ``date_from`` of event series does not really tell you anything.
-                           Default: ``slug``.
-   :query array attr[meta_data_key]: By providing the key and value of a meta data attribute, the list of events will
-        only contain the events matching the set criteria. Providing ``?attr[Format]=Seminar`` would return only those
-        events having set their ``Format`` meta data to ``Seminar``, ``?attr[Format]=`` only those, that have no value
-        set. Please note that this filter will respect default values set on organizer level.
    :param organizer: The ``slug`` field of a valid organizer
    :statuscode 200: no error
    :statuscode 401: Authentication failure
@@ -191,11 +152,7 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
-        "geo_lat": null,
-        "geo_lon": null,
         "has_subevents": false,
-        "seating_plan": null,
-        "seat_category_mapping": {},
         "meta_data": {},
         "plugins": [
           "pretix.plugins.banktransfer"
@@ -227,7 +184,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content-Type: application/json
+      Content: application/json
 
       {
         "name": {"en": "Sample Conference"},
@@ -241,11 +198,7 @@ Endpoints
         "is_public": false,
         "presale_start": null,
         "presale_end": null,
-        "seating_plan": null,
-        "seat_category_mapping": {},
         "location": null,
-        "geo_lat": null,
-        "geo_lon": null,
         "has_subevents": false,
         "meta_data": {},
         "plugins": [
@@ -275,10 +228,6 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
-        "geo_lat": null,
-        "geo_lon": null,
-        "seating_plan": null,
-        "seat_category_mapping": {},
         "has_subevents": false,
         "meta_data": {},
         "plugins": [
@@ -296,11 +245,11 @@ Endpoints
 
 .. http:post:: /api/v1/organizers/(organizer)/events/(event)/clone/
 
-   Creates a new event with properties as set in the request body. The properties that are copied are: ``is_public``,
-   ``testmode``, ``has_subevents``, settings, plugin settings, items, variations, add-ons, quotas, categories, tax rules, questions.
+   Creates a new event with properties as set in the request body. The properties that are copied are: 'is_public',
+   settings, plugin settings, items, variations, add-ons, quotas, categories, tax rules, questions.
 
-   If the ``plugins``, ``has_subevents`` and/or ``is_public`` fields are present in the post body this will determine their
-   value. Otherwise their value will be copied from the existing event.
+   If the 'plugins' and/or 'is_public' fields are present in the post body this will determine their value. Otherwise
+   their value will be copied from the existing event.
 
    Please note that you can only copy from events under the same organizer.
 
@@ -313,7 +262,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/clone/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content-Type: application/json
+      Content: application/json
 
       {
         "name": {"en": "Sample Conference"},
@@ -328,10 +277,6 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
-        "geo_lat": null,
-        "geo_lon": null,
-        "seating_plan": null,
-        "seat_category_mapping": {},
         "has_subevents": false,
         "meta_data": {},
         "plugins": [
@@ -361,11 +306,7 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
-        "geo_lat": null,
-        "geo_lon": null,
         "has_subevents": false,
-        "seating_plan": null,
-        "seat_category_mapping": {},
         "meta_data": {},
         "plugins": [
           "pretix.plugins.stripe",
@@ -394,7 +335,7 @@ Endpoints
       PATCH /api/v1/organizers/bigevents/events/sampleconf/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content-Type: application/json
+      Content: application/json
 
       {
         "plugins": [
@@ -426,11 +367,7 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
-        "geo_lat": null,
-        "geo_lon": null,
         "has_subevents": false,
-        "seating_plan": null,
-        "seat_category_mapping": {},
         "meta_data": {},
         "plugins": [
           "pretix.plugins.banktransfer",
@@ -442,7 +379,7 @@ Endpoints
 
    :param organizer: The ``slug`` field of the organizer of the event to update
    :param event: The ``slug`` field of the event to update
-   :statuscode 200: no error
+   :statuscode 201: no error
    :statuscode 400: The event could not be created due to invalid submitted data.
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.

doc/api/resources/giftcards.rst

@@ -1,229 +0,0 @@
-.. _`rest-giftcards`:
-
-Gift cards
-==========
-
-Resource description
---------------------
-
-The gift card resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the gift card
-secret                                string                     Gift card code (can not be modified later)
-value                                 money (string)             Current gift card value
-currency                              string                     Currency of the value (can not be modified later)
-testmode                              boolean                    Whether this is a test gift card
-===================================== ========================== =======================================================
-
-Endpoints
----------
-
-.. http:get:: /api/v1/organizers/(organizer)/giftcards/
-
-   Returns a list of all gift cards issued by a given organizer.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/giftcards/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "count": 1,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id": 1,
-            "secret": "HLBYVELFRC77NCQY",
-            "currency": "EUR",
-            "testmode": false,
-            "value": "13.37"
-          }
-        ]
-      }
-
-   :query integer page: The page number in case of a multi-page result set, default is 1
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to view this resource.
-
-.. http:get:: /api/v1/organizers/(organizer)/giftcards/(id)/
-
-   Returns information on one gift card, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/giftcards/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "secret": "HLBYVELFRC77NCQY",
-        "currency": "EUR",
-        "testmode": false,
-        "value": "13.37"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param id: The ``id`` field of the gift card to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/organizers/(organizer)/giftcards/
-
-   Creates a new gift card
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/giftcards/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "secret": "HLBYVELFRC77NCQY",
-        "currency": "EUR",
-        "value": "13.37"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "secret": "HLBYVELFRC77NCQY",
-        "testmode": false,
-        "currency": "EUR",
-        "value": "13.37"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to create a gift card for
-   :statuscode 201: no error
-   :statuscode 400: The gift card could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.
-
-.. http:patch:: /api/v1/organizers/(organizer)/giftcards/(id)/
-
-   Update a gift card. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
-   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
-   want to change.
-
-   You can change all fields of the resource except the ``id``, ``secret``, ``testmode``, and ``currency`` fields. Be
-   careful when modifying the ``value`` field to avoid race conditions. We recommend to use the ``transact`` method
-   described below.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/giftcards/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "value": "14.00"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "secret": "HLBYVELFRC77NCQY",
-        "testmode": false,
-        "currency": "EUR",
-        "value": "14.00"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param id: The ``id`` field of the gift card to modify
-   :statuscode 200: no error
-   :statuscode 400: The gift card could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to change this resource.
-
-.. http:post:: /api/v1/organizers/(organizer)/giftcards/(id)/transact/
-
-   Atomically change the value of a gift card. A positive amount will increase the value of the gift card,
-   a negative amount will decrease it.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/giftcards/1/transact/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "value": "2.00"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "secret": "HLBYVELFRC77NCQY",
-        "currency": "EUR",
-        "testmode": false,
-        "value": "15.37"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param id: The ``id`` field of the gift card to modify
-   :statuscode 200: no error
-   :statuscode 400: The gift card could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to change this resource.

doc/api/resources/index.rst

@@ -11,7 +11,6 @@ Resources and endpoints
    categories
    items
    item_variations
-   item_bundles
    item_add-ons
    questions
    question_options
@@ -21,8 +20,5 @@ Resources and endpoints
    vouchers
    checkinlists
    waitinglist
-   giftcards
    carts
    webhooks
-   seatingplans
-   billing_invoices

doc/api/resources/invoices.rst

@@ -13,7 +13,7 @@ Field                                 Type                       Description
 ===================================== ========================== =======================================================
 number                                string                     Invoice number (with prefix)
 order                                 string                     Order code of the order this invoice belongs to
-is_cancellation                       boolean                    ``true``, if this invoice is the cancellation of a
+is_cancellation                       boolean                    ``True``, if this invoice is the cancellation of a
                                                                  different invoice.
 invoice_from                          string                     Sender address
 invoice_to                            string                     Receiver address
@@ -28,7 +28,6 @@ payment_provider_text                 string                     Text to be prin
                                                                  payment information
 footer_text                           string                     Text to be printed in the page footer area
 lines                                 list of objects            The actual invoice contents
-├ position                            integer                    Number of the line within an invoice.
 ├ description                         string                     Text representing the invoice line (e.g. product name)
 ├ gross_value                         money (string)             Price including taxes
 ├ tax_value                           money (string)             Tax amount included
@@ -64,11 +63,6 @@ internal_reference                    string                     Customer's refe
    The attribute ``internal_reference`` has been added.
 
 
-.. versionchanged:: 3.4
-
-   The attribute ``lines.number`` has been added.
-
-
 Endpoints
 ---------
 
@@ -113,7 +107,6 @@ Endpoints
             "footer_text": "Big Events LLC - Registration No. 123456 - VAT ID: EU0987654321",
             "lines": [
               {
-                "position": 1,
                 "description": "Budget Ticket",
                 "gross_value": "23.00",
                 "tax_value": "0.00",
@@ -178,7 +171,6 @@ Endpoints
         "footer_text": "Big Events LLC - Registration No. 123456 - VAT ID: EU0987654321",
         "lines": [
           {
-            "position": 1,
             "description": "Budget Ticket",
             "gross_value": "23.00",
             "tax_value": "0.00",

doc/api/resources/item_add-ons.rst

@@ -134,7 +134,7 @@ Endpoints
       POST /api/v1/organizers/(organizer)/events/(event)/items/(item)/addons/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content-Type: application/json
+      Content: application/json
 
       {
         "addon_category": 1,
@@ -189,7 +189,7 @@ Endpoints
 
       {
         "min_count": 0,
-        "max_count": 10
+        "max_count": 10,
       }
 
    **Example response**:

doc/api/resources/item_bundles.rst

@@ -1,242 +0,0 @@
-Item bundles
-============
-
-Resource description
---------------------
-
-With bundles, you can specify products that are included within other products. There are two premier use cases of this:
-
-* Package discounts. For example, you could offer a discounted package that includes three tickets but can only be
-  bought as a whole. With a bundle including three times the usual product, the package will automatically pull three
-  sub-items into the cart, making sure of correct quota calculation and issuance of the correct number of tickets.
-
-* Tax splitting. For example, if your conference ticket includes a part that is subject to different taxation and that
-  you need to put on the invoice separately. When you putting a "designated price" on a bundled sub-item, pretix will
-  use that price to show a split taxation.
-
-The bundles resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the bundling configuration
-bundled_item                          integer                    Internal ID of the item that is included.
-bundled_variation                     integer                    Internal ID of the variation of the item (or ``null``).
-count                                 integer                    Number of items included
-designated_price                      money (string)             Designated price of the bundled product. This will be
-                                                                 used to split the price of the base item e.g. for mixed
-                                                                 taxation. This is not added to the price.
-===================================== ========================== =======================================================
-
-.. versionchanged:: 2.6
-
-   This resource has been added.
-
-Endpoints
----------
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/items/(item)/bundles/
-
-   Returns a list of all bundles for a given item.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/items/11/bundles/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "count": 2,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id": 3,
-            "bundled_item": 3,
-            "bundled_variation": null,
-            "count": 1,
-            "designated_price": "0.00"
-          },
-          {
-            "id": 3,
-            "bundled_item": 3,
-            "bundled_variation": null,
-            "count": 2,
-            "designated_price": "1.50"
-          }
-        ]
-      }
-
-   :query integer page: The page number in case of a multi-page result set, default is 1
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param item: The ``id`` field of the item to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/item does not exist **or** you have no permission to view this resource.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/items/(item)/bundles/(id)/
-
-   Returns information on one bundle configuration, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/items/1/bundles/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 3,
-        "bundled_item": 3,
-        "bundled_variation": null,
-        "count": 2,
-        "designated_price": "1.50"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param item: The ``id`` field of the item to fetch
-   :param id: The ``id`` field of the bundle to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/organizers/bigevents/events/sampleconf/items/1/bundles/
-
-   Creates a new bundle configuration
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/(organizer)/events/(event)/items/(item)/bundles/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "bundled_item": 3,
-        "bundled_variation": null,
-        "count": 2,
-        "designated_price": "1.50"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 3,
-        "bundled_item": 3,
-        "bundled_variation": null,
-        "count": 2,
-        "designated_price": "1.50"
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event/item to create a bundle-configuration for
-   :param event: The ``slug`` field of the event to create a bundle configuration for
-   :param item: The ``id`` field of the item to create a bundle configuration for
-   :statuscode 201: no error
-   :statuscode 400: The bundle could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/items/(item)/bundles/(id)/
-
-   Update a bundle configuration. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all
-   fields of the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields
-   that you want to change.
-
-   You can change all fields of the resource except the ``id`` field.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/items/1/bundles/3/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "count": 2
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 3,
-        "bundled_item": 3,
-        "bundled_variation": null,
-        "count": 2,
-        "designated_price": "1.50"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param item: The ``id`` field of the item to modify
-   :param id: The ``id`` field of the bundle to modify
-   :statuscode 200: no error
-   :statuscode 400: The bundle configuration could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/items/(id)/bundles/(id)/
-
-   Delete a bundle configuration.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/items/1/bundles/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the item to modify
-   :param id: The ``id`` field of the bundle to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.

doc/api/resources/item_variations.rst

@@ -18,18 +18,12 @@ default_price                         money (string)             The price set d
 price                                 money (string)             The price used for this variation. This is either the
                                                                  same as ``default_price`` if that value is set or equal
                                                                  to the item's ``default_price`` (read-only).
-original_price                        money (string)             An original price, shown for comparison, not used
-                                                                 for price calculations (or ``null``).
-active                                boolean                    If ``false``, this variation will not be sold or shown.
+active                                boolean                    If ``False``, this variation will not be sold or shown.
 description                           multi-lingual string       A public description of the variation. May contain
                                                                  Markdown syntax or can be ``null``.
 position                              integer                    An integer, used for sorting
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 2.7
-
-   The attribute ``original_price`` has been added.
-
 .. versionchanged:: 1.12
 
    This resource has been added.
@@ -73,8 +67,7 @@ Endpoints
             },
             "position": 0,
             "default_price": "223.00",
-            "price": 223.0,
-            "original_price": null,
+            "price": 223.0
           },
           {
             "id": 3,
@@ -127,7 +120,6 @@ Endpoints
         },
         "default_price": "10.00",
         "price": "10.00",
-        "original_price": null,
         "active": true,
         "description": null,
         "position": 0
@@ -152,7 +144,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/items/1/variations/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content-Type: application/json
+      Content: application/json
 
       {
         "value": {"en": "Student"},
@@ -175,7 +167,6 @@ Endpoints
         "value": {"en": "Student"},
         "default_price": "10.00",
         "price": "10.00",
-        "original_price": null,
         "active": true,
         "description": null,
         "position": 0
@@ -225,7 +216,6 @@ Endpoints
         "value": {"en": "Student"},
         "default_price": "10.00",
         "price": "10.00",
-        "original_price": null,
         "active": false,
         "description": null,
         "position": 1

doc/api/resources/items.rst

@@ -21,38 +21,34 @@ default_price                         money (string)             The item price
                                                                  overwritten by variations or other options.
 category                              integer                    The ID of the category this item belongs to
                                                                  (or ``null``).
-active                                boolean                    If ``false``, the item is hidden from all public lists
+active                                boolean                    If ``False``, the item is hidden from all public lists
                                                                  and will not be sold.
 description                           multi-lingual string       A public description of the item. May contain Markdown
                                                                  syntax or can be ``null``.
-free_price                            boolean                    If ``true``, customers can change the price at which
+free_price                            boolean                    If ``True``, customers can change the price at which
                                                                  they buy the product (however, the price can't be set
                                                                  lower than the price defined by ``default_price`` or
                                                                  otherwise).
-tax_rate                              decimal (string)           The VAT rate to be applied for this item (read-only,
-                                                                 set through ``tax_rule``).
+tax_rate                              decimal (string)           The VAT rate to be applied for this item.
 tax_rule                              integer                    The internal ID of the applied tax rule (or ``null``).
-admission                             boolean                    ``true`` for items that grant admission to the event
-                                                                 (such as primary tickets) and ``false`` for others
+admission                             boolean                    ``True`` for items that grant admission to the event
+                                                                 (such as primary tickets) and ``False`` for others
                                                                  (such as add-ons or merchandise).
 position                              integer                    An integer, used for sorting
 picture                               string                     A product picture to be displayed in the shop
-                                                                 (read-only, can be ``null``).
+                                                                 (read-only).
 sales_channels                        list of strings            Sales channels this product is available on, such as
                                                                  ``"web"`` or ``"resellers"``. Defaults to ``["web"]``.
 available_from                        datetime                   The first date time at which this item can be bought
                                                                  (or ``null``).
 available_until                       datetime                   The last date time at which this item can be bought
                                                                  (or ``null``).
-hidden_if_available                   integer                    The internal ID of a quota object, or ``null``. If
-                                                                 set, this item won't be shown publicly as long as this
-                                                                 quota is available.
-require_voucher                       boolean                    If ``true``, this item can only be bought using a
+require_voucher                       boolean                    If ``True``, this item can only be bought using a
                                                                  voucher that is specifically assigned to this item.
-hide_without_voucher                  boolean                    If ``true``, this item is only shown during the voucher
+hide_without_voucher                  boolean                    If ``True``, this item is only shown during the voucher
                                                                  redemption process, but not in the normal shop
                                                                  frontend.
-allow_cancel                          boolean                    If ``false``, customers cannot cancel orders containing
+allow_cancel                          boolean                    If ``False``, customers cannot cancel orders containing
                                                                  this item.
 min_per_order                         integer                    This product can only be bought if it is included at
                                                                  least this many times in the order (or ``null`` for no
@@ -60,26 +56,20 @@ min_per_order                         integer                    This product ca
 max_per_order                         integer                    This product can only be bought if it is included at
                                                                  most this many times in the order (or ``null`` for no
                                                                  limitation).
-checkin_attention                     boolean                    If ``true``, the check-in app should show a warning
+checkin_attention                     boolean                    If ``True``, the check-in app should show a warning
                                                                  that this ticket requires special attention if such
                                                                  a product is being scanned.
 original_price                        money (string)             An original price, shown for comparison, not used
-                                                                 for price calculations (or ``null``).
-require_approval                      boolean                    If ``true``, orders with this product will need to be
+                                                                 for price calculations.
+require_approval                      boolean                    If ``True``, orders with this product will need to be
                                                                  approved by the event organizer before they can be
                                                                  paid.
-require_bundling                      boolean                    If ``true``, this item is only available as part of bundles.
-generate_tickets                      boolean                    If ``false``, tickets are never generated for this
-                                                                 product, regardless of other settings. If ``true``,
+generate_tickets                      boolean                    If ``False``, tickets are never generated for this
+                                                                 product, regardless of other settings. If ``True``,
                                                                  tickets are generated even if this is a
                                                                  non-admission or add-on product, regardless of event
                                                                  settings. If this is ``null``, regular ticketing
                                                                  rules apply.
-allow_waitinglist                     boolean                    If ``false``, no waiting list will be shown for this
-                                                                 product when it is sold out.
-issue_giftcard                        boolean                    If ``true``, buying this product will yield a gift card.
-show_quota_left                       boolean                    Publicly show how many tickets are still available.
-                                                                 If this is ``null``, the event default is used.
 has_variations                        boolean                    Shows whether or not this item has variations.
 variations                            list of objects            A list with one object for each variation of this item.
                                                                  Can be empty. Only writable during creation,
@@ -90,9 +80,7 @@ variations                            list of objects            A list with one
 ├ price                               money (string)             The price used for this variation. This is either the
                                                                  same as ``default_price`` if that value is set or equal
                                                                  to the item's ``default_price``.
-├ original_price                      money (string)             An original price, shown for comparison, not used
-                                                                 for price calculations (or ``null``).
-├ active                              boolean                    If ``false``, this variation will not be sold or shown.
+├ active                              boolean                    If ``False``, this variation will not be sold or shown.
 ├ description                         multi-lingual string       A public description of the variation. May contain
                                                                  Markdown syntax or can be ``null``.
 └ position                            integer                    An integer, used for sorting
@@ -103,23 +91,10 @@ addons                                list of objects            Definition of a
                                                                  chosen from.
 ├ min_count                           integer                    The minimal number of add-ons that need to be chosen.
 ├ max_count                           integer                    The maximal number of add-ons that can be chosen.
-├ position                            integer                    An integer, used for sorting
+└ position                            integer                    An integer, used for sorting
 └ price_included                      boolean                    Adding this add-on to the item is free
-bundles                               list of objects            Definition of bundles that are included in this item.
-                                                                 Only writable during creation,
-                                                                 use separate endpoint to modify this later.
-├ bundled_item                        integer                    Internal ID of the item that is included.
-├ bundled_variation                   integer                    Internal ID of the variation of the item (or ``null``).
-├ count                               integer                    Number of items included
-└ designated_price                    money (string)             Designated price of the bundled product. This will be
-                                                                 used to split the price of the base item e.g. for mixed
-                                                                 taxation. This is not added to the price.
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 2.7
-
-   The attribute ``original_price`` has been added for ``variations``.
-
 .. versionchanged:: 1.7
 
    The attribute ``tax_rule`` has been added. ``tax_rate`` is kept for compatibility. The attribute
@@ -146,24 +121,15 @@ bundles                               list of objects            Definition of b
 
    The ``generate_tickets`` attribute has been added.
 
-.. versionchanged:: 2.6
-
-   The ``bundles`` and ``require_bundling`` attributes have been added.
-
-.. versionchanged:: 3.0
-
-   The ``show_quota_left``, ``allow_waitinglist``, and ``hidden_if_available`` attributes have been added.
-
 Notes
 -----
-
 Please note that an item either always has variations or never has. Once created with variations the item can never
 change to an item without and vice versa. To create an item with variations ensure that you POST an item with at least
 one variation.
 
-Also note that ``variations``, ``bundles``, and  ``addons`` are only supported on ``POST``. To update/delete variations,
-bundles, and add-ons please use the dedicated nested endpoints. By design this endpoint does not support ``PATCH`` and ``PUT``
-with nested ``variations``, ``bundles`` and/or ``addons``.
+Also note that ``variations`` and ``addons`` are only supported on ``POST``. To update/delete variations and add-ons please
+use the dedicated nested endpoints. By design this endpoint does not support ``PATCH`` and ``PUT`` with nested
+``variations`` and/or ``addons``.
 
 Endpoints
 ---------
@@ -207,12 +173,10 @@ Endpoints
             "tax_rate": "0.00",
             "tax_rule": 1,
             "admission": false,
-            "issue_giftcard": false,
             "position": 0,
             "picture": null,
             "available_from": null,
             "available_until": null,
-            "hidden_if_available": null,
             "require_voucher": false,
             "hide_without_voucher": false,
             "allow_cancel": true,
@@ -221,16 +185,12 @@ Endpoints
             "checkin_attention": false,
             "has_variations": false,
             "generate_tickets": null,
-            "allow_waitinglist": true,
-            "show_quota_left": null,
             "require_approval": false,
-            "require_bundling": false,
             "variations": [
               {
                  "value": {"en": "Student"},
                  "default_price": "10.00",
                  "price": "10.00",
-                 "original_price": null,
                  "active": true,
                  "description": null,
                  "position": 0
@@ -239,14 +199,12 @@ Endpoints
                  "value": {"en": "Regular"},
                  "default_price": null,
                  "price": "23.00",
-                 "original_price": null,
                  "active": true,
                  "description": null,
                  "position": 1
               }
             ],
-            "addons": [],
-            "bundles": []
+            "addons": []
           }
         ]
       }
@@ -302,30 +260,24 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
-        "issue_giftcard": false,
         "position": 0,
         "picture": null,
         "available_from": null,
         "available_until": null,
-        "hidden_if_available": null,
         "require_voucher": false,
         "hide_without_voucher": false,
         "allow_cancel": true,
         "generate_tickets": null,
-        "allow_waitinglist": true,
-        "show_quota_left": null,
         "min_per_order": null,
         "max_per_order": null,
         "checkin_attention": false,
         "has_variations": false,
         "require_approval": false,
-        "require_bundling": false,
         "variations": [
           {
              "value": {"en": "Student"},
              "default_price": "10.00",
              "price": "10.00",
-             "original_price": null,
              "active": true,
              "description": null,
              "position": 0
@@ -334,14 +286,12 @@ Endpoints
              "value": {"en": "Regular"},
              "default_price": null,
              "price": "23.00",
-             "original_price": null,
              "active": true,
              "description": null,
              "position": 1
           }
         ],
-        "addons": [],
-        "bundles": []
+        "addons": []
       }
 
    :param organizer: The ``slug`` field of the organizer to fetch
@@ -362,7 +312,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/items/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content-Type: application/json
+      Content: application/json
 
       {
         "id": 1,
@@ -378,29 +328,23 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
-        "issue_giftcard": false,
         "position": 0,
         "picture": null,
         "available_from": null,
         "available_until": null,
-        "hidden_if_available": null,
         "require_voucher": false,
         "hide_without_voucher": false,
         "allow_cancel": true,
         "generate_tickets": null,
-        "allow_waitinglist": true,
-        "show_quota_left": null,
         "min_per_order": null,
         "max_per_order": null,
         "checkin_attention": false,
         "require_approval": false,
-        "require_bundling": false,
         "variations": [
           {
              "value": {"en": "Student"},
              "default_price": "10.00",
              "price": "10.00",
-             "original_price": null,
              "active": true,
              "description": null,
              "position": 0
@@ -409,14 +353,12 @@ Endpoints
              "value": {"en": "Regular"},
              "default_price": null,
              "price": "23.00",
-             "original_price": null,
              "active": true,
              "description": null,
              "position": 1
           }
         ],
-        "addons": [],
-        "bundles": []
+        "addons": []
       }
 
    **Example response**:
@@ -441,30 +383,24 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
-        "issue_giftcard": false,
         "position": 0,
         "picture": null,
         "available_from": null,
         "available_until": null,
-        "hidden_if_available": null,
         "require_voucher": false,
         "hide_without_voucher": false,
         "allow_cancel": true,
         "min_per_order": null,
         "max_per_order": null,
         "generate_tickets": null,
-        "allow_waitinglist": true,
-        "show_quota_left": null,
         "checkin_attention": false,
         "has_variations": true,
         "require_approval": false,
-        "require_bundling": false,
         "variations": [
           {
              "value": {"en": "Student"},
              "default_price": "10.00",
              "price": "10.00",
-             "original_price": null,
              "active": true,
              "description": null,
              "position": 0
@@ -473,14 +409,12 @@ Endpoints
              "value": {"en": "Regular"},
              "default_price": null,
              "price": "23.00",
-             "original_price": null,
              "active": true,
              "description": null,
              "position": 1
           }
         ],
-        "addons": [],
-        "bundles": []
+        "addons": []
       }
 
    :param organizer: The ``slug`` field of the organizer of the event to create an item for
@@ -536,30 +470,24 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
-        "issue_giftcard": false,
         "position": 0,
         "picture": null,
         "available_from": null,
         "available_until": null,
-        "hidden_if_available": null,
         "require_voucher": false,
         "hide_without_voucher": false,
         "generate_tickets": null,
-        "allow_waitinglist": true,
-        "show_quota_left": null,
         "allow_cancel": true,
         "min_per_order": null,
         "max_per_order": null,
         "checkin_attention": false,
         "has_variations": true,
         "require_approval": false,
-        "require_bundling": false,
         "variations": [
           {
              "value": {"en": "Student"},
              "default_price": "10.00",
              "price": "10.00",
-             "original_price": null,
              "active": true,
              "description": null,
              "position": 0
@@ -568,14 +496,12 @@ Endpoints
              "value": {"en": "Regular"},
              "default_price": null,
              "price": "23.00",
-             "original_price": null,
              "active": true,
              "description": null,
              "position": 1
           }
         ],
-        "addons": [],
-        "bundles": []
+        "addons": []
       }
 
    :param organizer: The ``slug`` field of the organizer to modify

doc/api/resources/orders.rst

@@ -26,7 +26,7 @@ status                                string                     Order status, o
                                                                  * ``p`` – paid
                                                                  * ``e`` – expired
                                                                  * ``c`` – canceled
-testmode                              boolean                    If ``true``, this order was created when the event was in
+testmode                              boolean                    If ``True``, this order was created when the event was in
                                                                  test mode. Only orders in test mode can be deleted.
 secret                                string                     The secret contained in the link sent to the customer
 email                                 string                     The customer email address
@@ -39,13 +39,13 @@ payment_date                          date                       **DEPRECATED AN
 payment_provider                      string                     **DEPRECATED AND INACCURATE** Payment provider used for this order
 total                                 money (string)             Total value of this order
 comment                               string                     Internal comment on this order
-checkin_attention                     boolean                    If ``true``, the check-in app should show a warning
+checkin_attention                     boolean                    If ``True``, the check-in app should show a warning
                                                                  that this ticket requires special attention if a ticket
                                                                  of this order is scanned.
 invoice_address                       object                     Invoice address information (can be ``null``)
 ├ last_modified                       datetime                   Last modification date of the address
 ├ company                             string                     Customer company name
-├ is_business                         boolean                    Business or individual customers (always ``false``
+├ is_business                         boolean                    Business or individual customers (always ``False``
                                                                  for orders created before pretix 1.7, do not rely on
                                                                  it).
 ├ name                                string                     Customer name
@@ -53,12 +53,10 @@ invoice_address                       object                     Invoice address
 ├ street                              string                     Customer street
 ├ zipcode                             string                     Customer ZIP code
 ├ city                                string                     Customer city
-├ country                             string                     Customer country code
-├ state                               string                     Customer state (ISO 3166-2 code). Only supported in
-                                                                 AU, BR, CA, CN, MY, MX, and US.
+├ country                             string                     Customer country
 ├ internal_reference                  string                     Customer's internal reference to be printed on the invoice
 ├ vat_id                              string                     Customer VAT ID
-└ vat_id_validated                    string                     ``true``, if the VAT ID has been validated against the
+└ vat_id_validated                    string                     ``True``, if the VAT ID has been validated against the
                                                                  EU VAT service and validation was successful. This only
                                                                  happens in rare cases.
 positions                             list of objects            List of non-canceled order positions (see below)
@@ -80,11 +78,10 @@ downloads                             list of objects            List of ticket
                                                                  download options.
 ├ output                              string                     Ticket output provider (e.g. ``pdf``, ``passbook``)
 └ url                                 string                     Download URL
-require_approval                      boolean                    If ``true`` and the order is pending, this order
+require_approval                      boolean                    If ``True`` and the order is pending, this order
                                                                  needs approval by an organizer before it can
-                                                                 continue. If ``true`` and the order is canceled,
+                                                                 continue. If ``True`` and the order is canceled,
                                                                  this order has been denied by the event organizer.
-url                                   string                     The full URL to the order confirmation page
 payments                              list of objects            List of payment processes (see below)
 refunds                               list of objects            List of refund processes (see below)
 last_modified                         datetime                   Last modification of this object
@@ -131,21 +128,15 @@ last_modified                         datetime                   Last modificati
 
    The ``sales_channel`` attribute has been added.
 
-.. versionchanged:: 2.4
+.. versionchanged:: 2.4:
 
    ``order.status`` can no longer be ``r``, ``…/mark_canceled/`` now accepts a ``cancellation_fee`` parameter and
    ``…/mark_refunded/`` has been deprecated.
 
-.. versionchanged:: 2.5
+.. versionchanged:: 2.5:
 
    The ``testmode`` attribute has been added and ``DELETE`` has been implemented for orders.
 
-.. versionchanged:: 3.1
-
-   The ``invoice_address.state`` and ``url`` attributes have been added. When creating orders through the API,
-   vouchers are now supported and many fields are now optional.
-
-
 .. _order-position-resource:
 
 Order position resource
@@ -175,8 +166,7 @@ subevent                              integer                    ID of the date
 pseudonymization_id                   string                     A random ID, e.g. for use in lead scanning apps
 checkins                              list of objects            List of check-ins with this ticket
 ├ list                                integer                    Internal ID of the check-in list
-├ datetime                            datetime                   Time of check-in
-└ auto_checked_in                     boolean                    Indicates if this check-in been performed automatically by the system
+└ datetime                            datetime                   Time of check-in
 downloads                             list of objects            List of ticket download options
 ├ output                              string                     Ticket output provider (e.g. ``pdf``, ``passbook``)
 └ url                                 string                     Download URL
@@ -186,10 +176,6 @@ answers                               list of objects            Answers to user
 ├ question_identifier                 string                     The question's ``identifier`` field
 ├ options                             list of integers           Internal IDs of selected option(s)s (only for choice types)
 └ option_identifiers                  list of strings            The ``identifier`` fields of the selected option(s)s
-seat                                  objects                    The assigned seat. Can be ``null``.
-├ id                                  integer                    Internal ID of the seat instance
-├ name                                string                     Human-readable seat name
-└ seat_guid                           string                     Identifier of the seat within the seating plan
 pdf_data                              object                     Data object required for ticket PDF generation. By default,
                                                                  this field is missing. It will be added only if you add the
                                                                  ``pdf_data=true`` query parameter to your request.
@@ -211,19 +197,6 @@ pdf_data                              object                     Data object req
 
   The attributes ``pseudonymization_id`` and ``pdf_data`` have been added.
 
-.. versionchanged:: 3.0
-
-  The attribute ``seat`` has been added.
-
-.. versionchanged:: 3.2
-
-  The value ``auto_checked_in`` has been added to the ``checkins``-attribute.
-
-.. versionchanged:: 3.3
-
-  The ``url`` of a ticket ``download`` can now also return a ``text/uri-list`` instead of a file. See
-  :ref:`order-position-ticket-download` for details.
-
 .. _order-payment-resource:
 
 Order payment resource
@@ -240,27 +213,13 @@ amount                                money (string)             Payment amount
 created                               datetime                   Date and time of creation of this payment
 payment_date                          datetime                   Date and time of completion of this payment (or ``null``)
 provider                              string                     Identification string of the payment provider
-payment_url                           string                     The URL where an user can continue with the payment (or ``null``)
-details                               object                     Payment-specific information. This is a dictionary
-                                                                 with various fields that can be different between
-                                                                 payment providers, versions, payment states, etc. If
-                                                                 you read this field, you always need to be able to
-                                                                 deal with situations where values that you expect are
-                                                                 missing. Mostly, the field contains various IDs that
-                                                                 can be used for matching with other systems. If a
-                                                                 payment provider does not implement this feature,
-                                                                 the object is empty.
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 2.0
 
   This resource has been added.
 
-.. versionchanged:: 3.1
-
-  The attributes ``payment_url`` and ``details`` have been added.
-
-.. _order-refund-resource:
+.. _order-payment-resource:
 
 Order refund resource
 ---------------------
@@ -321,7 +280,6 @@ List of all orders
             "status": "p",
             "testmode": false,
             "secret": "k24fiuwvu8kxz3y1",
-            "url": "https://test.pretix.eu/dummy/dummy/order/ABC12/k24fiuwvu8kxz3y1/",
             "email": "tester@example.org",
             "locale": "en",
             "sales_channel": "web",
@@ -337,18 +295,17 @@ List of all orders
             "require_approval": false,
             "invoice_address": {
                 "last_modified": "2017-12-01T10:00:00Z",
-                "is_business": true,
+                "is_business": True,
                 "company": "Sample company",
                 "name": "John Doe",
                 "name_parts": {"full_name": "John Doe"},
                 "street": "Test street 12",
                 "zipcode": "12345",
                 "city": "Testington",
-                "country": "DE",
-                "state": "",
+                "country": "Testikistan",
                 "internal_reference": "",
                 "vat_id": "EU123456789",
-                "vat_id_validated": false
+                "vat_id_validated": False
             },
             "positions": [
               {
@@ -371,12 +328,10 @@ List of all orders
                 "addon_to": null,
                 "subevent": null,
                 "pseudonymization_id": "MQLJvANO3B",
-                "seat": null,
                 "checkins": [
                   {
                     "list": 44,
-                    "datetime": "2017-12-25T12:45:23Z",
-                    "auto_checked_in": false
+                    "datetime": "2017-12-25T12:45:23Z"
                   }
                 ],
                 "answers": [
@@ -409,8 +364,6 @@ List of all orders
                 "amount": "23.00",
                 "created": "2017-12-01T10:00:00Z",
                 "payment_date": "2017-12-04T12:13:12Z",
-                "payment_url": null,
-                "details": {},
                 "provider": "banktransfer"
               }
             ],
@@ -420,8 +373,8 @@ List of all orders
       }
 
    :query integer page: The page number in case of a multi-page result set, default is 1
-   :query string ordering: Manually set the ordering of results. Valid fields to be used are ``datetime``, ``code``,
-                           ``last_modified``, and ``status``. Default: ``datetime``
+   :query string ordering: Manually set the ordering of results. Valid fields to be used are ``datetime``, ``code`` and
+                           ``status``. Default: ``datetime``
    :query string code: Only return orders that match the given order code
    :query string status: Only return orders in the given order status (see above)
    :query boolean testmode: Only return orders with ``testmode`` set to ``true`` or ``false``
@@ -432,7 +385,6 @@ List of all orders
    :query datetime modified_since: Only return orders that have changed since the given date. Be careful: We only
        recommend using this in combination with ``testmode=false``, since test mode orders can vanish at any time and
        you will not notice it using this method.
-   :query datetime created_since: Only return orders that have been created since the given date.
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
    :resheader X-Page-Generated: The server time at the beginning of the operation. If you're using this API to fetch
@@ -469,7 +421,6 @@ Fetching individual orders
         "status": "p",
         "testmode": false,
         "secret": "k24fiuwvu8kxz3y1",
-        "url": "https://test.pretix.eu/dummy/dummy/order/ABC12/k24fiuwvu8kxz3y1/",
         "email": "tester@example.org",
         "locale": "en",
         "sales_channel": "web",
@@ -486,17 +437,16 @@ Fetching individual orders
         "invoice_address": {
             "last_modified": "2017-12-01T10:00:00Z",
             "company": "Sample company",
-            "is_business": true,
+            "is_business": True,
             "name": "John Doe",
             "name_parts": {"full_name": "John Doe"},
             "street": "Test street 12",
             "zipcode": "12345",
             "city": "Testington",
-            "country": "DE",
-            "state": "",
+            "country": "Testikistan",
             "internal_reference": "",
             "vat_id": "EU123456789",
-            "vat_id_validated": false
+            "vat_id_validated": False
         },
         "positions": [
           {
@@ -519,12 +469,10 @@ Fetching individual orders
             "addon_to": null,
             "subevent": null,
             "pseudonymization_id": "MQLJvANO3B",
-            "seat": null,
             "checkins": [
               {
                 "list": 44,
-                "datetime": "2017-12-25T12:45:23Z",
-                "auto_checked_in": false
+                "datetime": "2017-12-25T12:45:23Z"
               }
             ],
             "answers": [
@@ -557,8 +505,6 @@ Fetching individual orders
             "amount": "23.00",
             "created": "2017-12-01T10:00:00Z",
             "payment_date": "2017-12-04T12:13:12Z",
-            "payment_url": null,
-            "details": {},
             "provider": "banktransfer"
           }
         ],
@@ -617,92 +563,6 @@ Order ticket download
    :statuscode 409: The file is not yet ready and will now be prepared. Retry the request after waiting for a few
                           seconds.
 
-Updating order fields
----------------------
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/
-
-   Updates specific fields on an order. Currently, only the following fields are supported:
-
-   * ``email``
-
-   * ``checkin_attention``
-
-   * ``locale``
-
-   * ``comment``
-
-   * ``invoice_address`` (you always need to supply the full object, or ``null`` to delete the current address)
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "email": "other@example.org",
-        "locale": "de",
-        "comment": "Foo",
-        "checkin_attention": true
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      (Full order resource, see above.)
-
-   :param organizer: The ``slug`` field of the organizer of the event
-   :param event: The ``slug`` field of the event
-   :param code: The ``code`` field of the order to update
-
-   :statuscode 200: no error
-   :statuscode 400: The order could not be updated due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to update this order.
-
-Generating new secrets
-----------------------
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/regenerate_secrets/
-
-   Triggers generation of new ``secret`` attributes for both the order and all order positions.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/regenerate_secrets/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      (Full order resource, see above.)
-
-   :param organizer: The ``slug`` field of the organizer of the event
-   :param event: The ``slug`` field of the event
-   :param code: The ``code`` field of the order to update
-
-   :statuscode 200: no error
-   :statuscode 400: The order could not be updated due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to update this order.
-
 Deleting orders
 ---------------
 
@@ -734,8 +594,6 @@ Deleting orders
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource **or** the order may not be deleted.
    :statuscode 404: The requested order does not exist.
 
-.. _rest-orders-create:
-
 Creating orders
 ---------------
 
@@ -743,6 +601,8 @@ Creating orders
 
    Creates a new order.
 
+   .. warning:: This endpoint is considered **experimental**. It might change at any time without prior notice.
+
    .. warning::
 
        This endpoint is intended for advanced users. It is not designed to be used to build your own shop frontend,
@@ -761,20 +621,24 @@ Creating orders
 
        * does not validate the number of items per order or the number of times an item can be included in an order
 
-       * does not validate any requirements related to add-on products and does not add bundled products automatically
+       * does not validate any requirements related to add-on products
 
-       * does not check prices but believes any prices you send
+       * does not check or calculate prices but believes any prices you send
+
+       * does not support the redemption of vouchers
 
        * does not prevent you from buying items that can only be bought with a voucher
 
-       * does not calculate fees automatically
+       * does not calculate fees
 
        * does not allow to pass data to plugins and will therefore cause issues with some plugins like the shipping
          module
 
-       * does not support file upload questions
+       * does not send order confirmations via email
 
-       * does not support redeeming gift cards
+       * does not support reverse charge taxation
+
+       * does not support file upload questions
 
    You can supply the following fields of the resource:
 
@@ -786,21 +650,19 @@ Creating orders
      then call the ``mark_paid`` API method.
    * ``testmode`` (optional) – Defaults to ``false``
    * ``consume_carts`` (optional) – A list of cart IDs. All cart positions with these IDs will be deleted if the
-     order creation is successful. Any quotas or seats that become free by this operation will be credited to your order
+     order creation is successful. Any quotas that become free by this operation will be credited to your order
      creation.
    * ``email``
    * ``locale``
    * ``sales_channel``
-   * ``payment_provider`` (optional) – The identifier of the payment provider set for this order. This needs to be an
-     existing payment provider. You should use ``"free"`` for free orders, and we strongly advise to use ``"manual"``
-     for all orders you create as paid. This field is optional when the order status is ``"n"`` or the order total is
-     zero, otherwise it is required.
+   * ``payment_provider`` – The identifier of the payment provider set for this order. This needs to be an existing
+     payment provider. You should use ``"free"`` for free orders, and we strongly advise to use ``"manual"`` for all
+     orders you create as paid.
    * ``payment_info`` (optional) – You can pass a nested JSON object that will be set as the internal ``info``
      value of the payment object that will be created. How this value is handled is up to the payment provider and you
      should only use this if you know the specific payment provider in detail. Please keep in mind that the payment
      provider will not be called to do anything about this (i.e. if you pass a bank account to a debit provider, *no*
      charge will be created), this is just informative in case you *handled the payment already*.
-   * ``payment_date`` (optional) – Date and time of the completion of the payment.
    * ``comment`` (optional)
    * ``checkin_attention`` (optional)
    * ``invoice_address`` (optional)
@@ -812,22 +674,16 @@ Creating orders
       * ``zipcode``
       * ``city``
       * ``country``
-      * ``state``
       * ``internal_reference``
       * ``vat_id``
-      * ``vat_id_validated`` (optional) – If you need support for reverse charge (rarely the case), you need to check
-       yourself if the passed VAT ID is a valid EU VAT ID. In that case, set this to ``true``. Only valid VAT IDs will
-       trigger reverse charge taxation. Don't forget to set ``is_business`` as well!
 
    * ``positions``
 
       * ``positionid`` (optional, see below)
       * ``item``
       * ``variation``
-      * ``price`` (optional, if set to ``null`` or missing the price will be computed from the given product)
-      * ``seat`` (The ``seat_guid`` attribute of a seat. Required when the specified ``item`` requires a seat, otherwise must be ``null``.)
+      * ``price``
       * ``attendee_name`` **or** ``attendee_name_parts``
-      * ``voucher`` (optional, the ``code`` attribute of a valid voucher)
       * ``attendee_email``
       * ``secret`` (optional)
       * ``addon_to`` (optional, see below)
@@ -845,18 +701,6 @@ Creating orders
       * ``description``
       * ``internal_type``
       * ``tax_rule``
-      * ``_treat_value_as_percentage`` (Optional convenience flag. If set to ``true``, your ``value`` parameter will
-        be treated as a percentage and the fee will be calculated using that percentage and the sum of all product
-        prices. Note that this will not include other fees and is calculated once during order generation and will not
-        be respected automatically when the order changes later.)
-      * ``_split_taxes_like_products`` (Optional convenience flag. If set to ``true``, your ``tax_rule`` will be ignored
-        and the fee will be taxed like the products in the order. If the products have multiple tax rates, multiple fees
-        will be generated with weights adjusted to the net price of the products. Note that this will be calculated once
-        during order generation and is not respected automatically when the order changes later.)
-
-   * ``force`` (optional). If set to ``true``, quotas will be ignored.
-   * ``send_mail`` (optional). If set to ``true``, the same emails will be sent as for a regular order. Defaults to
-     ``false``.
 
    If you want to use add-on products, you need to set the ``positionid`` fields of all positions manually
    to incrementing integers starting with ``1``. Then, you can reference one of these
@@ -870,7 +714,7 @@ Creating orders
       POST /api/v1/organizers/bigevents/events/sampleconf/orders/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content-Type: application/json
+      Content: application/json
 
       {
         "email": "dummy@example.org",
@@ -887,14 +731,13 @@ Creating orders
         ],
         "payment_provider": "banktransfer",
         "invoice_address": {
-          "is_business": false,
+          "is_business": False,
           "company": "Sample company",
           "name_parts": {"full_name": "John Doe"},
           "street": "Sesam Street 12",
           "zipcode": "12345",
           "city": "Sample City",
           "country": "UK",
-          "state": "",
           "internal_reference": "",
           "vat_id": ""
         },
@@ -918,7 +761,7 @@ Creating orders
             ],
             "subevent": null
           }
-        ]
+        ],
       }
 
    **Example response**:
@@ -931,10 +774,10 @@ Creating orders
 
       (Full order resource, see above.)
 
-   :param organizer: The ``slug`` field of the organizer of the event to create an order for
-   :param event: The ``slug`` field of the event to create an order for
+   :param organizer: The ``slug`` field of the organizer of the event to create an item for
+   :param event: The ``slug`` field of the event to create an item for
    :statuscode 201: no error
-   :statuscode 400: The order could not be created due to invalid submitted data or lack of quota.
+   :statuscode 400: The item could not be created due to invalid submitted data or lack of quota.
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this
          order.
@@ -1059,7 +902,7 @@ Order state operations
 
 .. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/mark_expired/
 
-   Marks an unpaid order as expired.
+   Marks a unpaid order as expired.
 
    **Example request**:
 
@@ -1218,82 +1061,9 @@ Order state operations
    :statuscode 200: no error
    :statuscode 400: The order cannot be marked as denied since the current order status does not allow it.
    :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to update this resource.
-   :statuscode 404: The requested order does not exist.
-
-Generating invoices
--------------------
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/create_invoice/
-
-   Creates an invoice for an order which currently does not have an invoice. Returns the
-   invoice object.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/create_invoice/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "order": "FOO",
-        "number": "DUMMY-00001",
-        "is_cancellation": false,
-        ...
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param code: The ``code`` field of the order to create an invoice for
-   :statuscode 200: no error
-   :statuscode 400: The invoice can not be created (invoicing disabled, the order already has an invoice, …)
-   :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
    :statuscode 404: The requested order does not exist.
 
-Sending e-mails
----------------
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/resend_link/
-
-   Sends an email to the buyer with the link to the order page.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/resend_link/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param code: The ``code`` field of the order to send an email for
-   :statuscode 200: no error
-   :statuscode 400: The order does not have an email address associated
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-   :statuscode 404: The requested order does not exist.
-   :statuscode 503: The email could not be sent.
 
 List of all order positions
 ---------------------------
@@ -1309,11 +1079,6 @@ List of all order positions
    The order positions endpoint has been extended by the filter queries ``voucher``, ``voucher__code`` and
    ``pseudonymization_id``.
 
-.. versionchanged:: 3.2
-
-  The value ``auto_checked_in`` has been added to the ``checkins``-attribute.
-
-
 .. note:: Individually canceled order positions are currently not visible via the API at all.
 
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/
@@ -1359,14 +1124,12 @@ List of all order positions
             "tax_value": "0.00",
             "secret": "z3fsn8jyufm5kpk768q69gkbyr5f4h6w",
             "pseudonymization_id": "MQLJvANO3B",
-            "seat": null,
             "addon_to": null,
             "subevent": null,
             "checkins": [
               {
                 "list": 44,
-                "datetime": "2017-12-25T12:45:23Z",
-                "auto_checked_in": false
+                "datetime": "2017-12-25T12:45:23Z"
               }
             ],
             "answers": [
@@ -1463,12 +1226,10 @@ Fetching individual positions
         "addon_to": null,
         "subevent": null,
         "pseudonymization_id": "MQLJvANO3B",
-        "seat": null,
         "checkins": [
           {
             "list": 44,
-            "datetime": "2017-12-25T12:45:23Z",
-            "auto_checked_in": false
+            "datetime": "2017-12-25T12:45:23Z"
           }
         ],
         "answers": [
@@ -1496,8 +1257,6 @@ Fetching individual positions
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
    :statuscode 404: The requested order position does not exist.
 
-.. _`order-position-ticket-download`:
-
 Order position ticket download
 ------------------------------
 
@@ -1507,11 +1266,6 @@ Order position ticket download
    Depending on the chosen output, the response might be a ZIP file, PDF file or something else. The order details
    response contains a list of output options for this particular order position.
 
-   Be aware that the output does not have to be a file, but can also be a regular HTTP response with a ``Content-Type``
-   set to ``text/uri-list``. In this case, the user is expected to navigate to that URL in order to access their ticket.
-   The referenced URL can provide a download or a regular, human-viewable website - so it is advised to open this URL
-   in a webbrowser and leave it up to the user to handle the result.
-
    Tickets can be only downloaded if the order is paid and if ticket downloads are active. Also, depending on event
    configuration downloads might be only unavailable for add-on products or non-admission products.
    Note that in some cases the ticket file might not yet have been created. In that case, you will receive a status
@@ -1618,8 +1372,6 @@ Order payment endpoints
             "amount": "23.00",
             "created": "2017-12-01T10:00:00Z",
             "payment_date": "2017-12-04T12:13:12Z",
-            "payment_url": null,
-            "details": {},
             "provider": "banktransfer"
           }
         ]
@@ -1660,8 +1412,6 @@ Order payment endpoints
         "amount": "23.00",
         "created": "2017-12-01T10:00:00Z",
         "payment_date": "2017-12-04T12:13:12Z",
-        "payment_url": null,
-        "details": {},
         "provider": "banktransfer"
       }
 

doc/api/resources/organizers.rst

@@ -56,8 +56,6 @@ Endpoints
       }
 
    :query page: The page number in case of a multi-page result set, default is 1
-   :query string ordering: Manually set the ordering of results. Valid fields to be used are ``slug`` and
-                           ``name``. Default: ``slug``.
    :statuscode 200: no error
    :statuscode 401: Authentication failure
 

doc/api/resources/questions.rst

@@ -30,20 +30,14 @@ type                                  string                     The expected ty
                                                                  * ``D`` – date
                                                                  * ``H`` – time
                                                                  * ``W`` – date and time
-                                                                 * ``CC`` – country code (ISO 3666-1 alpha-2)
-                                                                 * ``TEL`` – telephone number
-required                              boolean                    If ``true``, the question needs to be filled out.
+required                              boolean                    If ``True``, the question needs to be filled out.
 position                              integer                    An integer, used for sorting
 items                                 list of integers           List of item IDs this question is assigned to.
 identifier                            string                     An arbitrary string that can be used for matching with
                                                                  other sources.
-ask_during_checkin                    boolean                    If ``true``, this question will not be asked while
+ask_during_checkin                    boolean                    If ``True``, this question will not be asked while
                                                                  buying the ticket, but will show up when redeeming
                                                                  the ticket instead.
-hidden                                boolean                    If ``true``, the question will only be shown in the
-                                                                 backend.
-print_on_invoice                      boolean                    If ``true``, the question will only be shown on
-                                                                 invoices.
 options                               list of objects            In case of question type ``C`` or ``M``, this lists the
                                                                  available objects. Only writable during creation,
                                                                  use separate endpoint to modify this later.
@@ -52,17 +46,6 @@ options                               list of objects            In case of ques
 ├ identifier                          string                     An arbitrary string that can be used for matching with
                                                                  other sources.
 └ answer                              multi-lingual string       The displayed value of this option
-dependency_question                   integer                    Internal ID of a different question. The current
-                                                                 question will only be shown if the question given in
-                                                                 this attribute is set to the value given in
-                                                                 ``dependency_value``. This cannot be combined with
-                                                                 ``ask_during_checkin``.
-dependency_values                     list of strings            If ``dependency_question`` is set to a boolean
-                                                                 question, this should be ``["True"]`` or ``["False"]``.
-                                                                 Otherwise, it should be a list of ``identifier`` values
-                                                                 of question options.
-dependency_value                      string                     An old version of ``dependency_values`` that only allows
-                                                                 for one value. **Deprecated.**
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.12
@@ -75,18 +58,6 @@ dependency_value                      string                     An old version
   Write methods have been added. The attribute ``identifier`` has been added to both the resource itself and the
   options resource. The ``position`` attribute has been added to the options resource.
 
-.. versionchanged:: 2.7
-
-  The attribute ``hidden`` and the question type ``CC`` have been added.
-
-.. versionchanged:: 3.0
-
-  The attribute ``dependency_values`` has been added.
-
-.. versionchanged:: 3.1
-
-  The attribute ``print_on_invoice`` has been added.
-
 Endpoints
 ---------
 
@@ -129,11 +100,6 @@ Endpoints
             "position": 1,
             "identifier": "WY3TP9SL",
             "ask_during_checkin": false,
-            "hidden": false,
-            "print_on_invoice": false,
-            "dependency_question": null,
-            "dependency_value": null,
-            "dependency_values": [],
             "options": [
               {
                 "id": 1,
@@ -199,11 +165,6 @@ Endpoints
         "position": 1,
         "identifier": "WY3TP9SL",
         "ask_during_checkin": false,
-        "hidden": false,
-        "print_on_invoice": false,
-        "dependency_question": null,
-        "dependency_value": null,
-        "dependency_values": [],
         "options": [
           {
             "id": 1,
@@ -244,7 +205,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/questions/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content-Type: application/json
+      Content: application/json
 
       {
         "question": {"en": "T-Shirt size"},
@@ -253,10 +214,6 @@ Endpoints
         "items": [1, 2],
         "position": 1,
         "ask_during_checkin": false,
-        "hidden": false,
-        "print_on_invoice": false,
-        "dependency_question": null,
-        "dependency_values": [],
         "options": [
           {
             "answer": {"en": "S"}
@@ -288,11 +245,6 @@ Endpoints
         "position": 1,
         "identifier": "WY3TP9SL",
         "ask_during_checkin": false,
-        "hidden": false,
-        "print_on_invoice": false,
-        "dependency_question": null,
-        "dependency_value": null,
-        "dependency_values": [],
         "options": [
           {
             "id": 1,
@@ -362,11 +314,6 @@ Endpoints
         "position": 2,
         "identifier": "WY3TP9SL",
         "ask_during_checkin": false,
-        "hidden": false,
-        "print_on_invoice": false,
-        "dependency_question": null,
-        "dependency_value": null,
-        "dependency_values": [],
         "options": [
           {
             "id": 1,

doc/api/resources/quotas.rst

@@ -20,22 +20,12 @@ size                                  integer                    The size of the
 items                                 list of integers           List of item IDs this quota acts on.
 variations                            list of integers           List of item variation IDs this quota acts on.
 subevent                              integer                    ID of the date inside an event series this quota belongs to (or ``null``).
-close_when_sold_out                   boolean                    If ``true``, the quota will "close" as soon as it is
-                                                                 sold out once. Even if tickets become available again,
-                                                                 they will not be sold unless the quota is set to open
-                                                                 again.
-closed                                boolean                    Whether the quota is currently closed (see above
-                                                                 field).
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.10
 
    The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
 
-.. versionchanged:: 3.0
-
-   The attributes ``close_when_sold_out`` and ``closed`` have been added.
-
 
 Endpoints
 ---------
@@ -71,9 +61,7 @@ Endpoints
             "size": 200,
             "items": [1, 2],
             "variations": [1, 4, 5, 7],
-            "subevent": null,
-            "close_when_sold_out": false,
-            "closed": false
+            "subevent": null
           }
         ]
       }
@@ -114,9 +102,7 @@ Endpoints
         "size": 200,
         "items": [1, 2],
         "variations": [1, 4, 5, 7],
-        "subevent": null,
-        "close_when_sold_out": false,
-        "closed": false
+        "subevent": null
       }
 
    :param organizer: The ``slug`` field of the organizer to fetch
@@ -137,16 +123,14 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/quotas/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content-Type: application/json
+      Content: application/json
 
       {
         "name": "Ticket Quota",
         "size": 200,
         "items": [1, 2],
         "variations": [1, 4, 5, 7],
-        "subevent": null,
-        "close_when_sold_out": false,
-        "closed": false
+        "subevent": null
       }
 
    **Example response**:
@@ -163,9 +147,7 @@ Endpoints
         "size": 200,
         "items": [1, 2],
         "variations": [1, 4, 5, 7],
-        "subevent": null,
-        "close_when_sold_out": false,
-        "closed": false
+        "subevent": null
       }
 
    :param organizer: The ``slug`` field of the organizer of the event/item to create a quota for
@@ -218,9 +200,7 @@ Endpoints
           1,
           2
         ],
-        "subevent": null,
-        "close_when_sold_out": false,
-        "closed": false
+        "subevent": null
       }
 
    :param organizer: The ``slug`` field of the organizer to modify

doc/api/resources/seatingplans.rst

@@ -1,209 +0,0 @@
-.. _`rest-seatingplans`:
-
-Seating plans
-=============
-
-Resource description
---------------------
-
-The seating plan resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the plan
-name                                  string                     Human-readable name of the plan
-layout                                object                     JSON representation of the seating plan. These
-                                                                 representations follow a JSON schema that currently
-                                                                 still evolves. The version in use can be found `here`_.
-===================================== ========================== =======================================================
-
-.. versionchanged:: 3.0
-
-   This endpoint has been added.
-
-Endpoints
----------
-
-.. http:get:: /api/v1/organizers/(organizer)/seatingplans/
-
-   Returns a list of all seating plans within a given organizer.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/seatingplans/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "count": 1,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id": 2,
-            "name": "Main plan",
-            "layout": { … }
-          }
-        ]
-      }
-
-   :query integer page: The page number in case of a multi-page result set, default is 1
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to view this resource.
-
-.. http:get:: /api/v1/organizers/(organizer)/seatingplans/(id)/
-
-   Returns information on one plan, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/seatingplans/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 2,
-        "name": "Main plan",
-        "layout": { … }
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param id: The ``id`` field of the seating plan to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/organizers/(organizer)/seatingplans/
-
-   Creates a new seating plan
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/seatingplans/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "name": "Main plan",
-        "layout": { … }
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 3,
-        "name": "Main plan",
-        "layout": { … }
-      }
-
-   :param organizer: The ``slug`` field of the organizer to create a seating plan for
-   :statuscode 201: no error
-   :statuscode 400: The seating plan could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.
-
-.. http:patch:: /api/v1/organizers/(organizer)/seatingplans/(id)/
-
-   Update a plan. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
-   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
-   want to change.
-
-   You can change all fields of the resource except the ``id`` field. **You can not change a plan while it is in use for
-   any events.**
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/seatingplans/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "name": "Old plan"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "name": "Old plan",
-        "layout": { … }
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param id: The ``id`` field of the plan to modify
-   :statuscode 200: no error
-   :statuscode 400: The plan could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to change this resource **or** the plan is currently in use.
-
-.. http:delete:: /api/v1/organizers/(organizer)/seatingplans/(id)/
-
-   Delete a plan. You can not delete plans which are currently in use by any events.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/seatingplans/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param id: The ``id`` field of the plan to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to delete this resource **or** the plan is currently in use.
-
-
-.. _here: https://github.com/pretix/pretix/blob/master/src/pretix/static/seating/seating-plan.schema.json

doc/api/resources/subevents.rst

@@ -1,9 +1,3 @@
-.. spelling::
-
-   geo
-   lat
-   lon
-
 .. _rest-subevents:
 
 Event series dates / Sub-events
@@ -26,16 +20,12 @@ name                                  multi-lingual string       The sub-event's
 event                                 string                     The slug of the parent event
 active                                boolean                    If ``true``, the sub-event ticket shop is publicly
                                                                  available.
-is_public                             boolean                    If ``true``, the sub-event ticket shop is publicly
-                                                                 shown in lists.
 date_from                             datetime                   The sub-event's start date
 date_to                               datetime                   The sub-event's end date (or ``null``)
 date_admission                        datetime                   The sub-event's admission date (or ``null``)
 presale_start                         datetime                   The sub-date at which the ticket shop opens (or ``null``)
 presale_end                           datetime                   The sub-date at which the ticket shop closes (or ``null``)
 location                              multi-lingual string       The sub-event location (or ``null``)
-geo_lat                               float                      Latitude of the location (or ``null``)
-geo_lon                               float                      Longitude of the location (or ``null``)
 item_price_overrides                  list of objects            List of items for which this sub-event overrides the
                                                                  default price
 ├ item                                integer                    The internal item ID
@@ -44,11 +34,7 @@ variation_price_overrides             list of objects            List of variati
                                                                  the default price
 ├ variation                           integer                    The internal variation ID
 └ price                               money (string)             The price or ``null`` for the default price
-meta_data                             object                     Values set for organizer-specific meta data parameters.
-seating_plan                          integer                    If reserved seating is in use, the ID of a seating
-                                                                 plan. Otherwise ``null``.
-seat_category_mapping                 object                     An object mapping categories of the seating plan
-                                                                 (strings) to items in the event (integers or ``null``).
+meta_data                             dict                       Values set for organizer-specific meta data parameters.
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.7
@@ -59,28 +45,10 @@ seat_category_mapping                 object                     An object mappi
 
    The ``event`` field has been added, together with filters on the list of dates and an organizer-level list.
 
-.. versionchanged:: 2.6
-   The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
-
-.. versionchanged:: 2.7
-
-   The attribute ``is_public`` has been added.
-
-.. versionchanged:: 3.0
-
-   The attributes ``seating_plan`` and ``seat_category_mapping`` have been added.
-
-.. versionchanged:: 3.3
-
-   The attributes ``geo_lat`` and ``geo_lon`` have been added.
 
 Endpoints
 ---------
 
-.. versionchanged:: 3.3
-
-    The sub-events resource can now be filtered by meta data attributes.
-
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/subevents/
 
    Returns a list of all sub-events of an event.
@@ -111,17 +79,12 @@ Endpoints
             "name": {"en": "First Sample Conference"},
             "event": "sampleconf",
             "active": false,
-            "is_public": true,
             "date_from": "2017-12-27T10:00:00Z",
             "date_to": null,
             "date_admission": null,
             "presale_start": null,
             "presale_end": null,
-            "seating_plan": null,
-            "seat_category_mapping": {},
             "location": null,
-            "geo_lat": null,
-            "geo_lon": null,
             "item_price_overrides": [
               {
                 "item": 2,
@@ -140,98 +103,11 @@ Endpoints
    :query is_past: If set to ``true`` (``false``), only events that are over are (not) returned.
    :query ends_after: If set to a date and time, only events that happen during of after the given time are returned.
    :param organizer: The ``slug`` field of a valid organizer
-   :param event: The ``slug`` field of the main event
-   :query array attr[meta_data_key]: By providing the key and value of a meta data attribute, the list of sub-events
-        will only contain the sub-events matching the set criteria. Providing ``?attr[Format]=Seminar`` would return
-        only those sub-events having set their ``Format`` meta data to ``Seminar``, ``?attr[Format]=`` only those, that
-        have no value set. Please note that this filter will respect default values set on 
-        organizer or event level.
+   :param event: The ``slug`` field of the event to fetch
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer does not exist **or** you have no permission to view it.
 
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/subevents/
-
-   Creates a new subevent.
-
-   Permission required: "Can create events"
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/subevents/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "name": {"en": "First Sample Conference"},
-        "active": false,
-        "is_public": true,
-        "date_from": "2017-12-27T10:00:00Z",
-        "date_to": null,
-        "date_admission": null,
-        "presale_start": null,
-        "presale_end": null,
-        "location": null,
-        "geo_lat": null,
-        "geo_lon": null,
-        "seating_plan": null,
-        "seat_category_mapping": {},
-        "item_price_overrides": [
-          {
-            "item": 2,
-            "price": "12.00"
-          }
-        ],
-        "variation_price_overrides": [],
-        "meta_data": {}
-      }
-
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "name": {"en": "First Sample Conference"},
-        "active": false,
-        "is_public": true,
-        "date_from": "2017-12-27T10:00:00Z",
-        "date_to": null,
-        "date_admission": null,
-        "presale_start": null,
-        "presale_end": null,
-        "location": null,
-        "geo_lat": null,
-        "geo_lon": null,
-        "seating_plan": null,
-        "seat_category_mapping": {},
-        "item_price_overrides": [
-          {
-            "item": 2,
-            "price": "12.00"
-          }
-        ],
-        "variation_price_overrides": [],
-        "meta_data": {}
-      }
-
-
-   :param organizer: The ``slug`` field of a valid organizer
-   :param event: The ``slug`` field of the main event
-   :statuscode 201: no error
-   :statuscode 400: The sub-event could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.
-
-
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/subevents/(id)/
 
    Returns information on one sub-event, identified by its ID.
@@ -257,17 +133,12 @@ Endpoints
         "name": {"en": "First Sample Conference"},
         "event": "sampleconf",
         "active": false,
-        "is_public": true,
         "date_from": "2017-12-27T10:00:00Z",
         "date_to": null,
         "date_admission": null,
         "presale_start": null,
         "presale_end": null,
         "location": null,
-        "geo_lat": null,
-        "geo_lon": null,
-        "seating_plan": null,
-        "seat_category_mapping": {},
         "item_price_overrides": [
           {
             "item": 2,
@@ -278,111 +149,13 @@ Endpoints
         "meta_data": {}
       }
 
-   :param organizer: The ``slug`` field of a valid organizer
-   :param event: The ``slug`` field of the main event
-   :param id: The ``id`` field of the sub-event to fetch
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param event: The ``slug`` field of the event to fetch
+   :param id: The ``slug`` field of the sub-event to fetch
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view it.
 
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/subevents/(id)/
-
-   Updates a sub-event, identified by its ID. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to
-   provide all fields of the resource, other fields will be reset to default. With ``PATCH``, you only need to provide
-   the fields that you want to change.
-
-   Permission required: "Can change event settings"
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/subevents/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "name": {"en": "New Subevent Name"},
-        "item_price_overrides": [
-          {
-            "item": 2,
-            "price": "23.42"
-          }
-        ],
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "name": {"en": "New Subevent Name"},
-        "event": "sampleconf",
-        "active": false,
-        "is_public": true,
-        "date_from": "2017-12-27T10:00:00Z",
-        "date_to": null,
-        "date_admission": null,
-        "presale_start": null,
-        "presale_end": null,
-        "location": null,
-        "geo_lat": null,
-        "geo_lon": null,
-        "seating_plan": null,
-        "seat_category_mapping": {},
-        "item_price_overrides": [
-          {
-            "item": 2,
-            "price": "23.42"
-          }
-        ],
-        "variation_price_overrides": [],
-        "meta_data": {}
-      }
-
-   :param organizer: The ``slug`` field of a valid organizer
-   :param event: The ``slug`` field of the main event
-   :param id: The ``id`` field of the sub-event to update
-   :statuscode 200: no error
-   :statuscode 400: The sub-event could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/sub-event does not exist **or** you have no permission to update this resource.
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/subevents/(id)/
-
-   Delete a sub-event. Note that events with orders cannot be deleted to ensure data integrity.
-
-   Permission required: "Can change event settings"
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/subevents/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of a valid organizer
-   :param event: The ``slug`` field of the main event
-   :param id: The ``id`` field of the sub-event to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/sub-event does not exist **or** you have no permission to delete this resource.
-
-
 .. http:get:: /api/v1/organizers/(organizer)/subevents/
 
    Returns a list of all sub-events of any event series you have access to within an organizer account.
@@ -413,17 +186,12 @@ Endpoints
             "name": {"en": "First Sample Conference"},
             "event": "sampleconf",
             "active": false,
-            "is_public": true,
             "date_from": "2017-12-27T10:00:00Z",
             "date_to": null,
             "date_admission": null,
             "presale_start": null,
             "presale_end": null,
             "location": null,
-            "geo_lat": null,
-            "geo_lon": null,
-            "seating_plan": null,
-            "seat_category_mapping": {},
             "item_price_overrides": [
               {
                 "item": 2,

doc/api/resources/vouchers.rst

@@ -18,8 +18,8 @@ max_usages                            integer                    The maximum num
 redeemed                              integer                    The number of times this voucher already has been
                                                                  redeemed.
 valid_until                           datetime                   The voucher expiration date (or ``null``).
-block_quota                           boolean                    If ``true``, quota is blocked for this voucher.
-allow_ignore_quota                    boolean                    If ``true``, this voucher can be redeemed even if a
+block_quota                           boolean                    If ``True``, quota is blocked for this voucher.
+allow_ignore_quota                    boolean                    If ``True``, this voucher can be redeemed even if a
                                                                  product is sold out and even if quota is not blocked
                                                                  for this voucher.
 price_mode                            string                     Determines how this voucher affects product prices.
@@ -38,11 +38,9 @@ quota                                 integer                    An ID of a quot
                                                                  attached either to a specific product or to all
                                                                  products within one quota or it can be available
                                                                  for all items without restriction.
-seat                                  string                     ``seat_guid`` attribute of a specific seat (or ``null``)
 tag                                   string                     A string that is used for grouping vouchers
 comment                               string                     An internal comment on the voucher
 subevent                              integer                    ID of the date inside an event series this voucher belongs to (or ``null``).
-show_hidden_items                     boolean                    Only if set to ``true``, this voucher allows to buy products with the property ``hide_without_voucher``. Defaults to ``true``.
 ===================================== ========================== =======================================================
 
 
@@ -50,14 +48,6 @@ show_hidden_items                     boolean                    Only if set to
 
    The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
 
-.. versionchanged:: 3.0
-
-   The attribute ``show_hidden_items`` has been added.
-
-.. versionchanged:: 3.4
-
-   The attribute ``seat`` has been added.
-
 Endpoints
 ---------
 
@@ -101,8 +91,7 @@ Endpoints
             "quota": null,
             "tag": "testvoucher",
             "comment": "",
-            "seat": null,
-            "subevent": null,
+            "subevent": null
           }
         ]
       }
@@ -168,7 +157,6 @@ Endpoints
         "quota": null,
         "tag": "testvoucher",
         "comment": "",
-        "seat": null,
         "subevent": null
       }
 
@@ -232,7 +220,6 @@ Endpoints
         "quota": null,
         "tag": "testvoucher",
         "comment": "",
-        "seat": null,
         "subevent": null
       }
 
@@ -360,7 +347,6 @@ Endpoints
         "quota": null,
         "tag": "testvoucher",
         "comment": "",
-        "seat": null,
         "subevent": null
       }
 

doc/api/resources/webhooks.rst

@@ -17,11 +17,11 @@ The webhook resource contains the following public fields:
 Field                                 Type                       Description
 ===================================== ========================== =======================================================
 id                                    integer                    Internal ID of the webhook
-enabled                               boolean                    If ``false``, this webhook will not receive any notifications
+enabled                               boolean                    If ``False``, this webhook will not receive any notifications
 target_url                            string                     The URL to call
-all_events                            boolean                    If ``true``, this webhook will receive notifications
+all_events                            boolean                    If ``True``, this webhook will receive notifications
                                                                  on all events of this organizer
-limit_events                          list of strings            If ``all_events`` is ``false``, this is a list of
+limit_events                          list of strings            If ``all_events`` is ``False``, this is a list of
                                                                  event slugs this webhook is active for
 action_types                          list of strings            A list of action type filters that limit the
                                                                  notifications sent to this webhook. See below for
@@ -137,7 +137,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/webhooks/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content-Type: application/json
+      Content: application/json
 
       {
         "enabled": true,

doc/conf.py

@@ -66,7 +66,7 @@ source_suffix = '.rst'
 #source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = 'contents'
 
 # General information about the project.
 project = 'pretix'
@@ -234,7 +234,7 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  ('index', 'pretix.tex', 'pretix Documentation',
+  ('contents', 'pretix.tex', 'pretix Documentation',
    'Raphael Michel', 'manual'),
 ]
 

doc/development/api/auth.rst

@@ -1,70 +0,0 @@
-.. highlight:: python
-   :linenothreshold: 5
-
-Pluggable authentication backends
-=================================
-
-Plugins can supply additional authentication backends. This is mainly useful in self-hosted installations
-and allows you to use company-wide login mechanisms such as LDAP or OAuth for accessing pretix' backend.
-
-Every authentication backend contains an implementation of the interface defined in ``pretix.base.auth.BaseAuthBackend``
-(see below). Note that pretix authentication backends work differently than plain Django authentication backends.
-Basically, three pre-defined flows are supported:
-
-* Authentication mechanisms that rely on a **set of input parameters**, e.g. a username and a password. These can be
-  implemented by supplying the ``login_form_fields`` property and a ``form_authenticate`` method.
-
-* Authentication mechanisms that rely on **external sessions**, e.g. a cookie or a proxy HTTP header. These can be
-  implemented by supplying a ``request_authenticate`` method.
-
-* Authentication mechanisms that rely on **redirection**, e.g. to an OAuth provider. These can be implemented by
-  supplying a ``authentication_url`` method and implementing a custom return view.
-
-Authentication backends are *not* collected through a signal. Instead, they must explicitly be set through the
-``auth_backends`` directive in the ``pretix.cfg`` :ref:`configuration file <config>`.
-
-In each of these methods (``form_authenticate``, ``request_authenticate`` or your custom view) you are supposed to
-either get an existing :py:class:`pretix.base.models.User` object from the database or create a new one. There are a
-few rules you need to follow:
-
-* You **MUST** only return users with the ``auth_backend`` attribute set to the ``identifier`` value of your backend.
-
-* You **MUST** create new users with the ``auth_backend`` attribute set to the ``identifier`` value of your backend.
-
-* Every user object **MUST** have an email address. Email addresses are globally unique. If the email address is
-  already registered to a user who signs in through a different backend, you **SHOULD** refuse the login.
-
-The backend interface
----------------------
-
-.. class:: pretix.base.auth.BaseAuthBackend
-
-   The central object of each backend is the subclass of ``BaseAuthBackend``.
-
-   .. autoattribute:: identifier
-
-      This is an abstract attribute, you **must** override this!
-
-   .. autoattribute:: verbose_name
-
-      This is an abstract attribute, you **must** override this!
-
-   .. autoattribute:: login_form_fields
-
-   .. autoattribute:: visible
-
-   .. automethod:: form_authenticate
-
-   .. automethod:: request_authenticate
-
-   .. automethod:: authentication_url
-
-Logging users in
-----------------
-
-If you return a user from ``form_authenticate`` or ``request_authenticate``, the system will handle everything else
-for you correctly. However, if you use a redirection method and build a custom view to verify the login, we strongly
-recommend that you use the following utility method to correctly set session values and enforce two-factor
-authentication (if activated):
-
-.. autofunction:: pretix.control.views.auth.process_login

doc/development/api/email.rst

@@ -101,12 +101,9 @@ The template is passed the following context variables:
    The ``Event`` object
 
 ``signature`` (optional, only if configured)
-   The signature with event organizer contact details as markdown (render with ``{{ signature|safe }}``)
+   The body as markdown (render with ``{{ signature|safe }}``)
 
 ``order`` (optional, only if applicable)
    The ``Order`` object
 
-``position`` (optional, only if applicable)
-   The ``OrderPosition`` object
-
 .. _inlinestyler: https://pypi.org/project/inlinestyler/

doc/development/api/general.rst

@@ -12,7 +12,7 @@ Core
 
 .. automodule:: pretix.base.signals
    :members: periodic_task, event_live_issues, event_copy_data, email_filter, register_notification_types,
-      item_copy_data, register_sales_channels, register_global_settings, quota_availability, global_email_filter
+      item_copy_data, register_sales_channels
 
 Order events
 """"""""""""
@@ -20,13 +20,13 @@ Order events
 There are multiple signals that will be sent out in the ordering cycle:
 
 .. automodule:: pretix.base.signals
-   :members: validate_cart, validate_cart_addons, validate_order, order_fee_calculation, order_paid, order_placed, order_canceled, order_expired, order_modified, order_changed, order_approved, order_denied, order_fee_type_name, allow_ticket_download, order_split, order_gracefully_delete, invoice_line_text
+   :members: validate_cart, order_fee_calculation, order_paid, order_placed, order_fee_type_name, allow_ticket_download
 
 Frontend
 --------
 
 .. automodule:: pretix.presale.signals
-   :members: html_head, html_footer, footer_link, front_page_top, front_page_bottom, fee_calculation_for_cart, contact_form_fields, question_form_fields, checkout_confirm_messages, checkout_confirm_page_content, checkout_all_optional, html_page_header, sass_preamble, sass_postamble, render_seating_plan, checkout_flow_steps, position_info, item_description
+   :members: html_head, html_footer, footer_link, front_page_top, front_page_bottom, fee_calculation_for_cart, contact_form_fields, question_form_fields, checkout_confirm_messages, checkout_confirm_page_content, checkout_all_optional
 
 
 .. automodule:: pretix.presale.signals
@@ -49,11 +49,11 @@ Backend
 
 .. automodule:: pretix.control.signals
    :members: nav_event, html_head, html_page_start, quota_detail_html, nav_topbar, nav_global, nav_organizer, nav_event_settings,
-             order_info, event_settings_widget, oauth_application_registered, order_position_buttons, subevent_forms,
-             item_formsets, order_search_filter_q
+             order_info, event_settings_widget, oauth_application_registered, order_position_buttons
+
 
 .. automodule:: pretix.base.signals
-   :members: logentry_display, logentry_object_link, requiredaction_display, timeline_events
+   :members: logentry_display, logentry_object_link, requiredaction_display
 
 Vouchers
 """"""""
@@ -78,6 +78,3 @@ Ticket designs
 
 .. automodule:: pretix.base.signals
    :members: layout_text_variables
-
-.. automodule:: pretix.plugins.ticketoutputpdf.signals
-   :members: override_layout

doc/development/api/index.rst

@@ -12,10 +12,8 @@ Contents:
    payment
    payment_2.0
    email
-   placeholder
    invoice
    shredder
    customview
-   auth
    general
    quality

doc/development/api/payment.rst

@@ -62,8 +62,6 @@ The provider class
 
    .. autoattribute:: is_enabled
 
-   .. autoattribute:: priority
-
    .. autoattribute:: settings_form_fields
 
    .. automethod:: settings_form_clean
@@ -110,14 +108,8 @@ The provider class
 
    .. automethod:: execute_refund
 
-   .. automethod:: refund_control_render
-
-   .. automethod:: api_payment_details
-
    .. automethod:: shred_payment_info
 
-   .. automethod:: cancel_payment
-
    .. autoattribute:: is_implicit
 
    .. autoattribute:: is_meta

doc/development/api/placeholder.rst

@@ -1,79 +0,0 @@
-.. highlight:: python
-   :linenothreshold: 5
-
-Writing an e-mail placeholder plugin
-====================================
-
-An email placeholder is a dynamic value that pretix users can use in their email templates.
-
-Please read :ref:`Creating a plugin <pluginsetup>` first, if you haven't already.
-
-Placeholder registration
-------------------------
-
-The placeholder API does not make a lot of usage from signals, however, it
-does use a signal to get a list of all available email placeholders. Your plugin
-should listen for this signal and return an instance of a subclass of ``pretix.base.email.BaseMailTextPlaceholder``::
-
-    from django.dispatch import receiver
-
-    from pretix.base.signals import register_mail_placeholders
-
-
-    @receiver(register_mail_placeholders, dispatch_uid="placeholder_custom")
-    def register_mail_renderers(sender, **kwargs):
-        from .email import MyPlaceholderClass
-        return MyPlaceholder()
-
-
-Context mechanism
------------------
-
-Emails are sent in different "contexts" within pretix. For example, many emails are sent in the
-the context of an order, but some are not, such as the notification of a waiting list voucher.
-
-Not all placeholders make sense in every email, and placeholders usually depend some parameters
-themselves, such as the ``Order`` object. Therefore, placeholders are expected to explicitly declare
-what values they depend on and they will only be available in an email if all those dependencies are
-met. Currently, placeholders can depend on the following context parameters:
-
-* ``event``
-* ``order``
-* ``position``
-* ``waiting_list_entry``
-* ``invoice_address``
-* ``payment``
-
-There are a few more that are only to be used internally but not by plugins.
-
-The placeholder class
----------------------
-
-.. class:: pretix.base.email.BaseMailTextPlaceholder
-
-   .. autoattribute:: identifier
-
-      This is an abstract attribute, you **must** override this!
-
-   .. autoattribute:: required_context
-
-      This is an abstract attribute, you **must** override this!
-
-   .. automethod:: render
-
-      This is an abstract method, you **must** implement this!
-
-   .. automethod:: render_sample
-
-      This is an abstract method, you **must** implement this!
-
-Helper class for simple placeholders
-------------------------------------
-
-pretix ships with a helper class that makes it easy to provide placeholders based on simple
-functions::
-
-     placeholder = SimpleFunctionalMailTextPlaceholder(
-         'code', ['order'], lambda order: order.code, sample='F8VVL'
-     )
-

doc/development/api/plugins.rst

@@ -49,19 +49,15 @@ description        string               A more verbose description of what your
 visible            boolean (optional)   ``True`` by default, can hide a plugin so it cannot be normally activated.
 restricted         boolean (optional)   ``False`` by default, restricts a plugin such that it can only be enabled
                                         for an event by system administrators / superusers.
-compatibility      string               Specifier for compatible pretix versions.
 ================== ==================== ===========================================================
 
 A working example would be::
 
-    try:
-        from pretix.base.plugins import PluginConfig
-    except ImportError:
-        raise RuntimeError("Please use pretix 2.7 or above to run this plugin!")
+    from django.apps import AppConfig
     from django.utils.translation import ugettext_lazy as _
 
 
-    class PaypalApp(PluginConfig):
+    class PaypalApp(AppConfig):
         name = 'pretix_paypal'
         verbose_name = _("PayPal")
 
@@ -72,7 +68,6 @@ A working example would be::
             visible = True
             restricted = False
             description = _("This plugin allows you to receive payments via PayPal")
-            compatibility = "pretix>=2.7.0"
 
 
     default_app_config = 'pretix_paypal.PaypalApp'

doc/development/api/shredder.rst

@@ -35,9 +35,9 @@ The shredder class
 
 .. class:: pretix.base.shredder.BaseDataShredder
 
-   The central object of each data shredder is the subclass of ``BaseDataShredder``.
+   The central object of each invoice renderer is the subclass of ``BaseInvoiceRenderer``.
 
-   .. py:attribute:: BaseDataShredder.event
+   .. py:attribute:: BaseInvoiceRenderer.event
 
       The default constructor sets this property to the event we are currently
       working for.

doc/development/api/ticketoutput.rst

@@ -69,9 +69,3 @@ The output class
    .. automethod:: generate_order
 
    .. autoattribute:: download_button_text
-
-   .. autoattribute:: download_button_icon
-
-   .. autoattribute:: preview_allowed
-
-   .. autoattribute:: javascript_required

doc/development/implementation/models.rst

@@ -23,7 +23,7 @@ Organizers and events
    :members:
 
 .. autoclass:: pretix.base.models.Event
-   :members: get_date_from_display, get_time_from_display, get_date_to_display, get_date_range_display, presale_has_ended, presale_is_running, cache, lock, get_plugins, get_mail_backend, payment_term_last, get_payment_providers, get_invoice_renderers, invoice_renderer, settings
+   :members: get_date_from_display, get_time_from_display, get_date_to_display, get_date_range_display, presale_has_ended, presale_is_running, cache, lock, get_plugins, get_mail_backend, payment_term_last, get_payment_providers, get_invoice_renderers, active_subevents, invoice_renderer, settings
 
 .. autoclass:: pretix.base.models.SubEvent
    :members: get_date_from_display, get_time_from_display, get_date_to_display, get_date_range_display, presale_has_ended, presale_is_running

doc/development/setup.rst

@@ -21,12 +21,10 @@ Your should install the following on your system:
 * Python 3.5 or newer
 * ``pip`` for Python 3 (Debian package: ``python3-pip``)
 * ``python-dev`` for Python 3 (Debian package: ``python3-dev``)
-* On Debian/Ubuntu: ``python-venv`` 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``)
-* ``libenchant1c2a`` (Debian package ``libenchant1c2a``)
 * ``msgfmt`` (Debian package ``gettext``)
 * ``git``
 
@@ -65,7 +63,9 @@ Then, create the local database::
     python manage.py migrate
 
 A first user with username ``admin@localhost`` and password ``admin`` will be automatically
-created.
+created. If you want to generate more test data, run::
+
+    python make_testdata.py
 
 If you want to see pretix in a different language than English, you have to compile our language
 files::
@@ -81,7 +81,8 @@ To run the local development webserver, execute::
 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.
+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/2019/
 
 .. note:: If you want the development server to listen on a different interface or
           port (for example because you develop on `pretixdroid`_), you can check

doc/index.rst

@@ -1 +0,0 @@
-.. include:: contents.rst

doc/plugins/badges.rst

@@ -108,43 +108,3 @@ Endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view it.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/badgeitems/
-
-   Returns a list of all assignments of items to layouts
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/democon/badgeitems/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: text/javascript
-
-      {
-        "count": 1,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id": 1,
-            "layout": 2,
-            "item": 3,
-          }
-        ]
-      }
-
-   :query page: The page number in case of a multi-page result set, default is 1
-   :param organizer: The ``slug`` field of a valid organizer
-   :param event: The ``slug`` field of a valid event
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to view it.

doc/plugins/pretixdroid.rst

@@ -316,7 +316,7 @@ uses to communicate with the pretix server.
         "total": 42,
         "version": 3,
         "event": {
-          "name": "Demo Conference",
+          "name": "Demo Converence",
           "slug": "democon",
           "date_from": "2016-12-27T17:00:00Z",
           "date_to": "2016-12-30T18:00:00Z",

doc/plugins/ticketoutputpdf.rst

@@ -114,44 +114,3 @@ Endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view it.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/ticketlayoutitems/
-
-   Returns a list of all assignments of items to layouts
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/democon/ticketlayoutitems/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: text/javascript
-
-      {
-        "count": 1,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id": 1,
-            "layout": 2,
-            "item": 3,
-            "sales_channel": web
-          }
-        ]
-      }
-
-   :query page: The page number in case of a multi-page result set, default is 1
-   :param organizer: The ``slug`` field of a valid organizer
-   :param event: The ``slug`` field of a valid event
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to view it.

doc/spelling_wordlist.txt

@@ -10,12 +10,10 @@ availabilities
 backend
 backends
 banktransfer
-Bcc
 boolean
 booleans
 cancelled
 casted
-Ceph
 checkbox
 checksum
 config
@@ -31,24 +29,18 @@ deprovision
 discoverable
 django
 dockerfile
-downloadable
 durations
 eu
 filename
 filesystem
 fontawesome
-formset
-formsets
 frontend
 frontpage
 gettext
-giftcard
 gunicorn
-guid
 hardcoded
 hostname
 idempotency
-iframe
 incrementing
 inofficial
 invalidations
@@ -57,11 +49,9 @@ Jimdo
 libpretixprint
 libsass
 linters
-login
 memcached
 metadata
 middleware
-Minio
 mixin
 mixins
 multi
@@ -79,7 +69,6 @@ overpayment
 param
 passphrase
 percental
-pluggable
 positionid
 pre
 prepend
@@ -104,12 +93,8 @@ renderer
 renderers
 reportlab
 SaaS
-scalability
 screenshot
-scss
-searchable
 selectable
-serializable
 serializers
 serializers
 sexualized
@@ -123,7 +108,6 @@ subdomains
 subevent
 subevents
 submodule
-subnet
 subpath
 Symfony
 systemd
@@ -136,15 +120,12 @@ unconfigured
 unix
 unprefixed
 untrusted
-uptime
 username
 url
 versa
 versioning
-viewable
 viewset
 viewsets
-waitinglist
 webhook
 webhooks
 webserver

doc/user/events/display.rst

@@ -21,18 +21,11 @@ Frontpage text
     your product types, give more information on the event or for other general notices.
     You can use :ref:`Markdown syntax <markdown-guide>` in this field.
 
-Voucher explanation
-    This text will be shown above the voucher input box. You can use it to explain how to obtain a voucher and use it.
-
 Show variations of a product expanded by default
     If this is not checked, a product with variations will be shown as one row in the show by default and will expand
     into multiple rows once it is clicked on. With this box checked, the variations will be shown as multiple rows
     right from the beginning.
 
-Ask search engines not to index the ticket shop
-    If this is checked, we will set a HTML meta attribute asking search engines by Google not to put this ticket shop
-    into their searchable index.
-
 
 The lower part of the page contains settings that you can **either** set on organizer-level for all your events **or**
 override for this single event individually. Those are:
@@ -42,12 +35,6 @@ Primary color
     customers. We suggest not choosing something to light, since text in that color should be readable on a white
     background and white text should be readable on a background of this color.
 
-Accent color for success
-    This color will be used for success messages. We suggest to choose a dark shade of green.
-
-Accent color for errors
-    This color will be used for error messages. We suggest to choose a dark shade of red.
-
 Font
     Choose one of multiple fonts to use for your web shop.
 

doc/user/events/email.rst

@@ -8,8 +8,8 @@ event.
    :align: center
    :class: screenshot
 
-The page is separated into four parts: "E-mail settings", "E-mail design", "E-mail content" and "SMTP settings".
-We will explain all of them in detail on this page.
+The page is separated into three parts: "E-mail settings", "E-mail content" and "SMTP settings". We will explain all
+of them in detail on this page.
 
 E-mail settings
 ---------------
@@ -30,18 +30,10 @@ Signature
     This text will be appended to all e-mails in form of a signature. This might be useful e.g. to add your contact
     details or any legal information that needs to be included with the e-mails.
 
-Bcc address
-    This email address will receive a copy of every event-related email.
-
-E-mail design
--------------
-
-In this part, you can choose and preview the layout of your emails. More layouts can be added by pretix plugins.
-
 E-mail content
 --------------
 
-The next part of the page allows you to customize the exact texts of all e-mails sent by the system automatically.
+The middle part of the page allows you to customize the exact texts of all e-mails sent by the system automatically.
 You can click on the different boxes to expand them and see the texts.
 
 Within the texts, you can use placeholders that will later by replaced by values depending on the event or order. Below
@@ -53,7 +45,6 @@ Placeholder                    Description
 ============================== ===============================================================================
 event                          The event name
 total                          The order's total value
-total_with_currency            The order's total value with a localized currency sign
 currency                       The currency used for the event (three-letter code)
 payment_info                   Information text specific to the payment method (e.g. banking details)
 url                            An URL pointing to the download/status page of the order
@@ -121,22 +112,6 @@ Reminder to download tickets
     attendees to download their tickets. The e-mail should include a link to the ticket download. This e-mail will only
     ever be sent if you specify a number of days.
 
-Order approval process
-    If you configure one of your products to "require approval", orders of that product will not immediately be confirmed
-    but only after you approved them manually. In this case, the following e-mail templates will be sent out.
-
-    Received order
-        After an order has been received, this e-mail will be sent automatically instead of the "order placed" e-mail from
-        above.
-
-    Approved order
-        This e-mail will be sent after you manually approved an order. This should include instructions to pay for the order,
-        which is why this will only be used for a paid order. For a free order, the "free order" e-mail from above will
-        be sent.
-
-    Denied order
-        This e-mail will be sent out to customers when their order has been denied.
-
 SMTP settings
 -------------
 

doc/user/events/giftcards.rst

@@ -1,71 +0,0 @@
-.. spelling::
-
-   Warengutschein
-   Wertgutschein
-
-Gift cards
-==========
-
-Gift cards, also known as "gift coupons" or "gift certificates" are a mechanism that allows you to sell tokens that
-can later be used to pay for tickets.
-
-Gift cards are very different feature than **vouchers**. The difference is:
-
-* Vouchers can be used to give a discount. When a voucher is used, the price of a ticket is reduced by the configured
-  discount and sold at a lower price. They therefore reduce both revenue as well as taxes. Vouchers (in pretix) are
-  always specific to a certain product in an order. Vouchers are usually not sold but given out as part of a
-  marketing campaign or to specific groups of people. Vouchers in pretix are bound to a specific event.
-
-* Gift cards are not a discount, but rather a means of payment. If you buy a €20 ticket with a €10 gift card, it is
-  still a €20 ticket and will still count towards your revenue with €20. Gift cards are usually bought for the money
-  that they are worth. Gift cards in pretix can be used across events (and even organizers).
-
-Selling gift cards
-------------------
-
-Selling gift cards works like selling every other type of product in pretix: Create a new product, then head to
-"Additional settings" and select the option "This product is a gift card". Whenever someone buys this product and
-pays for it, a new gift card will be created.
-
-In this case, the gift card code corresponds to the "ticket secret" in the PDF ticket. Therefore, if selling gift cards,
-you can use ticket downloads just as with normal tickets and use our ticket editor to create beautiful gift certificates
-people can give to their loved ones.
-
-Of course, you can use pretix' flexible options to modify your product. For example, you can configure that the customer
-can freely choose the price of the gift card.
-
-.. note::
-
-   pretix currently does not support charging sales tax or VAT when selling gift cards, but instead charges VAT on
-   the full price when the gift card is redeemed. This is the correct behavior in Germany and some other countries for
-   gift cards which are not bound to a very specific service ("Warengutschein"), but instead to a monetary amount
-   ("Wertgutschein").
-
-.. note::
-
-   The ticket PDF will not contain the correct gift card code before the order has been paid, so we recommend not
-   selling gift cards in events where tickets are issued before payments arrive.
-
-
-Accepting gift cards
---------------------
-
-All your events have have the payment provider "Gift card" enabled by default, but it will only show up in the ticket
-shop once the very first gift card has been issued on your organizer account. Of course, you can turn off gift card
-payments if you do not want them for a specific event.
-
-If gift card payments are enabled, buyers will be able to select "Gift card" as a payment method during checkout. If
-a gift card with a value less than the order total is used, the buyer will be asked to select a second payment method
-for the remaining payment. If a gift card with a value greater than the order total is used, the surplus amount
-remains on the gift card and can be used in a different purchase.
-
-If it possible to accept gift cards across organizer accounts. To do so, you need to have access to both organizer
-accounts. Then, you will see a configuration section at the bottom of the "Gift cards" page of your organizer settings
-where you can specify which gift cards should be accepted.
-
-Manually issuing or using gift cards
-------------------------------------
-
-Of course, you can also issue or redeem gift cards manually through our backend using the "Gift cards" menu item in your
-organizer profile or using our API. These gift cards will be tracked by pretix, but do not correspond to any purchase
-within pretix. You will therefore need to account for them in your books separately.

doc/user/events/invoicing.rst

@@ -11,6 +11,18 @@ The settings at "Settings" → "Invoice" allow you to specify if and how pretix
 
 In particular, you can configure the following things:
 
+Ask for invoice address
+    If this checkbox is enabled, customers will be able to enter an invoice address during checkout. If you only enable
+    this box, the invoice address will be optional to fill in.
+
+Require invoice address
+    If this checkbox is enabled, entering an invoice address will be obligatory for all customers and it will not be
+    able to create an order without entering an address.
+
+Require customer name
+    If this checkbox is enabled, the street, city, and country fields of the invoice address will still be optional but
+    the name field will be obligatory.
+
 Generate invoices
     This field controls whether pretix should generate an invoice for an order. You have the following options:
 
@@ -39,51 +51,6 @@ Attach invoices to emails
     "Automatically for all created orders" or to the payment confirmation e-mails if it is set to "Automatically on
     payment".
 
-Invoice number prefix
-    This is the prefix that will be prepended to all your invoice numbers. For example, if you set this to "Inv", your
-    invoices will be numbered Inv00001, Inv00002, etc. If you leave this field empty, your event slug will be used,
-    followed by a dash, e.g. DEMOCON-00001.
-
-    Within one organizer account, events with the same number prefix will share their number range. For example, if you
-    set this to "Inv" for all of your events, there will be only one invoice numbered Inv00007 across all your events
-    and the numbers will have gaps within one event.
-
-Generate invoices with consecutive numbers
-    If enabled, invoices will be created with numerical invoice numbers in the order of their creation, i.e.
-    PREFIX-00001, PREFIX-00002, and so on. If disabled, invoice numbers will instead be generated from the order code,
-    i.e. PREFIX-YHASD-1. When in doubt, keep this option enabled since it might be legally required in your country,
-    but disabling it has the advantage that your customers can not estimate the number of tickets sold by looking at
-    the invoice numbers.
-
-Invoice language
-    This setting allows you to configure the language of all invoices. You can either set it to one of your event
-    language or dynamically to the language used by the customer.
-
-Show free products on invoices
-    If enabled, products that do not cost anything will still show up on invoices. Note that the order needs to contain
-    at least one non-free product in order to generate an invoice.
-
-Show attendee names on invoices
-    If enabled, the attendee name will be printed on the invoice for admission tickets.
-
-Ask for invoice address
-    If this checkbox is enabled, customers will be able to enter an invoice address during checkout. If you only enable
-    this box, the invoice address will be optional to fill in.
-
-Require invoice address
-    If this checkbox is enabled, entering an invoice address will be obligatory for all customers and it will not be
-    able to create an order without entering an address.
-
-Require customer name
-    If this checkbox is enabled, the street, city, and country fields of the invoice address will still be optional but
-    the name field will be obligatory.
-
-Require a business address
-    If enabled, the invoice address form will require a company name and do not allow personal addresses.
-
-Ask for beneficiary
-    If enabled, the invoice address form will contain an additional field to input the beneficiary of the transaction.
-
 Ask for VAT ID
     If enabled, the invoice address form will not only ask for a postal address, but also for a VAT ID. The VAT ID will
     always be an optional field.
@@ -95,12 +62,25 @@ Generate invoices with consecutive numbers
     but disabling it has the advantage that your customers can not estimate the number of tickets sold by looking at
     the invoice numbers.
 
-Your invoice details
-    These fields should be set to the address of the entity issuing the invoice (read: you) and will be printed inside
-    the header of the invoice.
+Invoice number prefix
+    This is the prefix that will be prepended to all your invoice numbers. For example, if you set this to "Inv", your
+    invoices will be numbered Inv00001, Inv00002, etc. If you leave this field empty, your event slug will be used,
+    followed by a dash, e.g. DEMOCON-00001.
 
-Invoice style
-    This setting allows you to choose the design of your invoice. Additional designs can be added by pretix plugins.
+    Within one organizer account, events with the same number prefix will share their number range. For example, if you
+    set this to "Inv" for all of your events, there will be only one invoice numbered Inv00007 across all your events
+    and the numbers will have gaps within one event.
+
+Show free products on invoices
+    If enabled, products that do not cost anything will still show up on invoices. Note that the order needs to contain
+    at least one non-free product in order to generate an invoice.
+
+Show attendee names on invoices
+    If enabled, the attendee name will be printed on the invoice for admission tickets.
+
+Your address
+    This should be set to the address of the entity issuing the invoice (read: you) and will be printed inside
+    the header of the invoice.
 
 Introductory text
     A free custom text that will be printed above the list of products on the invoice.

doc/user/events/structureguide.rst

@@ -1,346 +0,0 @@
-Product structure guide
-=======================
-
-Between products, categories, variations, add-ons, bundles, and quotas, pretix provides a wide range of features that allow you to set up your event in the way you want it.
-However, it is easy to get lost in the process or to get started with building your event right.
-Often times, there are multiple ways to do something that come with different advantages and disadvantages.
-This guide will walk you through a number of typical examples of pretix event structures and will explain how to set them up – feel free to just skip ahead to a section relevant for you.
-
-Terminology
------------
-
-Products
-    A product is a basic entity that can be bought. You can think of it as a ticket type, but it can be more things than just a ticket, it can also be a piece of merchandise, a parking slot, etc.
-    You might find some places where they are called "items" instead, but we're trying to get rid of that.
-
-Product categories
-    Products can be sorted into categories. Each product can only be in one category. Category are mostly used for grouping related products together to make your event page easier to read for buyers. However, we'll need categories as well to set up some of the structures outlined below.
-
-Product variations
-    During creation of a product, you can decide that your product should have multiple variations. Variations of a product can differ in price, description, and availability, but are otherwise the same. You could use this e.g. for differentiating between a regular ticket and a discounted ticket for students, or when selling merchandise to differentiate the different sizes of a t-shirt.
-
-Product add-ons
-    Add-ons are products that are sold together with another product (which we will call the base product in this case). For example, you could have a base product "Conference ticket" and then define multiple workshops that can be chosen as an add-on.
-
-Product bundles
-    Bundles work very similarly to add-ons, but are different in the way that they are always automatically included with the base product and cannot be optional. In contrast to add-on products, the same product can be included multiple times in a bundle.
-
-Quotas
-    Quotas define the availability of products. A quota has a size (i.e. the number of products in the inventory) and is mapped to one or multiple products or variations.
-
-Questions
-    Questions are user-defined form fields that buyers will need to fill out when purchasing a product.
-
-Use case: Multiple price levels
--------------------------------
-
-Imagine you're running a concert with general admission that sells a total of 200 tickets for two prices:
-
-* Regular: € 25.00
-* Students: € 19.00
-
-You can either set up two different products called e.g. "Regular ticket" and "Student ticket" with the respective prices, or two variations within the same product. In this simple case, it really doesn't matter.
-
-In addition, you will need quotas. If you do not care how many of your tickets are sold to students, you should set up just **one quota** of 200 called e.g. "General admission" that you link to **both products**.
-
-If you want to limit the number of student tickets to 50 to ensure a certain minimum revenue, but do not want to limit the number of regular tickets artificially, we suggest you to create the same quota of 200 that is linked to both products, and then create a **second quota** of 50 that is only linked to the student ticket. This way, the system will reduce both quotas whenever a student ticket is sold and only the larger quota when a regular ticket is sold.
-
-Use case: Early-bird tiers based on dates
------------------------------------------
-
-Let's say you run a conference that has the following pricing scheme:
-
-* 12 to 6 months before the event: € 450
-* 6 to 3 months before the event: € 550
-* closer than 3 months to the event: € 650
-
-Of course, you could just set up one product and change its price at the given dates manually, but if you want to set this up automatically, here's how:
-
-Create three products (e.g. "super early bird", "early bird", "regular ticket") with the respective prices and one shared quota of your total event capacity. Then, set the **available from** and **available until** configuration fields of the products to automatically turn them on and off based on the current date.
-
-Use case: Early-bird tiers based on ticket numbers
---------------------------------------------------
-
-Let's say you run a conference with 400 tickets that has the following pricing scheme:
-
-* First 100 tickets ("super early bird"): € 450
-* Next 100 tickets ("early bird"): € 550
-* Remaining tickets ("regular"): € 650
-
-First of all, create three products:
-
-* "Super early bird ticket"
-* "Early bird ticket"
-* "Regular ticket"
-
-Then, create three quotas:
-
-* "Super early bird" with a **size of 100** and the "Super early bird ticket" product selected. At "Advanced options",
-  select the box "Close this quota permanently once it is sold out".
-
-* "Early bird and lower" with a **size of 200** and both of the "Super early bird ticket" and "Early bird ticket"
-  products selected. At "Advanced options", select the box "Close this quota permanently once it is sold out".
-
-* "All participants" with a **size of 400**, all three products selected and **no additional options**.
-
-Next, modify the product "Regular ticket". In the section "Availability", you should look for the option "Only show
-after sellout of" and select your quota "Early bird and lower". Do the same for the "Early bird ticket" with the quota
-"Super early bird ticket".
-
-This will ensure the following things:
-
-* Each ticket level is only visible after the previous level is sold out.
-
-* As soon as one level is really sold out, it's not coming back, because the quota "closes", i.e. locks in place.
-
-* By creating a total quota of 400 with all tickets included, you can still make sure to sell the maximum number of
-  tickets, even if e.g. early-bird tickets are canceled.
-
-Optionally, if you want to hide the early bird prices once they are sold out, go to "Settings", then "Display" and
-select "Hide all products that are sold out". Of course, it might be a nice idea to keep showing the prices to remind
-people to buy earlier next time ;)
-
-Please note that there might be short time intervals where the prices switch back and forth: When the last early bird
-tickets are in someone's cart (but not yet sold!), the early bird tickets will show as "Reserved" and the regular
-tickets start showing up. However, if the customers holding the reservations do not complete their order,
-the early bird tickets will become available again. This is not avoidable if we want to prevent malicious users
-from blocking all the cheap tickets without an actual sale happening.
-
-Use case: Up-selling of ticket extras
--------------------------------------
-
-Let's assume you're putting up a great music festival, and to save trouble with handling payments on-site, you want to sell parking spaces together with your ticket. By using our add-on feature, you can prompt all users to book the parking space (to make sure they see it) and ensure that only people with a ticket can book a parking space. You can set it up like this:
-
-* Create a base product "Festival admission"
-* Create a quota for the base product
-* Create a category "Ticket extras" and check "Products in this category are add-on products"
-* Create a product "Parking space" within that category
-* Create a quota for the parking space product
-* Go to the base product and select the tab "Add-Ons" at the top. Click "Add a new add-on" and choose the "Ticket extras" category. You can keep the numbers at 0 and 1.
-
-During checkout, all buyers of the base product will now be prompted if they want to add the parking space.
-
-.. tip::
-
-   You can also use add-on products for free things, just to keep tabs on capacity.
-
-Use case: Conference with workshops
------------------------------------
-
-When running a conference, you might also organize a number of workshops with smaller capacity. To be able to plan, it would be great to know which workshops an attendee plans to attend.
-
-Option A: Questions
-"""""""""""""""""""
-
-Your first and simplest option is to just create a multiple-choice question. This has the upside of making it easy for users to change their mind later on, but will not allow you to restrict the number of attendees signing up for a given workshop – or even charge extra for a given workshop.
-
-Option B: Add-on products with fixed time slots
-"""""""""""""""""""""""""""""""""""""""""""""""
-
-The usually better option is to go with add-on products. Let's take for example the following conference schedule, in which the lecture can be attended by anyone, but the workshops only have space for 20 persons each:
-
-==================== =================================== ===================================
-Time                 Room A                              Room B
-==================== =================================== ===================================
-Wednesday morning    Lecture
-Wednesday afternoon  Workshop A                          Workshop B
-Thursday morning     Workshop C                          Workshop D (20 € extra charge)
-==================== =================================== ===================================
-
-Assuming you already created one or more products for your general conference admission, we suggest that you additionally create:
-
-* A category called "Workshops" with the checkbox "Products in this category are add-on products" activated
-
-* A free product called "Wednesday afternoon" within the category "Workshops" and with two variations:
-
-    * Workshop A
-
-    * Workshop B
-
-* A free product called "Thursday morning" within the category "Workshops" and with two variations:
-
-    * Workshop C
-
-    * Workshop D with a price of 20 €
-
-* Four quotas for each of the workshops
-
-* One add-on configuration on your base product that allows users to choose between 0 and 2 products from the category "Workshops"
-
-Option C: Add-on products with variable time slots
-""""""""""""""""""""""""""""""""""""""""""""""""""
-
-The above option only works if your conference uses fixed time slots and every workshop uses exactly one time slot. If
-your schedule looks like this, it's not going to work great:
-
-+-------------+------------+-----------+
-| Time        | Room A     | Room B    |
-+=============+============+===========+
-| 09:00-11:00 | Talk 1     | Long      |
-+-------------+------------+ Workshop 1|
-| 11:00-13:00 | Talk 2     |           |
-+-------------+------------+-----------+
-| 14:00-16:00 | Long       | Talk 3    |
-+-------------+ workshop 2 +-----------+
-| 16:00-18:00 |            | Talk 4    |
-+-------------+------------+-----------+
-
-In this case, we recommend that you go to *Settings*, then *Plugins* and activate the plugin **Agenda constraints**.
-
-Then, create a product (without variations) for every single part that should be bookable (talks 1-4 and long workshops
-1 and 2) as well as appropriate quotas for each of them.
-
-All of these products should be part of the same category. In your base product (e.g. your conference ticket), you
-can then create an add-on product configuration allowing users to add products from this category.
-
-If you edit these products, you will be able to enter the "Start date" and "End date" of the talk or workshop close
-to the bottom of the page. If you fill in these values, pretix will automatically ensure no overlapping talks are
-booked.
-
-.. note::
-
-    This option is currently only available on pretix Hosted. If you are interested in using it with pretix Enterprise,
-    please contact sales@pretix.eu.
-
-
-Use case: Discounted packages
------------------------------
-
-Imagine you run a trade show that opens on three consecutive days and you want to have the following pricing:
-
-* Single day: € 10
-* Any two days: € 17
-* All three days:  € 25
-
-In this case, there are multiple different ways you could set this up with pretix.
-
-Option A: Combination products
-""""""""""""""""""""""""""""""
-
-With this option, you just set up all the different combinations someone could by as a separate product. In this case, you would need 7 products:
-
-* Day 1 pass
-* Day 2 pass
-* Day 3 pass
-* Day 1+2 pass
-* Day 2+3 pass
-* Day 1+3 pass
-* All-day pass
-
-Then, you create three quotas, each one with the maximum capacity of your venue on any given day:
-
-* Day 1 quota, linked to "Day 1 pass", "Day 1+2 pass", "Day 1+3 pass", and "All-day pass"
-* Day 2 quota, linked to "Day 2 pass", "Day 1+2 pass", "Day 2+3 pass", and "All-day pass"
-* Day 3 quota, linked to "Day 3 pass", "Day 2+3 pass", "Day 1+3 pass", and "All-day pass"
-
-This way, every person gets exactly one ticket that they can use for all days that they attend. You can later set up check-in lists appropriately to make sure only tickets valid for a certain day can be scanned on that day.
-
-The benefit of this option is that your product structure and order structure stays very simple. However, the two-day packages scale badly when you need many products.
-
-We recommend this setup for most setups in which the number of possible combinations does not exceed the number of parts (here: number of days) by much.
-
-Option B: Add-ons and bundles
-"""""""""""""""""""""""""""""
-
-We can combine the two features "product add-ons" and "product bundles" to set this up in a different way. Here, you would create the following five products:
-
-* Day 1 pass in a category called "Day passes"
-* Day 2 pass in a category called "Day passes"
-* Day 3 pass in a category called "Day passes"
-* Two-day pass
-* All-day pass
-
-This time, you will need five quotas:
-
-* Day 1 quota, linked to "Day 1 pass"
-* Day 2 quota, linked to "Day 2 pass"
-* Day 3 quota, linked to "Day 3 pass"
-* Two-day pass quota, linked to "Two-day pass" (can be unlimited)
-* All-day pass quota, linked to "All-day pass" (can be unlimited)
-
-Then, you open the "Add-On" tab in the settings of the **Two-day pass** product and create a new add-on configuration specifying the following options:
-
-* Category: "Day passes"
-* Minimum number: 2
-* Maximum number: 2
-* Add-Ons are included in the price: Yes
-
-This way, when buying a two-day pass, the user will be able to select *exactly* two days for free, which will then be added to the cart. Depending on your specific configuration, the user will now receive *two separate* tickets, one for each day.
-
-For the all-day pass, you open the "Bundled products" tab in the settings of the **All-day pass** product and add **three** new bundled items with the following options:
-
-* Bundled product: "Day 1/2/3"
-* Bundled variation: None
-* Count: 1
-* Designated price: 0
-
-This way, when buying an all-day pass, three free day passes will *automatically* be added to the cart. Depending on your specific configuration, the user will now receive *three separate* tickets, one for each day.
-
-This approach makes your order data more complicated, since e.g. someone who buys an all-day pass now technically bought **four products**. However, this option allows for more flexibility when you have lots of options to choose from.
-
-.. tip::
-
-   Depending on the packages you offer, you **might not need both the add-on and the bundle feature**, i.e. you only need the add-on feature for the two-day pass and only the bundle feature for the all-day pass. You could also set up the two-day pass like we showed here, but the all-day pass like in option A!
-
-Use case: Group discounts
--------------------------
-
-Often times, you want to give discounts for whole groups attending your event. pretix can't automatically discount based on volume, but there's still some ways you can set up group tickets.
-
-Flexible group sizes
-""""""""""""""""""""
-
-If you want to give out discounted tickets to groups starting at a given size, but still billed per person, you can do so by creating a special **Group ticket** at the per-person price and set the **Minimum amount per order** option of the ticket to the minimal group size.
-
-This way, your ticket can be bought an arbitrary number of times – but no less than the given minimal amount per order.
-
-Fixed group sizes
-"""""""""""""""""
-
-If you want to sell group tickets in fixed sizes, e.g. a table of eight at your gala dinner, you can use product bundles. Assuming you already set up a ticket for admission of single persons, you then set up a second product **Table (8 persons)** with a discounted full price. Then, head to the **Bundled products** tab of that product and add one bundle configuration to include the single admission product **eight times**. Next, create an unlimited quota mapped to the new product.
-
-This way, the purchase of a table will automatically create eight tickets, leading to a correct calculation of your total quota and, as expected, eight persons on your check-in list. You can even ask for the individual names of the persons during checkout.
-
-Use case: Restricted audience
------------------------------
-
-Not all events are for everyone. Sometimes, there is a good reason to restrict access to your event or parts of your event only to a specific, invited group. There's two ways to implement this with pretix:
-
-Option A: Required voucher codes
-""""""""""""""""""""""""""""""""
-
-If you check the option "**This product can only be bought using a voucher**" of one or multiple products, only people holding an applicable voucher code will be able to buy the product.
-
-You can then generate voucher codes for the respective product and send them out to the group of possible attendees. If the recipients should still be able to choose between different products, you can create an additional quota and map the voucher to that quota instead of the products themselves.
-
-There's also the second option "**This product will only be shown if a voucher matching the product is redeemed**". In this case, the existence of the product won't even be shown before a voucher code is entered – useful for a VIP option in a shop where you also sell other products to the general public. Please note that this option does **not** work with vouchers assigned to a quota, only with vouchers assigned directly to the product.
-
-This option is appropriate if you know the group of people beforehand, e.g. members of a club, and you can mail them their access codes.
-
-Option B: Order approvals
-"""""""""""""""""""""""""
-
-If you do not know your audience already, but still want to restrict it to a certain group, e.g. people with a given profession, you can check the "**Buying this product requires approval**" in the settings of your product. If a customer tries to buy such a product, they will be able to place their order but can not proceed to payment. Instead, you will be asked to approve or deny the order and only if you approve it, we will send a payment link to the customer.
-
-This requires the customer to interact with the ticket shop twice (once for the order, once for the payment) which adds a little more friction, but gives you full control over who attends the event.
-
-Use case: Mixed taxation
-------------------------
-
-Let's say you are a charitable organization in Germany and are allowed to charge a reduced tax rate of 7% for your educational event. However, your event includes a significant amount of food, you might need to charge a 19% tax rate on that portion. For example, your desired tax structure might then look like this:
-
-* Conference ticket price: € 450 (incl. € 150 for food)
-
-    * incl. € 19.63 VAT at 7%
-    * incl. € 23.95 VAT at 19%
-
-You can implement this in pretix using product bundles. In order to do so, you should create the following two products:
-
-* Conference ticket at € 450 with a 7% tax rule
-* Conference food at € 150 with a 19% tax rule and the option "**Only sell this product as part of a bundle**" set
-
-In addition to your normal conference quota, you need to create an unlimited quota for the food product.
-
-Then, head to the **Bundled products** tab of the "conference ticket" and add the "conference food" as a bundled product with a **designated price** of € 150.
-
-Once a customer tries to buy the € 450 conference ticket, a sub-product will be added and the price will automatically be split into the two components, leading to a correct computation of taxes.

doc/user/events/tickets.rst

@@ -25,10 +25,6 @@ Generate tickets for non-admission products
   By default, tickets will only be generated for products that are marked as admission products. Enable this option to
   generate tickets for all products instead.
 
-Offer to download tickets even before an order is paid
-  By default, ticket download is only possible for paid orders. If you run an event where people usually pay only after
-  the event, you can check this box to enable ticket download even before.
-
 Below these settings, the detail settings for the various ticket file formats are offered. They differ from format to
 format and only share the common "Enable" setting that can be used to turn them on. By default, pretix ships with
 a PDF output plugin that you can configure through a visual design editor.

doc/user/events/widget.rst

@@ -114,40 +114,6 @@ If you want to disable voucher input in the widget, you can pass the ``disable-v
 
    <pretix-widget event="https://pretix.eu/demo/democon/" disable-vouchers></pretix-widget>
 
-Multi-event selection
----------------------
-
-If you want to embed multiple events in a single widget, you can do so. If it's multiple dates of an event series, just leave off the ``series`` attribute::
-
-   <pretix-widget event="https://pretix.eu/demo/series/"></pretix-widget>
-
-If you want to include all your public events, you can just reference your organizer::
-
-   <pretix-widget event="https://pretix.eu/demo/"></pretix-widget>
-
-There is an optional ``style`` parameter that let's you choose between a calendar view and a list view. If you do not set it, the choice will be taken from your organizer settings::
-
-   <pretix-widget event="https://pretix.eu/demo/series/" style="list"></pretix-widget>
-   <pretix-widget event="https://pretix.eu/demo/series/" style="calendar"></pretix-widget>
-
-You can see an example here:
-
-.. raw:: html
-
-    <pretix-widget event="https://pretix.eu/demo/series/" style="calendar"></pretix-widget>
-    <noscript>
-       <div class="pretix-widget">
-            <div class="pretix-widget-info-message">
-                JavaScript is disabled in your browser. To access our ticket shop without javascript, please <a target="_blank" href="https://pretix.eu/demo/series/">click here</a>.
-            </div>
-        </div>
-    </noscript>
-
-You can filter events by meta data attributes. You can create those attributes in your order profile and set their values in both event and series date
-settings. For example, if you set up a meta data property called "Promoted" that you set to "Yes" on some events, you can pass a filter like this::
-
-   <pretix-widget event="https://pretix.eu/demo/series/" style="list" filter="attr[Promoted]=Yes"></pretix-widget>
-
 pretix Button
 -------------
 
@@ -206,21 +172,6 @@ If you want, you can suppress us loading the widget and/or modify the user data
 
 If you then later want to trigger loading the widgets, just call ``window.PretixWidget.buildWidgets()``.
 
-Waiting for the widget to load
-------------------------------
-
-If you want to run custom JavaScript once the widget is fully loaded, you can register a callback function. Note that
-this function might be run multiple times, for example if you have multiple widgets on a page or if the user switches
-e.g. from an event list to an event detail view::
-
-    <script type="text/javascript">
-    window.pretixWidgetCallback = function () {
-        window.PretixWidget.addLoadListener(function () {
-            console.log("Widget has loaded!");
-        });
-    }
-    </script>
-
 
 Passing user data to the widget
 -------------------------------
@@ -256,11 +207,6 @@ This works for the pretix Button as well. Currently, the following attributes ar
   naming scheme such as ``name-title`` or ``name-given-name`` (see above). ``country`` expects a two-character
   country code.
 
-* If ``data-fix="true"`` is given, the user will not be able to change the other given values later. This currently
-  only works for the order email address as well as the invoice address. Attendee-level fields and questions can
-  always be modified. Note that this is not a security feature and can easily be overridden by users, so do not rely
-  on this for authentication.
-
 Any configured pretix plugins might understand more data fields. For example, if the appropriate plugins on pretix
 Hosted or pretix Enterprise are active, you can pass the following fields:
 
@@ -294,9 +240,6 @@ Hosted or pretix Enterprise are active, you can pass the following fields:
         };
     </script>
 
-  In some combinations with Google Tag Manager, the widget does not load this way. In this case, try replacing
-  ``tracker.get('clientId')`` with ``ga.getAll()[0].get('clientId')``.
-
 
 .. versionchanged:: 2.3
 

doc/user/index.rst

@@ -10,8 +10,6 @@ wanting to use pretix to sell tickets.
    organizers/index
    events/create
    events/settings
-   events/structureguide
    events/widget
-   events/giftcards
    faq
-   markdown
+   markdown

doc/user/payments/paypal.rst

@@ -3,13 +3,6 @@
 PayPal
 ======
 
-.. note::
-
-   If you use pretix Hosted, you do not longer need to go through this tedious process! You can
-   just open the PayPal settings in the payment section of your event, click "Connect to PayPal"
-   and log in to your PayPal account. The following guide is only required for self-hosted
-   versions of pretix.
-
 To integrate PayPal with pretix, you first need to have an active PayPal merchant account. If you do not already have a
 PayPal account, you can create one on `paypal.com`_.
 If you look into pretix' settings, you are required to fill in two keys:

src/MANIFEST.in

@@ -22,5 +22,3 @@ recursive-include pretix/plugins/ticketoutputpdf/templates *
 recursive-include pretix/plugins/ticketoutputpdf/static *
 recursive-include pretix/plugins/badges/templates *
 recursive-include pretix/plugins/badges/static *
-recursive-include pretix/plugins/returnurl/templates *
-recursive-include pretix/plugins/returnurl/static *

src/make_testdata.py

@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+import os
+import sys
+from datetime import datetime
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pretix.settings")
+
+import django
+
+django.setup()
+
+from pretix.base.models import *  # NOQA
+from django.utils.timezone import now
+
+if Organizer.objects.exists():
+    print("There already is data in your DB!")
+    sys.exit(0)
+user = User.objects.get_or_create(
+    email='admin@localhost',
+)[0]
+user.set_password('admin')
+user.save()
+organizer = Organizer.objects.create(
+    name='BigEvents LLC', slug='bigevents'
+)
+year = now().year + 1
+event = Event.objects.create(
+    organizer=organizer, name='Demo Conference {}'.format(year),
+    slug=year, currency='EUR', live=True,
+    date_from=datetime(year, 9, 4, 17, 0, 0),
+    date_to=datetime(year, 9, 6, 17, 0, 0),
+)
+t = Team.objects.get_or_create(
+    organizer=organizer, name='Admin Team',
+    all_events=True, can_create_events=True, can_change_teams=True,
+    can_change_organizer_settings=True, can_change_event_settings=True, can_change_items=True,
+    can_view_orders=True, can_change_orders=True, can_view_vouchers=True, can_change_vouchers=True
+)
+t[0].members.add(user)
+cat_tickets = ItemCategory.objects.create(
+    event=event, name='Tickets'
+)
+cat_merch = ItemCategory.objects.create(
+    event=event, name='Merchandise'
+)
+question = Question.objects.create(
+    event=event, question='Age',
+    type=Question.TYPE_NUMBER, required=False
+)
+tr19 = event.tax_rules.create(rate=19)
+item_ticket = Item.objects.create(
+    event=event, category=cat_tickets, name='Ticket',
+    default_price=23, tax_rule=tr19, admission=True
+)
+item_ticket.questions.add(question)
+item_shirt = Item.objects.create(
+    event=event, category=cat_merch, name='T-Shirt',
+    default_price=15, tax_rule=tr19
+)
+var_s = ItemVariation.objects.create(item=item_shirt, value='S')
+var_m = ItemVariation.objects.create(item=item_shirt, value='M')
+var_l = ItemVariation.objects.create(item=item_shirt, value='L')
+ticket_quota = Quota.objects.create(
+    event=event, name='Ticket quota', size=400,
+)
+ticket_quota.items.add(item_ticket)
+ticket_shirts = Quota.objects.create(
+    event=event, name='Shirt quota', size=200,
+)
+ticket_quota.items.add(item_shirt)
+ticket_quota.variations.add(var_s, var_m, var_l)

src/pretix/__init__.py

@@ -1 +1 @@
-__version__ = "3.4.0"
+__version__ = "2.5.0.dev0"

src/pretix/api/auth/device.py

@@ -1,5 +1,4 @@
 from django.contrib.auth.models import AnonymousUser
-from django_scopes import scopes_disabled
 from rest_framework import exceptions
 from rest_framework.authentication import TokenAuthentication
 
@@ -13,15 +12,14 @@ class DeviceTokenAuthentication(TokenAuthentication):
     def authenticate_credentials(self, key):
         model = self.get_model()
         try:
-            with scopes_disabled():
-                device = model.objects.select_related('organizer').get(api_token=key)
+            device = model.objects.select_related('organizer').get(api_token=key)
         except model.DoesNotExist:
             raise exceptions.AuthenticationFailed('Invalid token.')
 
         if not device.initialized:
             raise exceptions.AuthenticationFailed('Device has not been initialized.')
 
-        if device.revoked:
+        if not device.api_token:
             raise exceptions.AuthenticationFailed('Device access has been revoked.')
 
         return AnonymousUser(), device

src/pretix/api/auth/permission.py

@@ -1,9 +1,8 @@
 from rest_framework.permissions import SAFE_METHODS, BasePermission
 
 from pretix.api.models import OAuthAccessToken
-from pretix.base.models import Device, Event, User
-from pretix.base.models.auth import SuperuserPermissionSet
-from pretix.base.models.organizer import TeamAPIToken
+from pretix.base.models import Device, Event
+from pretix.base.models.organizer import Organizer, TeamAPIToken
 from pretix.helpers.security import (
     SessionInvalid, SessionReauthRequired, assert_session_valid,
 )
@@ -38,24 +37,21 @@ class EventPermission(BasePermission):
                 slug=request.resolver_match.kwargs['event'],
                 organizer__slug=request.resolver_match.kwargs['organizer'],
             ).select_related('organizer').first()
-            if not request.event or not perm_holder.has_event_permission(request.event.organizer, request.event, request=request):
+            if not request.event or not perm_holder.has_event_permission(request.event.organizer, request.event):
                 return False
             request.organizer = request.event.organizer
-            if isinstance(perm_holder, User) and perm_holder.has_active_staff_session(request.session.session_key):
-                request.eventpermset = SuperuserPermissionSet()
-            else:
-                request.eventpermset = perm_holder.get_event_permission_set(request.organizer, request.event)
+            request.eventpermset = perm_holder.get_event_permission_set(request.organizer, request.event)
 
             if required_permission and required_permission not in request.eventpermset:
                 return False
 
         elif 'organizer' in request.resolver_match.kwargs:
-            if not request.organizer or not perm_holder.has_organizer_permission(request.organizer, request=request):
+            request.organizer = Organizer.objects.filter(
+                slug=request.resolver_match.kwargs['organizer'],
+            ).first()
+            if not request.organizer or not perm_holder.has_organizer_permission(request.organizer):
                 return False
-            if isinstance(perm_holder, User) and perm_holder.has_active_staff_session(request.session.session_key):
-                request.orgapermset = SuperuserPermissionSet()
-            else:
-                request.orgapermset = perm_holder.get_organizer_permission_set(request.organizer)
+            request.orgapermset = perm_holder.get_organizer_permission_set(request.organizer)
 
             if required_permission and required_permission not in request.orgapermset:
                 return False

src/pretix/api/middleware.py

@@ -1,112 +0,0 @@
-import json
-from hashlib import sha1
-
-from django.conf import settings
-from django.db import transaction
-from django.http import HttpRequest, HttpResponse, JsonResponse
-from django.urls import resolve
-from django.utils.timezone import now
-from django_scopes import scope
-from rest_framework import status
-
-from pretix.api.models import ApiCall
-from pretix.base.models import Organizer
-
-
-class IdempotencyMiddleware:
-    def __init__(self, get_response):
-        self.get_response = get_response
-
-    def __call__(self, request: HttpRequest):
-        if request.method in ('GET', 'HEAD', 'OPTIONS'):
-            return self.get_response(request)
-
-        if not request.path.startswith('/api/'):
-            return self.get_response(request)
-
-        if not request.headers.get('X-Idempotency-Key'):
-            return self.get_response(request)
-
-        auth_hash_parts = '{}:{}'.format(
-            request.headers.get('Authorization', ''),
-            request.COOKIES.get(settings.SESSION_COOKIE_NAME, '')
-        )
-        auth_hash = sha1(auth_hash_parts.encode()).hexdigest()
-        idempotency_key = request.headers.get('X-Idempotency-Key', '')
-
-        with transaction.atomic():
-            call, created = ApiCall.objects.select_for_update().get_or_create(
-                auth_hash=auth_hash,
-                idempotency_key=idempotency_key,
-                defaults={
-                    'locked': now(),
-                    'request_method': request.method,
-                    'request_path': request.path,
-                    'response_code': 0,
-                    'response_headers': '{}',
-                    'response_body': b''
-                }
-            )
-
-        if created:
-            resp = self.get_response(request)
-            with transaction.atomic():
-                if resp.status_code in (409, 429, 503):
-                    # This is the exception: These calls are *meant* to be retried!
-                    call.delete()
-                else:
-                    call.response_code = resp.status_code
-                    if isinstance(resp.content, str):
-                        call.response_body = resp.content.encode()
-                    elif isinstance(resp.content, memoryview):
-                        call.response_body = resp.content.tobytes()
-                    elif isinstance(resp.content, bytes):
-                        call.response_body = resp.content
-                    elif hasattr(resp.content, 'read'):
-                        call.response_body = resp.read()
-                    elif hasattr(resp, 'data'):
-                        call.response_body = json.dumps(resp.data)
-                    else:
-                        call.response_body = repr(resp).encode()
-                    call.response_headers = json.dumps(resp._headers)
-                    call.locked = None
-                    call.save(update_fields=['locked', 'response_code', 'response_headers',
-                                             'response_body'])
-            return resp
-        else:
-            if call.locked:
-                r = JsonResponse(
-                    {'detail': 'Concurrent request with idempotency key.'},
-                    status=status.HTTP_409_CONFLICT,
-                )
-                r['Retry-After'] = 5
-                return r
-
-            content = call.response_body
-            if isinstance(content, memoryview):
-                content = content.tobytes()
-            r = HttpResponse(
-                content=content,
-                status=call.response_code,
-            )
-            for k, v in json.loads(call.response_headers).values():
-                r[k] = v
-            return r
-
-
-class ApiScopeMiddleware:
-    def __init__(self, get_response):
-        self.get_response = get_response
-
-    def __call__(self, request: HttpRequest):
-        if not request.path.startswith('/api/'):
-            return self.get_response(request)
-
-        url = resolve(request.path_info)
-        if 'organizer' in url.kwargs:
-            request.organizer = Organizer.objects.filter(
-                slug=url.kwargs['organizer'],
-            ).first()
-
-        with scope(organizer=getattr(request, 'organizer', None)):
-            return self.get_response(request)

src/pretix/api/migrations/0004_auto_20190405_1048.py

@@ -1,44 +0,0 @@
-# Generated by Django 2.1.5 on 2019-04-05 10:48
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('pretixbase', '0116_auto_20190402_0722'),
-        ('pretixapi', '0003_webhook_webhookcall_webhookeventlistener'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ApiCall',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('idempotency_key', models.CharField(db_index=True, max_length=190)),
-                ('auth_hash', models.CharField(db_index=True, max_length=190)),
-                ('created', models.DateTimeField(auto_now_add=True)),
-                ('locked', models.DateTimeField(null=True)),
-                ('request_method', models.CharField(max_length=20)),
-                ('request_path', models.CharField(max_length=255)),
-                ('response_code', models.PositiveIntegerField()),
-                ('response_headers', models.TextField()),
-                ('response_body', models.BinaryField()),
-            ],
-        ),
-        migrations.AlterModelOptions(
-            name='webhookcall',
-            options={'ordering': ('-datetime',)},
-        ),
-        migrations.AlterModelOptions(
-            name='webhookeventlistener',
-            options={'ordering': ('action_type',)},
-        ),
-        migrations.AlterUniqueTogether(
-            name='apicall',
-            unique_together={('idempotency_key', 'auth_hash')},
-        ),
-    ]

src/pretix/api/migrations/0005_auto_20191028_1541.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.1 on 2019-10-28 15:41
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixapi', '0004_auto_20190405_1048'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='oauthgrant',
-            name='redirect_uri',
-            field=models.CharField(max_length=2500),
-        ),
-    ]

src/pretix/api/models.py

@@ -43,7 +43,6 @@ class OAuthGrant(AbstractGrant):
         OAuthApplication, on_delete=models.CASCADE
     )
     organizers = models.ManyToManyField('pretixbase.Organizer')
-    redirect_uri = models.CharField(max_length=2500)  # Only 255 in AbstractGrant, which caused problems
 
 
 class OAuthAccessToken(AbstractAccessToken):
@@ -78,9 +77,6 @@ class WebHook(models.Model):
     all_events = models.BooleanField(default=True, verbose_name=_("All events (including newly created ones)"))
     limit_events = models.ManyToManyField('pretixbase.Event', verbose_name=_("Limit to events"), blank=True)
 
-    class Meta:
-        ordering = ('id',)
-
     @property
     def action_types(self):
         return [
@@ -110,20 +106,3 @@ class WebHookCall(models.Model):
 
     class Meta:
         ordering = ("-datetime",)
-
-
-class ApiCall(models.Model):
-    idempotency_key = models.CharField(max_length=190, db_index=True)
-    auth_hash = models.CharField(max_length=190, db_index=True)
-    created = models.DateTimeField(auto_now_add=True)
-    locked = models.DateTimeField(null=True)
-
-    request_method = models.CharField(max_length=20)
-    request_path = models.CharField(max_length=255)
-
-    response_code = models.PositiveIntegerField()
-    response_headers = models.TextField()
-    response_body = models.BinaryField()
-
-    class Meta:
-        unique_together = (('idempotency_key', 'auth_hash'),)

src/pretix/api/serializers/cart.py

@@ -8,33 +8,31 @@ from rest_framework.exceptions import ValidationError
 
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.api.serializers.order import (
-    AnswerCreateSerializer, AnswerSerializer, InlineSeatSerializer,
+    AnswerCreateSerializer, AnswerSerializer,
 )
-from pretix.base.models import Quota, Seat
+from pretix.base.models import Quota
 from pretix.base.models.orders import CartPosition
 
 
 class CartPositionSerializer(I18nAwareModelSerializer):
     answers = AnswerSerializer(many=True)
-    seat = InlineSeatSerializer()
 
     class Meta:
         model = CartPosition
         fields = ('id', 'cart_id', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
                   'attendee_email', 'voucher', 'addon_to', 'subevent', 'datetime', 'expires', 'includes_tax',
-                  'answers', 'seat')
+                  'answers',)
 
 
 class CartPositionCreateSerializer(I18nAwareModelSerializer):
     answers = AnswerCreateSerializer(many=True, required=False)
     expires = serializers.DateTimeField(required=False)
     attendee_name = serializers.CharField(required=False, allow_null=True)
-    seat = serializers.CharField(required=False, allow_null=True)
 
     class Meta:
         model = CartPosition
         fields = ('cart_id', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts', 'attendee_email',
-                  'subevent', 'expires', 'includes_tax', 'answers', 'seat')
+                  'subevent', 'expires', 'includes_tax', 'answers',)
 
     def create(self, validated_data):
         answers_data = validated_data.pop('answers')
@@ -73,24 +71,6 @@ class CartPositionCreateSerializer(I18nAwareModelSerializer):
                 validated_data['attendee_name_parts'] = {
                     '_legacy': attendee_name
                 }
-
-            seated = validated_data.get('item').seat_category_mappings.filter(subevent=validated_data.get('subevent')).exists()
-            if validated_data.get('seat'):
-                if not seated:
-                    raise ValidationError('The specified product does not allow to choose a seat.')
-                try:
-                    seat = self.context['event'].seats.get(seat_guid=validated_data['seat'], subevent=validated_data.get('subevent'))
-                except Seat.DoesNotExist:
-                    raise ValidationError('The specified seat does not exist.')
-                except Seat.MultipleObjectsReturned:
-                    raise ValidationError('The specified seat ID is not unique.')
-                else:
-                    validated_data['seat'] = seat
-                    if not seat.is_available():
-                        raise ValidationError(ugettext_lazy('The selected seat "{seat}" is not available.').format(seat=seat.name))
-            elif seated:
-                raise ValidationError('The specified product requires to choose a seat.')
-
             cp = CartPosition.objects.create(event=self.context['event'], **validated_data)
 
         for answ_data in answers_data:

src/pretix/api/serializers/checkin.py

@@ -3,7 +3,6 @@ from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
-from pretix.base.channels import get_all_sales_channels
 from pretix.base.models import CheckinList
 
 
@@ -14,7 +13,7 @@ class CheckinListSerializer(I18nAwareModelSerializer):
     class Meta:
         model = CheckinList
         fields = ('id', 'name', 'all_products', 'limit_products', 'subevent', 'checkin_count', 'position_count',
-                  'include_pending', 'auto_checkin_sales_channels')
+                  'include_pending')
 
     def validate(self, data):
         data = super().validate(data)
@@ -36,8 +35,4 @@ class CheckinListSerializer(I18nAwareModelSerializer):
             if full_data.get('subevent'):
                 raise ValidationError(_('The subevent does not belong to this event.'))
 
-        for channel in full_data.get('auto_checkin_sales_channels') or []:
-            if channel not in get_all_sales_channels():
-                raise ValidationError(_('Unknown sales channel.'))
-
         return data

src/pretix/api/serializers/event.py

@@ -11,9 +11,6 @@ from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.base.models import Event, TaxRule
 from pretix.base.models.event import SubEvent
 from pretix.base.models.items import SubEventItem, SubEventItemVariation
-from pretix.base.services.seating import (
-    SeatProtected, generate_seats, validate_plan_change,
-)
 
 
 class MetaDataField(Field):
@@ -29,31 +26,15 @@ class MetaDataField(Field):
         }
 
 
-class SeatCategoryMappingField(Field):
-
-    def to_representation(self, value):
-        qs = value.seat_category_mappings.all()
-        if isinstance(value, Event):
-            qs = qs.filter(subevent=None)
-        return {
-            v.layout_category: v.product_id for v in qs
-        }
-
-    def to_internal_value(self, data):
-        return {
-            'seat_category_mapping': data or {}
-        }
-
-
 class PluginsField(Field):
 
     def to_representation(self, obj):
         from pretix.base.plugins import get_all_plugins
 
-        return sorted([
+        return {
             p.module for p in get_all_plugins()
             if not p.name.startswith('.') and getattr(p, 'visible', True) and p.module in obj.get_plugins()
-        ])
+        }
 
     def to_internal_value(self, data):
         return {
@@ -64,14 +45,12 @@ class PluginsField(Field):
 class EventSerializer(I18nAwareModelSerializer):
     meta_data = MetaDataField(required=False, source='*')
     plugins = PluginsField(required=False, source='*')
-    seat_category_mapping = SeatCategoryMappingField(source='*', required=False)
 
     class Meta:
         model = Event
         fields = ('name', 'slug', 'live', 'testmode', 'currency', 'date_from',
                   'date_to', 'date_admission', 'is_public', 'presale_start',
-                  'presale_end', 'location', 'geo_lat', 'geo_lon', 'has_subevents', 'meta_data', 'seating_plan',
-                  'plugins', 'seat_category_mapping')
+                  'presale_end', 'location', 'has_subevents', 'meta_data', 'plugins')
 
     def validate(self, data):
         data = super().validate(data)
@@ -82,9 +61,6 @@ class EventSerializer(I18nAwareModelSerializer):
         Event.clean_dates(data.get('date_from'), data.get('date_to'))
         Event.clean_presale(data.get('presale_start'), data.get('presale_end'))
 
-        if full_data.get('has_subevents') and full_data.get('seating_plan'):
-            raise ValidationError('Event series should not directly be assigned a seating plan.')
-
         return data
 
     def validate_has_subevents(self, value):
@@ -116,27 +92,6 @@ class EventSerializer(I18nAwareModelSerializer):
                 raise ValidationError(_('Meta data property \'{name}\' does not exist.').format(name=key))
         return value
 
-    def validate_seating_plan(self, value):
-        if value and value.organizer != self.context['request'].organizer:
-            raise ValidationError('Invalid seating plan.')
-        if self.instance and self.instance.pk:
-            try:
-                validate_plan_change(self.instance, None, value)
-            except SeatProtected as e:
-                raise ValidationError(str(e))
-        return value
-
-    def validate_seat_category_mapping(self, value):
-        if value and value['seat_category_mapping'] and (not self.instance or not self.instance.pk):
-            raise ValidationError('You cannot specify seat category mappings on event creation.')
-        item_cache = {i.pk: i for i in self.instance.items.all()}
-        result = {}
-        for k, item in value['seat_category_mapping'].items():
-            if item not in item_cache:
-                raise ValidationError('Item \'{id}\' does not exist.'.format(id=item))
-            result[k] = item_cache[item]
-        return {'seat_category_mapping': result}
-
     def validate_plugins(self, value):
         from pretix.base.plugins import get_all_plugins
 
@@ -154,7 +109,6 @@ class EventSerializer(I18nAwareModelSerializer):
     @transaction.atomic
     def create(self, validated_data):
         meta_data = validated_data.pop('meta_data', None)
-        validated_data.pop('seat_category_mapping', None)
         plugins = validated_data.pop('plugins', settings.PRETIX_PLUGINS_DEFAULT.split(','))
         event = super().create(validated_data)
 
@@ -166,10 +120,6 @@ class EventSerializer(I18nAwareModelSerializer):
                     value=value
                 )
 
-        # Seats
-        if event.seating_plan:
-            generate_seats(event, None, event.seating_plan, {})
-
         # Plugins
         if plugins is not None:
             event.set_active_plugins(plugins)
@@ -181,7 +131,6 @@ class EventSerializer(I18nAwareModelSerializer):
     def update(self, instance, validated_data):
         meta_data = validated_data.pop('meta_data', None)
         plugins = validated_data.pop('plugins', None)
-        seat_category_mapping = validated_data.pop('seat_category_mapping', None)
         event = super().update(instance, validated_data)
 
         # Meta data
@@ -202,29 +151,6 @@ class EventSerializer(I18nAwareModelSerializer):
                 if prop.name not in meta_data:
                     current_object.delete()
 
-        # Seats
-        if seat_category_mapping is not None or ('seating_plan' in validated_data and validated_data['seating_plan'] is None):
-            current_mappings = {
-                m.layout_category: m
-                for m in event.seat_category_mappings.filter(subevent=None)
-            }
-            if not event.seating_plan:
-                seat_category_mapping = {}
-            for key, value in seat_category_mapping.items():
-                if key in current_mappings:
-                    m = current_mappings.pop(key)
-                    m.product = value
-                    m.save()
-                else:
-                    event.seat_category_mappings.create(product=value, layout_category=key)
-            for m in current_mappings.values():
-                m.delete()
-        if 'seating_plan' in validated_data or seat_category_mapping is not None:
-            generate_seats(event, None, event.seating_plan, {
-                m.layout_category: m.product
-                for m in event.seat_category_mappings.select_related('product').filter(subevent=None)
-            })
-
         # Plugins
         if plugins is not None:
             event.set_active_plugins(plugins)
@@ -238,8 +164,6 @@ class CloneEventSerializer(EventSerializer):
     def create(self, validated_data):
         plugins = validated_data.pop('plugins', None)
         is_public = validated_data.pop('is_public', None)
-        testmode = validated_data.pop('testmode', None)
-        has_subevents = validated_data.pop('has_subevents', None)
         new_event = super().create(validated_data)
 
         event = Event.objects.filter(slug=self.context['event'], organizer=self.context['organizer'].pk).first()
@@ -249,10 +173,6 @@ class CloneEventSerializer(EventSerializer):
             new_event.set_active_plugins(plugins)
         if is_public is not None:
             new_event.is_public = is_public
-        if testmode is not None:
-            new_event.testmode = testmode
-        if has_subevents is not None:
-            new_event.has_subevents = has_subevents
         new_event.save()
 
         return new_event
@@ -271,173 +191,16 @@ class SubEventItemVariationSerializer(I18nAwareModelSerializer):
 
 
 class SubEventSerializer(I18nAwareModelSerializer):
-    item_price_overrides = SubEventItemSerializer(source='subeventitem_set', many=True, required=False)
-    variation_price_overrides = SubEventItemVariationSerializer(source='subeventitemvariation_set', many=True, required=False)
-    seat_category_mapping = SeatCategoryMappingField(source='*', required=False)
+    item_price_overrides = SubEventItemSerializer(source='subeventitem_set', many=True)
+    variation_price_overrides = SubEventItemVariationSerializer(source='subeventitemvariation_set', many=True)
     event = SlugRelatedField(slug_field='slug', read_only=True)
     meta_data = MetaDataField(source='*')
 
     class Meta:
         model = SubEvent
         fields = ('id', 'name', 'date_from', 'date_to', 'active', 'date_admission',
-                  'presale_start', 'presale_end', 'location', 'geo_lat', 'geo_lon', 'event', 'is_public',
-                  'seating_plan', 'item_price_overrides', 'variation_price_overrides', 'meta_data',
-                  'seat_category_mapping')
-
-    def validate(self, data):
-        data = super().validate(data)
-        event = self.context['request'].event
-
-        full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
-        full_data.update(data)
-
-        Event.clean_dates(data.get('date_from'), data.get('date_to'))
-        Event.clean_presale(data.get('presale_start'), data.get('presale_end'))
-
-        SubEvent.clean_items(event, [item['item'] for item in full_data.get('subeventitem_set', [])])
-        SubEvent.clean_variations(event, [item['variation'] for item in full_data.get('subeventitemvariation_set', [])])
-        return data
-
-    def validate_item_price_overrides(self, data):
-        return list(filter(lambda i: 'item' in i, data))
-
-    def validate_variation_price_overrides(self, data):
-        return list(filter(lambda i: 'variation' in i, data))
-
-    def validate_seating_plan(self, value):
-        if value and value.organizer != self.context['request'].organizer:
-            raise ValidationError('Invalid seating plan.')
-        if self.instance and self.instance.pk:
-            try:
-                validate_plan_change(self.context['request'].event, self.instance, value)
-            except SeatProtected as e:
-                raise ValidationError(str(e))
-        return value
-
-    def validate_seat_category_mapping(self, value):
-        item_cache = {i.pk: i for i in self.context['request'].event.items.all()}
-        result = {}
-        for k, item in value['seat_category_mapping'].items():
-            if item not in item_cache:
-                raise ValidationError('Item \'{id}\' does not exist.'.format(id=item))
-            result[k] = item_cache[item]
-        return {'seat_category_mapping': result}
-
-    @cached_property
-    def meta_properties(self):
-        return {
-            p.name: p for p in self.context['request'].organizer.meta_properties.all()
-        }
-
-    def validate_meta_data(self, value):
-        for key in value['meta_data'].keys():
-            if key not in self.meta_properties:
-                raise ValidationError(_('Meta data property \'{name}\' does not exist.').format(name=key))
-        return value
-
-    @transaction.atomic
-    def create(self, validated_data):
-        item_price_overrides_data = validated_data.pop('subeventitem_set') if 'subeventitem_set' in validated_data else {}
-        variation_price_overrides_data = validated_data.pop('subeventitemvariation_set') if 'subeventitemvariation_set' in validated_data else {}
-        meta_data = validated_data.pop('meta_data', None)
-        seat_category_mapping = validated_data.pop('seat_category_mapping', None)
-        subevent = super().create(validated_data)
-
-        for item_price_override_data in item_price_overrides_data:
-            SubEventItem.objects.create(subevent=subevent, **item_price_override_data)
-        for variation_price_override_data in variation_price_overrides_data:
-            SubEventItemVariation.objects.create(subevent=subevent, **variation_price_override_data)
-
-        # Meta data
-        if meta_data is not None:
-            for key, value in meta_data.items():
-                subevent.meta_values.create(
-                    property=self.meta_properties.get(key),
-                    value=value
-                )
-
-        # Seats
-        if subevent.seating_plan:
-            if seat_category_mapping is not None:
-                for key, value in seat_category_mapping.items():
-                    self.context['request'].event.seat_category_mappings.create(
-                        product=value, layout_category=key, subevent=subevent
-                    )
-            generate_seats(self.context['request'].event, subevent, subevent.seating_plan, {
-                m.layout_category: m.product
-                for m in self.context['request'].event.seat_category_mappings.select_related('product').filter(subevent=subevent)
-            })
-
-        return subevent
-
-    @transaction.atomic
-    def update(self, instance, validated_data):
-        item_price_overrides_data = validated_data.pop('subeventitem_set') if 'subeventitem_set' in validated_data else {}
-        variation_price_overrides_data = validated_data.pop('subeventitemvariation_set') if 'subeventitemvariation_set' in validated_data else {}
-        meta_data = validated_data.pop('meta_data', None)
-        seat_category_mapping = validated_data.pop('seat_category_mapping', None)
-        subevent = super().update(instance, validated_data)
-
-        existing_item_overrides = {item.item: item.id for item in SubEventItem.objects.filter(subevent=subevent)}
-
-        for item_price_override_data in item_price_overrides_data:
-            id = existing_item_overrides.pop(item_price_override_data['item'], None)
-            SubEventItem(id=id, subevent=subevent, **item_price_override_data).save()
-
-        SubEventItem.objects.filter(id__in=existing_item_overrides.values()).delete()
-
-        existing_variation_overrides = {item.variation: item.id for item in SubEventItemVariation.objects.filter(subevent=subevent)}
-
-        for variation_price_override_data in variation_price_overrides_data:
-            id = existing_variation_overrides.pop(variation_price_override_data['variation'], None)
-            SubEventItemVariation(id=id, subevent=subevent, **variation_price_override_data).save()
-
-        SubEventItemVariation.objects.filter(id__in=existing_variation_overrides.values()).delete()
-
-        # Meta data
-        if meta_data is not None:
-            current = {mv.property: mv for mv in subevent.meta_values.select_related('property')}
-            for key, value in meta_data.items():
-                prop = self.meta_properties.get(key)
-                if prop in current:
-                    current[prop].value = value
-                    current[prop].save()
-                else:
-                    subevent.meta_values.create(
-                        property=self.meta_properties.get(key),
-                        value=value
-                    )
-
-            for prop, current_object in current.items():
-                if prop.name not in meta_data:
-                    current_object.delete()
-
-        # Seats
-        if seat_category_mapping is not None or ('seating_plan' in validated_data and validated_data['seating_plan'] is None):
-            current_mappings = {
-                m.layout_category: m
-                for m in self.context['request'].event.seat_category_mappings.filter(subevent=subevent)
-            }
-            if not subevent.seating_plan:
-                seat_category_mapping = {}
-            for key, value in seat_category_mapping.items():
-                if key in current_mappings:
-                    m = current_mappings.pop(key)
-                    m.product = value
-                    m.save()
-                else:
-                    self.context['request'].event.seat_category_mappings.create(
-                        product=value, layout_category=key, subevent=subevent
-                    )
-            for m in current_mappings.values():
-                m.delete()
-        if 'seating_plan' in validated_data or seat_category_mapping is not None:
-            generate_seats(self.context['request'].event, subevent, subevent.seating_plan, {
-                m.layout_category: m.product
-                for m in self.context['request'].event.seat_category_mappings.select_related('product').filter(subevent=subevent)
-            })
-
-        return subevent
+                  'presale_start', 'presale_end', 'location', 'event',
+                  'item_price_overrides', 'variation_price_overrides', 'meta_data')
 
 
 class TaxRuleSerializer(CountryFieldMixin, I18nAwareModelSerializer):

src/pretix/api/serializers/item.py

@@ -7,36 +7,23 @@ from rest_framework import serializers
 
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.base.models import (
-    Item, ItemAddOn, ItemBundle, ItemCategory, ItemVariation, Question,
-    QuestionOption, Quota,
+    Item, ItemAddOn, ItemCategory, ItemVariation, Question, QuestionOption,
+    Quota,
 )
 
 
 class InlineItemVariationSerializer(I18nAwareModelSerializer):
-    price = serializers.DecimalField(read_only=True, decimal_places=2, max_digits=10,
-                                     coerce_to_string=True)
-
     class Meta:
         model = ItemVariation
         fields = ('id', 'value', 'active', 'description',
-                  'position', 'default_price', 'price', 'original_price')
+                  'position', 'default_price', 'price')
 
 
 class ItemVariationSerializer(I18nAwareModelSerializer):
-    price = serializers.DecimalField(read_only=True, decimal_places=2, max_digits=10,
-                                     coerce_to_string=True)
-
     class Meta:
         model = ItemVariation
         fields = ('id', 'value', 'active', 'description',
-                  'position', 'default_price', 'price', 'original_price')
-
-
-class InlineItemBundleSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = ItemBundle
-        fields = ('bundled_item', 'bundled_variation', 'count',
-                  'designated_price')
+                  'position', 'default_price', 'price')
 
 
 class InlineItemAddOnSerializer(serializers.ModelSerializer):
@@ -46,31 +33,6 @@ class InlineItemAddOnSerializer(serializers.ModelSerializer):
                   'position', 'price_included')
 
 
-class ItemBundleSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = ItemBundle
-        fields = ('id', 'bundled_item', 'bundled_variation', 'count',
-                  'designated_price')
-
-    def validate(self, data):
-        data = super().validate(data)
-        event = self.context['event']
-
-        full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
-        full_data.update(data)
-
-        ItemBundle.clean_itemvar(event, full_data.get('bundled_item'), full_data.get('bundled_variation'))
-
-        item = self.context['item']
-        if item == full_data.get('bundled_item'):
-            raise ValidationError(_("The bundled item must not be the same item as the bundling one."))
-        if full_data.get('bundled_item'):
-            if full_data['bundled_item'].bundles.exists():
-                raise ValidationError(_("The bundled item must not have bundles on its own."))
-
-        return data
-
-
 class ItemAddOnSerializer(serializers.ModelSerializer):
     class Meta:
         model = ItemAddOn
@@ -107,7 +69,6 @@ class ItemTaxRateField(serializers.Field):
 
 class ItemSerializer(I18nAwareModelSerializer):
     addons = InlineItemAddOnSerializer(many=True, required=False)
-    bundles = InlineItemBundleSerializer(many=True, required=False)
     variations = InlineItemVariationSerializer(many=True, required=False)
     tax_rate = ItemTaxRateField(source='*', read_only=True)
 
@@ -116,32 +77,23 @@ class ItemSerializer(I18nAwareModelSerializer):
         fields = ('id', 'category', 'name', 'internal_name', 'active', 'sales_channels', 'description',
                   'default_price', 'free_price', 'tax_rate', 'tax_rule', 'admission',
                   'position', 'picture', 'available_from', 'available_until',
-                  'require_voucher', 'hide_without_voucher', 'allow_cancel', 'require_bundling',
-                  'min_per_order', 'max_per_order', 'checkin_attention', 'has_variations', 'variations',
-                  'addons', 'bundles', 'original_price', 'require_approval', 'generate_tickets',
-                  'show_quota_left', 'hidden_if_available', 'allow_waitinglist', 'issue_giftcard')
+                  'require_voucher', 'hide_without_voucher', 'allow_cancel',
+                  'min_per_order', 'max_per_order', 'checkin_attention', 'has_variations',
+                  'variations', 'addons', 'original_price', 'require_approval', 'generate_tickets')
         read_only_fields = ('has_variations', 'picture')
 
+    def get_serializer_context(self):
+        return {"has_variations": self.kwargs['has_variations']}
+
     def validate(self, data):
         data = super().validate(data)
-        if self.instance and ('addons' in data or 'variations' in data or 'bundles' in data):
-            raise ValidationError(_('Updating add-ons, bundles, or variations via PATCH/PUT is not supported. Please use the '
+        if self.instance and ('addons' in data or 'variations' in data):
+            raise ValidationError(_('Updating add-ons or variations via PATCH/PUT is not supported. Please use the '
                                     'dedicated nested endpoint.'))
 
         Item.clean_per_order(data.get('min_per_order'), data.get('max_per_order'))
         Item.clean_available(data.get('available_from'), data.get('available_until'))
 
-        if data.get('issue_giftcard'):
-            if data.get('tax_rule') and data.get('tax_rule').rate > 0:
-                raise ValidationError(
-                    _("Gift card products should not be associated with non-zero tax rates since sales tax will be "
-                      "applied when the gift card is redeemed.")
-                )
-            if data.get('admission'):
-                raise ValidationError(_(
-                    "Gift card products should not be admission products at the same time."
-                ))
-
         return data
 
     def validate_category(self, value):
@@ -152,12 +104,6 @@ class ItemSerializer(I18nAwareModelSerializer):
         Item.clean_tax_rule(value, self.context['event'])
         return value
 
-    def validate_bundles(self, value):
-        if not self.instance:
-            for b_data in value:
-                ItemBundle.clean_itemvar(self.context['event'], b_data['bundled_item'], b_data['bundled_variation'])
-        return value
-
     def validate_addons(self, value):
         if not self.instance:
             for addon_data in value:
@@ -171,14 +117,11 @@ class ItemSerializer(I18nAwareModelSerializer):
     def create(self, validated_data):
         variations_data = validated_data.pop('variations') if 'variations' in validated_data else {}
         addons_data = validated_data.pop('addons') if 'addons' in validated_data else {}
-        bundles_data = validated_data.pop('bundles') if 'bundles' in validated_data else {}
         item = Item.objects.create(**validated_data)
         for variation_data in variations_data:
             ItemVariation.objects.create(item=item, **variation_data)
         for addon_data in addons_data:
             ItemAddOn.objects.create(base_item=item, **addon_data)
-        for bundle_data in bundles_data:
-            ItemBundle.objects.create(base_item=item, **bundle_data)
         return item
 
 
@@ -209,38 +152,19 @@ class InlineQuestionOptionSerializer(I18nAwareModelSerializer):
         fields = ('id', 'identifier', 'answer', 'position')
 
 
-class LegacyDependencyValueField(serializers.CharField):
-
-    def to_representation(self, obj):
-        return obj[0] if obj else None
-
-    def to_internal_value(self, data):
-        return [data] if data else []
-
-
 class QuestionSerializer(I18nAwareModelSerializer):
     options = InlineQuestionOptionSerializer(many=True, required=False)
     identifier = serializers.CharField(allow_null=True)
-    dependency_value = LegacyDependencyValueField(source='dependency_values', required=False, allow_null=True)
 
     class Meta:
         model = Question
         fields = ('id', 'question', 'type', 'required', 'items', 'options', 'position',
-                  'ask_during_checkin', 'identifier', 'dependency_question', 'dependency_values',
-                  'hidden', 'dependency_value', 'print_on_invoice')
+                  'ask_during_checkin', 'identifier')
 
     def validate_identifier(self, value):
         Question._clean_identifier(self.context['event'], value, self.instance)
         return value
 
-    def validate_dependency_question(self, value):
-        if value:
-            if value.type not in (Question.TYPE_CHOICE, Question.TYPE_BOOLEAN, Question.TYPE_CHOICE_MULTIPLE):
-                raise ValidationError('Question dependencies can only be set to boolean or choice questions.')
-        if value == self.instance:
-            raise ValidationError('A question cannot depend on itself.')
-        return value
-
     def validate(self, data):
         data = super().validate(data)
         if self.instance and 'options' in data:
@@ -252,24 +176,6 @@ class QuestionSerializer(I18nAwareModelSerializer):
         full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
         full_data.update(data)
 
-        if full_data.get('ask_during_checkin') and full_data.get('dependency_question'):
-            raise ValidationError('Dependencies are not supported during check-in.')
-
-        dep = full_data.get('dependency_question')
-        if dep:
-            if dep.ask_during_checkin:
-                raise ValidationError(_('Question cannot depend on a question asked during check-in.'))
-
-            seen_ids = {self.instance.pk} if self.instance else set()
-            while dep:
-                if dep.pk in seen_ids:
-                    raise ValidationError(_('Circular dependency between questions detected.'))
-                seen_ids.add(dep.pk)
-                dep = dep.dependency_question
-
-        if full_data.get('ask_during_checkin') and full_data.get('type') in Question.ASK_DURING_CHECKIN_UNSUPPORTED:
-            raise ValidationError(_('This type of question cannot be asked during check-in.'))
-
         Question.clean_items(event, full_data.get('items'))
         return data
 
@@ -287,7 +193,6 @@ class QuestionSerializer(I18nAwareModelSerializer):
     def create(self, validated_data):
         options_data = validated_data.pop('options') if 'options' in validated_data else []
         items = validated_data.pop('items')
-
         question = Question.objects.create(**validated_data)
         question.items.set(items)
         for opt_data in options_data:
@@ -299,7 +204,7 @@ class QuotaSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = Quota
-        fields = ('id', 'name', 'size', 'items', 'variations', 'subevent', 'closed', 'close_when_sold_out')
+        fields = ('id', 'name', 'size', 'items', 'variations', 'subevent')
 
     def validate(self, data):
         data = super().validate(data)

src/pretix/api/serializers/order.py

@@ -1,9 +1,7 @@
 import json
-from collections import Counter, defaultdict
+from collections import Counter
 from decimal import Decimal
 
-import pycountry
-from django.db.models import F, Q
 from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy
 from django_countries.fields import Country
@@ -14,21 +12,16 @@ from rest_framework.reverse import reverse
 
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.base.channels import get_all_sales_channels
-from pretix.base.decimal import round_decimal
 from pretix.base.i18n import language
 from pretix.base.models import (
-    Checkin, Invoice, InvoiceAddress, InvoiceLine, Item, ItemVariation, Order,
-    OrderPosition, Question, QuestionAnswer, Seat, SubEvent, TaxRule, Voucher,
+    Checkin, Invoice, InvoiceAddress, InvoiceLine, Order, OrderPosition,
+    Question, QuestionAnswer,
 )
 from pretix.base.models.orders import (
     CartPosition, OrderFee, OrderPayment, OrderRefund,
 )
 from pretix.base.pdf import get_variables
-from pretix.base.services.cart import error_messages
-from pretix.base.services.pricing import get_price
-from pretix.base.settings import COUNTRIES_WITH_STATE_IN_ADDRESS
 from pretix.base.signals import register_ticket_outputs
-from pretix.multidomain.urlreverse import build_absolute_uri
 
 
 class CompatibleCountryField(serializers.Field):
@@ -49,8 +42,8 @@ class InvoiceAddressSerializer(I18nAwareModelSerializer):
     class Meta:
         model = InvoiceAddress
         fields = ('last_modified', 'is_business', 'company', 'name', 'name_parts', 'street', 'zipcode', 'city', 'country',
-                  'state', 'vat_id', 'vat_id_validated', 'internal_reference')
-        read_only_fields = ('last_modified',)
+                  'vat_id', 'vat_id_validated', 'internal_reference')
+        read_only_fields = ('last_modified', 'vat_id_validated')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -65,24 +58,6 @@ class InvoiceAddressSerializer(I18nAwareModelSerializer):
             )
         if data.get('name_parts') and '_scheme' not in data.get('name_parts'):
             data['name_parts']['_scheme'] = self.context['request'].event.settings.name_scheme
-
-        if data.get('country'):
-            if not pycountry.countries.get(alpha_2=data.get('country')):
-                raise ValidationError(
-                    {'country': ['Invalid country code.']}
-                )
-
-        if data.get('state'):
-            cc = str(data.get('country') or self.instance.country or '')
-            if cc not in COUNTRIES_WITH_STATE_IN_ADDRESS:
-                raise ValidationError(
-                    {'state': ['States are not supported in country "{}".'.format(cc)]}
-                )
-            if not pycountry.subdivisions.get(code=cc + '-' + data.get('state')):
-                raise ValidationError(
-                    {'state': ['"{}" is not a known subdivision of the country "{}".'.format(data.get('state'), cc)]}
-                )
-
         return data
 
 
@@ -96,13 +71,6 @@ class AnswerQuestionOptionsIdentifierField(serializers.Field):
         return [o.identifier for o in instance.options.all()]
 
 
-class InlineSeatSerializer(I18nAwareModelSerializer):
-
-    class Meta:
-        model = Seat
-        fields = ('id', 'name', 'seat_guid')
-
-
 class AnswerSerializer(I18nAwareModelSerializer):
     question_identifier = AnswerQuestionIdentifierField(source='*', read_only=True)
     option_identifiers = AnswerQuestionOptionsIdentifierField(source='*', read_only=True)
@@ -115,7 +83,7 @@ class AnswerSerializer(I18nAwareModelSerializer):
 class CheckinSerializer(I18nAwareModelSerializer):
     class Meta:
         model = Checkin
-        fields = ('datetime', 'list', 'auto_checked_in')
+        fields = ('datetime', 'list')
 
 
 class OrderDownloadsField(serializers.Field):
@@ -198,13 +166,12 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
     downloads = PositionDownloadsField(source='*')
     order = serializers.SlugRelatedField(slug_field='code', read_only=True)
     pdf_data = PdfDataSerializer(source='*')
-    seat = InlineSeatSerializer(read_only=True)
 
     class Meta:
         model = OrderPosition
         fields = ('id', 'order', 'positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
                   'attendee_email', 'voucher', 'tax_rate', 'tax_value', 'secret', 'addon_to', 'subevent', 'checkins',
-                  'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat')
+                  'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -212,55 +179,6 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
             self.fields.pop('pdf_data')
 
 
-class RequireAttentionField(serializers.Field):
-    def to_representation(self, instance: OrderPosition):
-        return instance.order.checkin_attention or instance.item.checkin_attention
-
-
-class AttendeeNameField(serializers.Field):
-    def to_representation(self, instance: OrderPosition):
-        an = instance.attendee_name
-        if not an:
-            if instance.addon_to_id:
-                an = instance.addon_to.attendee_name
-        if not an:
-            try:
-                an = instance.order.invoice_address.name
-            except InvoiceAddress.DoesNotExist:
-                pass
-        return an
-
-
-class AttendeeNamePartsField(serializers.Field):
-    def to_representation(self, instance: OrderPosition):
-        an = instance.attendee_name
-        p = instance.attendee_name_parts
-        if not an:
-            if instance.addon_to_id:
-                an = instance.addon_to.attendee_name
-                p = instance.addon_to.attendee_name_parts
-        if not an:
-            try:
-                p = instance.order.invoice_address.name_parts
-            except InvoiceAddress.DoesNotExist:
-                pass
-        return p
-
-
-class CheckinListOrderPositionSerializer(OrderPositionSerializer):
-    require_attention = RequireAttentionField(source='*')
-    attendee_name = AttendeeNameField(source='*')
-    attendee_name_parts = AttendeeNamePartsField(source='*')
-    order__status = serializers.SlugRelatedField(read_only=True, slug_field='status', source='order')
-
-    class Meta:
-        model = OrderPosition
-        fields = ('id', 'order', 'positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
-                  'attendee_email', 'voucher', 'tax_rate', 'tax_value', 'secret', 'addon_to', 'subevent', 'checkins',
-                  'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'require_attention',
-                  'order__status')
-
-
 class OrderPaymentTypeField(serializers.Field):
     # TODO: Remove after pretix 2.2
     def to_representation(self, instance: Order):
@@ -287,33 +205,10 @@ class OrderFeeSerializer(I18nAwareModelSerializer):
         fields = ('fee_type', 'value', 'description', 'internal_type', 'tax_rate', 'tax_value', 'tax_rule')
 
 
-class PaymentURLField(serializers.URLField):
-    def to_representation(self, instance: OrderPayment):
-        if instance.state != OrderPayment.PAYMENT_STATE_CREATED:
-            return None
-        return build_absolute_uri(self.context['event'], 'presale:event.order.pay', kwargs={
-            'order': instance.order.code,
-            'secret': instance.order.secret,
-            'payment': instance.pk,
-        })
-
-
-class PaymentDetailsField(serializers.Field):
-    def to_representation(self, value: OrderPayment):
-        pp = value.payment_provider
-        if not pp:
-            return {}
-        return pp.api_payment_details(value)
-
-
 class OrderPaymentSerializer(I18nAwareModelSerializer):
-    payment_url = PaymentURLField(source='*', allow_null=True, read_only=True)
-    details = PaymentDetailsField(source='*', allow_null=True, read_only=True)
-
     class Meta:
         model = OrderPayment
-        fields = ('local_id', 'state', 'amount', 'created', 'payment_date', 'provider', 'payment_url',
-                  'details')
+        fields = ('local_id', 'state', 'amount', 'created', 'payment_date', 'provider')
 
 
 class OrderRefundSerializer(I18nAwareModelSerializer):
@@ -324,100 +219,27 @@ class OrderRefundSerializer(I18nAwareModelSerializer):
         fields = ('local_id', 'state', 'source', 'amount', 'payment', 'created', 'execution_date', 'provider')
 
 
-class OrderURLField(serializers.URLField):
-    def to_representation(self, instance: Order):
-        return build_absolute_uri(self.context['event'], 'presale:event.order', kwargs={
-            'order': instance.code,
-            'secret': instance.secret,
-        })
-
-
 class OrderSerializer(I18nAwareModelSerializer):
-    invoice_address = InvoiceAddressSerializer(allow_null=True)
-    positions = OrderPositionSerializer(many=True, read_only=True)
-    fees = OrderFeeSerializer(many=True, read_only=True)
-    downloads = OrderDownloadsField(source='*', read_only=True)
-    payments = OrderPaymentSerializer(many=True, read_only=True)
-    refunds = OrderRefundSerializer(many=True, read_only=True)
-    payment_date = OrderPaymentDateField(source='*', read_only=True)
-    payment_provider = OrderPaymentTypeField(source='*', read_only=True)
-    url = OrderURLField(source='*', read_only=True)
+    invoice_address = InvoiceAddressSerializer()
+    positions = OrderPositionSerializer(many=True)
+    fees = OrderFeeSerializer(many=True)
+    downloads = OrderDownloadsField(source='*')
+    payments = OrderPaymentSerializer(many=True)
+    refunds = OrderRefundSerializer(many=True)
+    payment_date = OrderPaymentDateField(source='*')
+    payment_provider = OrderPaymentTypeField(source='*')
 
     class Meta:
         model = Order
-        fields = (
-            'code', 'status', 'testmode', 'secret', 'email', 'locale', 'datetime', 'expires', 'payment_date',
-            'payment_provider', 'fees', 'total', 'comment', 'invoice_address', 'positions', 'downloads',
-            'checkin_attention', 'last_modified', 'payments', 'refunds', 'require_approval', 'sales_channel',
-            'url'
-        )
-        read_only_fields = (
-            'code', 'status', 'testmode', 'secret', 'datetime', 'expires', 'payment_date',
-            'payment_provider', 'fees', 'total', 'positions', 'downloads',
-            'last_modified', 'payments', 'refunds', 'require_approval', 'sales_channel'
-        )
+        fields = ('code', 'status', 'testmode', 'secret', 'email', 'locale', 'datetime', 'expires', 'payment_date',
+                  'payment_provider', 'fees', 'total', 'comment', 'invoice_address', 'positions', 'downloads',
+                  'checkin_attention', 'last_modified', 'payments', 'refunds', 'require_approval', 'sales_channel')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if not self.context['request'].query_params.get('pdf_data', 'false') == 'true':
             self.fields['positions'].child.fields.pop('pdf_data')
 
-    def validate_locale(self, l):
-        if l not in set(k for k in self.instance.event.settings.locales):
-            raise ValidationError('"{}" is not a supported locale for this event.'.format(l))
-        return l
-
-    def update(self, instance, validated_data):
-        # Even though all fields that shouldn't be edited are marked as read_only in the serializer
-        # (hopefully), we'll be extra careful here and be explicit about the model fields we update.
-        update_fields = ['comment', 'checkin_attention', 'email', 'locale']
-
-        if 'invoice_address' in validated_data:
-            iadata = validated_data.pop('invoice_address')
-
-            if not iadata:
-                try:
-                    instance.invoice_address.delete()
-                except InvoiceAddress.DoesNotExist:
-                    pass
-            else:
-                name = iadata.pop('name', '')
-                if name and not iadata.get('name_parts'):
-                    iadata['name_parts'] = {
-                        '_legacy': name
-                    }
-                try:
-                    ia = instance.invoice_address
-                    if iadata.get('vat_id') != ia.vat_id and 'vat_id_validated' not in iadata:
-                        ia.vat_id_validated = False
-                    self.fields['invoice_address'].update(ia, iadata)
-                except InvoiceAddress.DoesNotExist:
-                    InvoiceAddress.objects.create(order=instance, **iadata)
-
-        for attr, value in validated_data.items():
-            if attr in update_fields:
-                setattr(instance, attr, value)
-
-        instance.save(update_fields=update_fields)
-        return instance
-
-
-class PriceCalcSerializer(serializers.Serializer):
-    item = serializers.PrimaryKeyRelatedField(queryset=Item.objects.none(), required=False, allow_null=True)
-    variation = serializers.PrimaryKeyRelatedField(queryset=ItemVariation.objects.none(), required=False, allow_null=True)
-    subevent = serializers.PrimaryKeyRelatedField(queryset=SubEvent.objects.none(), required=False, allow_null=True)
-    locale = serializers.CharField(allow_null=True, required=False)
-
-    def __init__(self, *args, **kwargs):
-        event = kwargs.pop('event')
-        super().__init__(*args, **kwargs)
-        self.fields['item'].queryset = event.items.all()
-        self.fields['variation'].queryset = ItemVariation.objects.filter(item__event=event)
-        if event.has_subevents:
-            self.fields['subevent'].queryset = event.subevents.all()
-        else:
-            del self.fields['subevent']
-
 
 class AnswerCreateSerializer(I18nAwareModelSerializer):
 
@@ -478,13 +300,9 @@ class AnswerCreateSerializer(I18nAwareModelSerializer):
 
 
 class OrderFeeCreateSerializer(I18nAwareModelSerializer):
-    _treat_value_as_percentage = serializers.BooleanField(default=False, required=False)
-    _split_taxes_like_products = serializers.BooleanField(default=False, required=False)
-
     class Meta:
         model = OrderFee
-        fields = ('fee_type', 'value', 'description', 'internal_type', 'tax_rule',
-                  '_treat_value_as_percentage', '_split_taxes_like_products')
+        fields = ('fee_type', 'value', 'description', 'internal_type', 'tax_rule')
 
     def validate_tax_rule(self, tr):
         if tr and tr.event != self.context['event']:
@@ -499,16 +317,11 @@ class OrderPositionCreateSerializer(I18nAwareModelSerializer):
     addon_to = serializers.IntegerField(required=False, allow_null=True)
     secret = serializers.CharField(required=False)
     attendee_name = serializers.CharField(required=False, allow_null=True)
-    seat = serializers.CharField(required=False, allow_null=True)
-    price = serializers.DecimalField(required=False, allow_null=True, decimal_places=2,
-                                     max_digits=10)
-    voucher = serializers.SlugRelatedField(slug_field='code', queryset=Voucher.objects.none(),
-                                           required=False, allow_null=True)
 
     class Meta:
         model = OrderPosition
         fields = ('positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts', 'attendee_email',
-                  'secret', 'addon_to', 'subevent', 'answers', 'seat', 'voucher')
+                  'secret', 'addon_to', 'subevent', 'answers')
 
     def validate_secret(self, secret):
         if secret and OrderPosition.all.filter(order__event=self.context['event'], secret=secret).exists():
@@ -582,7 +395,7 @@ class CompatibleJSONField(serializers.JSONField):
 
 class OrderCreateSerializer(I18nAwareModelSerializer):
     invoice_address = InvoiceAddressSerializer(required=False)
-    positions = OrderPositionCreateSerializer(many=True, required=True)
+    positions = OrderPositionCreateSerializer(many=True, required=False)
     fees = OrderFeeCreateSerializer(many=True, required=False)
     status = serializers.ChoiceField(choices=(
         ('n', Order.STATUS_PENDING),
@@ -594,26 +407,16 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         min_length=5
     )
     comment = serializers.CharField(required=False, allow_blank=True)
-    payment_provider = serializers.CharField(required=False, allow_null=True)
+    payment_provider = serializers.CharField(required=True)
     payment_info = CompatibleJSONField(required=False)
     consume_carts = serializers.ListField(child=serializers.CharField(), required=False)
-    force = serializers.BooleanField(default=False, required=False)
-    payment_date = serializers.DateTimeField(required=False, allow_null=True)
-    send_mail = serializers.BooleanField(default=False, required=False)
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['positions'].child.fields['voucher'].queryset = self.context['event'].vouchers.all()
 
     class Meta:
         model = Order
         fields = ('code', 'status', 'testmode', 'email', 'locale', 'payment_provider', 'fees', 'comment', 'sales_channel',
-                  'invoice_address', 'positions', 'checkin_attention', 'payment_info', 'payment_date', 'consume_carts',
-                  'force', 'send_mail')
+                  'invoice_address', 'positions', 'checkin_attention', 'payment_info', 'consume_carts')
 
     def validate_payment_provider(self, pp):
-        if pp is None:
-            return None
         if pp not in self.context['event'].get_payment_providers():
             raise ValidationError('The given payment provider is not known.')
         return pp
@@ -672,36 +475,16 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                 {'positionid': ["If you set addon_to on any position, you need to specify position IDs manually."]}
                 for p in data
             ]
-        else:
-            for i, p in enumerate(data):
-                p['positionid'] = i + 1
 
         if any(errs):
             raise ValidationError(errs)
         return data
 
-    def validate_testmode(self, testmode):
-        if 'sales_channel' in self.initial_data:
-            try:
-                sales_channel = get_all_sales_channels()[self.initial_data['sales_channel']]
-
-                if testmode and not sales_channel.testmode_supported:
-                    raise ValidationError('This sales channel does not provide support for testmode.')
-            except KeyError:
-                # We do not need to raise a ValidationError here, since there is another check to validate the
-                # sales_channel
-                pass
-
-        return testmode
-
     def create(self, validated_data):
         fees_data = validated_data.pop('fees') if 'fees' in validated_data else []
         positions_data = validated_data.pop('positions') if 'positions' in validated_data else []
-        payment_provider = validated_data.pop('payment_provider', None)
+        payment_provider = validated_data.pop('payment_provider')
         payment_info = validated_data.pop('payment_info', '{}')
-        payment_date = validated_data.pop('payment_date', now())
-        force = validated_data.pop('force', False)
-        self._send_mail = validated_data.pop('send_mail', False)
 
         if 'invoice_address' in validated_data:
             iadata = validated_data.pop('invoice_address')
@@ -715,16 +498,13 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
             ia = None
 
         with self.context['event'].lock() as now_dt:
-            free_seats = set()
-            seats_seen = set()
+            quotadiff = Counter()
+
             consume_carts = validated_data.pop('consume_carts', [])
             delete_cps = []
             quota_avail_cache = {}
-            voucher_usage = Counter()
             if consume_carts:
-                for cp in CartPosition.objects.filter(
-                    event=self.context['event'], cart_id__in=consume_carts, expires__gt=now()
-                ):
+                for cp in CartPosition.objects.filter(event=self.context['event'], cart_id__in=consume_carts):
                     quotas = (cp.variation.quotas.filter(subevent=cp.subevent)
                               if cp.variation else cp.item.quotas.filter(subevent=cp.subevent))
                     for quota in quotas:
@@ -732,84 +512,35 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                             quota_avail_cache[quota] = list(quota.availability())
                         if quota_avail_cache[quota][1] is not None:
                             quota_avail_cache[quota][1] += 1
-                    if cp.voucher:
-                        voucher_usage[cp.voucher] -= 1
                     if cp.expires > now_dt:
-                        if cp.seat:
-                            free_seats.add(cp.seat)
+                        quotadiff.subtract(quotas)
                     delete_cps.append(cp)
 
             errs = [{} for p in positions_data]
 
             for i, pos_data in enumerate(positions_data):
-                if pos_data.get('voucher'):
-                    v = pos_data['voucher']
+                new_quotas = (pos_data.get('variation').quotas.filter(subevent=pos_data.get('subevent'))
+                              if pos_data.get('variation')
+                              else pos_data.get('item').quotas.filter(subevent=pos_data.get('subevent')))
+                if len(new_quotas) == 0:
+                    errs[i]['item'] = [ugettext_lazy('The product "{}" is not assigned to a quota.').format(
+                        str(pos_data.get('item'))
+                    )]
+                else:
+                    for quota in new_quotas:
+                        if quota not in quota_avail_cache:
+                            quota_avail_cache[quota] = list(quota.availability())
 
-                    if not v.applies_to(pos_data['item'], pos_data.get('variation')):
-                        errs[i]['voucher'] = [error_messages['voucher_invalid_item']]
-                        continue
+                        if quota_avail_cache[quota][1] is not None:
+                            quota_avail_cache[quota][1] -= 1
+                            if quota_avail_cache[quota][1] < 0:
+                                errs[i]['item'] = [
+                                    ugettext_lazy('There is not enough quota available on quota "{}" to perform the operation.').format(
+                                        quota.name
+                                    )
+                                ]
 
-                    if v.subevent_id and pos_data.get('subevent').pk != v.subevent_id:
-                        errs[i]['voucher'] = [error_messages['voucher_invalid_subevent']]
-                        continue
-
-                    if v.valid_until is not None and v.valid_until < now_dt:
-                        errs[i]['voucher'] = [error_messages['voucher_expired']]
-                        continue
-
-                    voucher_usage[v] += 1
-                    if voucher_usage[v] > 0:
-                        redeemed_in_carts = CartPosition.objects.filter(
-                            Q(voucher=pos_data['voucher']) & Q(event=self.context['event']) & Q(expires__gte=now_dt)
-                        ).exclude(pk__in=[cp.pk for cp in delete_cps])
-                        v_avail = v.max_usages - v.redeemed - redeemed_in_carts.count()
-                        if v_avail < voucher_usage[v]:
-                            errs[i]['voucher'] = [
-                                'The voucher has already been used the maximum number of times.'
-                            ]
-
-                seated = pos_data.get('item').seat_category_mappings.filter(subevent=pos_data.get('subevent')).exists()
-                if pos_data.get('seat'):
-                    if not seated:
-                        errs[i]['seat'] = ['The specified product does not allow to choose a seat.']
-                    try:
-                        seat = self.context['event'].seats.get(seat_guid=pos_data['seat'], subevent=pos_data.get('subevent'))
-                    except Seat.DoesNotExist:
-                        errs[i]['seat'] = ['The specified seat does not exist.']
-                    else:
-                        pos_data['seat'] = seat
-                        if (seat not in free_seats and not seat.is_available()) or seat in seats_seen:
-                            errs[i]['seat'] = [ugettext_lazy('The selected seat "{seat}" is not available.').format(seat=seat.name)]
-                        seats_seen.add(seat)
-                elif seated:
-                    errs[i]['seat'] = ['The specified product requires to choose a seat.']
-
-            if not force:
-                for i, pos_data in enumerate(positions_data):
-                    if pos_data.get('voucher'):
-                        if pos_data['voucher'].allow_ignore_quota or pos_data['voucher'].block_quota:
-                            continue
-
-                    new_quotas = (pos_data.get('variation').quotas.filter(subevent=pos_data.get('subevent'))
-                                  if pos_data.get('variation')
-                                  else pos_data.get('item').quotas.filter(subevent=pos_data.get('subevent')))
-                    if len(new_quotas) == 0:
-                        errs[i]['item'] = [ugettext_lazy('The product "{}" is not assigned to a quota.').format(
-                            str(pos_data.get('item'))
-                        )]
-                    else:
-                        for quota in new_quotas:
-                            if quota not in quota_avail_cache:
-                                quota_avail_cache[quota] = list(quota.availability())
-
-                            if quota_avail_cache[quota][1] is not None:
-                                quota_avail_cache[quota][1] -= 1
-                                if quota_avail_cache[quota][1] < 0:
-                                    errs[i]['item'] = [
-                                        ugettext_lazy('There is not enough quota available on quota "{}" to perform the operation.').format(
-                                            quota.name
-                                        )
-                                    ]
+                quotadiff.update(new_quotas)
 
             if any(errs):
                 raise ValidationError({'positions': errs})
@@ -818,14 +549,38 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                 validated_data['locale'] = self.context['event'].settings.locale
             order = Order(event=self.context['event'], **validated_data)
             order.set_expires(subevents=[p.get('subevent') for p in positions_data])
+            order.total = sum([p['price'] for p in positions_data]) + sum([f['value'] for f in fees_data], Decimal('0.00'))
             order.meta_info = "{}"
-            order.total = Decimal('0.00')
             order.save()
 
+            if order.total == Decimal('0.00') and validated_data.get('status') != Order.STATUS_PAID:
+                order.status = Order.STATUS_PAID
+                order.save()
+                order.payments.create(
+                    amount=order.total, provider='free', state=OrderPayment.PAYMENT_STATE_CONFIRMED,
+                    payment_date=now()
+                )
+            elif payment_provider == "free" and order.total != Decimal('0.00'):
+                raise ValidationError('You cannot use the "free" payment provider for non-free orders.')
+            elif validated_data.get('status') == Order.STATUS_PAID:
+                order.payments.create(
+                    amount=order.total,
+                    provider=payment_provider,
+                    info=payment_info,
+                    payment_date=now(),
+                    state=OrderPayment.PAYMENT_STATE_CONFIRMED
+                )
+            elif payment_provider:
+                order.payments.create(
+                    amount=order.total,
+                    provider=payment_provider,
+                    info=payment_info,
+                    state=OrderPayment.PAYMENT_STATE_CREATED
+                )
+
             if ia:
                 ia.order = order
                 ia.save()
-
             pos_map = {}
             for pos_data in positions_data:
                 answers_data = pos_data.pop('answers', [])
@@ -837,27 +592,9 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                     }
                 pos = OrderPosition(**pos_data)
                 pos.order = order
+                pos._calculate_tax()
                 if addon_to:
                     pos.addon_to = pos_map[addon_to]
-
-                if pos.price is None:
-                    price = get_price(
-                        item=pos.item,
-                        variation=pos.variation,
-                        voucher=pos.voucher,
-                        custom_price=None,
-                        subevent=pos.subevent,
-                        addon_to=pos.addon_to,
-                        invoice_address=ia,
-                    )
-                    pos.price = price.gross
-                    pos.tax_rate = price.rate
-                    pos.tax_value = price.tax
-                    pos.tax_rule = pos.item.tax_rule
-                else:
-                    pos._calculate_tax()
-                if pos.voucher:
-                    Voucher.objects.filter(pk=pos.voucher.pk).update(redeemed=F('redeemed') + 1)
                 pos.save()
                 pos_map[pos.positionid] = pos
                 for answ_data in answers_data:
@@ -867,103 +604,19 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
 
             for cp in delete_cps:
                 cp.delete()
-
-        order.total = sum([p.price for p in order.positions.all()])
         for fee_data in fees_data:
-            is_percentage = fee_data.pop('_treat_value_as_percentage', False)
-            if is_percentage:
-                fee_data['value'] = round_decimal(order.total * (fee_data['value'] / Decimal('100.00')),
-                                                  self.context['event'].currency)
-            is_split_taxes = fee_data.pop('_split_taxes_like_products', False)
-
-            if is_split_taxes:
-                d = defaultdict(lambda: Decimal('0.00'))
-                trz = TaxRule.zero()
-                for p in pos_map.values():
-                    tr = p.tax_rule
-                    d[tr] += p.price - p.tax_value
-
-                base_values = sorted([tuple(t) for t in d.items()], key=lambda t: (t[0] or trz).rate)
-                sum_base = sum(t[1] for t in base_values)
-                fee_values = [(t[0], round_decimal(fee_data['value'] * t[1] / sum_base, self.context['event'].currency))
-                              for t in base_values]
-                sum_fee = sum(t[1] for t in fee_values)
-
-                # If there are rounding differences, we fix them up, but always leaning to the benefit of the tax
-                # authorities
-                if sum_fee > fee_data['value']:
-                    fee_values[0] = (fee_values[0][0], fee_values[0][1] + (fee_data['value'] - sum_fee))
-                elif sum_fee < fee_data['value']:
-                    fee_values[-1] = (fee_values[-1][0], fee_values[-1][1] + (fee_data['value'] - sum_fee))
-
-                for tr, val in fee_values:
-                    fee_data['tax_rule'] = tr
-                    fee_data['value'] = val
-                    f = OrderFee(**fee_data)
-                    f.order = order
-                    f._calculate_tax()
-                    f.save()
-            else:
-                f = OrderFee(**fee_data)
-                f.order = order
-                f._calculate_tax()
-                f.save()
-
-        order.total += sum([f.value for f in order.fees.all()])
-        order.save(update_fields=['total'])
-
-        if order.total == Decimal('0.00') and validated_data.get('status') == Order.STATUS_PAID and not payment_provider:
-            payment_provider = 'free'
-
-        if order.total == Decimal('0.00') and validated_data.get('status') != Order.STATUS_PAID:
-            order.status = Order.STATUS_PAID
-            order.save()
-            order.payments.create(
-                amount=order.total, provider='free', state=OrderPayment.PAYMENT_STATE_CONFIRMED,
-                payment_date=now()
-            )
-        elif payment_provider == "free" and order.total != Decimal('0.00'):
-            raise ValidationError('You cannot use the "free" payment provider for non-free orders.')
-        elif validated_data.get('status') == Order.STATUS_PAID:
-            if not payment_provider:
-                raise ValidationError('You cannot create a paid order without a payment provider.')
-            order.payments.create(
-                amount=order.total,
-                provider=payment_provider,
-                info=payment_info,
-                payment_date=payment_date,
-                state=OrderPayment.PAYMENT_STATE_CONFIRMED
-            )
-        elif payment_provider:
-            order.payments.create(
-                amount=order.total,
-                provider=payment_provider,
-                info=payment_info,
-                state=OrderPayment.PAYMENT_STATE_CREATED
-            )
+            f = OrderFee(**fee_data)
+            f.order = order
+            f._calculate_tax()
+            f.save()
 
         return order
 
 
-class LinePositionField(serializers.IntegerField):
-    """
-    Internally, the position field is stored starting at 0, but for the API, starting at 1 makes it
-    more consistent with other models
-    """
-
-    def to_representation(self, value):
-        return super().to_representation(value) + 1
-
-    def to_internal_value(self, data):
-        return super().to_internal_value(data) - 1
-
-
 class InlineInvoiceLineSerializer(I18nAwareModelSerializer):
-    position = LinePositionField(read_only=True)
-
     class Meta:
         model = InvoiceLine
-        fields = ('position', 'description', 'gross_value', 'tax_value', 'tax_rate', 'tax_name')
+        fields = ('description', 'gross_value', 'tax_value', 'tax_rate', 'tax_name')
 
 
 class InvoiceSerializer(I18nAwareModelSerializer):

src/pretix/api/serializers/organizer.py

@@ -1,49 +1,8 @@
-from django.db.models import Q
-from django.utils.translation import ugettext_lazy as _
-from rest_framework import serializers
-from rest_framework.exceptions import ValidationError
-
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
-from pretix.api.serializers.order import CompatibleJSONField
-from pretix.base.models import GiftCard, Organizer, SeatingPlan
-from pretix.base.models.seating import SeatingPlanLayoutValidator
+from pretix.base.models import Organizer
 
 
 class OrganizerSerializer(I18nAwareModelSerializer):
     class Meta:
         model = Organizer
         fields = ('name', 'slug')
-
-
-class SeatingPlanSerializer(I18nAwareModelSerializer):
-    layout = CompatibleJSONField(
-        validators=[SeatingPlanLayoutValidator()]
-    )
-
-    class Meta:
-        model = SeatingPlan
-        fields = ('id', 'name', 'layout')
-
-
-class GiftCardSerializer(I18nAwareModelSerializer):
-    value = serializers.DecimalField(max_digits=10, decimal_places=2)
-
-    def validate(self, data):
-        data = super().validate(data)
-        s = data['secret']
-        qs = GiftCard.objects.filter(
-            secret=s
-        ).filter(
-            Q(issuer=self.context["organizer"]) | Q(issuer__gift_card_collector_acceptance__collector=self.context["organizer"])
-        )
-        if self.instance:
-            qs = qs.exclude(pk=self.instance.pk)
-        if qs.exists():
-            raise ValidationError(
-                {'secret': _('A gift card with the same secret already exists in your or an affiliated organizer account.')}
-            )
-        return data
-
-    class Meta:
-        model = GiftCard
-        fields = ('id', 'secret', 'issuance', 'value', 'currency', 'testmode')

src/pretix/api/serializers/voucher.py

@@ -2,23 +2,15 @@ from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
-from pretix.base.models import Seat, Voucher
+from pretix.base.models import Voucher
 
 
 class VoucherListSerializer(serializers.ListSerializer):
     def create(self, validated_data):
         codes = set()
-        seats = set()
         errs = []
         err = False
         for voucher_data in validated_data:
-            if voucher_data.get('seat') and (voucher_data.get('seat'), voucher_data.get('subevent')) in seats:
-                err = True
-                errs.append({'code': ['Duplicate seat ID in request.']})
-                continue
-            else:
-                seats.add((voucher_data.get('seat'), voucher_data.get('subevent')))
-
             if voucher_data['code'] in codes:
                 err = True
                 errs.append({'code': ['Duplicate voucher code in request.']})
@@ -30,19 +22,12 @@ class VoucherListSerializer(serializers.ListSerializer):
         return super().create(validated_data)
 
 
-class SeatGuidField(serializers.CharField):
-    def to_representation(self, val: Seat):
-        return val.seat_guid
-
-
 class VoucherSerializer(I18nAwareModelSerializer):
-    seat = SeatGuidField(allow_null=True, required=False)
-
     class Meta:
         model = Voucher
         fields = ('id', 'code', 'max_usages', 'redeemed', 'valid_until', 'block_quota',
                   'allow_ignore_quota', 'price_mode', 'value', 'item', 'variation', 'quota',
-                  'tag', 'comment', 'subevent', 'show_hidden_items', 'seat')
+                  'tag', 'comment', 'subevent')
         read_only_fields = ('id', 'redeemed')
         list_serializer_class = VoucherListSerializer
 
@@ -54,8 +39,7 @@ class VoucherSerializer(I18nAwareModelSerializer):
 
         Voucher.clean_item_properties(
             full_data, self.context.get('event'),
-            full_data.get('quota'), full_data.get('item'), full_data.get('variation'),
-            block_quota=full_data.get('block_quota')
+            full_data.get('quota'), full_data.get('item'), full_data.get('variation')
         )
         Voucher.clean_subevent(
             full_data, self.context.get('event')
@@ -77,10 +61,4 @@ class VoucherSerializer(I18nAwareModelSerializer):
             )
         Voucher.clean_voucher_code(full_data, self.context.get('event'), self.instance.pk if self.instance else None)
 
-        if full_data.get('seat'):
-            data['seat'] = Voucher.clean_seat_id(
-                full_data, full_data.get('item'), full_data.get('quota'), self.context.get('event'),
-                self.instance.pk if self.instance else None
-            )
-
         return data

src/pretix/api/signals.py

@@ -2,9 +2,8 @@ from datetime import timedelta
 
 from django.dispatch import Signal, receiver
 from django.utils.timezone import now
-from django_scopes import scopes_disabled
 
-from pretix.api.models import ApiCall, WebHookCall
+from pretix.api.models import WebHookCall
 from pretix.base.signals import periodic_task
 
 register_webhook_events = Signal(
@@ -18,12 +17,5 @@ instances.
 
 
 @receiver(periodic_task)
-@scopes_disabled()
 def cleanup_webhook_logs(sender, **kwargs):
     WebHookCall.objects.filter(datetime__lte=now() - timedelta(days=30)).delete()
-
-
-@receiver(periodic_task)
-@scopes_disabled()
-def cleanup_api_logs(sender, **kwargs):
-    ApiCall.objects.filter(created__lte=now() - timedelta(hours=24)).delete()

src/pretix/api/urls.py

@@ -18,8 +18,6 @@ orga_router = routers.DefaultRouter()
 orga_router.register(r'events', event.EventViewSet)
 orga_router.register(r'subevents', event.SubEventViewSet)
 orga_router.register(r'webhooks', webhooks.WebHookViewSet)
-orga_router.register(r'seatingplans', organizer.SeatingPlanViewSet)
-orga_router.register(r'giftcards', organizer.GiftCardViewSet)
 
 event_router = routers.DefaultRouter()
 event_router.register(r'subevents', event.SubEventViewSet)
@@ -46,7 +44,6 @@ question_router.register(r'options', item.QuestionOptionViewSet)
 item_router = routers.DefaultRouter()
 item_router.register(r'variations', item.ItemVariationViewSet)
 item_router.register(r'addons', item.ItemAddOnViewSet)
-item_router.register(r'bundles', item.ItemBundleViewSet)
 
 order_router = routers.DefaultRouter()
 order_router.register(r'payments', order.PaymentViewSet)

src/pretix/api/views/__init__.py

@@ -31,10 +31,10 @@ class RichOrderingFilter(OrderingFilter):
 class ConditionalListView:
 
     def list(self, request, **kwargs):
-        if_modified_since = request.headers.get('If-Modified-Since')
+        if_modified_since = request.META.get('HTTP_IF_MODIFIED_SINCE')
         if if_modified_since:
             if_modified_since = parse_http_date_safe(if_modified_since)
-        if_unmodified_since = request.headers.get('If-Unmodified-Since')
+        if_unmodified_since = request.META.get('HTTP_IF_UNMODIFIED_SINCE')
         if if_unmodified_since:
             if_unmodified_since = parse_http_date_safe(if_unmodified_since)
         if not hasattr(request, 'event'):

src/pretix/api/views/cart.py

@@ -24,7 +24,7 @@ class CartPositionViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnly
         return CartPosition.objects.filter(
             event=self.request.event,
             cart_id__endswith="@api"
-        ).select_related('seat').prefetch_related('answers')
+        )
 
     def get_serializer_context(self):
         ctx = super().get_serializer_context()

src/pretix/api/views/checkin.py

@@ -6,15 +6,14 @@ from django.shortcuts import get_object_or_404
 from django.utils.functional import cached_property
 from django.utils.timezone import now
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
-from django_scopes import scopes_disabled
 from rest_framework import viewsets
-from rest_framework.decorators import action
+from rest_framework.decorators import detail_route
 from rest_framework.fields import DateTimeField
 from rest_framework.response import Response
 
 from pretix.api.serializers.checkin import CheckinListSerializer
 from pretix.api.serializers.item import QuestionSerializer
-from pretix.api.serializers.order import CheckinListOrderPositionSerializer
+from pretix.api.serializers.order import OrderPositionSerializer
 from pretix.api.views import RichOrderingFilter
 from pretix.api.views.order import OrderPositionFilter
 from pretix.base.models import (
@@ -25,11 +24,11 @@ from pretix.base.services.checkin import (
 )
 from pretix.helpers.database import FixedOrderBy
 
-with scopes_disabled():
-    class CheckinListFilter(FilterSet):
-        class Meta:
-            model = CheckinList
-            fields = ['subevent']
+
+class CheckinListFilter(FilterSet):
+    class Meta:
+        model = CheckinList
+        fields = ['subevent']
 
 
 class CheckinListViewSet(viewsets.ModelViewSet):
@@ -44,6 +43,7 @@ class CheckinListViewSet(viewsets.ModelViewSet):
         qs = self.request.event.checkin_lists.prefetch_related(
             'limit_products',
         )
+        qs = CheckinList.annotate_with_numbers(qs, self.request.event)
         return qs
 
     def perform_create(self, serializer):
@@ -77,7 +77,7 @@ class CheckinListViewSet(viewsets.ModelViewSet):
         )
         super().perform_destroy(instance)
 
-    @action(detail=True, methods=['GET'])
+    @detail_route(methods=['GET'])
     def status(self, *args, **kwargs):
         clist = self.get_object()
         cqs = Checkin.objects.filter(
@@ -92,7 +92,6 @@ class CheckinListViewSet(viewsets.ModelViewSet):
         )
         if not clist.all_products:
             pqs = pqs.filter(item__in=clist.limit_products.values_list('id', flat=True))
-            cqs = cqs.filter(position__item__in=clist.limit_products.values_list('id', flat=True))
 
         ev = clist.subevent or clist.event
         response = {
@@ -147,16 +146,15 @@ class CheckinListViewSet(viewsets.ModelViewSet):
         return Response(response)
 
 
-with scopes_disabled():
-    class CheckinOrderPositionFilter(OrderPositionFilter):
+class CheckinOrderPositionFilter(OrderPositionFilter):
 
-        def has_checkin_qs(self, queryset, name, value):
-            return queryset.filter(last_checked_in__isnull=not value)
+    def has_checkin_qs(self, queryset, name, value):
+        return queryset.filter(last_checked_in__isnull=not value)
 
 
 class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
-    serializer_class = CheckinListOrderPositionSerializer
-    queryset = OrderPosition.all.none()
+    serializer_class = OrderPositionSerializer
+    queryset = OrderPosition.objects.none()
     filter_backends = (DjangoFilterBackend, RichOrderingFilter)
     ordering = ('attendee_name_cached', 'positionid')
     ordering_fields = (
@@ -191,7 +189,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
         except ValueError:
             raise Http404()
 
-    def get_queryset(self, ignore_status=False):
+    def get_queryset(self):
         cqs = Checkin.objects.filter(
             position_id=OuterRef('pk'),
             list_id=self.checkinlist.pk
@@ -201,15 +199,11 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
 
         qs = OrderPosition.objects.filter(
             order__event=self.request.event,
+            order__status__in=[Order.STATUS_PAID, Order.STATUS_PENDING] if self.checkinlist.include_pending else [Order.STATUS_PAID],
             subevent=self.checkinlist.subevent
         ).annotate(
             last_checked_in=Subquery(cqs)
         )
-
-        if self.request.query_params.get('ignore_status', 'false') != 'true' and not ignore_status:
-            qs = qs.filter(
-                order__status__in=[Order.STATUS_PAID, Order.STATUS_PENDING] if self.checkinlist.include_pending else [Order.STATUS_PAID]
-            )
         if self.request.query_params.get('pdf_data', 'false') == 'true':
             qs = qs.prefetch_related(
                 Prefetch(
@@ -231,7 +225,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                     )
                 ))
             ).select_related(
-                'item', 'variation', 'item__category', 'addon_to', 'order', 'order__invoice_address', 'seat'
+                'item', 'variation', 'item__category', 'addon_to'
             )
         else:
             qs = qs.prefetch_related(
@@ -241,19 +235,19 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                 ),
                 'answers', 'answers__options', 'answers__question',
                 Prefetch('addons', OrderPosition.objects.select_related('item', 'variation'))
-            ).select_related('item', 'variation', 'order', 'addon_to', 'order__invoice_address', 'order', 'seat')
+            ).select_related('item', 'variation', 'order', 'addon_to', 'order__invoice_address')
 
         if not self.checkinlist.all_products:
             qs = qs.filter(item__in=self.checkinlist.limit_products.values_list('id', flat=True))
 
         return qs
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def redeem(self, *args, **kwargs):
         force = bool(self.request.data.get('force', False))
         ignore_unpaid = bool(self.request.data.get('ignore_unpaid', False))
         nonce = self.request.data.get('nonce')
-        op = self.get_object(ignore_status=True)
+        op = self.get_object()
 
         if 'datetime' in self.request.data:
             dt = DateTimeField().to_internal_value(self.request.data.get('datetime'))
@@ -280,7 +274,6 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                 nonce=nonce,
                 datetime=dt,
                 questions_supported=self.request.data.get('questions_supported', True),
-                canceled_supported=self.request.data.get('canceled_supported', False),
                 user=self.request.user,
                 auth=self.request.auth,
             )
@@ -288,7 +281,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
             return Response({
                 'status': 'incomplete',
                 'require_attention': op.item.checkin_attention or op.order.checkin_attention,
-                'position': CheckinListOrderPositionSerializer(op, context=self.get_serializer_context()).data,
+                'position': OrderPositionSerializer(op, context=self.get_serializer_context()).data,
                 'questions': [
                     QuestionSerializer(q).data for q in e.questions
                 ]
@@ -298,17 +291,17 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                 'status': 'error',
                 'reason': e.code,
                 'require_attention': op.item.checkin_attention or op.order.checkin_attention,
-                'position': CheckinListOrderPositionSerializer(op, context=self.get_serializer_context()).data
+                'position': OrderPositionSerializer(op, context=self.get_serializer_context()).data
             }, status=400)
         else:
             return Response({
                 'status': 'ok',
                 'require_attention': op.item.checkin_attention or op.order.checkin_attention,
-                'position': CheckinListOrderPositionSerializer(op, context=self.get_serializer_context()).data
+                'position': OrderPositionSerializer(op, context=self.get_serializer_context()).data
             }, status=201)
 
-    def get_object(self, ignore_status=False):
-        queryset = self.filter_queryset(self.get_queryset(ignore_status=ignore_status))
+    def get_object(self):
+        queryset = self.filter_queryset(self.get_queryset())
         if self.kwargs['pk'].isnumeric():
             obj = get_object_or_404(queryset, Q(pk=self.kwargs['pk']) | Q(secret=self.kwargs['pk']))
         else:

src/pretix/api/views/device.py

@@ -105,7 +105,7 @@ class RevokeKeyView(APIView):
 
     def post(self, request, format=None):
         device = request.auth
-        device.revoked = True
+        device.api_token = None
         device.save()
         device.log_action('pretix.device.revoked', auth=device)
 

src/pretix/api/views/event.py

@@ -3,7 +3,6 @@ from django.db import transaction
 from django.db.models import ProtectedError, Q
 from django.utils.timezone import now
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
-from django_scopes import scopes_disabled
 from rest_framework import filters, viewsets
 from rest_framework.exceptions import PermissionDenied
 
@@ -14,57 +13,56 @@ from pretix.api.serializers.event import (
 )
 from pretix.api.views import ConditionalListView
 from pretix.base.models import (
-    CartPosition, Device, Event, ItemCategory, TaxRule, TeamAPIToken,
+    Device, Event, ItemCategory, TaxRule, TeamAPIToken,
 )
 from pretix.base.models.event import SubEvent
 from pretix.helpers.dicts import merge_dicts
-from pretix.presale.views.organizer import filter_qs_by_attr
 
-with scopes_disabled():
-    class EventFilter(FilterSet):
-        is_past = django_filters.rest_framework.BooleanFilter(method='is_past_qs')
-        is_future = django_filters.rest_framework.BooleanFilter(method='is_future_qs')
-        ends_after = django_filters.rest_framework.IsoDateTimeFilter(method='ends_after_qs')
 
-        class Meta:
-            model = Event
-            fields = ['is_public', 'live', 'has_subevents']
+class EventFilter(FilterSet):
+    is_past = django_filters.rest_framework.BooleanFilter(method='is_past_qs')
+    is_future = django_filters.rest_framework.BooleanFilter(method='is_future_qs')
+    ends_after = django_filters.rest_framework.IsoDateTimeFilter(method='ends_after_qs')
 
-        def ends_after_qs(self, queryset, name, value):
-            expr = (
-                Q(has_subevents=False) &
-                Q(
-                    Q(Q(date_to__isnull=True) & Q(date_from__gte=value))
-                    | Q(Q(date_to__isnull=False) & Q(date_to__gte=value))
-                )
+    class Meta:
+        model = Event
+        fields = ['is_public', 'live', 'has_subevents']
+
+    def ends_after_qs(self, queryset, name, value):
+        expr = (
+            Q(has_subevents=False) &
+            Q(
+                Q(Q(date_to__isnull=True) & Q(date_from__gte=value))
+                | Q(Q(date_to__isnull=False) & Q(date_to__gte=value))
             )
+        )
+        return queryset.filter(expr)
+
+    def is_past_qs(self, queryset, name, value):
+        expr = (
+            Q(has_subevents=False) &
+            Q(
+                Q(Q(date_to__isnull=True) & Q(date_from__lt=now()))
+                | Q(Q(date_to__isnull=False) & Q(date_to__lt=now()))
+            )
+        )
+        if value:
             return queryset.filter(expr)
+        else:
+            return queryset.exclude(expr)
 
-        def is_past_qs(self, queryset, name, value):
-            expr = (
-                Q(has_subevents=False) &
-                Q(
-                    Q(Q(date_to__isnull=True) & Q(date_from__lt=now()))
-                    | Q(Q(date_to__isnull=False) & Q(date_to__lt=now()))
-                )
+    def is_future_qs(self, queryset, name, value):
+        expr = (
+            Q(has_subevents=False) &
+            Q(
+                Q(Q(date_to__isnull=True) & Q(date_from__gte=now()))
+                | Q(Q(date_to__isnull=False) & Q(date_to__gte=now()))
             )
-            if value:
-                return queryset.filter(expr)
-            else:
-                return queryset.exclude(expr)
-
-        def is_future_qs(self, queryset, name, value):
-            expr = (
-                Q(has_subevents=False) &
-                Q(
-                    Q(Q(date_to__isnull=True) & Q(date_from__gte=now()))
-                    | Q(Q(date_to__isnull=False) & Q(date_to__gte=now()))
-                )
-            )
-            if value:
-                return queryset.filter(expr)
-            else:
-                return queryset.exclude(expr)
+        )
+        if value:
+            return queryset.filter(expr)
+        else:
+            return queryset.exclude(expr)
 
 
 class EventViewSet(viewsets.ModelViewSet):
@@ -74,8 +72,6 @@ class EventViewSet(viewsets.ModelViewSet):
     lookup_url_kwarg = 'event'
     permission_classes = (EventCRUDPermission,)
     filter_backends = (DjangoFilterBackend, filters.OrderingFilter)
-    ordering = ('slug',)
-    ordering_fields = ('date_from', 'slug')
     filterset_class = EventFilter
 
     def get_queryset(self):
@@ -86,10 +82,8 @@ class EventViewSet(viewsets.ModelViewSet):
                 organizer=self.request.organizer
             )
 
-        qs = filter_qs_by_attr(qs, self.request)
-
         return qs.prefetch_related(
-            'meta_values', 'meta_values__property', 'seat_category_mappings'
+            'meta_values', 'meta_values__property'
         )
 
     def perform_update(self, serializer):
@@ -186,48 +180,46 @@ class CloneEventViewSet(viewsets.ModelViewSet):
         )
 
 
-with scopes_disabled():
-    class SubEventFilter(FilterSet):
-        is_past = django_filters.rest_framework.BooleanFilter(method='is_past_qs')
-        is_future = django_filters.rest_framework.BooleanFilter(method='is_future_qs')
-        ends_after = django_filters.rest_framework.IsoDateTimeFilter(method='ends_after_qs')
+class SubEventFilter(FilterSet):
+    is_past = django_filters.rest_framework.BooleanFilter(method='is_past_qs')
+    is_future = django_filters.rest_framework.BooleanFilter(method='is_future_qs')
+    ends_after = django_filters.rest_framework.IsoDateTimeFilter(method='ends_after_qs')
 
-        class Meta:
-            model = SubEvent
-            fields = ['active', 'event__live']
+    class Meta:
+        model = SubEvent
+        fields = ['active', 'event__live']
 
-        def ends_after_qs(self, queryset, name, value):
-            expr = Q(
-                Q(Q(date_to__isnull=True) & Q(date_from__gte=value))
-                | Q(Q(date_to__isnull=False) & Q(date_to__gte=value))
-            )
+    def ends_after_qs(self, queryset, name, value):
+        expr = Q(
+            Q(Q(date_to__isnull=True) & Q(date_from__gte=value))
+            | Q(Q(date_to__isnull=False) & Q(date_to__gte=value))
+        )
+        return queryset.filter(expr)
+
+    def is_past_qs(self, queryset, name, value):
+        expr = Q(
+            Q(Q(date_to__isnull=True) & Q(date_from__lt=now()))
+            | Q(Q(date_to__isnull=False) & Q(date_to__lt=now()))
+        )
+        if value:
             return queryset.filter(expr)
+        else:
+            return queryset.exclude(expr)
 
-        def is_past_qs(self, queryset, name, value):
-            expr = Q(
-                Q(Q(date_to__isnull=True) & Q(date_from__lt=now()))
-                | Q(Q(date_to__isnull=False) & Q(date_to__lt=now()))
-            )
-            if value:
-                return queryset.filter(expr)
-            else:
-                return queryset.exclude(expr)
-
-        def is_future_qs(self, queryset, name, value):
-            expr = Q(
-                Q(Q(date_to__isnull=True) & Q(date_from__gte=now()))
-                | Q(Q(date_to__isnull=False) & Q(date_to__gte=now()))
-            )
-            if value:
-                return queryset.filter(expr)
-            else:
-                return queryset.exclude(expr)
+    def is_future_qs(self, queryset, name, value):
+        expr = Q(
+            Q(Q(date_to__isnull=True) & Q(date_from__gte=now()))
+            | Q(Q(date_to__isnull=False) & Q(date_to__gte=now()))
+        )
+        if value:
+            return queryset.filter(expr)
+        else:
+            return queryset.exclude(expr)
 
 
-class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
+class SubEventViewSet(ConditionalListView, viewsets.ReadOnlyModelViewSet):
     serializer_class = SubEventSerializer
     queryset = ItemCategory.objects.none()
-    write_permission = 'can_change_event_settings'
     filter_backends = (DjangoFilterBackend, filters.OrderingFilter)
     filterset_class = SubEventFilter
 
@@ -244,57 +236,10 @@ class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
                 event__organizer=self.request.organizer,
                 event__in=self.request.user.get_events_with_any_permission()
             )
-
-        qs = filter_qs_by_attr(qs, self.request)
-
         return qs.prefetch_related(
-            'subeventitem_set', 'subeventitemvariation_set', 'seat_category_mappings'
+            'subeventitem_set', 'subeventitemvariation_set'
         )
 
-    def perform_update(self, serializer):
-        original_data = self.get_serializer(instance=serializer.instance).data
-        super().perform_update(serializer)
-
-        if serializer.data == original_data:
-            # Performance optimization: If nothing was changed, we do not need to save or log anything.
-            # This costs us a few cycles on save, but avoids thousands of lines in our log.
-            return
-
-        serializer.instance.log_action(
-            'pretix.subevent.changed',
-            user=self.request.user,
-            auth=self.request.auth,
-            data=self.request.data
-        )
-
-    def perform_create(self, serializer):
-        serializer.save(event=self.request.event)
-        serializer.instance.log_action(
-            'pretix.subevent.added',
-            user=self.request.user,
-            auth=self.request.auth,
-            data=self.request.data
-        )
-
-    def perform_destroy(self, instance):
-        if not instance.allow_delete():
-            raise PermissionDenied('The sub-event can not be deleted as it has already been used in orders. Please set'
-                                   ' \'active\' to false instead to hide it from users.')
-        try:
-            with transaction.atomic():
-                instance.log_action(
-                    'pretix.subevent.deleted',
-                    user=self.request.user,
-                    auth=self.request.auth,
-                    data=self.request.data
-                )
-                CartPosition.objects.filter(addon_to__subevent=instance).delete()
-                instance.cartposition_set.all().delete()
-                super().perform_destroy(instance)
-        except ProtectedError:
-            raise PermissionDenied('The sub-event could not be deleted as some constraints (e.g. data created by '
-                                   'plug-ins) do not allow it.')
-
 
 class TaxRuleViewSet(ConditionalListView, viewsets.ModelViewSet):
     serializer_class = TaxRuleSerializer

src/pretix/api/views/item.py

@@ -1,40 +1,38 @@
 import django_filters
 from django.db.models import Q
 from django.shortcuts import get_object_or_404
-from django.utils.functional import cached_property
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
-from django_scopes import scopes_disabled
 from rest_framework import viewsets
-from rest_framework.decorators import action
+from rest_framework.decorators import detail_route
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.filters import OrderingFilter
 from rest_framework.response import Response
 
 from pretix.api.serializers.item import (
-    ItemAddOnSerializer, ItemBundleSerializer, ItemCategorySerializer,
-    ItemSerializer, ItemVariationSerializer, QuestionOptionSerializer,
-    QuestionSerializer, QuotaSerializer,
+    ItemAddOnSerializer, ItemCategorySerializer, ItemSerializer,
+    ItemVariationSerializer, QuestionOptionSerializer, QuestionSerializer,
+    QuotaSerializer,
 )
 from pretix.api.views import ConditionalListView
 from pretix.base.models import (
-    CartPosition, Item, ItemAddOn, ItemBundle, ItemCategory, ItemVariation,
-    Question, QuestionOption, Quota,
+    Item, ItemAddOn, ItemCategory, ItemVariation, Question, QuestionOption,
+    Quota,
 )
 from pretix.helpers.dicts import merge_dicts
 
-with scopes_disabled():
-    class ItemFilter(FilterSet):
-        tax_rate = django_filters.CharFilter(method='tax_rate_qs')
 
-        def tax_rate_qs(self, queryset, name, value):
-            if value in ("0", "None", "0.00"):
-                return queryset.filter(Q(tax_rule__isnull=True) | Q(tax_rule__rate=0))
-            else:
-                return queryset.filter(tax_rule__rate=value)
+class ItemFilter(FilterSet):
+    tax_rate = django_filters.CharFilter(method='tax_rate_qs')
 
-        class Meta:
-            model = Item
-            fields = ['active', 'category', 'admission', 'tax_rate', 'free_price']
+    def tax_rate_qs(self, queryset, name, value):
+        if value in ("0", "None", "0.00"):
+            return queryset.filter(Q(tax_rule__isnull=True) | Q(tax_rule__rate=0))
+        else:
+            return queryset.filter(tax_rule__rate=value)
+
+    class Meta:
+        model = Item
+        fields = ['active', 'category', 'admission', 'tax_rate', 'free_price']
 
 
 class ItemViewSet(ConditionalListView, viewsets.ModelViewSet):
@@ -48,7 +46,7 @@ class ItemViewSet(ConditionalListView, viewsets.ModelViewSet):
     write_permission = 'can_change_items'
 
     def get_queryset(self):
-        return self.request.event.items.select_related('tax_rule').prefetch_related('variations', 'addons', 'bundles').all()
+        return self.request.event.items.select_related('tax_rule').prefetch_related('variations', 'addons').all()
 
     def perform_create(self, serializer):
         serializer.save(event=self.request.event)
@@ -62,17 +60,11 @@ class ItemViewSet(ConditionalListView, viewsets.ModelViewSet):
     def get_serializer_context(self):
         ctx = super().get_serializer_context()
         ctx['event'] = self.request.event
+        ctx['has_variations'] = self.request.data.get('has_variations')
         return ctx
 
     def perform_update(self, serializer):
-        original_data = self.get_serializer(instance=serializer.instance).data
-
         serializer.save(event=self.request.event)
-
-        if serializer.data == original_data:
-            # Performance optimization: If nothing was changed, we do not need to save or log anything.
-            # This costs us a few cycles on save, but avoids thousands of lines in our log.
-            return
         serializer.instance.log_action(
             'pretix.event.item.changed',
             user=self.request.user,
@@ -91,8 +83,7 @@ class ItemViewSet(ConditionalListView, viewsets.ModelViewSet):
             user=self.request.user,
             auth=self.request.auth,
         )
-        CartPosition.objects.filter(addon_to__item=instance).delete()
-        instance.cartposition_set.all().delete()
+        self.get_object().cartposition_set.all().delete()
         super().perform_destroy(instance)
 
 
@@ -105,20 +96,17 @@ class ItemVariationViewSet(viewsets.ModelViewSet):
     permission = None
     write_permission = 'can_change_items'
 
-    @cached_property
-    def item(self):
-        return get_object_or_404(Item, pk=self.kwargs['item'], event=self.request.event)
-
     def get_queryset(self):
-        return self.item.variations.all()
+        item = get_object_or_404(Item, pk=self.kwargs['item'], event=self.request.event)
+        return item.variations.all()
 
     def get_serializer_context(self):
         ctx = super().get_serializer_context()
-        ctx['item'] = self.item
+        ctx['item'] = get_object_or_404(Item, pk=self.kwargs['item'], event=self.request.event)
         return ctx
 
     def perform_create(self, serializer):
-        item = self.item
+        item = get_object_or_404(Item, pk=self.kwargs['item'], event=self.request.event)
         if not item.has_variations:
             raise PermissionDenied('This variation cannot be created because the item does not have variations. '
                                    'Changing a product without variations to a product with variations is not allowed.')
@@ -161,58 +149,6 @@ class ItemVariationViewSet(viewsets.ModelViewSet):
         )
 
 
-class ItemBundleViewSet(viewsets.ModelViewSet):
-    serializer_class = ItemBundleSerializer
-    queryset = ItemBundle.objects.none()
-    filter_backends = (DjangoFilterBackend, OrderingFilter,)
-    ordering_fields = ('id',)
-    ordering = ('id',)
-    permission = None
-    write_permission = 'can_change_items'
-
-    @cached_property
-    def item(self):
-        return get_object_or_404(Item, pk=self.kwargs['item'], event=self.request.event)
-
-    def get_queryset(self):
-        return self.item.bundles.all()
-
-    def get_serializer_context(self):
-        ctx = super().get_serializer_context()
-        ctx['event'] = self.request.event
-        ctx['item'] = self.item
-        return ctx
-
-    def perform_create(self, serializer):
-        item = get_object_or_404(Item, pk=self.kwargs['item'], event=self.request.event)
-        serializer.save(base_item=item)
-        item.log_action(
-            'pretix.event.item.bundles.added',
-            user=self.request.user,
-            auth=self.request.auth,
-            data=merge_dicts(self.request.data, {'id': serializer.instance.pk})
-        )
-
-    def perform_update(self, serializer):
-        serializer.save(event=self.request.event)
-        serializer.instance.base_item.log_action(
-            'pretix.event.item.bundles.changed',
-            user=self.request.user,
-            auth=self.request.auth,
-            data=merge_dicts(self.request.data, {'id': serializer.instance.pk})
-        )
-
-    def perform_destroy(self, instance):
-        super().perform_destroy(instance)
-        instance.base_item.log_action(
-            'pretix.event.item.bundles.removed',
-            user=self.request.user,
-            auth=self.request.auth,
-            data={'bundled_item': instance.bundled_item.pk, 'bundled_variation': instance.bundled_variation.pk if instance.bundled_variation else None,
-                  'count': instance.count, 'designated_price': instance.designated_price}
-        )
-
-
 class ItemAddOnViewSet(viewsets.ModelViewSet):
     serializer_class = ItemAddOnSerializer
     queryset = ItemAddOn.objects.none()
@@ -222,21 +158,18 @@ class ItemAddOnViewSet(viewsets.ModelViewSet):
     permission = None
     write_permission = 'can_change_items'
 
-    @cached_property
-    def item(self):
-        return get_object_or_404(Item, pk=self.kwargs['item'], event=self.request.event)
-
     def get_queryset(self):
-        return self.item.addons.all()
+        item = get_object_or_404(Item, pk=self.kwargs['item'], event=self.request.event)
+        return item.addons.all()
 
     def get_serializer_context(self):
         ctx = super().get_serializer_context()
         ctx['event'] = self.request.event
-        ctx['item'] = self.item
+        ctx['item'] = get_object_or_404(Item, pk=self.kwargs['item'], event=self.request.event)
         return ctx
 
     def perform_create(self, serializer):
-        item = self.item
+        item = get_object_or_404(Item, pk=self.kwargs['item'], event=self.request.event)
         category = get_object_or_404(ItemCategory, pk=self.request.data['addon_category'])
         serializer.save(base_item=item, addon_category=category)
         item.log_action(
@@ -319,11 +252,10 @@ class ItemCategoryViewSet(ConditionalListView, viewsets.ModelViewSet):
         super().perform_destroy(instance)
 
 
-with scopes_disabled():
-    class QuestionFilter(FilterSet):
-        class Meta:
-            model = Question
-            fields = ['ask_during_checkin', 'required', 'identifier']
+class QuestionFilter(FilterSet):
+    class Meta:
+        model = Question
+        fields = ['ask_during_checkin', 'required', 'identifier']
 
 
 class QuestionViewSet(ConditionalListView, viewsets.ModelViewSet):
@@ -419,11 +351,10 @@ class QuestionOptionViewSet(viewsets.ModelViewSet):
         super().perform_destroy(instance)
 
 
-with scopes_disabled():
-    class QuotaFilter(FilterSet):
-        class Meta:
-            model = Quota
-            fields = ['subevent']
+class QuotaFilter(FilterSet):
+    class Meta:
+        model = Quota
+        fields = ['subevent']
 
 
 class QuotaViewSet(ConditionalListView, viewsets.ModelViewSet):
@@ -461,30 +392,9 @@ class QuotaViewSet(ConditionalListView, viewsets.ModelViewSet):
         return ctx
 
     def perform_update(self, serializer):
-        original_data = self.get_serializer(instance=serializer.instance).data
-
         current_subevent = serializer.instance.subevent
         serializer.save(event=self.request.event)
         request_subevent = serializer.instance.subevent
-
-        if serializer.data == original_data:
-            # Performance optimization: If nothing was changed, we do not need to save or log anything.
-            # This costs us a few cycles on save, but avoids thousands of lines in our log.
-            return
-
-        if original_data['closed'] is True and serializer.instance.closed is False:
-            serializer.instance.log_action(
-                'pretix.event.quota.opened',
-                user=self.request.user,
-                auth=self.request.auth,
-            )
-        elif original_data['closed'] is False and serializer.instance.closed is True:
-            serializer.instance.log_action(
-                'pretix.event.quota.closed',
-                user=self.request.user,
-                auth=self.request.auth,
-            )
-
         serializer.instance.log_action(
             'pretix.event.quota.changed',
             user=self.request.user,
@@ -529,7 +439,7 @@ class QuotaViewSet(ConditionalListView, viewsets.ModelViewSet):
             )
         super().perform_destroy(instance)
 
-    @action(detail=True, methods=['get'])
+    @detail_route(methods=['get'])
     def availability(self, request, *args, **kwargs):
         quota = self.get_object()
 

src/pretix/api/views/order.py

@@ -6,66 +6,55 @@ import pytz
 from django.db import transaction
 from django.db.models import F, Prefetch, Q
 from django.db.models.functions import Coalesce, Concat
-from django.http import FileResponse, HttpResponse
+from django.http import FileResponse
 from django.shortcuts import get_object_or_404
 from django.utils.timezone import make_aware, now
-from django.utils.translation import ugettext as _
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
-from django_scopes import scopes_disabled
 from rest_framework import mixins, serializers, status, viewsets
-from rest_framework.decorators import action
+from rest_framework.decorators import detail_route
 from rest_framework.exceptions import (
     APIException, NotFound, PermissionDenied, ValidationError,
 )
 from rest_framework.filters import OrderingFilter
-from rest_framework.mixins import CreateModelMixin
+from rest_framework.mixins import CreateModelMixin, DestroyModelMixin
 from rest_framework.response import Response
 
 from pretix.api.models import OAuthAccessToken
 from pretix.api.serializers.order import (
     InvoiceSerializer, OrderCreateSerializer, OrderPaymentSerializer,
     OrderPositionSerializer, OrderRefundCreateSerializer,
-    OrderRefundSerializer, OrderSerializer, PriceCalcSerializer,
+    OrderRefundSerializer, OrderSerializer,
 )
-from pretix.base.i18n import language
 from pretix.base.models import (
-    CachedCombinedTicket, CachedTicket, Device, Event, Invoice, InvoiceAddress,
-    Order, OrderPayment, OrderPosition, OrderRefund, Quota, TeamAPIToken,
-    generate_position_secret, generate_secret,
+    CachedCombinedTicket, CachedTicket, Device, Event, Invoice, Order,
+    OrderPayment, OrderPosition, OrderRefund, Quota, TeamAPIToken,
 )
 from pretix.base.payment import PaymentException
-from pretix.base.services import tickets
 from pretix.base.services.invoices import (
     generate_cancellation, generate_invoice, invoice_pdf, invoice_qualified,
     regenerate_invoice,
 )
 from pretix.base.services.mail import SendMailException
 from pretix.base.services.orders import (
-    OrderChangeManager, OrderError, _order_placed_email,
-    _order_placed_email_attendee, approve_order, cancel_order, deny_order,
+    OrderChangeManager, OrderError, approve_order, cancel_order, deny_order,
     extend_order, mark_order_expired, mark_order_refunded,
 )
-from pretix.base.services.pricing import get_price
 from pretix.base.services.tickets import generate
-from pretix.base.signals import (
-    order_modified, order_paid, order_placed, register_ticket_outputs,
-)
-from pretix.base.templatetags.money import money_filter
-
-with scopes_disabled():
-    class OrderFilter(FilterSet):
-        email = django_filters.CharFilter(field_name='email', lookup_expr='iexact')
-        code = django_filters.CharFilter(field_name='code', lookup_expr='iexact')
-        status = django_filters.CharFilter(field_name='status', lookup_expr='iexact')
-        modified_since = django_filters.IsoDateTimeFilter(field_name='last_modified', lookup_expr='gte')
-        created_since = django_filters.IsoDateTimeFilter(field_name='datetime', lookup_expr='gte')
-
-        class Meta:
-            model = Order
-            fields = ['code', 'status', 'email', 'locale', 'testmode', 'require_approval']
+from pretix.base.signals import order_placed, register_ticket_outputs
 
 
-class OrderViewSet(viewsets.ModelViewSet):
+class OrderFilter(FilterSet):
+    email = django_filters.CharFilter(field_name='email', lookup_expr='iexact')
+    code = django_filters.CharFilter(field_name='code', lookup_expr='iexact')
+    status = django_filters.CharFilter(field_name='status', lookup_expr='iexact')
+    modified_since = django_filters.IsoDateTimeFilter(field_name='last_modified', lookup_expr='gte')
+
+    class Meta:
+        model = Order
+        fields = ['code', 'status', 'email', 'locale', 'testmode', 'require_approval']
+
+
+class OrderViewSet(DestroyModelMixin, CreateModelMixin, viewsets.ReadOnlyModelViewSet):
     serializer_class = OrderSerializer
     queryset = Order.objects.none()
     filter_backends = (DjangoFilterBackend, OrderingFilter)
@@ -94,8 +83,8 @@ class OrderViewSet(viewsets.ModelViewSet):
                     'positions',
                     OrderPosition.objects.all().prefetch_related(
                         'checkins', 'item', 'variation', 'answers', 'answers__options', 'answers__question',
-                        'item__category', 'addon_to', 'seat',
-                        Prefetch('addons', OrderPosition.objects.select_related('item', 'variation', 'seat'))
+                        'item__category', 'addon_to',
+                        Prefetch('addons', OrderPosition.objects.select_related('item', 'variation'))
                     )
                 )
             )
@@ -104,7 +93,7 @@ class OrderViewSet(viewsets.ModelViewSet):
                 Prefetch(
                     'positions',
                     OrderPosition.objects.all().prefetch_related(
-                        'checkins', 'item', 'variation', 'answers', 'answers__options', 'answers__question', 'seat',
+                        'checkins', 'item', 'variation', 'answers', 'answers__options', 'answers__question',
                     )
                 )
             )
@@ -133,7 +122,7 @@ class OrderViewSet(viewsets.ModelViewSet):
         serializer = self.get_serializer(queryset, many=True)
         return Response(serializer.data, headers={'X-Page-Generated': date})
 
-    @action(detail=True, url_name='download', url_path='download/(?P<output>[^/]+)')
+    @detail_route(url_name='download', url_path='download/(?P<output>[^/]+)')
     def download(self, request, output, **kwargs):
         provider = self._get_output_provider(output)
         order = self.get_object()
@@ -148,18 +137,14 @@ class OrderViewSet(viewsets.ModelViewSet):
             generate.apply_async(args=('order', order.pk, provider.identifier))
             raise RetryException()
         else:
-            if ct.type == 'text/uri-list':
-                resp = HttpResponse(ct.file.file.read(), content_type='text/uri-list')
-                return resp
-            else:
-                resp = FileResponse(ct.file.file, content_type=ct.type)
-                resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}{}"'.format(
-                    self.request.event.slug.upper(), order.code,
-                    provider.identifier, ct.extension
-                )
-                return resp
+            resp = FileResponse(ct.file.file, content_type=ct.type)
+            resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}{}"'.format(
+                self.request.event.slug.upper(), order.code,
+                provider.identifier, ct.extension
+            )
+            return resp
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def mark_paid(self, request, **kwargs):
         order = self.get_object()
 
@@ -173,26 +158,9 @@ class OrderViewSet(viewsets.ModelViewSet):
                     amount=ps
                 )
             except OrderPayment.DoesNotExist:
-                for p in order.payments.filter(state__in=(OrderPayment.PAYMENT_STATE_PENDING,
-                                                          OrderPayment.PAYMENT_STATE_CREATED)):
-                    try:
-                        with transaction.atomic():
-                            p.payment_provider.cancel_payment(p)
-                            order.log_action('pretix.event.order.payment.canceled', {
-                                'local_id': p.local_id,
-                                'provider': p.provider,
-                            }, user=self.request.user if self.request.user.is_authenticated else None, auth=self.request.auth)
-                    except PaymentException as e:
-                        order.log_action(
-                            'pretix.event.order.payment.canceled.failed',
-                            {
-                                'local_id': p.local_id,
-                                'provider': p.provider,
-                                'error': str(e)
-                            },
-                            user=self.request.user if self.request.user.is_authenticated else None,
-                            auth=self.request.auth
-                        )
+                order.payments.filter(state__in=(OrderPayment.PAYMENT_STATE_PENDING,
+                                                 OrderPayment.PAYMENT_STATE_CREATED)) \
+                    .update(state=OrderPayment.PAYMENT_STATE_CANCELED)
                 p = order.payments.create(
                     state=OrderPayment.PAYMENT_STATE_CREATED,
                     provider='manual',
@@ -217,7 +185,7 @@ class OrderViewSet(viewsets.ModelViewSet):
             status=status.HTTP_400_BAD_REQUEST
         )
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def mark_canceled(self, request, **kwargs):
         send_mail = request.data.get('send_email', True)
         cancellation_fee = request.data.get('cancellation_fee', None)
@@ -251,7 +219,7 @@ class OrderViewSet(viewsets.ModelViewSet):
             )
         return self.retrieve(request, [], **kwargs)
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def approve(self, request, **kwargs):
         send_mail = request.data.get('send_email', True)
 
@@ -269,7 +237,7 @@ class OrderViewSet(viewsets.ModelViewSet):
             return Response({'detail': str(e)}, status=status.HTTP_400_BAD_REQUEST)
         return self.retrieve(request, [], **kwargs)
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def deny(self, request, **kwargs):
         send_mail = request.data.get('send_email', True)
         comment = request.data.get('comment', '')
@@ -287,7 +255,7 @@ class OrderViewSet(viewsets.ModelViewSet):
             return Response({'detail': str(e)}, status=status.HTTP_400_BAD_REQUEST)
         return self.retrieve(request, [], **kwargs)
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def mark_pending(self, request, **kwargs):
         order = self.get_object()
 
@@ -306,7 +274,7 @@ class OrderViewSet(viewsets.ModelViewSet):
         )
         return self.retrieve(request, [], **kwargs)
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def mark_expired(self, request, **kwargs):
         order = self.get_object()
 
@@ -323,7 +291,7 @@ class OrderViewSet(viewsets.ModelViewSet):
         )
         return self.retrieve(request, [], **kwargs)
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def mark_refunded(self, request, **kwargs):
         order = self.get_object()
 
@@ -340,73 +308,7 @@ class OrderViewSet(viewsets.ModelViewSet):
         )
         return self.retrieve(request, [], **kwargs)
 
-    @action(detail=True, methods=['POST'])
-    def create_invoice(self, request, **kwargs):
-        order = self.get_object()
-        has_inv = order.invoices.exists() and not (
-            order.status in (Order.STATUS_PAID, Order.STATUS_PENDING)
-            and order.invoices.filter(is_cancellation=True).count() >= order.invoices.filter(is_cancellation=False).count()
-        )
-        if self.request.event.settings.get('invoice_generate') not in ('admin', 'user', 'paid', 'True') or not invoice_qualified(order):
-            return Response(
-                {'detail': _('You cannot generate an invoice for this order.')},
-                status=status.HTTP_400_BAD_REQUEST
-            )
-        elif has_inv:
-            return Response(
-                {'detail': _('An invoice for this order already exists.')},
-                status=status.HTTP_400_BAD_REQUEST
-            )
-
-        inv = generate_invoice(order)
-        order.log_action(
-            'pretix.event.order.invoice.generated',
-            user=self.request.user,
-            auth=self.request.auth,
-            data={
-                'invoice': inv.pk
-            }
-        )
-        return Response(
-            InvoiceSerializer(inv).data,
-            status=status.HTTP_201_CREATED
-        )
-
-    @action(detail=True, methods=['POST'])
-    def resend_link(self, request, **kwargs):
-        order = self.get_object()
-        if not order.email:
-            return Response({'detail': 'There is no email address associated with this order.'}, status=status.HTTP_400_BAD_REQUEST)
-        try:
-            order.resend_link(user=self.request.user, auth=self.request.auth)
-        except SendMailException:
-            return Response({'detail': _('There was an error sending the mail. Please try again later.')}, status=status.HTTP_503_SERVICE_UNAVAILABLE)
-
-        return Response(
-            status=status.HTTP_204_NO_CONTENT
-        )
-
-    @action(detail=True, methods=['POST'])
-    @transaction.atomic
-    def regenerate_secrets(self, request, **kwargs):
-        order = self.get_object()
-        order.secret = generate_secret()
-        for op in order.all_positions.all():
-            op.secret = generate_position_secret()
-            op.save()
-        order.save(update_fields=['secret'])
-        CachedTicket.objects.filter(order_position__order=order).delete()
-        CachedCombinedTicket.objects.filter(order=order).delete()
-        tickets.invalidate_cache.apply_async(kwargs={'event': self.request.event.pk,
-                                                     'order': order.pk})
-        order.log_action(
-            'pretix.event.order.secret.changed',
-            user=self.request.user,
-            auth=self.request.auth,
-        )
-        return self.retrieve(request, [], **kwargs)
-
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def extend(self, request, **kwargs):
         new_date = request.data.get('expires', None)
         force = request.data.get('force', False)
@@ -453,7 +355,6 @@ class OrderViewSet(viewsets.ModelViewSet):
         serializer.is_valid(raise_exception=True)
         with transaction.atomic():
             self.perform_create(serializer)
-            send_mail = serializer._send_mail
             order = serializer.instance
             serializer = OrderSerializer(order, context=serializer.context)
 
@@ -462,126 +363,18 @@ class OrderViewSet(viewsets.ModelViewSet):
                 user=request.user if request.user.is_authenticated else None,
                 auth=request.auth,
             )
+        order_placed.send(self.request.event, order=order)
 
-        with language(order.locale):
-            order_placed.send(self.request.event, order=order)
-            if order.status == Order.STATUS_PAID:
-                order_paid.send(self.request.event, order=order)
-
-            gen_invoice = invoice_qualified(order) and (
-                (order.event.settings.get('invoice_generate') == 'True') or
-                (order.event.settings.get('invoice_generate') == 'paid' and order.status == Order.STATUS_PAID)
-            ) and not order.invoices.last()
-            invoice = None
-            if gen_invoice:
-                invoice = generate_invoice(order, trigger_pdf=True)
-
-            if send_mail:
-                payment = order.payments.last()
-                free_flow = (
-                    payment and order.total == Decimal('0.00') and order.status == Order.STATUS_PAID and
-                    not order.require_approval and payment.provider == "free"
-                )
-                if free_flow:
-                    email_template = request.event.settings.mail_text_order_free
-                    log_entry = 'pretix.event.order.email.order_free'
-                    email_attendees = request.event.settings.mail_send_order_free_attendee
-                    email_attendees_template = request.event.settings.mail_text_order_free_attendee
-                else:
-                    email_template = request.event.settings.mail_text_order_placed
-                    log_entry = 'pretix.event.order.email.order_placed'
-                    email_attendees = request.event.settings.mail_send_order_placed_attendee
-                    email_attendees_template = request.event.settings.mail_text_order_placed_attendee
-
-                _order_placed_email(
-                    request.event, order, payment.payment_provider if payment else None, email_template,
-                    log_entry, invoice, payment
-                )
-                if email_attendees:
-                    for p in order.positions.all():
-                        if p.addon_to_id is None and p.attendee_email and p.attendee_email != order.email:
-                            _order_placed_email_attendee(request.event, order, p, email_attendees_template, log_entry)
-
-                if not free_flow and order.status == Order.STATUS_PAID and payment:
-                    payment._send_paid_mail(invoice, None, '')
-                    if self.request.event.settings.mail_send_order_paid_attendee:
-                        for p in order.positions.all():
-                            if p.addon_to_id is None and p.attendee_email and p.attendee_email != order.email:
-                                payment._send_paid_mail_attendee(p, None)
+        gen_invoice = invoice_qualified(order) and (
+            (order.event.settings.get('invoice_generate') == 'True') or
+            (order.event.settings.get('invoice_generate') == 'paid' and order.status == Order.STATUS_PAID)
+        ) and not order.invoices.last()
+        if gen_invoice:
+            generate_invoice(order, trigger_pdf=True)
 
         headers = self.get_success_headers(serializer.data)
         return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
 
-    def update(self, request, *args, **kwargs):
-        partial = kwargs.get('partial', False)
-        if not partial:
-            return Response(
-                {"detail": "Method \"PUT\" not allowed."},
-                status=status.HTTP_405_METHOD_NOT_ALLOWED,
-            )
-        return super().update(request, *args, **kwargs)
-
-    def perform_update(self, serializer):
-        with transaction.atomic():
-            if 'comment' in self.request.data and serializer.instance.comment != self.request.data.get('comment'):
-                serializer.instance.log_action(
-                    'pretix.event.order.comment',
-                    user=self.request.user,
-                    auth=self.request.auth,
-                    data={
-                        'new_comment': self.request.data.get('comment')
-                    }
-                )
-
-            if 'checkin_attention' in self.request.data and serializer.instance.checkin_attention != self.request.data.get('checkin_attention'):
-                serializer.instance.log_action(
-                    'pretix.event.order.checkin_attention',
-                    user=self.request.user,
-                    auth=self.request.auth,
-                    data={
-                        'new_value': self.request.data.get('checkin_attention')
-                    }
-                )
-
-            if 'email' in self.request.data and serializer.instance.email != self.request.data.get('email'):
-                serializer.instance.email_known_to_work = False
-                serializer.instance.log_action(
-                    'pretix.event.order.contact.changed',
-                    user=self.request.user,
-                    auth=self.request.auth,
-                    data={
-                        'old_email': serializer.instance.email,
-                        'new_email': self.request.data.get('email'),
-                    }
-                )
-
-            if 'locale' in self.request.data and serializer.instance.locale != self.request.data.get('locale'):
-                serializer.instance.log_action(
-                    'pretix.event.order.locale.changed',
-                    user=self.request.user,
-                    auth=self.request.auth,
-                    data={
-                        'old_locale': serializer.instance.locale,
-                        'new_locale': self.request.data.get('locale'),
-                    }
-                )
-
-            if 'invoice_address' in self.request.data:
-                serializer.instance.log_action(
-                    'pretix.event.order.modified',
-                    user=self.request.user,
-                    auth=self.request.auth,
-                    data={
-                        'invoice_data': self.request.data.get('invoice_address'),
-                    }
-                )
-
-            serializer.save()
-            tickets.invalidate_cache.apply_async(kwargs={'event': serializer.instance.event.pk, 'order': serializer.instance.pk})
-
-        if 'invoice_address' in self.request.data:
-            order_modified.send(sender=serializer.instance.event, order=serializer.instance)
-
     def perform_create(self, serializer):
         serializer.save()
 
@@ -593,49 +386,46 @@ class OrderViewSet(viewsets.ModelViewSet):
             self.get_object().gracefully_delete(user=self.request.user if self.request.user.is_authenticated else None, auth=self.request.auth)
 
 
-with scopes_disabled():
-    class OrderPositionFilter(FilterSet):
-        order = django_filters.CharFilter(field_name='order', lookup_expr='code__iexact')
-        has_checkin = django_filters.rest_framework.BooleanFilter(method='has_checkin_qs')
-        attendee_name = django_filters.CharFilter(method='attendee_name_qs')
-        search = django_filters.CharFilter(method='search_qs')
+class OrderPositionFilter(FilterSet):
+    order = django_filters.CharFilter(field_name='order', lookup_expr='code__iexact')
+    has_checkin = django_filters.rest_framework.BooleanFilter(method='has_checkin_qs')
+    attendee_name = django_filters.CharFilter(method='attendee_name_qs')
+    search = django_filters.CharFilter(method='search_qs')
 
-        def search_qs(self, queryset, name, value):
-            return queryset.filter(
-                Q(secret__istartswith=value)
-                | Q(attendee_name_cached__icontains=value)
-                | Q(addon_to__attendee_name_cached__icontains=value)
-                | Q(attendee_email__icontains=value)
-                | Q(addon_to__attendee_email__icontains=value)
-                | Q(order__code__istartswith=value)
-                | Q(order__invoice_address__name_cached__icontains=value)
-                | Q(order__email__icontains=value)
-            )
+    def search_qs(self, queryset, name, value):
+        return queryset.filter(
+            Q(secret__istartswith=value)
+            | Q(attendee_name_cached__icontains=value)
+            | Q(addon_to__attendee_name_cached__icontains=value)
+            | Q(order__code__istartswith=value)
+            | Q(order__invoice_address__name_cached__icontains=value)
+            | Q(order__email__icontains=value)
+        )
 
-        def has_checkin_qs(self, queryset, name, value):
-            return queryset.filter(checkins__isnull=not value)
+    def has_checkin_qs(self, queryset, name, value):
+        return queryset.filter(checkins__isnull=not value)
 
-        def attendee_name_qs(self, queryset, name, value):
-            return queryset.filter(Q(attendee_name_cached__iexact=value) | Q(addon_to__attendee_name_cached__iexact=value))
+    def attendee_name_qs(self, queryset, name, value):
+        return queryset.filter(Q(attendee_name_cached__iexact=value) | Q(addon_to__attendee_name_cached__iexact=value))
 
-        class Meta:
-            model = OrderPosition
-            fields = {
-                'item': ['exact', 'in'],
-                'variation': ['exact', 'in'],
-                'secret': ['exact'],
-                'order__status': ['exact', 'in'],
-                'addon_to': ['exact', 'in'],
-                'subevent': ['exact', 'in'],
-                'pseudonymization_id': ['exact'],
-                'voucher__code': ['exact'],
-                'voucher': ['exact'],
-            }
+    class Meta:
+        model = OrderPosition
+        fields = {
+            'item': ['exact', 'in'],
+            'variation': ['exact', 'in'],
+            'secret': ['exact'],
+            'order__status': ['exact', 'in'],
+            'addon_to': ['exact', 'in'],
+            'subevent': ['exact', 'in'],
+            'pseudonymization_id': ['exact'],
+            'voucher__code': ['exact'],
+            'voucher': ['exact'],
+        }
 
 
 class OrderPositionViewSet(mixins.DestroyModelMixin, viewsets.ReadOnlyModelViewSet):
     serializer_class = OrderPositionSerializer
-    queryset = OrderPosition.all.none()
+    queryset = OrderPosition.objects.none()
     filter_backends = (DjangoFilterBackend, OrderingFilter)
     ordering = ('order__datetime', 'positionid')
     ordering_fields = ('order__code', 'order__datetime', 'positionid', 'attendee_name', 'order__status',)
@@ -672,13 +462,13 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, viewsets.ReadOnlyModelViewS
                     )
                 ))
             ).select_related(
-                'item', 'variation', 'item__category', 'addon_to', 'seat'
+                'item', 'variation', 'item__category', 'addon_to'
             )
         else:
             qs = qs.prefetch_related(
                 'checkins', 'answers', 'answers__options', 'answers__question'
             ).select_related(
-                'item', 'order', 'order__event', 'order__event__organizer', 'seat'
+                'item', 'order', 'order__event', 'order__event__organizer'
             )
         return qs
 
@@ -690,84 +480,7 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, viewsets.ReadOnlyModelViewS
                 return prov
         raise NotFound('Unknown output provider.')
 
-    @action(detail=True, methods=['POST'], url_name='price_calc')
-    def price_calc(self, request, *args, **kwargs):
-        """
-        This calculates the price assuming a change of product or subevent. This endpoint
-        is deliberately not documented and considered a private API, only to be used by
-        pretix' web interface.
-
-        Sample input:
-
-        {
-            "item": 2,
-            "variation": null,
-            "subevent": 3
-        }
-
-        Sample output:
-
-        {
-            "gross": "2.34",
-            "gross_formatted": "2,34",
-            "net": "2.34",
-            "tax": "0.00",
-            "rate": "0.00",
-            "name": "VAT"
-        }
-        """
-        serializer = PriceCalcSerializer(data=request.data, event=request.event)
-        serializer.is_valid(raise_exception=True)
-        data = serializer.validated_data
-        pos = self.get_object()
-
-        try:
-            ia = pos.order.invoice_address
-        except InvoiceAddress.DoesNotExist:
-            ia = InvoiceAddress()
-
-        kwargs = {
-            'item': pos.item,
-            'variation': pos.variation,
-            'voucher': pos.voucher,
-            'subevent': pos.subevent,
-            'addon_to': pos.addon_to,
-            'invoice_address': ia,
-        }
-
-        if data.get('item'):
-            item = data.get('item')
-            kwargs['item'] = item
-
-            if item.has_variations:
-                variation = data.get('variation') or pos.variation
-                if not variation:
-                    raise ValidationError('No variation given')
-                if variation.item != item:
-                    raise ValidationError('Variation does not belong to item')
-                kwargs['variation'] = variation
-            else:
-                variation = None
-                kwargs['variation'] = None
-
-            if pos.voucher and not pos.voucher.applies_to(item, variation):
-                kwargs['voucher'] = None
-
-        if data.get('subevent'):
-            kwargs['subevent'] = data.get('subevent')
-
-        price = get_price(**kwargs)
-        with language(data.get('locale') or self.request.event.settings.locale):
-            return Response({
-                'gross': price.gross,
-                'gross_formatted': money_filter(price.gross, self.request.event.currency, hide_currency=True),
-                'net': price.net,
-                'rate': price.rate,
-                'name': str(price.name),
-                'tax': price.tax,
-            })
-
-    @action(detail=True, url_name='download', url_path='download/(?P<output>[^/]+)')
+    @detail_route(url_name='download', url_path='download/(?P<output>[^/]+)')
     def download(self, request, output, **kwargs):
         provider = self._get_output_provider(output)
         pos = self.get_object()
@@ -784,16 +497,12 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, viewsets.ReadOnlyModelViewS
             generate.apply_async(args=('orderposition', pos.pk, provider.identifier))
             raise RetryException()
         else:
-            if ct.type == 'text/uri-list':
-                resp = HttpResponse(ct.file.file.read(), content_type='text/uri-list')
-                return resp
-            else:
-                resp = FileResponse(ct.file.file, content_type=ct.type)
-                resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}-{}{}"'.format(
-                    self.request.event.slug.upper(), pos.order.code, pos.positionid,
-                    provider.identifier, ct.extension
-                )
-                return resp
+            resp = FileResponse(ct.file.file, content_type=ct.type)
+            resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}-{}{}"'.format(
+                self.request.event.slug.upper(), pos.order.code, pos.positionid,
+                provider.identifier, ct.extension
+            )
+            return resp
 
     def perform_destroy(self, instance):
         try:
@@ -822,7 +531,7 @@ class PaymentViewSet(viewsets.ReadOnlyModelViewSet):
         order = get_object_or_404(Order, code=self.kwargs['order'], event=self.request.event)
         return order.payments.all()
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def confirm(self, request, **kwargs):
         payment = self.get_object()
         force = request.data.get('force', False)
@@ -843,7 +552,7 @@ class PaymentViewSet(viewsets.ReadOnlyModelViewSet):
             pass
         return self.retrieve(request, [], **kwargs)
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def refund(self, request, **kwargs):
         payment = self.get_object()
         amount = serializers.DecimalField(max_digits=10, decimal_places=2).to_internal_value(
@@ -908,23 +617,20 @@ class PaymentViewSet(viewsets.ReadOnlyModelViewSet):
                     payment.order.save(update_fields=['status', 'expires'])
             return Response(OrderRefundSerializer(r).data, status=status.HTTP_200_OK)
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def cancel(self, request, **kwargs):
         payment = self.get_object()
 
         if payment.state not in (OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED):
             return Response({'detail': 'Invalid state of payment'}, status=status.HTTP_400_BAD_REQUEST)
 
-        try:
-            with transaction.atomic():
-                payment.payment_provider.cancel_payment(payment)
-                payment.order.log_action('pretix.event.order.payment.canceled', {
-                    'local_id': payment.local_id,
-                    'provider': payment.provider,
-                }, user=self.request.user if self.request.user.is_authenticated else None, auth=self.request.auth)
-        except PaymentException as e:
-            return Response({'detail': 'External error: {}'.format(str(e))},
-                            status=status.HTTP_400_BAD_REQUEST)
+        with transaction.atomic():
+            payment.state = OrderPayment.PAYMENT_STATE_CANCELED
+            payment.save()
+            payment.order.log_action('pretix.event.order.payment.canceled', {
+                'local_id': payment.local_id,
+                'provider': payment.provider,
+            }, user=self.request.user if self.request.user.is_authenticated else None, auth=self.request.auth)
         return self.retrieve(request, [], **kwargs)
 
 
@@ -939,7 +645,7 @@ class RefundViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
         order = get_object_or_404(Order, code=self.kwargs['order'], event=self.request.event)
         return order.refunds.all()
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def cancel(self, request, **kwargs):
         refund = self.get_object()
 
@@ -956,7 +662,7 @@ class RefundViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
             }, user=self.request.user if self.request.user.is_authenticated else None, auth=self.request.auth)
         return self.retrieve(request, [], **kwargs)
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def process(self, request, **kwargs):
         refund = self.get_object()
 
@@ -981,7 +687,7 @@ class RefundViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
             refund.order.save(update_fields=['status', 'expires'])
         return self.retrieve(request, [], **kwargs)
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def done(self, request, **kwargs):
         refund = self.get_object()
 
@@ -1030,23 +736,22 @@ class RefundViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
         serializer.save()
 
 
-with scopes_disabled():
-    class InvoiceFilter(FilterSet):
-        refers = django_filters.CharFilter(method='refers_qs')
-        number = django_filters.CharFilter(method='nr_qs')
-        order = django_filters.CharFilter(field_name='order', lookup_expr='code__iexact')
+class InvoiceFilter(FilterSet):
+    refers = django_filters.CharFilter(method='refers_qs')
+    number = django_filters.CharFilter(method='nr_qs')
+    order = django_filters.CharFilter(field_name='order', lookup_expr='code__iexact')
 
-        def refers_qs(self, queryset, name, value):
-            return queryset.annotate(
-                refers_nr=Concat('refers__prefix', 'refers__invoice_no')
-            ).filter(refers_nr__iexact=value)
+    def refers_qs(self, queryset, name, value):
+        return queryset.annotate(
+            refers_nr=Concat('refers__prefix', 'refers__invoice_no')
+        ).filter(refers_nr__iexact=value)
 
-        def nr_qs(self, queryset, name, value):
-            return queryset.filter(nr__iexact=value)
+    def nr_qs(self, queryset, name, value):
+        return queryset.filter(nr__iexact=value)
 
-        class Meta:
-            model = Invoice
-            fields = ['order', 'number', 'is_cancellation', 'refers', 'locale']
+    class Meta:
+        model = Invoice
+        fields = ['order', 'number', 'is_cancellation', 'refers', 'locale']
 
 
 class RetryException(APIException):
@@ -1072,7 +777,7 @@ class InvoiceViewSet(viewsets.ReadOnlyModelViewSet):
             nr=Concat('prefix', 'invoice_no')
         )
 
-    @action(detail=True, )
+    @detail_route()
     def download(self, request, **kwargs):
         invoice = self.get_object()
 
@@ -1090,7 +795,7 @@ class InvoiceViewSet(viewsets.ReadOnlyModelViewSet):
         resp['Content-Disposition'] = 'attachment; filename="{}.pdf"'.format(invoice.number)
         return resp
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def regenerate(self, request, **kwarts):
         inv = self.get_object()
         if inv.canceled:
@@ -1109,7 +814,7 @@ class InvoiceViewSet(viewsets.ReadOnlyModelViewSet):
             )
             return Response(status=204)
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def reissue(self, request, **kwarts):
         inv = self.get_object()
         if inv.canceled:

src/pretix/api/views/organizer.py

@@ -1,15 +1,8 @@
-from django.db import transaction
-from rest_framework import filters, serializers, status, viewsets
-from rest_framework.decorators import action
-from rest_framework.exceptions import MethodNotAllowed, PermissionDenied
-from rest_framework.response import Response
+from rest_framework import viewsets
 
 from pretix.api.models import OAuthAccessToken
-from pretix.api.serializers.organizer import (
-    GiftCardSerializer, OrganizerSerializer, SeatingPlanSerializer,
-)
-from pretix.base.models import GiftCard, Organizer, SeatingPlan
-from pretix.helpers.dicts import merge_dicts
+from pretix.api.serializers.organizer import OrganizerSerializer
+from pretix.base.models import Organizer
 
 
 class OrganizerViewSet(viewsets.ReadOnlyModelViewSet):
@@ -17,9 +10,6 @@ class OrganizerViewSet(viewsets.ReadOnlyModelViewSet):
     queryset = Organizer.objects.none()
     lookup_field = 'slug'
     lookup_url_kwarg = 'organizer'
-    filter_backends = (filters.OrderingFilter,)
-    ordering = ('slug',)
-    ordering_fields = ('name', 'slug')
 
     def get_queryset(self):
         if self.request.user.is_authenticated:
@@ -37,113 +27,3 @@ class OrganizerViewSet(viewsets.ReadOnlyModelViewSet):
             return Organizer.objects.filter(pk=self.request.auth.organizer_id)
         else:
             return Organizer.objects.filter(pk=self.request.auth.team.organizer_id)
-
-
-class SeatingPlanViewSet(viewsets.ModelViewSet):
-    serializer_class = SeatingPlanSerializer
-    queryset = SeatingPlan.objects.none()
-    permission = 'can_change_organizer_settings'
-    write_permission = 'can_change_organizer_settings'
-
-    def get_queryset(self):
-        return self.request.organizer.seating_plans.all()
-
-    def get_serializer_context(self):
-        ctx = super().get_serializer_context()
-        ctx['organizer'] = self.request.organizer
-        return ctx
-
-    def perform_create(self, serializer):
-        inst = serializer.save(organizer=self.request.organizer)
-        self.request.organizer.log_action(
-            'pretix.seatingplan.added',
-            user=self.request.user,
-            auth=self.request.auth,
-            data=merge_dicts(self.request.data, {'id': inst.pk})
-        )
-
-    def perform_update(self, serializer):
-        if serializer.instance.events.exists() or serializer.instance.subevents.exists():
-            raise PermissionDenied('This plan can not be changed while it is in use for an event.')
-        inst = serializer.save(organizer=self.request.organizer)
-        self.request.organizer.log_action(
-            'pretix.seatingplan.changed',
-            user=self.request.user,
-            auth=self.request.auth,
-            data=merge_dicts(self.request.data, {'id': serializer.instance.pk})
-        )
-        return inst
-
-    def perform_destroy(self, instance):
-        if instance.events.exists() or instance.subevents.exists():
-            raise PermissionDenied('This plan can not be deleted while it is in use for an event.')
-        instance.log_action(
-            'pretix.seatingplan.deleted',
-            user=self.request.user,
-            auth=self.request.auth,
-            data={'id': instance.pk}
-        )
-        instance.delete()
-
-
-class GiftCardViewSet(viewsets.ModelViewSet):
-    serializer_class = GiftCardSerializer
-    queryset = GiftCard.objects.none()
-    permission = 'can_manage_gift_cards'
-    write_permission = 'can_manage_gift_cards'
-
-    def get_queryset(self):
-        return self.request.organizer.issued_gift_cards.all()
-
-    def get_serializer_context(self):
-        ctx = super().get_serializer_context()
-        ctx['organizer'] = self.request.organizer
-        return ctx
-
-    @transaction.atomic()
-    def perform_create(self, serializer):
-        value = serializer.validated_data.pop('value')
-        inst = serializer.save(issuer=self.request.organizer)
-        inst.transactions.create(value=value)
-        inst.log_action(
-            'pretix.giftcards.transaction.manual',
-            user=self.request.user,
-            auth=self.request.auth,
-            data=merge_dicts(self.request.data, {'id': inst.pk})
-        )
-
-    @transaction.atomic()
-    def perform_update(self, serializer):
-        GiftCard.objects.select_for_update().get(pk=self.get_object().pk)
-        old_value = serializer.instance.value
-        value = serializer.validated_data.pop('value')
-        inst = serializer.save(secret=serializer.instance.secret, currency=serializer.instance.currency,
-                               testmode=serializer.instance.testmode)
-        diff = value - old_value
-        inst.transactions.create(value=diff)
-        inst.log_action(
-            'pretix.giftcards.transaction.manual',
-            user=self.request.user,
-            auth=self.request.auth,
-            data={'value': diff}
-        )
-        return inst
-
-    @action(detail=True, methods=["POST"])
-    @transaction.atomic()
-    def transact(self, request, **kwargs):
-        gc = GiftCard.objects.select_for_update().get(pk=self.get_object().pk)
-        value = serializers.DecimalField(max_digits=10, decimal_places=2).to_internal_value(
-            request.data.get('value')
-        )
-        gc.transactions.create(value=value)
-        gc.log_action(
-            'pretix.giftcards.transaction.manual',
-            user=self.request.user,
-            auth=self.request.auth,
-            data={'value': value}
-        )
-        return Response(GiftCardSerializer(gc).data, status=status.HTTP_200_OK)
-
-    def perform_destroy(self, instance):
-        raise MethodNotAllowed("Gift cards cannot be deleted.")

src/pretix/api/views/voucher.py

@@ -6,9 +6,8 @@ from django.utils.timezone import now
 from django_filters.rest_framework import (
     BooleanFilter, DjangoFilterBackend, FilterSet,
 )
-from django_scopes import scopes_disabled
 from rest_framework import status, viewsets
-from rest_framework.decorators import action
+from rest_framework.decorators import list_route
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.filters import OrderingFilter
 from rest_framework.response import Response
@@ -16,22 +15,22 @@ from rest_framework.response import Response
 from pretix.api.serializers.voucher import VoucherSerializer
 from pretix.base.models import Voucher
 
-with scopes_disabled():
-    class VoucherFilter(FilterSet):
-        active = BooleanFilter(method='filter_active')
 
-        class Meta:
-            model = Voucher
-            fields = ['code', 'max_usages', 'redeemed', 'block_quota', 'allow_ignore_quota',
-                      'price_mode', 'value', 'item', 'variation', 'quota', 'tag', 'subevent']
+class VoucherFilter(FilterSet):
+    active = BooleanFilter(method='filter_active')
 
-        def filter_active(self, queryset, name, value):
-            if value:
-                return queryset.filter(Q(redeemed__lt=F('max_usages')) &
-                                       (Q(valid_until__isnull=True) | Q(valid_until__gt=now())))
-            else:
-                return queryset.filter(Q(redeemed__gte=F('max_usages')) |
-                                       (Q(valid_until__isnull=False) & Q(valid_until__lte=now())))
+    class Meta:
+        model = Voucher
+        fields = ['code', 'max_usages', 'redeemed', 'block_quota', 'allow_ignore_quota',
+                  'price_mode', 'value', 'item', 'variation', 'quota', 'tag', 'subevent']
+
+    def filter_active(self, queryset, name, value):
+        if value:
+            return queryset.filter(Q(redeemed__lt=F('max_usages')) &
+                                   (Q(valid_until__isnull=True) | Q(valid_until__gt=now())))
+        else:
+            return queryset.filter(Q(redeemed__gte=F('max_usages')) |
+                                   (Q(valid_until__isnull=False) & Q(valid_until__lte=now())))
 
 
 class VoucherViewSet(viewsets.ModelViewSet):
@@ -45,7 +44,7 @@ class VoucherViewSet(viewsets.ModelViewSet):
     write_permission = 'can_change_vouchers'
 
     def get_queryset(self):
-        return self.request.event.vouchers.select_related('seat').all()
+        return self.request.event.vouchers.all()
 
     def _predict_quota_check(self, data, instance):
         # This method predicts if Voucher.clean_quota_needs_checking
@@ -112,12 +111,9 @@ class VoucherViewSet(viewsets.ModelViewSet):
             user=self.request.user,
             auth=self.request.auth,
         )
-        with transaction.atomic():
-            instance.cartposition_set.filter(addon_to__isnull=False).delete()
-            instance.cartposition_set.all().delete()
-            super().perform_destroy(instance)
+        super().perform_destroy(instance)
 
-    @action(detail=False, methods=['POST'])
+    @list_route(methods=['POST'])
     def batch_create(self, request, *args, **kwargs):
         if any(self._predict_quota_check(d, None) for d in request.data):
             lockfn = request.event.lock

src/pretix/api/views/waitinglist.py

@@ -1,8 +1,7 @@
 import django_filters
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
-from django_scopes import scopes_disabled
 from rest_framework import viewsets
-from rest_framework.decorators import action
+from rest_framework.decorators import detail_route
 from rest_framework.exceptions import PermissionDenied, ValidationError
 from rest_framework.filters import OrderingFilter
 from rest_framework.response import Response
@@ -11,16 +10,16 @@ from pretix.api.serializers.waitinglist import WaitingListSerializer
 from pretix.base.models import WaitingListEntry
 from pretix.base.models.waitinglist import WaitingListException
 
-with scopes_disabled():
-    class WaitingListFilter(FilterSet):
-        has_voucher = django_filters.rest_framework.BooleanFilter(method='has_voucher_qs')
 
-        def has_voucher_qs(self, queryset, name, value):
-            return queryset.filter(voucher__isnull=not value)
+class WaitingListFilter(FilterSet):
+    has_voucher = django_filters.rest_framework.BooleanFilter(method='has_voucher_qs')
 
-        class Meta:
-            model = WaitingListEntry
-            fields = ['item', 'variation', 'email', 'locale', 'has_voucher', 'subevent']
+    def has_voucher_qs(self, queryset, name, value):
+        return queryset.filter(voucher__isnull=not value)
+
+    class Meta:
+        model = WaitingListEntry
+        fields = ['item', 'variation', 'email', 'locale', 'has_voucher', 'subevent']
 
 
 class WaitingListViewSet(viewsets.ModelViewSet):
@@ -70,7 +69,7 @@ class WaitingListViewSet(viewsets.ModelViewSet):
         )
         super().perform_destroy(instance)
 
-    @action(detail=True, methods=['POST'])
+    @detail_route(methods=['POST'])
     def send_voucher(self, *args, **kwargs):
         try:
             self.get_object().send_voucher(

src/pretix/api/webhooks.py

@@ -8,7 +8,6 @@ from celery.exceptions import MaxRetriesExceededError
 from django.db.models import Exists, OuterRef, Q
 from django.dispatch import receiver
 from django.utils.translation import ugettext_lazy as _
-from django_scopes import scope, scopes_disabled
 from requests import RequestException
 
 from pretix.api.models import WebHook, WebHookCall, WebHookEventListener
@@ -204,52 +203,51 @@ def notify_webhooks(logentry_id: int):
 @app.task(base=ProfiledTask, bind=True, max_retries=9)
 def send_webhook(self, logentry_id: int, action_type: str, webhook_id: int):
     # 9 retries with 2**(2*x) timing is roughly 72 hours
-    with scopes_disabled():
-        webhook = WebHook.objects.get(id=webhook_id)
-    with scope(organizer=webhook.organizer):
-        logentry = LogEntry.all.get(id=logentry_id)
-        types = get_all_webhook_events()
-        event_type = types.get(action_type)
-        if not event_type or not webhook.enabled:
-            return  # Ignore, e.g. plugin not installed
+    logentry = LogEntry.all.get(id=logentry_id)
+    webhook = WebHook.objects.get(id=webhook_id)
 
-        payload = event_type.build_payload(logentry)
-        t = time.time()
+    types = get_all_webhook_events()
+    event_type = types.get(action_type)
+    if not event_type or not webhook.enabled:
+        return  # Ignore, e.g. plugin not installed
 
+    payload = event_type.build_payload(logentry)
+    t = time.time()
+
+    try:
         try:
-            try:
-                resp = requests.post(
-                    webhook.target_url,
-                    json=payload,
-                    allow_redirects=False
-                )
-                WebHookCall.objects.create(
-                    webhook=webhook,
-                    action_type=logentry.action_type,
-                    target_url=webhook.target_url,
-                    is_retry=self.request.retries > 0,
-                    execution_time=time.time() - t,
-                    return_code=resp.status_code,
-                    payload=json.dumps(payload),
-                    response_body=resp.text[:1024 * 1024],
-                    success=200 <= resp.status_code <= 299
-                )
-                if resp.status_code == 410:
-                    webhook.enabled = False
-                    webhook.save()
-                elif resp.status_code > 299:
-                    raise self.retry(countdown=2 ** (self.request.retries * 2))
-            except RequestException as e:
-                WebHookCall.objects.create(
-                    webhook=webhook,
-                    action_type=logentry.action_type,
-                    target_url=webhook.target_url,
-                    is_retry=self.request.retries > 0,
-                    execution_time=time.time() - t,
-                    return_code=0,
-                    payload=json.dumps(payload),
-                    response_body=str(e)[:1024 * 1024]
-                )
+            resp = requests.post(
+                webhook.target_url,
+                json=payload,
+                allow_redirects=False
+            )
+            WebHookCall.objects.create(
+                webhook=webhook,
+                action_type=logentry.action_type,
+                target_url=webhook.target_url,
+                is_retry=self.request.retries > 0,
+                execution_time=time.time() - t,
+                return_code=resp.status_code,
+                payload=json.dumps(payload),
+                response_body=resp.text[:1024 * 1024],
+                success=200 <= resp.status_code <= 299
+            )
+            if resp.status_code == 410:
+                webhook.enabled = False
+                webhook.save()
+            elif resp.status_code > 299:
                 raise self.retry(countdown=2 ** (self.request.retries * 2))
-        except MaxRetriesExceededError:
-            pass
+        except RequestException as e:
+            WebHookCall.objects.create(
+                webhook=webhook,
+                action_type=logentry.action_type,
+                target_url=webhook.target_url,
+                is_retry=self.request.retries > 0,
+                execution_time=time.time() - t,
+                return_code=0,
+                payload=json.dumps(payload),
+                response_body=str(e)[:1024 * 1024]
+            )
+            raise self.retry(countdown=2 ** (self.request.retries * 2))
+    except MaxRetriesExceededError:
+        pass

src/pretix/base/__init__.py

@@ -13,7 +13,7 @@ class PretixBaseConfig(AppConfig):
         from . import invoice  # NOQA
         from . import notifications  # NOQA
         from . import email  # NOQA
-        from .services import auth, checkin, export, mail, tickets, cart, orders, invoices, cleanup, update_check, quotas, notifications, vouchers  # NOQA
+        from .services import auth, export, mail, tickets, cart, orders, invoices, cleanup, update_check, quotas, notifications  # NOQA
 
         try:
             from .celery_app import app as celery_app  # NOQA

src/pretix/base/auth.py

@@ -1,109 +0,0 @@
-from collections import OrderedDict
-from importlib import import_module
-
-from django import forms
-from django.conf import settings
-from django.contrib.auth import authenticate
-from django.utils.translation import gettext_lazy as _
-
-
-def get_auth_backends():
-    backends = {}
-    for b in settings.PRETIX_AUTH_BACKENDS:
-        mod, name = b.rsplit('.', 1)
-        b = getattr(import_module(mod), name)()
-        backends[b.identifier] = b
-    return backends
-
-
-class BaseAuthBackend:
-    """
-    This base class defines the interface that needs to be implemented by every class that supplies
-    an authentication method to pretix. Please note that pretix authentication backends are different
-    from plain Django authentication backends! Be sure to read the documentation chapter on authentication
-    backends before you implement one.
-    """
-
-    @property
-    def identifier(self):
-        """
-        A short and unique identifier for this authentication backend.
-        This should only contain lowercase letters and in most cases will
-        be the same as your package name.
-        """
-        raise NotImplementedError()
-
-    @property
-    def verbose_name(self):
-        """
-        A human-readable name of this authentication backend.
-        """
-        raise NotImplementedError()
-
-    @property
-    def visible(self):
-        """
-        Whether or not this backend can be selected by users actively. Set this to ``False``
-        if you only implement ``request_authenticate``.
-        """
-        return True
-
-    @property
-    def login_form_fields(self) -> dict:
-        """
-        This property may return form fields that the user needs to fill in to log in.
-        """
-        return {}
-
-    def form_authenticate(self, request, form_data):
-        """
-        This method will be called after the user filled in the login form. ``request`` will contain
-        the current request and ``form_data`` the input for the form fields defined in ``login_form_fields``.
-        You are expected to either return a ``User`` object (if login was successful) or ``None``.
-        """
-        return
-
-    def request_authenticate(self, request):
-        """
-        This method will be called when the user opens the login form. If the user already has a valid session
-        according to your login mechanism, for example a cookie set by a different system or HTTP header set by a
-        reverse proxy, you can directly return a ``User`` object that will be logged in.
-
-        ``request`` will contain the current request.
-        You are expected to either return a ``User`` object (if login was successful) or ``None``.
-        """
-        return
-
-    def authentication_url(self, request):
-        """
-        This method will be called to populate the URL for your authentication method's tab on the login page.
-        For example, if your method works through OAuth, you could return the URL of the OAuth authorization URL the
-        user needs to visit.
-
-        If you return ``None`` (the default), the link will point to a page that shows the form defined by
-        ``login_form_fields``.
-        """
-        return
-
-
-class NativeAuthBackend(BaseAuthBackend):
-    identifier = 'native'
-    verbose_name = _('pretix User')
-
-    @property
-    def login_form_fields(self) -> dict:
-        """
-        This property may return form fields that the user needs to fill in
-        to log in.
-        """
-        d = OrderedDict([
-            ('email', forms.EmailField(label=_("E-mail"), max_length=254,
-                                       widget=forms.EmailInput(attrs={'autofocus': 'autofocus'}))),
-            ('password', forms.CharField(label=_("Password"), widget=forms.PasswordInput)),
-        ])
-        return d
-
-    def form_authenticate(self, request, form_data):
-        u = authenticate(request=request, email=form_data['email'].lower(), password=form_data['password'])
-        if u and u.auth_backend == self.identifier:
-            return u

src/pretix/base/banlist.py

@@ -1,80 +0,0 @@
-import re
-
-# banlist based on http://www.bannedwordlist.com/lists/swearWords.txt
-banlist = [
-    "anal",
-    "anus",
-    "arse",
-    "ass",
-    "balls",
-    "bastard",
-    "bitch",
-    "biatch",
-    "bloody",
-    "blowjob",
-    "bollock",
-    "bollok",
-    "boner",
-    "boob",
-    "bugger",
-    "bum",
-    "butt",
-    "clitoris",
-    "cock",
-    "coon",
-    "crap",
-    "cunt",
-    "damn",
-    "dick",
-    "dildo",
-    "dyke",
-    "fag",
-    "feck",
-    "fellate",
-    "fellatio",
-    "felching",
-    "fuck",
-    "fudgepacker",
-    "flange",
-    "goddamn",
-    "hell",
-    "homo",
-    "jerk",
-    "jizz",
-    "knobend",
-    "labia",
-    "lmao",
-    "lmfao",
-    "muff",
-    "nigger",
-    "nigga",
-    "omg",
-    "penis",
-    "piss",
-    "poop",
-    "prick",
-    "pube",
-    "pussy",
-    "queer",
-    "scrotum",
-    "sex",
-    "shit",
-    "sh1t",
-    "slut",
-    "smegma",
-    "spunk",
-    "tit",
-    "tosser",
-    "turd",
-    "twat",
-    "vagina",
-    "wank",
-    "whore",
-    "wtf"
-]
-
-blacklist_regex = re.compile('(' + '|'.join(banlist) + ')')
-
-
-def banned(string):
-    return bool(blacklist_regex.search(string.lower()))

src/pretix/base/channels.py

@@ -35,32 +35,6 @@ class SalesChannel:
         """
         return "circle"
 
-    @property
-    def testmode_supported(self) -> bool:
-        """
-        Indication, if a saleschannels supports test mode orders
-        """
-        return True
-
-    @property
-    def payment_restrictions_supported(self) -> bool:
-        """
-        If this property is ``True``, organizers can restrict the usage of payment providers to this sales channel.
-
-        Example: pretixPOS provides its own sales channel, ignores the configured payment providers completely and
-        handles payments locally. Therefor, this property should be set to ``False`` for the pretixPOS sales channel as
-        the event organizer cannot restrict the usage of any payment provider through the backend.
-        """
-        return True
-
-    @property
-    def unlimited_items_per_order(self) -> bool:
-        """
-        If this property is ``True``, purchases made using this sales channel are not limited to the maximum amount of
-        items defined in the event settings.
-        """
-        return False
-
 
 def get_all_sales_channels():
     global _ALL_CHANNELS

src/pretix/base/context.py

@@ -1,15 +0,0 @@
-import sys
-
-from django.conf import settings
-
-
-def contextprocessor(request):
-    ctx = {
-        'rtl': getattr(request, 'LANGUAGE_CODE', 'en') in settings.LANGUAGES_RTL,
-    }
-    if settings.DEBUG and 'runserver' not in sys.argv:
-        ctx['debug_warning'] = True
-    elif 'runserver' in sys.argv:
-        ctx['development_warning'] = True
-
-    return ctx

src/pretix/base/email.py

@@ -1,24 +1,18 @@
-import inspect
 import logging
-from datetime import timedelta
-from decimal import Decimal
 from smtplib import SMTPResponseException
 
+import bleach
+import markdown
 from django.conf import settings
 from django.core.mail.backends.smtp import EmailBackend
 from django.dispatch import receiver
 from django.template.loader import get_template
-from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
 from inlinestyler.utils import inline_css
 
-from pretix.base.i18n import LazyCurrencyNumber, LazyDate, LazyNumber
-from pretix.base.models import Event
-from pretix.base.settings import PERSON_NAME_SCHEMES
-from pretix.base.signals import (
-    register_html_mail_renderers, register_mail_placeholders,
-)
-from pretix.base.templatetags.rich_text import markdown_compile_email
+from pretix.base.models import Event, Order
+from pretix.base.signals import register_html_mail_renderers
+from pretix.base.templatetags.rich_text import markdown_compile
 
 logger = logging.getLogger('pretix.base.email')
 
@@ -52,8 +46,7 @@ class BaseHTMLMailRenderer:
     def __str__(self):
         return self.identifier
 
-    def render(self, plain_body: str, plain_signature: str, subject: str, order=None,
-               position=None) -> str:
+    def render(self, plain_body: str, plain_signature: str, subject: str, order: Order=None) -> str:
         """
         This method should generate the HTML part of the email.
 
@@ -61,7 +54,6 @@ class BaseHTMLMailRenderer:
         :param plain_signature: The signature with event organizer contact details in plain text.
         :param subject: The email subject.
         :param order: The order if this email is connected to one, otherwise ``None``.
-        :param position: The order position if this email is connected to one, otherwise ``None``.
         :return: An HTML string
         """
         raise NotImplementedError()
@@ -105,8 +97,8 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
     def template_name(self):
         raise NotImplementedError()
 
-    def render(self, plain_body: str, plain_signature: str, subject: str, order, position) -> str:
-        body_md = markdown_compile_email(plain_body)
+    def render(self, plain_body: str, plain_signature: str, subject: str, order: Order) -> str:
+        body_md = bleach.linkify(markdown_compile(plain_body))
         htmlctx = {
             'site': settings.PRETIX_INSTANCE_NAME,
             'site_url': settings.SITE_URL,
@@ -120,15 +112,12 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
 
         if plain_signature:
             signature_md = plain_signature.replace('\n', '<br>\n')
-            signature_md = markdown_compile_email(signature_md)
+            signature_md = bleach.linkify(bleach.clean(markdown.markdown(signature_md), tags=bleach.ALLOWED_TAGS + ['p', 'br']))
             htmlctx['signature'] = signature_md
 
         if order:
             htmlctx['order'] = order
 
-        if position:
-            htmlctx['position'] = position
-
         tpl = get_template(self.template_name)
         body_html = inline_css(tpl.render(htmlctx))
         return body_html
@@ -144,305 +133,3 @@ class ClassicMailRenderer(TemplateBasedMailRenderer):
 @receiver(register_html_mail_renderers, dispatch_uid="pretixbase_email_renderers")
 def base_renderers(sender, **kwargs):
     return [ClassicMailRenderer]
-
-
-class BaseMailTextPlaceholder:
-    """
-    This is the base class for for all email text placeholders.
-    """
-
-    @property
-    def required_context(self):
-        """
-        This property should return a list of all attribute names that need to be
-        contained in the base context so that this placeholder is available. By default,
-        it returns a list containing the string "event".
-        """
-        return ["event"]
-
-    @property
-    def identifier(self):
-        """
-        This should return the identifier of this placeholder in the email.
-        """
-        raise NotImplementedError()
-
-    def render(self, context):
-        """
-        This method is called to generate the actual text that is being
-        used in the email. You will be passed a context dictionary with the
-        base context attributes specified in ``required_context``. You are
-        expected to return a plain-text string.
-        """
-        raise NotImplementedError()
-
-    def render_sample(self, event):
-        """
-        This method is called to generate a text to be used in email previews.
-        This may only depend on the event.
-        """
-        raise NotImplementedError()
-
-
-class SimpleFunctionalMailTextPlaceholder(BaseMailTextPlaceholder):
-    def __init__(self, identifier, args, func, sample):
-        self._identifier = identifier
-        self._args = args
-        self._func = func
-        self._sample = sample
-
-    @property
-    def identifier(self):
-        return self._identifier
-
-    @property
-    def required_context(self):
-        return self._args
-
-    def render(self, context):
-        return self._func(**{k: context[k] for k in self._args})
-
-    def render_sample(self, event):
-        if callable(self._sample):
-            return self._sample(event)
-        else:
-            return self._sample
-
-
-def get_available_placeholders(event, base_parameters):
-    if 'order' in base_parameters:
-        base_parameters.append('invoice_address')
-    params = {}
-    for r, val in register_mail_placeholders.send(sender=event):
-        if not isinstance(val, (list, tuple)):
-            val = [val]
-        for v in val:
-            if all(rp in base_parameters for rp in v.required_context):
-                params[v.identifier] = v
-    return params
-
-
-def get_email_context(**kwargs):
-    from pretix.base.models import InvoiceAddress
-
-    event = kwargs['event']
-    if 'order' in kwargs:
-        try:
-            kwargs['invoice_address'] = kwargs['order'].invoice_address
-        except InvoiceAddress.DoesNotExist:
-            kwargs['invoice_address'] = InvoiceAddress()
-    ctx = {}
-    for r, val in register_mail_placeholders.send(sender=event):
-        if not isinstance(val, (list, tuple)):
-            val = [val]
-        for v in val:
-            if all(rp in kwargs for rp in v.required_context):
-                ctx[v.identifier] = v.render(kwargs)
-    return ctx
-
-
-def _placeholder_payment(order, payment):
-    if not payment:
-        return None
-    if 'payment' in inspect.signature(payment.payment_provider.order_pending_mail_render).parameters:
-        return str(payment.payment_provider.order_pending_mail_render(order, payment))
-    else:
-        return str(payment.payment_provider.order_pending_mail_render(order))
-
-
-@receiver(register_mail_placeholders, dispatch_uid="pretixbase_register_mail_placeholders")
-def base_placeholders(sender, **kwargs):
-    from pretix.base.models import InvoiceAddress
-    from pretix.multidomain.urlreverse import build_absolute_uri
-
-    ph = [
-        SimpleFunctionalMailTextPlaceholder(
-            'event', ['event'], lambda event: event.name, lambda event: event.name
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'event_slug', ['event'], lambda event: event.slug, lambda event: event.slug
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'code', ['order'], lambda order: order.code, 'F8VVL'
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'total', ['order'], lambda order: LazyNumber(order.total), lambda event: LazyNumber(Decimal('42.23'))
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'currency', ['event'], lambda event: event.currency, lambda event: event.currency
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'total_with_currency', ['event', 'order'], lambda event, order: LazyCurrencyNumber(order.total,
-                                                                                               event.currency),
-            lambda event: LazyCurrencyNumber(Decimal('42.23'), event.currency)
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'expire_date', ['event', 'order'], lambda event, order: LazyDate(order.expires.astimezone(event.timezone)),
-            lambda event: LazyDate(now() + timedelta(days=15))
-            # TODO: This used to be "date" in some placeholders, add a migration!
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'url', ['order', 'event'], lambda order, event: build_absolute_uri(
-                event,
-                'presale:event.order.open', kwargs={
-                    'order': order.code,
-                    'secret': order.secret,
-                    'hash': order.email_confirm_hash()
-                }
-            ), lambda event: build_absolute_uri(
-                event,
-                'presale:event.order.open', kwargs={
-                    'order': 'F8VVL',
-                    'secret': '6zzjnumtsx136ddy',
-                    'hash': '98kusd8ofsj8dnkd'
-                }
-            ),
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'url', ['event', 'position'], lambda event, position: build_absolute_uri(
-                event,
-                'presale:event.order.position',
-                kwargs={
-                    'order': position.order.code,
-                    'secret': position.web_secret,
-                    'position': position.positionid
-                }
-            ),
-            lambda event: build_absolute_uri(
-                event,
-                'presale:event.order.position', kwargs={
-                    'order': 'F8VVL',
-                    'secret': '6zzjnumtsx136ddy',
-                    'position': '123'
-                }
-            ),
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'url', ['waiting_list_entry', 'event'],
-            lambda waiting_list_entry, event: build_absolute_uri(
-                event, 'presale:event.redeem'
-            ) + '?voucher=' + waiting_list_entry.voucher.code,
-            lambda event: build_absolute_uri(
-                event,
-                'presale:event.redeem',
-            ) + '?voucher=68CYU2H6ZTP3WLK5',
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'invoice_name', ['invoice_address'], lambda invoice_address: invoice_address.name or '',
-            _('John Doe')
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'invoice_company', ['invoice_address'], lambda invoice_address: invoice_address.company or '',
-            _('Sample Corporation')
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'orders', ['event', 'orders'], lambda event, orders: '\n' + '\n\n'.join(
-                '* {} - {}'.format(
-                    order.full_code,
-                    build_absolute_uri(event, 'presale:event.order', kwargs={
-                        'event': event.slug,
-                        'organizer': event.organizer.slug,
-                        'order': order.code,
-                        'secret': order.secret
-                    }),
-                )
-                for order in orders
-            ), lambda event: '\n' + '\n\n'.join(
-                '* {} - {}'.format(
-                    '{}-{}'.format(event.slug.upper(), order['code']),
-                    build_absolute_uri(event, 'presale:event.order', kwargs={
-                        'event': event.slug,
-                        'organizer': event.organizer.slug,
-                        'order': order['code'],
-                        'secret': order['secret']
-                    }),
-                )
-                for order in [
-                    {'code': 'F8VVL', 'secret': '6zzjnumtsx136ddy'},
-                    {'code': 'HIDHK', 'secret': '98kusd8ofsj8dnkd'},
-                    {'code': 'OPKSB', 'secret': '09pjdksflosk3njd'}
-                ]
-            ),
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'hours', ['event', 'waiting_list_entry'], lambda event, waiting_list_entry:
-            event.settings.waiting_list_hours,
-            lambda event: event.settings.waiting_list_hours
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'product', ['waiting_list_entry'], lambda waiting_list_entry: waiting_list_entry.item.name,
-            _('Sample Admission Ticket')
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'code', ['waiting_list_entry'], lambda waiting_list_entry: waiting_list_entry.voucher.code,
-            '68CYU2H6ZTP3WLK5'
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'voucher_list', ['voucher_list'], lambda voucher_list: '\n'.join(voucher_list),
-            '    68CYU2H6ZTP3WLK5\n    7MB94KKPVEPSMVF2'
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'url', ['event', 'voucher_list'], lambda event, voucher_list: build_absolute_uri(event, 'presale:event.index', kwargs={
-                'event': event.slug,
-                'organizer': event.organizer.slug,
-            }), lambda event: build_absolute_uri(event, 'presale:event.index', kwargs={
-                'event': event.slug,
-                'organizer': event.organizer.slug,
-            })
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'name', ['name'], lambda name: name,
-            _('John Doe')
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'comment', ['comment'], lambda comment: comment,
-            _('An individual text with a reason can be inserted here.'),
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'payment_info', ['order', 'payment'], _placeholder_payment,
-            _('The amount has been charged to your card.'),
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'payment_info', ['payment_info'], lambda payment_info: payment_info,
-            _('Please transfer money to this bank account: 9999-9999-9999-9999'),
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'attendee_name', ['position'], lambda position: position.attendee_name,
-            _('John Doe'),
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'name', ['position_or_address'],
-            lambda position_or_address: (
-                position_or_address.name
-                if isinstance(position_or_address, InvoiceAddress)
-                else position_or_address.attendee_name
-            ),
-            _('John Doe'),
-        ),
-    ]
-
-    name_scheme = PERSON_NAME_SCHEMES[sender.settings.name_scheme]
-    for f, l, w in name_scheme['fields']:
-        if f == 'full_name':
-            continue
-        ph.append(SimpleFunctionalMailTextPlaceholder(
-            'attendee_name_%s' % f, ['position'], lambda position, f=f: position.attendee_name_parts.get(f, ''),
-            name_scheme['sample'][f]
-        ))
-        ph.append(SimpleFunctionalMailTextPlaceholder(
-            'name_%s' % f, ['position_or_address'],
-            lambda position_or_address, f=f: (
-                position_or_address.name_parts.get(f, '')
-                if isinstance(position_or_address, InvoiceAddress)
-                else position_or_address.attendee_name_parts.get(f, '')
-            ),
-            name_scheme['sample'][f]
-        ))
-
-    for k, v in sender.meta_data.items():
-        ph.append(SimpleFunctionalMailTextPlaceholder(
-            'meta_%s' % k, ['event'], lambda event, k=k: event.meta_data[k],
-            v
-        ))
-
-    return ph

src/pretix/base/exporter.py

@@ -71,8 +71,6 @@ class BaseExporter:
 
         :type form_data: dict
         :param form_data: The form data of the export details form
-        :param output_file: You can optionally accept a parameter that will be given a file handle to write the
-                            output to. In this case, you can return None instead of the file content.
 
         Note: If you use a ``ModelChoiceField`` (or a ``ModelMultipleChoiceField``), the
         ``form_data`` will not contain the model instance but only it's primary key (or
@@ -94,7 +92,7 @@ class ListExporter(BaseExporter):
                      choices=(
                          ('xlsx', _('Excel (.xlsx)')),
                          ('default', _('CSV (with commas)')),
-                         ('csv-excel', _('CSV (Excel-style)')),
+                         ('excel', _('CSV (Excel-style)')),
                          ('semicolon', _('CSV (with semicolons)')),
                      ),
                  )),
@@ -111,22 +109,16 @@ class ListExporter(BaseExporter):
         raise NotImplementedError()  # noqa
 
     def get_filename(self):
-        return 'export'
+        return 'export.csv'
 
-    def _render_csv(self, form_data, output_file=None, **kwargs):
-        if output_file:
-            writer = csv.writer(output_file, **kwargs)
-            for line in self.iterate_list(form_data):
-                writer.writerow(line)
-            return self.get_filename() + '.csv', 'text/csv', None
-        else:
-            output = io.StringIO()
-            writer = csv.writer(output, **kwargs)
-            for line in self.iterate_list(form_data):
-                writer.writerow(line)
-            return self.get_filename() + '.csv', 'text/csv', output.getvalue().encode("utf-8")
+    def _render_csv(self, form_data, **kwargs):
+        output = io.StringIO()
+        writer = csv.writer(output, **kwargs)
+        for line in self.iterate_list(form_data):
+            writer.writerow(line)
+        return self.get_filename() + '.csv', 'text/csv', output.getvalue().encode("utf-8")
 
-    def _render_xlsx(self, form_data, output_file=None):
+    def _render_xlsx(self, form_data):
         wb = Workbook()
         ws = wb.get_active_sheet()
         try:
@@ -137,24 +129,20 @@ class ListExporter(BaseExporter):
             for j, val in enumerate(line):
                 ws.cell(row=i + 1, column=j + 1).value = str(val) if not isinstance(val, KNOWN_TYPES) else val
 
-        if output_file:
-            wb.save(output_file)
-            return self.get_filename() + '.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', None
-        else:
-            with tempfile.NamedTemporaryFile(suffix='.xlsx') as f:
-                wb.save(f.name)
-                f.seek(0)
-                return self.get_filename() + '.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', f.read()
+        with tempfile.NamedTemporaryFile(suffix='.xlsx') as f:
+            wb.save(f.name)
+            f.seek(0)
+            return self.get_filename() + '.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', f.read()
 
-    def render(self, form_data: dict, output_file=None) -> Tuple[str, str, bytes]:
+    def render(self, form_data: dict) -> Tuple[str, str, bytes]:
         if form_data.get('_format') == 'xlsx':
-            return self._render_xlsx(form_data, output_file=output_file)
+            return self._render_xlsx(form_data)
         elif form_data.get('_format') == 'default':
-            return self._render_csv(form_data, quoting=csv.QUOTE_NONNUMERIC, delimiter=',', output_file=output_file)
+            return self._render_csv(form_data, quoting=csv.QUOTE_NONNUMERIC, delimiter=',')
         elif form_data.get('_format') == 'csv-excel':
-            return self._render_csv(form_data, dialect='excel', output_file=output_file)
+            return self._render_csv(form_data, dialect='excel')
         elif form_data.get('_format') == 'semicolon':
-            return self._render_csv(form_data, dialect='excel', delimiter=';', output_file=output_file)
+            return self._render_csv(form_data, dialect='excel', delimiter=';')
 
 
 class MultiSheetListExporter(ListExporter):
@@ -192,20 +180,14 @@ class MultiSheetListExporter(ListExporter):
     def iterate_sheet(self, form_data, sheet):
         raise NotImplementedError()  # noqa
 
-    def _render_sheet_csv(self, form_data, sheet, output_file=None, **kwargs):
-        if output_file:
-            writer = csv.writer(output_file, **kwargs)
-            for line in self.iterate_sheet(form_data, sheet):
-                writer.writerow(line)
-            return self.get_filename() + '.csv', 'text/csv', None
-        else:
-            output = io.StringIO()
-            writer = csv.writer(output, **kwargs)
-            for line in self.iterate_sheet(form_data, sheet):
-                writer.writerow(line)
-            return self.get_filename() + '.csv', 'text/csv', output.getvalue().encode("utf-8")
+    def _render_sheet_csv(self, form_data, sheet, **kwargs):
+        output = io.StringIO()
+        writer = csv.writer(output, **kwargs)
+        for line in self.iterate_sheet(form_data, sheet):
+            writer.writerow(line)
+        return self.get_filename() + '.csv', 'text/csv', output.getvalue().encode("utf-8")
 
-    def _render_xlsx(self, form_data, output_file=None):
+    def _render_xlsx(self, form_data):
         wb = Workbook()
         ws = wb.get_active_sheet()
         wb.remove(ws)
@@ -215,24 +197,19 @@ class MultiSheetListExporter(ListExporter):
                 for j, val in enumerate(line):
                     ws.cell(row=i + 1, column=j + 1).value = str(val) if not isinstance(val, KNOWN_TYPES) else val
 
-        if output_file:
-            wb.save(output_file)
-            return self.get_filename() + '.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', None
-        else:
-            with tempfile.NamedTemporaryFile(suffix='.xlsx') as f:
-                wb.save(f.name)
-                f.seek(0)
-                return self.get_filename() + '.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', f.read()
+        with tempfile.NamedTemporaryFile(suffix='.xlsx') as f:
+            wb.save(f.name)
+            f.seek(0)
+            return self.get_filename() + '.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', f.read()
 
-    def render(self, form_data: dict, output_file=None) -> Tuple[str, str, bytes]:
+    def render(self, form_data: dict) -> Tuple[str, str, bytes]:
         if form_data.get('_format') == 'xlsx':
-            return self._render_xlsx(form_data, output_file=output_file)
+            return self._render_xlsx(form_data)
         elif ':' in form_data.get('_format'):
             sheet, f = form_data.get('_format').split(':')
             if f == 'default':
-                return self._render_sheet_csv(form_data, sheet, quoting=csv.QUOTE_NONNUMERIC, delimiter=',',
-                                              output_file=output_file)
+                return self._render_sheet_csv(form_data, sheet, quoting=csv.QUOTE_NONNUMERIC, delimiter=',')
             elif f == 'excel':
-                return self._render_sheet_csv(form_data, sheet, dialect='excel', output_file=output_file)
+                return self._render_sheet_csv(form_data, sheet, dialect='excel')
             elif f == 'semicolon':
-                return self._render_sheet_csv(form_data, sheet, dialect='excel', delimiter=';', output_file=output_file)
+                return self._render_sheet_csv(form_data, sheet, dialect='excel', delimiter=';')

src/pretix/base/exporters/__init__.py

@@ -1,5 +1,4 @@
 from .answers import *  # noqa
-from .dekodi import *  # noqa
 from .invoices import *  # noqa
 from .json import *  # noqa
 from .mail import *  # noqa

src/pretix/base/exporters/answers.py

@@ -40,7 +40,6 @@ class AnswerFilesExporter(BaseExporter):
         if form_data.get('questions'):
             qs = qs.filter(question__in=form_data['questions'])
         with tempfile.TemporaryDirectory() as d:
-            any = False
             with ZipFile(os.path.join(d, 'tmp.zip'), 'w') as zipf:
                 for i in qs:
                     if i.file:
@@ -52,12 +51,9 @@ class AnswerFilesExporter(BaseExporter):
                             i.question.pk,
                             os.path.basename(i.file.name).split('.', 1)[1]
                         )
-                        any = True
                         zipf.writestr(fname, i.file.read())
                         i.file.close()
 
-            if not any:
-                return None
             with open(os.path.join(d, 'tmp.zip'), 'rb') as zipf:
                 return '{}_answers.zip'.format(self.event.slug), 'application/zip', zipf.read()