Locking optimizations

.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

@@ -13,24 +13,26 @@ services:
   - postgresql
 matrix:
   include:
-    - python: 3.8
+    - python: 3.7
       env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_sqlite.cfg
-    - python: 3.8
+    - python: 3.7
       env: JOB=tests-cov PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
-    - python: 3.8
+    - python: 3.7
       env: JOB=style
-    - python: 3.8
+    - python: 3.7
       env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_mysql.cfg
-    - python: 3.8
-      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
     - python: 3.7
       env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
-    - python: 3.8
+    - python: 3.5
+      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
+    - python: 3.7
+      env: JOB=plugins
+    - python: 3.7
       env: JOB=doc-spelling
-    - python: 3.8
+    - python: 3.7
       env: JOB=translation-spelling
 addons:
-  postgresql: "10"
+  postgresql: "9.4"
   mariadb: '10.3'
   apt:
       packages:

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 && \

deployment/docker/nginx.conf

@@ -4,7 +4,7 @@ pid /var/run/nginx.pid;
 daemon off;
 
 events {
-	worker_connections 4096;
+	worker_connections 768;
 }
 
 http {
@@ -39,7 +39,7 @@ http {
 	include /etc/nginx/conf.d/*.conf;
 
     server {
-        listen 80 backlog=4096 default_server;
+        listen 80 default_server;
         listen [::]:80 ipv6only=on default_server;
         server_name _;
         index index.php index.html;

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,20 +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``.
-
-``trust_x_forwarded_proto``
-    Specifies whether the ``X-Forwarded-Proto`` 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
 ---------------
@@ -290,24 +273,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/installation/docker_smallscale.rst

@@ -125,8 +125,6 @@ Fill the configuration file ``/etc/pretix/pretix.cfg`` with the following conten
     ; DO NOT change the following value, it has to be set to the location of the
     ; directory *inside* the docker container
     datadir=/data
-    trust_x_forwarded_for=on
-    trust_x_forwarded_proto=on
 
     [database]
     ; Replace postgresql with mysql for MySQL
@@ -182,7 +180,6 @@ 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 \
-        --sysctl net.core.somaxconn=4096 \
         pretix/standalone:stable all
     ExecStop=/usr/bin/docker stop %n
 
@@ -279,7 +276,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/manual_smallscale.rst

@@ -12,7 +12,7 @@ solution with many things readily set-up, look at :ref:`dockersmallscale`.
              get it right. If you're not feeling comfortable managing a Linux server, check out our hosting and service
              offers at `pretix.eu`_.
 
-We tested this guide on the Linux distribution **Debian 10.0** but it should work very similar on other
+We tested this guide on the Linux distribution **Debian 8.0** but it should work very similar on other
 modern distributions, especially on all systemd-based ones.
 
 Requirements
@@ -85,8 +85,6 @@ Fill the configuration file ``/etc/pretix/pretix.cfg`` with the following conten
     url=https://pretix.mydomain.com
     currency=EUR
     datadir=/var/pretix/data
-    trust_x_forwarded_for=on
-    trust_x_forwarded_proto=on
 
     [database]
     ; For MySQL, replace with "mysql"
@@ -133,7 +131,7 @@ command if you're running MySQL::
 
     (venv)$ pip3 install "pretix[postgres]" gunicorn
 
-Note that you need Python 3.6 or newer. You can find out your Python version using ``python -V``.
+Note that you need Python 3.5 or newer. You can find out your Python version using ``python -V``.
 
 We also need to create a data directory::
 

doc/admin/scaling.rst

@@ -192,8 +192,7 @@ that you have a deep understanding of the semantics of your replication mechanis
 
 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
+As of pretix 2.6, this is mainly used for search queries in the backend and therefore does not really accelerate sales throughput, but we plan on expanding this in the future.
-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.
@@ -208,29 +207,30 @@ Having some memory available is good in case of e.g. lots of tasks queuing up du
 
 Feel free to set up a redis cluster for availability – but you won't need it for performance in a long time.
 
-The limitations
+The locking issue
----------------
+-----------------
 
-Up to a certain point, pretix scales really well. However, there are a few things that we consider
+Currently, there is one big issue with scaling pretix. We take the reliability and correctness
-even more important than scalability, and those are correctness and reliability. We want you to be
+of pretix' core features very seriously and one part of this is that we want to make absolutely
-able to trust that pretix will not sell more tickets than you intended or run into similar error
+sure that pretix never sells the wrong number of tickets or tickets it otherwise shouldn't sell.
-cases.
 
-Combined with pretix' flexibility and complexity, especially around vouchers and quotas, this creates
+However, due to pretix flexibility and complexity, ensuring this in a high-concurrency environment is really hard.
-some hard issues. In many cases, we need to fall back to event-global locking for some actions which
+We're not just counting down integers, since quota availability in pretix depends on a multitude of factors and requires a handful of complex database queries to calculate.
-are likely to run with high concurrency and cause harm.
+We can't rely on database-level locking alone to get this right.
 
-For every event, only one of these locking actions can be run at the same time. Examples for this are
+Therefore, we currently use a very drastic option:
-adding products limited by a quota to a cart, adding items to a cart using a voucher or placing an order
+During relevant actions that typically occur with high concurrency, such as creating carts and completing orders, we create a system-wide lock for the event and all other such
-consisting of cart positions that don't have a valid reservation for much longer. In these cases, it is
+actions need to wait. In essence, this means **for a given event we're only ever selling
-currently not realistically possible to exceed selling **approx. 500 orders per minute per event**, even
+one ticket at a time**.
-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
+Therefore, it is currently very unlikely that you will be able to exceed **300-400 tickets per minute per event**.
-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!
+For events up to a few thousand tickets, this isn't a problem and it's not even desirable to be able to sell much faster: If all tickets are reserved in the first minute, the shop shows a big "sold out" and everyone else goes away. Fifteen to thirty minutes later, depending on your settings, the first shopping carts will expire because people didn't actually go through with the purchase and tickets will become available again. This leads to a much more frustrating shopping experience for those trying to get a ticket than if tickets are sold at a slower pace and the first reservations expire before the last reservations are made. Not selling tickets through quickly (e.g. through a queue system) can do a lot to smooth out this process.
+
+That said, we still want to fix this of course and make it possible to achieve much higher
+throughput rates. We have some plans on how to soften this limitation, but they require
+lots of time and effort to be realized. If you want to use pretix for an event with
+10,000+ tickets that will be sold out within minutes, get in touch, we will make it work ;)
 
 
 .. _object storage cluster: https://behind.pretix.eu/2018/03/20/high-available-cdn/

doc/api/fundamentals.rst

@@ -170,19 +170,6 @@ Date                  String in ISO 8601 format    ``2017-12-27``
 Multi-lingual string  Object of strings            ``{"en": "red", "de": "rot", "de_Informal": "rot"}``
 Money                 String with decimal number   ``"23.42"``
 Currency              String with ISO 4217 code    ``"EUR"``, ``"USD"``
-Relative datetime     *either* String in ISO 8601  ``"2017-12-27T10:00:00.596934Z"``,
-                      format *or* specification of ``"RELDATE/3/12:00:00/presale_start/"``
-                      a relative datetime,
-                      constructed from a number of
-                      days before the base point,
-                      a time of day, and the base
-                      point.
-Relative date         *either* String in ISO 8601  ``"2017-12-27"``,
-                      format *or* specification of ``"RELDATE/3/-/presale_start/"``
-                      a relative date,
-                      constructed from a number of
-                      days before the base point
-                      and the base point.
 ===================== ============================ ===================================
 
 Query parameters

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/oauth.rst

@@ -61,7 +61,7 @@ access to the API. The ``token`` endpoint expects you to authenticate using `HTT
 ID as a username and your client secret as a password. You are also required to again supply the same ``redirect_uri``
 parameter that you used for the authorization.
 
-.. http:post:: /api/v1/oauth/token
+.. http:get:: /api/v1/oauth/token
 
    Request a new access token
 

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/billing_var.rst

@@ -1,148 +0,0 @@
-pretix Hosted reseller API
-==========================
-
-This API is only accessible to our `value-added reseller partners`_ on pretix Hosted.
-
-.. note:: This API is only accessible with user-level permissions, not with API tokens. Therefore, you will need to
-          create an :ref:`OAuth application <rest-oauth>` and obtain an OAuth access token for a user account that has
-          permission to your reseller account.
-
-Reseller account resource
--------------------------
-
-The resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Your reseller ID
-name                                  string                     Internal name of your reseller account
-public_name                           string                     Public name of your reseller account
-public_url                            string                     Public URL of your company
-support_email                         string                     Your support email address
-support_phone                         string                     Your support phone number
-communication_language                string                     Language code we use to communicate with you
-===================================== ========================== =======================================================
-
-
-Endpoints
----------
-
-.. http:get:: /api/v1/var/
-
-   Returns a list of all reseller accounts you have access to.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/var/ 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,
-            "name": "ticketshop.live Ltd & Co. KG",
-            "public_name": "ticketshop.live",
-            "public_url": "https://ticketshop.live",
-            "support_email": "support@ticketshop.live",
-            "support_phone": "+4962213217750",
-            "communication_language": "de"
-          }
-        ]
-      }
-
-   :query integer page: The page number in case of a multi-page result set, default is 1
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-
-.. http:get:: /api/v1/var/(id)/
-
-   Returns information on one reseller account, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/var/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,
-        "name": "ticketshop.live Ltd & Co. KG",
-        "public_name": "ticketshop.live",
-        "public_url": "https://ticketshop.live",
-        "support_email": "support@ticketshop.live",
-        "support_phone": "+4962213217750",
-        "communication_language": "de"
-      }
-
-   :param id: The ``id`` field of the reseller account to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 404: The requested account does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/var/(id)/create_organizer/
-
-   Creates a new organizer account that will be associated with a given reseller account.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/var/1/create_organizer/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 123
-
-      {
-        "name": "My new client",
-        "slug": "New client"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "name": "My new client",
-        "slug": "New client"
-      }
-
-   :param id: The ``id`` field of the reseller account to fetch
-   :statuscode 201: no error
-   :statuscode 400: Invalid request body, usually the slug is invalid or already taken.
-   :statuscode 401: Authentication failure
-   :statuscode 404: The requested account does not exist **or** you have no permission to view this resource.
-
-.. _value-added reseller partners: https://pretix.eu/about/en/var

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,13 +178,11 @@ 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)
    * ``expires`` (optional)
    * ``includes_tax`` (optional)
-   * ``sales_channel`` (optional)
    * ``answers``
 
       * ``question``
@@ -208,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

@@ -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,
+            "subevent": null
-            "auto_checkin_sales_channels": [
-              "pretixpos"
-            ]
           }
         ]
       }
@@ -132,10 +122,7 @@ Endpoints
         "all_products": true,
         "limit_products": [],
         "include_pending": false,
-        "subevent": null,
+        "subevent": null
-        "auto_checkin_sales_channels": [
-          "pretixpos"
-        ]
       }
 
    :param organizer: The ``slug`` field of the organizer to fetch
@@ -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,
+        "subevent": null
-        "auto_checkin_sales_channels": [
-          "pretixpos"
-        ]
       }
 
    **Example response**:
@@ -250,10 +234,7 @@ Endpoints
         "all_products": false,
         "limit_products": [1, 2],
         "include_pending": false,
-        "subevent": null,
+        "subevent": null
-        "auto_checkin_sales_channels": [
-          "pretixpos"
-        ]
       }
 
    :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,
+        "subevent": null
-        "auto_checkin_sales_channels": [
-          "pretixpos"
-        ]
       }
 
    :param organizer: The ``slug`` field of the organizer to modify
@@ -364,11 +342,6 @@ Order position endpoints
    ``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
@@ -423,12 +396,10 @@ Order position endpoints
             "addon_to": null,
             "subevent": null,
             "pseudonymization_id": "MQLJvANO3B",
-            "seat": null,
             "checkins": [
               {
                 "list": 1,
-                "datetime": "2017-12-25T12:45:23Z",
+                "datetime": "2017-12-25T12:45:23Z"
-                "auto_checked_in": true
               }
             ],
             "answers": [
@@ -534,12 +505,10 @@ Order position endpoints
         "addon_to": null,
         "subevent": null,
         "pseudonymization_id": "MQLJvANO3B",
-        "seat": null,
         "checkins": [
           {
             "list": 1,
-            "datetime": "2017-12-25T12:45:23Z",
+            "datetime": "2017-12-25T12:45:23Z"
-            "auto_checked_in": true
           }
         ],
         "answers": [
@@ -577,8 +546,6 @@ 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``.
@@ -607,7 +574,6 @@ Order position endpoints
         "nonce": "Pvrk50vUzQd0DhdpNRL4I4OcXsvg70uA",
         "datetime": null,
         "questions_supported": true,
-        "canceled_supported": true,
         "answers": {
           "4": "XS"
         }
@@ -691,9 +657,7 @@ Order position endpoints
 
    Possible error reasons:
 
-   * ``unpaid`` - Ticket is not paid for
+   * ``unpaid`` - Ticket is not paid for or has been refunded
-   * ``canceled`` – Ticket is canceled or expired. This reason is only sent when your request sets
-     ``canceled_supported`` to ``true``, otherwise these orders return ``unpaid``.
    * ``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,19 +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
                                                                  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``).
-timezone                              string                     Event timezone name
-item_meta_properties                  object                     Item-specific meta data parameters and default values.
 ===================================== ========================== =======================================================
 
 
@@ -64,33 +50,9 @@ item_meta_properties                  object                     Item-specific m
 
    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.
-
-.. versionchanged:: 3.4
-
-   The attribute ``timezone`` has been added.
-
-.. versionchanged:: 3.7
-
-   The attribute ``item_meta_properties`` has 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.
@@ -131,14 +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": {},
-            "timezone": "Europe/Berlin",
-            "item_meta_properties": {},
             "plugins": [
               "pretix.plugins.banktransfer"
               "pretix.plugins.stripe"
@@ -156,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
@@ -203,14 +152,8 @@ 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": {},
-        "timezone": "Europe/Berlin",
-        "item_meta_properties": {},
         "plugins": [
           "pretix.plugins.banktransfer"
           "pretix.plugins.stripe"
@@ -241,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"},
@@ -255,15 +198,9 @@ 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": {},
-        "timezone": "Europe/Berlin",
-        "item_meta_properties": {},
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
@@ -291,14 +228,8 @@ 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": {},
-        "timezone": "Europe/Berlin",
-        "item_meta_properties": {},
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
@@ -314,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``,
+   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.
+   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
+   If the 'plugins' and/or 'is_public' fields are present in the post body this will determine their value. Otherwise
-   value. Otherwise their value will be copied from the existing event.
+   their value will be copied from the existing event.
 
    Please note that you can only copy from events under the same organizer.
 
@@ -331,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"},
@@ -346,14 +277,8 @@ 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": {},
-        "timezone": "Europe/Berlin",
-        "item_meta_properties": {},
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
@@ -381,14 +306,8 @@ 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": {},
-        "timezone": "Europe/Berlin",
-        "item_meta_properties": {},
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
@@ -416,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": [
@@ -448,14 +367,8 @@ 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": {},
-        "timezone": "Europe/Berlin",
-        "item_meta_properties": {},
         "plugins": [
           "pretix.plugins.banktransfer",
           "pretix.plugins.stripe",
@@ -498,123 +411,3 @@ Endpoints
    :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.
-
-Event settings
---------------
-
-pretix events have lots and lots of parameters of different types that are stored in a key-value store on our system.
-Since many of these settings depend on each other in complex ways, we can not give direct access to all of these
-settings through the API. However, we do expose many of the simple and useful flags through the API.
-
-Please note that the available settings flags change between pretix versions and also between events, depending on the
-installed plugins, and we do not give a guarantee on backwards-compatibility like with other parts of the API.
-Therefore, we're also not including a list of the options here, but instead recommend to look at the endpoint output
-to see available options. The ``explain=true`` flag enables a verbose mode that provides you with human-readable
-information about the properties.
-
-.. note:: Please note that this is not a complete representation of all event settings. You will find more settings
-          in the web interface.
-
-.. warning:: This API is intended for advanced users. Even though we take care to validate your input, you will be
-             able to break your event using this API by creating situations of conflicting settings. Please take care.
-
-.. versionchanged:: 3.6
-
-   Initial support for settings has been added to the API.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/settings/
-
-   Get current values of event settings.
-
-   Permission required: "Can change event settings"
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/settings/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example standard response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "imprint_url": "https://pretix.eu",
-        …
-      }
-
-   **Example verbose response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "imprint_url":
-          {
-            "value": "https://pretix.eu",
-            "label": "Imprint URL",
-            "help_text": "This should point e.g. to a part of your website that has your contact details and legal information."
-          }
-        },
-        …
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event to access
-   :param event: The ``slug`` field of the event to access
-   :query explain: Set to ``true`` to enable verbose response mode
-   :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:patch:: /api/v1/organizers/(organizer)/events/(event)/settings/
-
-   Updates event settings. Note that ``PUT`` is not allowed here, only ``PATCH``.
-
-    .. warning::
-
-       Settings can be stored at different levels in pretix. If a value is not set on event level, a default setting
-       from a higher level (organizer, global) will be returned. If you explicitly set a setting on event level, it
-       will no longer be inherited from the higher levels. Therefore, we recommend you to send only settings that you
-       explicitly want to set on event level. To unset a settings, pass ``null``.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/settings/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "imprint_url": "https://example.org/imprint/"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "imprint_url": "https://example.org/imprint/",
-        …
-      }
-
-   :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 400: The event 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 create this resource.

doc/api/resources/giftcards.rst

@@ -1,239 +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
-   :query string secret: Only show gift cards with the given secret.
-   :query boolean testmode: Filter for gift cards that are (not) in test mode.
-   :query boolean include_accepted: Also show gift cards issued by other organizers that are accepted by this organizer.
-   :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
-   :query boolean include_accepted: Also show gift cards issued by other organizers that are accepted by this organizer.
-   :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"
-      }
-
-   .. versionchanged:: 3.5
-
-      This endpoint now returns status code ``409`` if the transaction would lead to a negative gift card value.
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param id: The ``id`` field of the gift card to modify
-   :query boolean include_accepted: Also show gift cards issued by other organizers that are accepted by this organizer.
-   :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.
-   :statuscode 409: There is not sufficient credit on the gift card.

doc/api/resources/index.rst

@@ -21,10 +21,5 @@ Resources and endpoints
    vouchers
    checkinlists
    waitinglist
-   giftcards
    carts
-   teams
    webhooks
-   seatingplans
-   billing_invoices
-   billing_var

doc/api/resources/invoices.rst

@@ -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,

doc/api/resources/item_bundles.rst

@@ -134,7 +134,7 @@ Endpoints
       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
+      Content: application/json
 
       {
         "bundled_item": 3,

doc/api/resources/item_variations.rst

@@ -152,7 +152,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"},

doc/api/resources/items.rst

@@ -44,9 +44,6 @@ available_from                        datetime                   The first date
                                                                  (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
                                                                  voucher that is specifically assigned to this item.
 hide_without_voucher                  boolean                    If ``true``, this item is only shown during the voucher
@@ -75,11 +72,6 @@ generate_tickets                      boolean                    If ``false``, t
                                                                  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,
@@ -114,7 +106,6 @@ bundles                               list of objects            Definition of b
 └ 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.
-meta_data                             object                     Values set for event-specific meta data parameters.
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 2.7
@@ -151,14 +142,6 @@ meta_data                             object                     Values set for
 
    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.
-
-.. versionchanged:: 3.7
-
-   The attribute ``meta_data`` has been added.
-
 Notes
 -----
 
@@ -212,13 +195,10 @@ Endpoints
             "tax_rate": "0.00",
             "tax_rule": 1,
             "admission": false,
-            "issue_giftcard": false,
-            "meta_data": {},
             "position": 0,
             "picture": null,
             "available_from": null,
             "available_until": null,
-            "hidden_if_available": null,
             "require_voucher": false,
             "hide_without_voucher": false,
             "allow_cancel": true,
@@ -227,8 +207,6 @@ Endpoints
             "checkin_attention": false,
             "has_variations": false,
             "generate_tickets": null,
-            "allow_waitinglist": true,
-            "show_quota_left": null,
             "require_approval": false,
             "require_bundling": false,
             "variations": [
@@ -308,19 +286,14 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
-        "issue_giftcard": false,
-        "meta_data": {},
         "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,
@@ -369,7 +342,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,
@@ -385,19 +358,14 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
-        "issue_giftcard": false,
-        "meta_data": {},
         "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,
@@ -449,21 +417,16 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
-        "issue_giftcard": false,
-        "meta_data": {},
         "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,
@@ -545,18 +508,13 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
-        "issue_giftcard": false,
-        "meta_data": {},
         "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,

doc/api/resources/orders.rst

@@ -53,18 +53,15 @@ invoice_address                       object                     Invoice address
 ├ street                              string                     Customer street
 ├ zipcode                             string                     Customer ZIP code
 ├ city                                string                     Customer city
-├ country                             string                     Customer country code
+├ country                             string                     Customer country
-├ state                               string                     Customer state (ISO 3166-2 code). Only supported in
-                                                                 AU, BR, CA, CN, MY, MX, and US.
 ├ 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
                                                                  EU VAT service and validation was successful. This only
                                                                  happens in rare cases.
-positions                             list of objects            List of order positions (see below). By default, only
+positions                             list of objects            List of non-canceled order positions (see below)
-                                                                 non-canceled positions are included.
+fees                                  list of objects            List of non-canceled fees included in the order total
-fees                                  list of objects            List of fees included in the order total. By default, only
+                                                                 (i.e. payment fees)
-                                                                 non-canceled fees are included.
 ├ fee_type                            string                     Type of fee (currently ``payment``, ``passbook``,
                                                                  ``other``)
 ├ value                               money (string)             Fee amount
@@ -73,8 +70,7 @@ fees                                  list of objects            List of fees in
                                                                  can be empty
 ├ tax_rate                            decimal (string)           VAT rate applied for this fee
 ├ tax_value                           money (string)             VAT included in this fee
-├ tax_rule                            integer                    The ID of the used tax rule (or ``null``)
+└ tax_rule                            integer                    The ID of the used tax rule (or ``null``)
-└ canceled                            boolean                    Whether or not this fee has been canceled.
 downloads                             list of objects            List of ticket download options for order-wise ticket
                                                                  downloading. This might be a multi-page PDF or a ZIP
                                                                  file of tickets for outputs that do not support
@@ -86,7 +82,6 @@ require_approval                      boolean                    If ``true`` and
                                                                  needs approval by an organizer before it can
                                                                  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
@@ -133,29 +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.
-
-.. versionchanged:: 3.5
-
-   The ``order.fees.canceled`` attribute has been added.
-
-.. versionchanged:: 3.8
-
-   The ``reactivate`` operation has been added.
-
-
 .. _order-position-resource:
 
 Order position resource
@@ -169,21 +150,12 @@ Field                                 Type                       Description
 id                                    integer                    Internal ID of the order position
 order                                 string                     Order code of the order the position belongs to
 positionid                            integer                    Number of the position within the order
-canceled                              boolean                    Whether or not this position has been canceled. Note that
-                                                                 by default, only non-canceled positions are shown.
 item                                  integer                    ID of the purchased item
 variation                             integer                    ID of the purchased variation (or ``null``)
 price                                 money (string)             Price of this position
 attendee_name                         string                     Specified attendee name for this position (or ``null``)
 attendee_name_parts                   object of strings          Decomposition of attendee name (i.e. given name, family name)
 attendee_email                        string                     Specified attendee email address for this position (or ``null``)
-company                               string                     Attendee company name (or ``null``)
-street                                string                     Attendee street (or ``null``)
-zipcode                               string                     Attendee ZIP code (or ``null``)
-city                                  string                     Attendee city (or ``null``)
-country                               string                     Attendee country code (or ``null``)
-state                                 string                     Attendee state (ISO 3166-2 code). Only supported in
-                                                                 AU, BR, CA, CN, MY, MX, and US, otherwise ``null``.
 voucher                               integer                    Internal ID of the voucher used for this position (or ``null``)
 tax_rate                              decimal (string)           VAT rate applied for this position
 tax_value                             money (string)             VAT included in this position
@@ -194,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
+└ datetime                            datetime                   Time of check-in
-└ auto_checked_in                     boolean                    Indicates if this check-in been performed automatically by the system
 downloads                             list of objects            List of ticket download options
 ├ output                              string                     Ticket output provider (e.g. ``pdf``, ``passbook``)
 └ url                                 string                     Download URL
@@ -205,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.
@@ -230,27 +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.
-
-.. versionchanged:: 3.5
-
-  The attribute ``canceled`` has been added.
-
-.. versionchanged:: 3.8
-
-  The attributes ``company``, ``street``, ``zipcode``, ``city``, ``country``, and ``state`` have been added.
-
 .. _order-payment-resource:
 
 Order payment resource
@@ -267,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
+.. _order-payment-resource:
-
-  The attributes ``payment_url`` and ``details`` have been added.
-
-.. _order-refund-resource:
 
 Order refund resource
 ---------------------
@@ -317,10 +249,6 @@ List of all orders
 
    Filtering for emails or order codes is now case-insensitive.
 
-.. versionchanged:: 3.5
-
-   The ``include_canceled_positions`` and ``include_canceled_fees`` query parameters have been added.
-
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orders/
 
    Returns a list of all orders within a given event.
@@ -352,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",
@@ -375,8 +302,7 @@ List of all orders
                 "street": "Test street 12",
                 "zipcode": "12345",
                 "city": "Testington",
-                "country": "DE",
+                "country": "Testikistan",
-                "state": "",
                 "internal_reference": "",
                 "vat_id": "EU123456789",
                 "vat_id_validated": false
@@ -386,7 +312,6 @@ List of all orders
                 "id": 23442,
                 "order": "ABC12",
                 "positionid": 1,
-                "canceled": false,
                 "item": 1345,
                 "variation": null,
                 "price": "23.00",
@@ -395,12 +320,6 @@ List of all orders
                   "full_name": "Peter",
                 },
                 "attendee_email": null,
-                "company": "Sample company",
-                "street": "Test street 12",
-                "zipcode": "12345",
-                "city": "Testington",
-                "country": "DE",
-                "state": null,
                 "voucher": null,
                 "tax_rate": "0.00",
                 "tax_value": "0.00",
@@ -409,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",
+                    "datetime": "2017-12-25T12:45:23Z"
-                    "auto_checked_in": false
                   }
                 ],
                 "answers": [
@@ -447,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"
               }
             ],
@@ -465,9 +380,6 @@ List of all orders
    :query boolean testmode: Only return orders with ``testmode`` set to ``true`` or ``false``
    :query boolean require_approval: If set to ``true`` or ``false``, only categories with this value for the field
                                     ``require_approval`` will be returned.
-   :query include_canceled_positions: If set to ``true``, the output will contain canceled order positions. Note that this
-                                      only affects position-level cancellations, not fully-canceled orders.
-   :query include_canceled_fees: If set to ``true``, the output will contain canceled order fees.
    :query string email: Only return orders created with the given email address
    :query string locale: Only return orders with the given customer locale
    :query datetime modified_since: Only return orders that have changed since the given date. Be careful: We only
@@ -485,10 +397,6 @@ List of all orders
 Fetching individual orders
 --------------------------
 
-.. versionchanged:: 3.5
-
-   The ``include_canceled_positions`` and ``include_canceled_fees`` query parameters have been added.
-
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/
 
    Returns information on one order, identified by its order code.
@@ -514,7 +422,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",
@@ -537,8 +444,7 @@ Fetching individual orders
             "street": "Test street 12",
             "zipcode": "12345",
             "city": "Testington",
-            "country": "DE",
+            "country": "Testikistan",
-            "state": "",
             "internal_reference": "",
             "vat_id": "EU123456789",
             "vat_id_validated": false
@@ -548,7 +454,6 @@ Fetching individual orders
             "id": 23442,
             "order": "ABC12",
             "positionid": 1,
-            "canceled": false,
             "item": 1345,
             "variation": null,
             "price": "23.00",
@@ -557,12 +462,6 @@ Fetching individual orders
               "full_name": "Peter",
             },
             "attendee_email": null,
-            "company": "Sample company",
-            "street": "Test street 12",
-            "zipcode": "12345",
-            "city": "Testington",
-            "country": "DE",
-            "state": null,
             "voucher": null,
             "tax_rate": "0.00",
             "tax_rule": null,
@@ -571,12 +470,10 @@ Fetching individual orders
             "addon_to": null,
             "subevent": null,
             "pseudonymization_id": "MQLJvANO3B",
-            "seat": null,
             "checkins": [
               {
                 "list": 44,
-                "datetime": "2017-12-25T12:45:23Z",
+                "datetime": "2017-12-25T12:45:23Z"
-                "auto_checked_in": false
               }
             ],
             "answers": [
@@ -609,8 +506,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"
           }
         ],
@@ -620,9 +515,6 @@ Fetching individual orders
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
    :param code: The ``code`` field of the order to fetch
-   :query include_canceled_positions: If set to ``true``, the output will contain canceled order positions. Note that this
-                                      only affects position-level cancellations, not fully-canceled orders.
-   :query include_canceled_fees: If set to ``true``, the output will contain canceled order fees.
    :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.
@@ -789,8 +681,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
 ---------------
 
@@ -798,6 +688,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,
@@ -816,20 +708,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:
 
@@ -841,15 +737,14 @@ 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`` (optional)
+   * ``email``
    * ``locale``
-   * ``sales_channel`` (optional)
+   * ``sales_channel``
-   * ``payment_provider`` (optional) – The identifier of the payment provider set for this order. This needs to be an
+   * ``payment_provider`` – The identifier of the payment provider set for this order. This needs to be an existing
-     existing payment provider. You should use ``"free"`` for free orders, and we strongly advise to use ``"manual"``
+     payment provider. You should use ``"free"`` for free orders, and we strongly advise to use ``"manual"`` for all
-     for all orders you create as paid. This field is optional when the order status is ``"n"`` or the order total is
+     orders you create as paid.
-     zero, otherwise it is required.
    * ``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
@@ -867,32 +762,20 @@ 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`` (optional)
+      * ``variation``
-      * ``price`` (optional, if set to ``null`` or missing the price will be computed from the given product)
+      * ``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``
-      * ``attendee_name`` **or** ``attendee_name_parts`` (optional)
+      * ``attendee_email``
-      * ``voucher`` (optional, the ``code`` attribute of a valid voucher)
-      * ``attendee_email`` (optional)
-      * ``company`` (optional)
-      * ``street`` (optional)
-      * ``zipcode`` (optional)
-      * ``city`` (optional)
-      * ``country`` (optional)
-      * ``state`` (optional)
       * ``secret`` (optional)
       * ``addon_to`` (optional, see below)
-      * ``subevent`` (optional)
+      * ``subevent``
       * ``answers``
 
         * ``question``
@@ -906,31 +789,14 @@ 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
    IDs in the ``addon_to`` field of another position. Note that all add_ons for a specific position need to come
    immediately after the position itself.
 
-   Starting with pretix 3.7, you can add ``"simulate": true`` to the body to do a "dry run" of your order. This will
-   validate your order and return you an order object with the resulting prices, but will not create an actual order.
-   You can use this for testing or to look up prices. In this case, some attributes are ignored, such as whether
-   to send an email or what payment provider will be used. Note that some returned fields will contain empty values
-   (e.g. all ``id`` fields of positions will be zero) and some will contain fake values (e.g. the order code will
-   always be ``PREVIEW``). pretix plugins will not be triggered, so some special behavior might be missing as well.
-
    **Example request**:
 
    .. sourcecode:: http
@@ -962,7 +828,6 @@ Creating orders
           "zipcode": "12345",
           "city": "Sample City",
           "country": "UK",
-          "state": "",
           "internal_reference": "",
           "vat_id": ""
         },
@@ -986,7 +851,7 @@ Creating orders
             ],
             "subevent": null
           }
-        ]
+        ],
       }
 
    **Example response**:
@@ -1090,42 +955,6 @@ Order state operations
    :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.
 
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/reactivate/
-
-   Reactivates a canceled order. This will set the order to pending or paid state. Only possible if all products are
-   still available.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/reactivate/ 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
-
-      {
-        "code": "ABC12",
-        "status": "n",
-        ...
-      }
-
-   :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 modify
-   :statuscode 200: no error
-   :statuscode 400: The order cannot be reactivated
-   :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.
-
 .. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/mark_pending/
 
    Marks a paid order as unpaid.
@@ -1413,13 +1242,7 @@ 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
+.. note:: Individually canceled order positions are currently not visible via the API at all.
-
-  The value ``auto_checked_in`` has been added to the ``checkins``-attribute.
-
-.. versionchanged:: 3.5
-
-   The ``include_canceled_positions`` and ``include_canceled_fees`` query parameters have been added.
 
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/
 
@@ -1450,7 +1273,6 @@ List of all order positions
             "id": 23442,
             "order": "ABC12",
             "positionid": 1,
-            "canceled": false,
             "item": 1345,
             "variation": null,
             "price": "23.00",
@@ -1465,14 +1287,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",
+                "datetime": "2017-12-25T12:45:23Z"
-                "auto_checked_in": false
               }
             ],
             "answers": [
@@ -1520,8 +1340,6 @@ List of all order positions
                                 comma-separated IDs.
    :query string voucher: Only return positions with a specific voucher.
    :query string voucher__code: Only return positions with a specific voucher code.
-   :query include_canceled_positions: If set to ``true``, the output will contain canceled order positions. Note that this
-                                      only affects position-level cancellations, not fully-canceled orders.
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
    :statuscode 200: no error
@@ -1555,7 +1373,6 @@ Fetching individual positions
         "id": 23442,
         "order": "ABC12",
         "positionid": 1,
-        "canceled": false,
         "item": 1345,
         "variation": null,
         "price": "23.00",
@@ -1572,12 +1389,10 @@ Fetching individual positions
         "addon_to": null,
         "subevent": null,
         "pseudonymization_id": "MQLJvANO3B",
-        "seat": null,
         "checkins": [
           {
             "list": 44,
-            "datetime": "2017-12-25T12:45:23Z",
+            "datetime": "2017-12-25T12:45:23Z"
-            "auto_checked_in": false
           }
         ],
         "answers": [
@@ -1600,14 +1415,11 @@ Fetching individual positions
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
    :param id: The ``id`` field of the order position to fetch
-   :query include_canceled_positions: If set to ``true``, canceled positions may be returned (otherwise, they return 404).
    :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 404: The requested order position does not exist.
 
-.. _`order-position-ticket-download`:
-
 Order position ticket download
 ------------------------------
 
@@ -1617,11 +1429,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
@@ -1697,10 +1504,6 @@ Order payment endpoints
 
   These endpoints have been added.
 
-.. versionchanged:: 3.6
-
-   Payments can now be created through the API.
-
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/payments/
 
    Returns a list of all payments for an order.
@@ -1732,8 +1535,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"
           }
         ]
@@ -1774,8 +1575,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"
       }
 
@@ -1909,61 +1708,6 @@ Order payment endpoints
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
    :statuscode 404: The requested order or payment does not exist.
 
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/payments/
-
-   Creates a new payment.
-
-   Be careful with the ``info`` parameter: 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*.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/payments/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "state": "confirmed",
-        "amount": "23.00",
-        "payment_date": "2017-12-04T12:13:12Z",
-        "info": {},
-        "provider": "banktransfer"
-      }
-
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "local_id": 1,
-        "state": "confirmed",
-        "amount": "23.00",
-        "created": "2017-12-01T10:00:00Z",
-        "payment_date": "2017-12-04T12:13:12Z",
-        "payment_url": null,
-        "details": {},
-        "provider": "banktransfer"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to access
-   :param event: The ``slug`` field of the event to access
-   :param order: The ``code`` field of the order to access
-   :statuscode 201: 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 404: The requested order does not exist.
-
 
 Order refund endpoints
 ----------------------
@@ -2082,8 +1826,7 @@ Order refund endpoints
         "payment": 1,
         "execution_date": null,
         "provider": "manual",
-        "mark_canceled": false,
+        "mark_canceled": false
-        "mark_pending": true
       }
 
    **Example response**:

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

@@ -18,7 +18,6 @@ Field                                 Type                       Description
 ===================================== ========================== =======================================================
 id                                    integer                    Internal ID of the question
 question                              multi-lingual string       The field label shown to the customer
-help_text                             multi-lingual string       The help text shown to the customer
 type                                  string                     The expected type of answer. Valid options:
 
                                                                  * ``N`` – number
@@ -31,8 +30,6 @@ 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.
 position                              integer                    An integer, used for sorting
 items                                 list of integers           List of item IDs this question is assigned to.
@@ -41,10 +38,6 @@ identifier                            string                     An arbitrary st
 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.
@@ -58,12 +51,11 @@ dependency_question                   integer                    Internal ID of
                                                                  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
+dependency_value                      string                     The value ``dependency_question`` needs to be set to.
-                                                                 question, this should be ``["True"]`` or ``["False"]``.
+                                                                 If ``dependency_question`` is set to a boolean
-                                                                 Otherwise, it should be a list of ``identifier`` values
+                                                                 question, this should be ``"true"`` or ``"false"``.
-                                                                 of question options.
+                                                                 Otherwise, it should be the ``identifier`` of a
-dependency_value                      string                     An old version of ``dependency_values`` that only allows
+                                                                 question option.
-                                                                 for one value. **Deprecated.**
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.12
@@ -76,22 +68,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.
-
-.. versionchanged:: 3.5
-
-  The attribute ``help_text`` has been added.
-
 Endpoints
 ---------
 
@@ -128,18 +104,14 @@ Endpoints
           {
             "id": 1,
             "question": {"en": "T-Shirt size"},
-            "help_text": {"en": "Choose your preferred t-shirt-size"},
             "type": "C",
             "required": false,
             "items": [1, 2],
             "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,18 +171,14 @@ Endpoints
       {
         "id": 1,
         "question": {"en": "T-Shirt size"},
-        "help_text": {"en": "Choose your preferred t-shirt-size"},
         "type": "C",
         "required": false,
         "items": [1, 2],
         "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,
@@ -251,20 +219,17 @@ 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"},
-        "help_text": {"en": "Choose your preferred t-shirt-size"},
         "type": "C",
         "required": false,
         "items": [1, 2],
         "position": 1,
         "ask_during_checkin": false,
-        "hidden": false,
-        "print_on_invoice": false,
         "dependency_question": null,
-        "dependency_values": [],
+        "dependency_value": null,
         "options": [
           {
             "answer": {"en": "S"}
@@ -290,18 +255,14 @@ Endpoints
       {
         "id": 1,
         "question": {"en": "T-Shirt size"},
-        "help_text": {"en": "Choose your preferred t-shirt-size"},
         "type": "C",
         "required": false,
         "items": [1, 2],
         "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,
@@ -365,18 +326,14 @@ Endpoints
       {
         "id": 1,
         "question": {"en": "T-Shirt size"},
-        "help_text": {"en": "Choose your preferred t-shirt-size"},
         "type": "C",
         "required": false,
         "items": [1, 2],
         "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,
+            "subevent": null
-            "close_when_sold_out": false,
-            "closed": false
           }
         ]
       }
@@ -114,9 +102,7 @@ Endpoints
         "size": 200,
         "items": [1, 2],
         "variations": [1, 4, 5, 7],
-        "subevent": null,
+        "subevent": null
-        "close_when_sold_out": false,
-        "closed": false
       }
 
    :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,
+        "subevent": null
-        "close_when_sold_out": false,
-        "closed": false
       }
 
    **Example response**:
@@ -163,9 +147,7 @@ Endpoints
         "size": 200,
         "items": [1, 2],
         "variations": [1, 4, 5, 7],
-        "subevent": null,
+        "subevent": null
-        "close_when_sold_out": false,
-        "closed": false
       }
 
    :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,
+        "subevent": null
-        "close_when_sold_out": false,
-        "closed": false
       }
 
    :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
@@ -34,8 +28,6 @@ date_admission                        datetime                   The sub-event's
 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 +36,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.
+meta_data                             dict                       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``).
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.7
@@ -66,21 +54,9 @@ seat_category_mapping                 object                     An object mappi
 
    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.
@@ -117,11 +93,7 @@ Endpoints
             "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,
@@ -141,11 +113,6 @@ Endpoints
    :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.
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer does not exist **or** you have no permission to view it.
@@ -163,7 +130,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/subevents/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content-Type: application/json
+      Content: application/json
 
       {
         "name": {"en": "First Sample Conference"},
@@ -175,10 +142,6 @@ Endpoints
         "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,
@@ -209,10 +172,6 @@ Endpoints
         "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,
@@ -264,10 +223,6 @@ Endpoints
         "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,
@@ -300,7 +255,7 @@ Endpoints
       PATCH /api/v1/organizers/bigevents/events/sampleconf/subevents/1/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content-Type: application/json
+      Content: application/json
 
       {
         "name": {"en": "New Subevent Name"},
@@ -332,10 +287,6 @@ Endpoints
         "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,
@@ -420,10 +371,6 @@ Endpoints
             "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/teams.rst

@@ -1,671 +0,0 @@
-.. spelling:: fullname
-
-.. _`rest-teams`:
-
-Teams
-=====
-
-.. warning:: Unlike our user interface, the team API **does** allow you to lock yourself out by deleting or modifying
-             the team your user or API key belongs to. Be careful around here!
-
-Team resource
--------------
-
-The team resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the team
-name                                  string                     Team name
-all_events                            boolean                    Whether this team has access to all events
-limit_events                          list                       List of event slugs this team has access to
-can_create_events                     boolean
-can_change_teams                      boolean
-can_change_organizer_settings         boolean
-can_manage_gift_cards                 boolean
-can_change_event_settings             boolean
-can_change_items                      boolean
-can_view_orders                       boolean
-can_change_orders                     boolean
-can_view_vouchers                     boolean
-can_change_vouchers                   boolean
-===================================== ========================== =======================================================
-
-Team member resource
---------------------
-
-The team member resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the user
-email                                 string                     The user's email address
-fullname                              string                     The user's full name (or ``null``)
-require_2fa                           boolean                    Whether this user uses two-factor-authentication
-===================================== ========================== =======================================================
-
-Team invite resource
---------------------
-
-The team invite resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the invite
-email                                 string                     The invitee's email address
-===================================== ========================== =======================================================
-
-Team API token resource
------------------------
-
-The team API token resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the invite
-name                                  string                     Name of this API token
-active                                boolean                    Whether this API token is active (can never be set to
-                                                                 ``true`` again once ``false``)
-token                                 string                     The actual API token. Will only be sent back during
-                                                                 token creation.
-===================================== ========================== =======================================================
-
-Team endpoints
---------------
-
-.. http:get:: /api/v1/organizers/(organizer)/teams/
-
-   Returns a list of all teams within a given organizer.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/teams/ 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,
-            "name": "Admin team",
-            "all_events": true,
-            "limit_events": [],
-            "can_create_events": true,
-            ...
-          }
-        ]
-      }
-
-   :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)/teams/(id)/
-
-   Returns information on one team, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/teams/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,
-        "name": "Admin team",
-        "all_events": true,
-        "limit_events": [],
-        "can_create_events": true,
-        ...
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param id: The ``id`` field of the team 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)/teams/
-
-   Creates a new team
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/teams/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "name": "Admin team",
-        "all_events": true,
-        "limit_events": [],
-        "can_create_events": true,
-        ...
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 2,
-        "name": "Admin team",
-        "all_events": true,
-        "limit_events": [],
-        "can_create_events": true,
-        ...
-      }
-
-   :param organizer: The ``slug`` field of the organizer to create a team for
-   :statuscode 201: no error
-   :statuscode 400: The team 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)/teams/(id)/
-
-   Update a team. 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.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/teams/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "can_create_events": true
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "name": "Admin team",
-        "all_events": true,
-        "limit_events": [],
-        "can_create_events": true,
-        ...
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param id: The ``id`` field of the team to modify
-   :statuscode 200: no error
-   :statuscode 400: The team 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:delete:: /api/v1/organizers/(organizer)/teams/(id)/
-
-   Deletes a team.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/teams/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param id: The ``id`` field of the team to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to change this resource.
-
-Team member endpoints
----------------------
-
-.. http:get:: /api/v1/organizers/(organizer)/teams/(team)/members/
-
-   Returns a list of all members of a team.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/teams/1/members/ 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,
-            "fullname": "John Doe",
-            "email": "john@example.com",
-            "require_2fa": true
-          }
-        ]
-      }
-
-   :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 team: The ``id`` field of the team 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.
-   :statuscode 404: The requested team does not exist
-
-.. http:get:: /api/v1/organizers/(organizer)/teams/(team)/members/(id)/
-
-   Returns information on one team member, identified by their ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/teams/1/members/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,
-        "fullname": "John Doe",
-        "email": "john@example.com",
-        "require_2fa": true
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param team: The ``id`` field of the team to fetch
-   :param id: The ``id`` field of the member 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.
-   :statuscode 404: The requested team or member does not exist
-
-.. http:delete:: /api/v1/organizers/(organizer)/teams/(team)/members/(id)/
-
-   Removes a member from the team.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/teams/1/members/1/ HTTP/1.1
-      Host: pretix.eu
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param team: The ``id`` field of the team to modify
-   :param id: The ``id`` field of the member to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.
-   :statuscode 404: The requested team or member does not exist
-
-Team invite endpoints
----------------------
-
-.. http:get:: /api/v1/organizers/(organizer)/teams/(team)/invites/
-
-   Returns a list of all invitations to a team.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/teams/1/invites/ 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,
-            "email": "john@example.com"
-          }
-        ]
-      }
-
-   :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 team: The ``id`` field of the team 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.
-   :statuscode 404: The requested team does not exist
-
-.. http:get:: /api/v1/organizers/(organizer)/teams/(team)/invites/(id)/
-
-   Returns information on one invite, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/teams/1/invites/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,
-        "email": "john@example.org"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param team: The ``id`` field of the team to fetch
-   :param id: The ``id`` field of the invite 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.
-   :statuscode 404: The requested team or invite does not exist
-
-.. http:post:: /api/v1/organizers/(organizer)/teams/(team)/invites/
-
-   Invites someone into the team. Note that if the user already has a pretix account, you will receive a response without
-   an ``id`` and instead of an invite being created, the user will be directly added to the team.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/teams/1/invites/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "email": "mark@example.org"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "email": "mark@example.org"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param team: The ``id`` field of the team to modify
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.
-   :statuscode 404: The requested team does not exist
-
-.. http:delete:: /api/v1/organizers/(organizer)/teams/(team)/invites/(id)/
-
-   Revokes an invite.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/teams/1/invites/1/ HTTP/1.1
-      Host: pretix.eu
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param team: The ``id`` field of the team to modify
-   :param id: The ``id`` field of the invite to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.
-   :statuscode 404: The requested team or invite does not exist
-
-Team API token endpoints
-------------------------
-
-.. http:get:: /api/v1/organizers/(organizer)/teams/(team)/tokens/
-
-   Returns a list of all API tokens of a team.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/teams/1/tokens/ 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,
-            "active": true,
-            "name": "Test token"
-          }
-        ]
-      }
-
-   :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 team: The ``id`` field of the team 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.
-   :statuscode 404: The requested team does not exist
-
-.. http:get:: /api/v1/organizers/(organizer)/teams/(team)/tokens/(id)/
-
-   Returns information on one token, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/teams/1/tokens/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,
-        "active": true,
-        "name": "Test token"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param team: The ``id`` field of the team to fetch
-   :param id: The ``id`` field of the token 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.
-   :statuscode 404: The requested team or token does not exist
-
-.. http:post:: /api/v1/organizers/(organizer)/teams/(team)/tokens/
-
-   Creates a new token.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/teams/1/tokens/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "name": "New token"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 2,
-        "name": "New token",
-        "active": true,
-        "token": "",
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param team: The ``id`` field of the team to create a token for
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.
-   :statuscode 404: The requested team does not exist
-
-.. http:delete:: /api/v1/organizers/(organizer)/teams/(team)/tokens/(id)/
-
-   Disables a token.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/teams/1/tokens/1/ HTTP/1.1
-      Host: pretix.eu
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "name": "My token",
-        "active": false
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param team: The ``id`` field of the team to modify
-   :param id: The ``id`` field of the token to delete
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.
-   :statuscode 404: The requested team or token does not exist

doc/api/resources/vouchers.rst

@@ -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

@@ -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/customview.rst

@@ -66,7 +66,7 @@ event-related views, there is also a signal that allows you to add the view to t
 
     from django.urls import resolve, reverse
     from django.dispatch import receiver
-    from django.utils.translation import gettext_lazy as _
+    from django.utils.translation import ugettext_lazy as _
     from pretix.control.signals import nav_event
 
 

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,24 +20,17 @@ 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_reactivated, 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_canceled, order_expired, order_modified, order_changed, order_approved, order_denied, order_fee_type_name, allow_ticket_download
-
-Check-ins
-"""""""""
-
-.. automodule:: pretix.base.signals
-   :members: checkin_created
-
 
 Frontend
 --------
 
 .. automodule:: pretix.presale.signals
-   :members: html_head, html_footer, footer_link, front_page_top, front_page_bottom, front_page_bottom_widget, 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, position_info_top, 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, html_page_header, sass_preamble, sass_postamble
 
 
 .. automodule:: pretix.presale.signals
-   :members: order_info, order_info_top, order_meta_from_request
+   :members: order_info, order_meta_from_request
 
 Request flow
 """"""""""""
@@ -56,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,
+             order_info, event_settings_widget, oauth_application_registered, order_position_buttons
-             item_formsets, order_search_filter_q
+
 
 .. automodule:: pretix.base.signals
-   :members: logentry_display, logentry_object_link, requiredaction_display, timeline_events
+   :members: logentry_display, logentry_object_link, requiredaction_display
 
 Vouchers
 """"""""
@@ -85,12 +78,3 @@ Ticket designs
 
 .. automodule:: pretix.base.signals
    :members: layout_text_variables
-
-.. automodule:: pretix.plugins.ticketoutputpdf.signals
-   :members: override_layout
-
-API
----
-
-.. automodule:: pretix.base.signals
-   :members: validate_event_settings, api_event_settings_fields

doc/development/api/import.rst

@@ -1,112 +0,0 @@
-.. highlight:: python
-   :linenothreshold: 5
-
-.. _`importcol`:
-
-Extending the order import process
-==================================
-
-It's possible through the backend to import orders into pretix, for example from a legacy ticketing system. If your
-plugins defines additional data structures around orders, it might be useful to make it possible to import them as well.
-
-Import process
---------------
-
-Here's a short description of pretix' import process to show you where the system will need to interact with your plugin.
-You can find more detailed descriptions of the attributes and methods further below.
-
-1. The user uploads a CSV file. The system tries to parse the CSV file and understand its column headers.
-
-2. A preview of the file is shown to the user and the user is asked to assign the various different input parameters to
-   columns of the file or static values. For example, the user either needs to manually select a product or specify a
-   column that contains a product. For this purpose, a select field is rendered for every possible input column,
-   allowing the user to choose between a default/empty value (defined by your ``default_value``/``default_label``)
-   attributes, the columns of the uploaded file, or a static value (defined by your ``static_choices`` method).
-
-3. The user submits its assignment and the system uses the ``resolve`` method of all columns to get the raw value for
-   all columns.
-
-4. The system uses the ``clean`` method of all columns to verify that all input fields are valid and transformed to the
-   correct data type.
-
-5. The system prepares internal model objects (``Order`` etc) and uses the ``assign`` method of all columns to assign
-   these objects with actual values.
-
-6. The system saves all of these model objects to the database in a database transaction. Plugins can create additional
-   objects in this stage through their ``save`` method.
-
-Column registration
--------------------
-
-The import API does not make a lot of usage from signals, however, it
-does use a signal to get a list of all available import columns. Your plugin
-should listen for this signal and return the subclass of ``pretix.base.orderimport.ImportColumn``
-that we'll provide in this plugin:
-
-.. sourcecode:: python
-
-    from django.dispatch import receiver
-
-    from pretix.base.signals import order_import_columns
-
-
-    @receiver(order_import_columns, dispatch_uid="custom_columns")
-    def register_column(sender, **kwargs):
-        return [
-            EmailColumn(sender),
-        ]
-
-The column class API
---------------------
-
-.. class:: pretix.base.orderimport.ImportColumn
-
-   The central object of each import extension is the subclass of ``ImportColumn``.
-
-   .. py:attribute:: ImportColumn.event
-
-      The default constructor sets this property to the event we are currently
-      working for.
-
-   .. autoattribute:: identifier
-
-      This is an abstract attribute, you **must** override this!
-
-   .. autoattribute:: verbose_name
-
-      This is an abstract attribute, you **must** override this!
-
-   .. autoattribute:: default_value
-
-   .. autoattribute:: default_label
-
-   .. autoattribute:: initial
-
-   .. automethod:: static_choices
-
-   .. automethod:: resolve
-
-   .. automethod:: clean
-
-   .. automethod:: assign
-
-   .. automethod:: save
-
-Example
--------
-
-For example, the import column responsible for assigning email addresses looks like this:
-
-.. sourcecode:: python
-
-   class EmailColumn(ImportColumn):
-       identifier = 'email'
-       verbose_name = _('E-mail address')
-
-       def clean(self, value, previous_values):
-           if value:
-               EmailValidator()(value)
-           return value
-
-       def assign(self, value, order, position, invoice_address, **kwargs):
-           order.email = value

doc/development/api/index.rst

@@ -12,11 +12,8 @@ Contents:
    payment
    payment_2.0
    email
-   placeholder
    invoice
    shredder
-   import
    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,16 +108,8 @@ The provider class
 
    .. automethod:: execute_refund
 
-   .. automethod:: refund_control_render
-
-   .. automethod:: api_payment_details
-
-   .. automethod:: matching_id
-
    .. 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

@@ -46,25 +46,18 @@ name               string               The human-readable name of your plugin
 author             string               Your name
 version            string               A human-readable version code of your plugin
 description        string               A more verbose description of what your plugin does.
-category           string               Category of a plugin. Either one of ``"FEATURE"``, ``"PAYMENT"``,
-                                        ``"INTEGRATION"``, ``"CUSTOMIZATION"``, ``"FORMAT"``, or ``"API"``,
-                                        or any other string.
 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 django.apps import AppConfig
-        from pretix.base.plugins import PluginConfig
+    from django.utils.translation import ugettext_lazy as _
-    except ImportError:
-        raise RuntimeError("Please use pretix 2.7 or above to run this plugin!")
-    from django.utils.translation import gettext_lazy as _
 
 
-    class PaypalApp(PluginConfig):
+    class PaypalApp(AppConfig):
         name = 'pretix_paypal'
         verbose_name = _("PayPal")
 
@@ -72,11 +65,9 @@ A working example would be::
             name = _("PayPal")
             author = _("the pretix team")
             version = '1.0.0'
-            category = 'PAYMENT
             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/logging.rst

@@ -69,7 +69,7 @@ We now need a way to translate the action codes like ``pretix.event.changed`` in
 strings. The :py:attr:`pretix.base.signals.logentry_display` signals allows you to do so. A simple
 implementation could look like::
 
-    from django.utils.translation import gettext as _
+    from django.utils.translation import ugettext as _
     from pretix.base.signals import logentry_display
 
     @receiver(signal=logentry_display)

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/campaigns.rst

@@ -1,224 +0,0 @@
-Campaigns
-=========
-
-The campaigns plugin provides a HTTP API that allows you to create new campaigns.
-
-Resource description
---------------------
-
-The campaign resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal campaign ID
-code                                  string                     The URL component of the campaign, e.g. with code ``BAR``
-                                                                 the campaign URL would to be ``https://<server>/<organizer>/<event>/c/BAR/``.
-                                                                 This value needs to be *globally unique* and we do not
-                                                                 recommend setting it manually. If you omit it, a random
-                                                                 value will be chosen.
-description                           string                     An internal, human-readable name of the campaign.
-external_target                       string                     An URL to redirect to from the tracking link. To redirect to
-                                                                 the ticket shop, use an empty string.
-order_count                           integer                    Number of orders tracked on this campaign (read-only)
-click_count                           integer                    Number of clicks tracked on this campaign (read-only)
-===================================== ========================== =======================================================
-
-Endpoints
----------
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/campaigns/
-
-   Returns a list of all campaigns configured for an event.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/campaigns/ 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,
-            "code": "wZnL11fjq",
-            "description": "Facebook",
-            "external_target": "",
-            "order_count:" 0,
-            "click_count:" 0
-          }
-        ]
-      }
-
-   :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 the event to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer or event does not exist **or** you have no permission to view it.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/campaigns/(id)/
-
-   Returns information on one campaign, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/campaigns/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,
-        "code": "wZnL11fjq",
-        "description": "Facebook",
-        "external_target": "",
-        "order_count:" 0,
-        "click_count:" 0
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param id: The ``id`` field of the campaign to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/campaign does not exist **or** you have no permission to view it.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/campaigns/
-
-   Create a new campaign.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/campaigns/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 166
-
-      {
-        "description": "Twitter"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 2,
-        "code": "IfVJQzSBL",
-        "description": "Twitter",
-        "external_target": "",
-        "order_count:" 0,
-        "click_count:" 0
-      }
-
-   :param organizer: The ``slug`` field of the organizer to create a campaign for
-   :param event: The ``slug`` field of the event to create a campaign for
-   :statuscode 201: no error
-   :statuscode 400: The campaign 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 campaigns.
-
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/campaigns/(id)/
-
-   Update a campaign. 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.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/campaigns/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 34
-
-      {
-        "external_target": "https://mywebsite.com"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: text/javascript
-
-      {
-        "id": 2,
-        "code": "IfVJQzSBL",
-        "description": "Twitter",
-        "external_target": "https://mywebsite.com",
-        "order_count:" 0,
-        "click_count:" 0
-      }
-
-   :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 campaign to modify
-   :statuscode 200: no error
-   :statuscode 400: The campaign could not be modified due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/campaign does not exist **or** you have no permission to change it.
-
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/campaigns/(id)/
-
-   Delete a campaign and all associated data.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/campaigns/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 campaign to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/campaign does not exist **or** you have no permission to change it

doc/plugins/digital.rst

@@ -1,277 +0,0 @@
-Digital content
-===============
-
-The digital content plugin provides a HTTP API that allows you to create new digital content for your ticket holders,
-such as live streams, videos, or material downloads.
-
-Resource description
---------------------
-
-The digital content resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal content ID
-title                                 multi-lingual string       The content title (required)
-content_type                          string                     The type of content, valid values are ``webinar``, ``video``, ``livestream``, ``link``, ``file``
-url                                   string                     The location of the digital content
-description                           multi-lingual string       A public description of the item. May contain Markdown
-                                                                 syntax and is not required.
-available_from                        datetime                   The first date time at which this content will be shown
-                                                                 (or ``null``).
-available_until                       datetime                   The last date time at which this content will b e shown
-                                                                 (or ``null``).
-all_products                          boolean                    If ``true``, the content is available to all buyers of tickets for this event. The ``limit_products`` field is ignored in this case.
-limit_products                        list of integers           List of product/item IDs. This content is only shown to buyers of these ticket types.
-position                              integer                    An integer, used for sorting
-subevent                              integer                    Date in an event series this content should be shown for. Should be ``null`` if this is not an event series or if this should be shown to all customers.
-===================================== ========================== =======================================================
-
-Endpoints
----------
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/digitalcontents/
-
-   Returns a list of all digital content configured for an event.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/digitalcontents/ 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,
-            "subevent": null,
-            "title": {
-                "en": "Concert livestream"
-            },
-            "content_type": "link",
-            "url": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
-            "description": {
-                "en": "Watch our event live here on YouTube!"
-            },
-            "all_products": true,
-            "limit_products": [],
-            "available_from": "2020-03-22T23:00:00Z",
-            "available_until": null,
-            "position": 1
-          }
-        ]
-      }
-
-   :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 the event to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer or event does not exist **or** you have no permission to view it.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/digitalcontents/(id)/
-
-   Returns information on one content item, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/digitalcontents/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,
-        "subevent": null,
-        "title": {
-            "en": "Concert livestream"
-        },
-        "content_type": "link",
-        "url": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
-        "description": {
-            "en": "Watch our event live here on YouTube!"
-        },
-        "all_products": true,
-        "limit_products": [],
-        "available_from": "2020-03-22T23:00:00Z",
-        "available_until": null,
-        "position": 1
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param id: The ``id`` field of the content to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/content does not exist **or** you have no permission to view it.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/digitalcontents/
-
-   Create a new digital content.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/digitalcontents/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 166
-
-      {
-        "subevent": null,
-        "title": {
-            "en": "Concert livestream"
-        },
-        "content_type": "link",
-        "url": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
-        "description": {
-            "en": "Watch our event live here on YouTube!"
-        },
-        "all_products": true,
-        "limit_products": [],
-        "available_from": "2020-03-22T23:00:00Z",
-        "available_until": null,
-        "position": 1
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 2,
-        "subevent": null,
-        "title": {
-            "en": "Concert livestream"
-        },
-        "content_type": "link",
-        "url": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
-        "description": {
-            "en": "Watch our event live here on YouTube!"
-        },
-        "all_products": true,
-        "limit_products": [],
-        "available_from": "2020-03-22T23:00:00Z",
-        "available_until": null,
-        "position": 1
-      }
-
-   :param organizer: The ``slug`` field of the organizer to create new content for
-   :param event: The ``slug`` field of the event to create new content for
-   :statuscode 201: no error
-   :statuscode 400: The content 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 digital contents.
-
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/digitalcontents/(id)/
-
-   Update a content. 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.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/digitalcontents/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 34
-
-      {
-        "url": "https://mywebsite.com"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: text/javascript
-
-      {
-        "id": 2,
-        "subevent": null,
-        "title": {
-            "en": "Concert livestream"
-        },
-        "content_type": "link",
-        "url": "https://mywebsite.com",
-        "description": {
-            "en": "Watch our event live here on YouTube!"
-        },
-        "all_products": true,
-        "limit_products": [],
-        "available_from": "2020-03-22T23:00:00Z",
-        "available_until": null,
-        "position": 1
-      }
-
-   :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 content to modify
-   :statuscode 200: no error
-   :statuscode 400: The content could not be modified due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/content does not exist **or** you have no permission to change it.
-
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/digitalcontents/(id)/
-
-   Delete a digital content.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/digitalcontents/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 content to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/content does not exist **or** you have no permission to change it

doc/plugins/index.rst

@@ -14,5 +14,3 @@ If you want to **create** a plugin, please go to the
    banktransfer
    ticketoutputpdf
    badges
-   campaigns
-   digital

doc/requirements.txt

@@ -1,9 +1,8 @@
 -r ../src/requirements.txt
-sphinx==2.3.*
+sphinx==1.6.*
 sphinx-rtd-theme
 sphinxcontrib-httpdomain
 sphinxcontrib-images
 sphinxcontrib-spelling
-pygments-markdown-lexer
 # See https://github.com/rfk/pyenchant/pull/130
 git+https://github.com/raphaelm/pyenchant.git@patch-1#egg=pyenchant

doc/spelling_wordlist.txt

@@ -31,24 +31,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,7 +51,6 @@ Jimdo
 libpretixprint
 libsass
 linters
-login
 memcached
 metadata
 middleware
@@ -79,7 +72,6 @@ overpayment
 param
 passphrase
 percental
-pluggable
 positionid
 pre
 prepend
@@ -103,18 +95,14 @@ regex
 renderer
 renderers
 reportlab
-reseller
 SaaS
-scalability
 screenshot
 scss
 searchable
 selectable
-serializable
+serializers
-serializer
 serializers
 sexualized
-SQL
 startup
 stdout
 stylesheet
@@ -141,13 +129,10 @@ untrusted
 uptime
 username
 url
-validator
 versa
 versioning
-viewable
 viewset
 viewsets
-waitinglist
 webhook
 webhooks
 webserver

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/structureguide.rst

@@ -45,8 +45,8 @@ In addition, you will need quotas. If you do not care how many of your tickets a
 
 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
+Use case: Early-bird tiers
------------------------------------------
+--------------------------
 
 Let's say you run a conference that has the following pricing scheme:
 
@@ -58,53 +58,9 @@ Of course, you could just set up one product and change its price at the given d
 
 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
+.. note::
---------------------------------------------------
 
-Let's say you run a conference with 400 tickets that has the following pricing scheme:
+   pretix currently can't do early-bird tiers based on **ticket number** instead of time. We're planning this feature for later in 2019. For now, you'll need to monitor that manually.
-
-* 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
 -------------------------------------
@@ -129,14 +85,8 @@ 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:
 
 ==================== =================================== ===================================
@@ -167,42 +117,6 @@ Assuming you already created one or more products for your general conference ad
 
 * 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
 -----------------------------
 

doc/user/events/widget.rst

@@ -114,17 +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>
 
-Filtering products
-------------------
-
-You can filter the products shown in the widget by passing in a list of product IDs::
-
-   <pretix-widget event="https://pretix.eu/demo/democon/" items="23,42"></pretix-widget>
-
-Alternatively, you can select one or more categories to be shown::
-
-   <pretix-widget event="https://pretix.eu/demo/democon/" categories="12,25"></pretix-widget>
-
 Multi-event selection
 ---------------------
 
@@ -154,11 +143,6 @@ You can see an example here:
         </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
 -------------
 
@@ -194,24 +178,6 @@ Just as the widget, the button supports the optional attributes ``voucher`` and
 
 You can style the button using the ``pretix-button`` CSS class.
 
-Dynamically opening the widget
-------------------------------
-
-You can get the behavior of the pretix Button without a button at all, so you can trigger it from your own code in
-response to a user action. Usually, this will open an overlay with your ticket shop, however in some cases, such as
-missing HTTPS encryption on your case or a really small screen (mobile), it will open a new tab instead of an overlay.
-Therefore, make sure you call this *in direct response to a user action*, otherwise most browser will block it as an
-unwanted pop-up.
-
-.. js:function:: window.PretixWidget.open(target_url [, voucher [, subevent [, items, [, widget_data [, skip_ssl_check ]]]]])
-
-   :param string target_url: The URL of the ticket shop.
-   :param string voucher: A voucher code to be pre-selected, or ``null``.
-   :param string subevent: A subevent to be pre-selected, or ``null``.
-   :param array items: A collection of items to be put in the cart, of the form ``[{"item": "item_3", "count": 1}, {"item": "variation_5_6", "count": 4}]``
-   :param object widget_data: Additional data to be passed to the shop, see below.
-   :param boolean skip_ssl_check: Whether to ignore the check for HTTPS. Only to be used during development.
-
 Dynamically loading the widget
 ------------------------------
 
@@ -235,21 +201,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
 -------------------------------
@@ -267,8 +218,7 @@ with that information::
         data-question-L9G8NG9M="Foobar">
     </pretix-widget>
 
-This works for the pretix Button as well, if you also specify a product.
+This works for the pretix Button as well. Currently, the following attributes are understood by pretix itself:
-Currently, the following attributes are understood by pretix itself:
 
 * ``data-email`` will pre-fill the order email field as well as the attendee email field (if enabled).
 
@@ -286,11 +236,6 @@ Currently, the following attributes are understood by pretix itself:
   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:
 
@@ -324,17 +269,10 @@ 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
 
    Data passing options have been added in pretix 2.3. If you use a self-hosted version of pretix, they only work
    fully if you configured a redis server.
 
-.. versionchanged:: 3.6
-
-   Dynamically opening the widget has been added in pretix 3.6.
-
 .. _Let's Encrypt: https://letsencrypt.org/

doc/user/index.rst

@@ -12,6 +12,5 @@ wanting to use pretix to sell tickets.
    events/settings
    events/structureguide
    events/widget
-   events/giftcards
    faq
-   markdown
+   markdown

doc/user/organizers/domain.rst

@@ -14,23 +14,30 @@ and with pretix, you can do this. On this page, you find out the necessary steps
 With the pretix.eu hosted service
 ---------------------------------
 
-Go to "Organizers" in the backend and select your organizer account. Then, go to "Settings" and "Custom Domain".
+Step 1: DNS Configuration
-
+#########################
-This page will show you instructions on how to set up your own domain. Basically, it works like this:
 
 Go to the website of the provider you registered your domain name with. Look for the "DNS" settings page in their
 interface. Unfortunately, we can't tell you exactly how that is named and how it looks, since it is different for every
 domain provider.
 
 Use this interface to add a new subdomain record, e.g. ``tickets`` of the type ``CNAME`` (might also be called "alias").
-The value of the record should be the one shown on the "Custom Domain" page in pretix' backend.
+The value of the record should be ``www.pretix.eu``.
+
+Step 2: Wait for the DNS entry to propagate
+###########################################
 
 Submit your changes and wait a bit, it can regularly take up to three hours for DNS changes to propagate to the caches
 of all DNS servers. You can try checking by accessing your new subdomain, ``http://tickets.awesomepartycorp.com``.
 If DNS was changed successfully, you should see a SSL certificate error. If you ignore the error and access the page
 anyways, you should get a pretix-themed error page with the headline "Unknown domain".
 
-Now, tell us about your domain on the "Custom Domain" page to get started.
+Step 3: Tell us
+###############
+
+Write an email to support@pretix.eu, naming your new domain and your organizer account. We will then generate a SSL
+certificate for you (for free!) and configure the domain.
+
 
 With a custom pretix installation
 ---------------------------------

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.8.0"
+__version__ = "2.6.0"

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,8 +12,7 @@ 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.')
 

src/pretix/api/auth/permission.py

@@ -3,7 +3,7 @@ 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.organizer import Organizer, TeamAPIToken
 from pretix.helpers.security import (
     SessionInvalid, SessionReauthRequired, assert_session_valid,
 )
@@ -50,6 +50,9 @@ class EventPermission(BasePermission):
                 return False
 
         elif 'organizer' in request.resolver_match.kwargs:
+            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, request=request):
                 return False
             if isinstance(perm_holder, User) and perm_holder.has_active_staff_session(request.session.session_key):

src/pretix/api/middleware.py

@@ -4,13 +4,10 @@ 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:
@@ -92,21 +89,3 @@ class IdempotencyMiddleware:
             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/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

@@ -3,7 +3,7 @@ from datetime import timedelta
 from django.db import models
 from django.urls import reverse
 from django.utils.timezone import now
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 from oauth2_provider.generators import (
     generate_client_id, generate_client_secret,
 )
@@ -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):

src/pretix/api/serializers/cart.py

@@ -2,40 +2,37 @@ from datetime import timedelta
 
 from django.utils.crypto import get_random_string
 from django.utils.timezone import now
-from django.utils.translation import gettext_lazy
+from django.utils.translation import ugettext_lazy
 from rest_framework import serializers
 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)
-    sales_channel = serializers.CharField(required=False, default='sales_channel')
 
     class Meta:
         model = CartPosition
         fields = ('cart_id', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts', 'attendee_email',
-                  'subevent', 'expires', 'includes_tax', 'answers', 'seat', 'sales_channel')
+                  'subevent', 'expires', 'includes_tax', 'answers',)
 
     def create(self, validated_data):
         answers_data = validated_data.pop('answers')
@@ -56,7 +53,7 @@ class CartPositionCreateSerializer(I18nAwareModelSerializer):
                           else validated_data.get('item').quotas.filter(subevent=validated_data.get('subevent')))
             if len(new_quotas) == 0:
                 raise ValidationError(
-                    gettext_lazy('The product "{}" is not assigned to a quota.').format(
+                    ugettext_lazy('The product "{}" is not assigned to a quota.').format(
                         str(validated_data.get('item'))
                     )
                 )
@@ -64,8 +61,8 @@ class CartPositionCreateSerializer(I18nAwareModelSerializer):
                 avail = quota.availability()
                 if avail[0] != Quota.AVAILABILITY_OK or (avail[1] is not None and avail[1] < 1):
                     raise ValidationError(
-                        gettext_lazy('There is not enough quota available on quota "{}" to perform '
+                        ugettext_lazy('There is not enough quota available on quota "{}" to perform '
-                                     'the operation.').format(
+                                      'the operation.').format(
                             quota.name
                         )
                     )
@@ -74,25 +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(sales_channel=validated_data.get('sales_channel', 'web')):
-                        raise ValidationError(gettext_lazy('The selected seat "{seat}" is not available.').format(seat=seat.name))
-            elif seated:
-                raise ValidationError('The specified product requires to choose a seat.')
-
-            validated_data.pop('sales_channel')
             cp = CartPosition.objects.create(event=self.context['event'], **validated_data)
 
         for answ_data in answers_data:

src/pretix/api/serializers/checkin.py

@@ -1,9 +1,8 @@
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext as _
 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

@@ -2,23 +2,15 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.utils.functional import cached_property
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext as _
 from django_countries.serializers import CountryFieldMixin
-from hierarkey.proxy import HierarkeyProxy
+from rest_framework.fields import Field
-from pytz import common_timezones
-from rest_framework import serializers
-from rest_framework.fields import ChoiceField, Field
 from rest_framework.relations import SlugRelatedField
 
 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,
-)
-from pretix.base.settings import DEFAULTS, validate_settings
-from pretix.base.signals import api_event_settings_fields
 
 
 class MetaDataField(Field):
@@ -34,35 +26,6 @@ class MetaDataField(Field):
         }
 
 
-class MetaPropertyField(Field):
-
-    def to_representation(self, value):
-        return {
-            v.name: v.default for v in value.item_meta_properties.all()
-        }
-
-    def to_internal_value(self, data):
-        return {
-            'item_meta_properties': data
-        }
-
-
-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):
@@ -79,28 +42,15 @@ class PluginsField(Field):
         }
 
 
-class TimeZoneField(ChoiceField):
-    def get_attribute(self, instance):
-        return instance.cache.get_or_set(
-            'timezone_name',
-            lambda: instance.settings.timezone,
-            3600
-        )
-
-
 class EventSerializer(I18nAwareModelSerializer):
     meta_data = MetaDataField(required=False, source='*')
-    item_meta_properties = MetaPropertyField(required=False, source='*')
     plugins = PluginsField(required=False, source='*')
-    seat_category_mapping = SeatCategoryMappingField(source='*', required=False)
-    timezone = TimeZoneField(required=False, choices=[(a, a) for a in common_timezones])
 
     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',
+                  'presale_end', 'location', 'has_subevents', 'meta_data', 'plugins')
-                  'plugins', 'seat_category_mapping', 'timezone', 'item_meta_properties')
 
     def validate(self, data):
         data = super().validate(data)
@@ -111,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):
@@ -145,36 +92,6 @@ class EventSerializer(I18nAwareModelSerializer):
                 raise ValidationError(_('Meta data property \'{name}\' does not exist.').format(name=key))
         return value
 
-    @cached_property
-    def item_meta_props(self):
-        return {
-            p.name: p for p in self.context['request'].event.item_meta_properties.all()
-        }
-
-    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 not self.instance or not self.instance.pk:
-            if value and value['seat_category_mapping']:
-                raise ValidationError('You cannot specify seat category mappings on event creation.')
-            else:
-                return {'seat_category_mapping': {}}
-        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
 
@@ -192,15 +109,9 @@ class EventSerializer(I18nAwareModelSerializer):
     @transaction.atomic
     def create(self, validated_data):
         meta_data = validated_data.pop('meta_data', None)
-        item_meta_properties = validated_data.pop('item_meta_properties', None)
-        validated_data.pop('seat_category_mapping', None)
         plugins = validated_data.pop('plugins', settings.PRETIX_PLUGINS_DEFAULT.split(','))
-        tz = validated_data.pop('timezone', None)
         event = super().create(validated_data)
 
-        if tz:
-            event.settings.timezone = tz
-
         # Meta data
         if meta_data is not None:
             for key, value in meta_data.items():
@@ -209,19 +120,6 @@ class EventSerializer(I18nAwareModelSerializer):
                     value=value
                 )
 
-        # Item Meta properties
-        if item_meta_properties is not None:
-            for key, value in item_meta_properties.items():
-                event.item_meta_properties.create(
-                    name=key,
-                    default=value,
-                    event=event
-                )
-
-        # Seats
-        if event.seating_plan:
-            generate_seats(event, None, event.seating_plan, {})
-
         # Plugins
         if plugins is not None:
             event.set_active_plugins(plugins)
@@ -232,15 +130,9 @@ class EventSerializer(I18nAwareModelSerializer):
     @transaction.atomic
     def update(self, instance, validated_data):
         meta_data = validated_data.pop('meta_data', None)
-        item_meta_properties = validated_data.pop('item_meta_properties', None)
         plugins = validated_data.pop('plugins', None)
-        seat_category_mapping = validated_data.pop('seat_category_mapping', None)
-        tz = validated_data.pop('timezone', None)
         event = super().update(instance, validated_data)
 
-        if tz:
-            event.settings.timezone = tz
-
         # Meta data
         if meta_data is not None:
             current = {mv.property: mv for mv in event.meta_values.select_related('property')}
@@ -259,49 +151,6 @@ class EventSerializer(I18nAwareModelSerializer):
                 if prop.name not in meta_data:
                     current_object.delete()
 
-        # Item Meta properties
-        if item_meta_properties is not None:
-            current = [imp for imp in event.item_meta_properties.all()]
-            for key, value in item_meta_properties.items():
-                prop = self.item_meta_props.get(key)
-                if prop in current:
-                    prop.default = value
-                    prop.save()
-                else:
-                    prop = event.item_meta_properties.create(
-                        name=key,
-                        default=value,
-                        event=event
-                    )
-                    current.append(prop)
-
-            for prop in current:
-                if prop.name not in list(item_meta_properties.keys()):
-                    prop.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)
@@ -315,9 +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)
-        tz = validated_data.pop('timezone', None)
         new_event = super().create(validated_data)
 
         event = Event.objects.filter(slug=self.context['event'], organizer=self.context['organizer'].pk).first()
@@ -327,13 +173,7 @@ 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()
-        if tz:
-            new_event.settings.timezone = tz
 
         return new_event
 
@@ -353,16 +193,14 @@ 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)
     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',
+                  'presale_start', 'presale_end', 'location', 'event', 'is_public',
-                  'seating_plan', 'item_price_overrides', 'variation_price_overrides', 'meta_data',
+                  'item_price_overrides', 'variation_price_overrides', 'meta_data')
-                  'seat_category_mapping')
 
     def validate(self, data):
         data = super().validate(data)
@@ -384,25 +222,6 @@ class SubEventSerializer(I18nAwareModelSerializer):
     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 {
@@ -420,7 +239,6 @@ class SubEventSerializer(I18nAwareModelSerializer):
         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:
@@ -436,18 +254,6 @@ class SubEventSerializer(I18nAwareModelSerializer):
                     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
@@ -455,7 +261,6 @@ class SubEventSerializer(I18nAwareModelSerializer):
         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)}
@@ -492,31 +297,6 @@ class SubEventSerializer(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 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
 
 
@@ -524,138 +304,3 @@ class TaxRuleSerializer(CountryFieldMixin, I18nAwareModelSerializer):
     class Meta:
         model = TaxRule
         fields = ('id', 'name', 'rate', 'price_includes_tax', 'eu_reverse_charge', 'home_country')
-
-
-class EventSettingsSerializer(serializers.Serializer):
-    default_fields = [
-        'imprint_url',
-        'checkout_email_helptext',
-        'presale_has_ended_text',
-        'voucher_explanation_text',
-        'banner_text',
-        'banner_text_bottom',
-        'show_dates_on_frontpage',
-        'show_date_to',
-        'show_times',
-        'show_items_outside_presale_period',
-        'display_net_prices',
-        'presale_start_show_date',
-        'locales',
-        'locale',
-        'last_order_modification_date',
-        'show_quota_left',
-        'waiting_list_enabled',
-        'waiting_list_hours',
-        'waiting_list_auto',
-        'max_items_per_order',
-        'reservation_time',
-        'contact_mail',
-        'show_variations_expanded',
-        'hide_sold_out',
-        'meta_noindex',
-        'redirect_to_checkout_directly',
-        'frontpage_subevent_ordering',
-        'frontpage_text',
-        'attendee_names_asked',
-        'attendee_names_required',
-        'attendee_emails_asked',
-        'attendee_emails_required',
-        'attendee_addresses_asked',
-        'attendee_addresses_required',
-        'attendee_company_asked',
-        'attendee_company_required',
-        'confirm_text',
-        'order_email_asked_twice',
-        'payment_term_days',
-        'payment_term_last',
-        'payment_term_weekdays',
-        'payment_term_expire_automatically',
-        'payment_term_accept_late',
-        'payment_explanation',
-        'ticket_download',
-        'ticket_download_date',
-        'ticket_download_addons',
-        'ticket_download_nonadm',
-        'ticket_download_pending',
-        'mail_prefix',
-        'mail_from',
-        'mail_from_name',
-        'mail_attach_ical',
-        'invoice_address_asked',
-        'invoice_address_required',
-        'invoice_address_vatid',
-        'invoice_address_company_required',
-        'invoice_address_beneficiary',
-        'invoice_address_custom_field',
-        'invoice_name_required',
-        'invoice_address_not_asked_free',
-        'invoice_show_payments',
-        'invoice_reissue_after_modify',
-        'invoice_include_free',
-        'invoice_generate',
-        'invoice_numbers_consecutive',
-        'invoice_numbers_prefix',
-        'invoice_numbers_prefix_cancellations',
-        'invoice_attendee_name',
-        'invoice_include_expire_date',
-        'invoice_address_explanation_text',
-        'invoice_email_attachment',
-        'invoice_address_from_name',
-        'invoice_address_from',
-        'invoice_address_from_zipcode',
-        'invoice_address_from_city',
-        'invoice_address_from_country',
-        'invoice_address_from_tax_id',
-        'invoice_address_from_vat_id',
-        'invoice_introductory_text',
-        'invoice_additional_text',
-        'invoice_footer_text',
-        'cancel_allow_user',
-        'cancel_allow_user_until',
-        'cancel_allow_user_paid',
-        'cancel_allow_user_paid_until',
-        'cancel_allow_user_paid_keep',
-        'cancel_allow_user_paid_keep_fees',
-        'cancel_allow_user_paid_keep_percentage',
-        'cancel_allow_user_paid_adjust_fees',
-        'cancel_allow_user_paid_adjust_fees_explanation',
-        'cancel_allow_user_paid_refund_as_giftcard',
-        'cancel_allow_user_paid_require_approval',
-    ]
-
-    def __init__(self, *args, **kwargs):
-        self.event = kwargs.pop('event')
-        super().__init__(*args, **kwargs)
-        for fname in self.default_fields:
-            kwargs = DEFAULTS[fname].get('serializer_kwargs', {})
-            kwargs.setdefault('required', False)
-            kwargs.setdefault('allow_null', True)
-            form_kwargs = DEFAULTS[fname].get('form_kwargs', {})
-            if 'serializer_class' not in DEFAULTS[fname]:
-                raise ValidationError('{} has no serializer class'.format(fname))
-            f = DEFAULTS[fname]['serializer_class'](
-                **kwargs
-            )
-            f._label = form_kwargs.get('label', fname)
-            f._help_text = form_kwargs.get('help_text')
-            self.fields[fname] = f
-
-        for recv, resp in api_event_settings_fields.send(sender=self.event):
-            for fname, field in resp.items():
-                field.required = False
-                self.fields[fname] = field
-
-    def update(self, instance: HierarkeyProxy, validated_data):
-        for attr, value in validated_data.items():
-            if value is None:
-                instance.delete(attr)
-            elif instance.get(attr, as_type=type(value)) != value:
-                instance.set(attr, value)
-        return instance
-
-    def validate(self, data):
-        data = super().validate(data)
-        settings_dict = self.instance.freeze()
-        settings_dict.update(data)
-        validate_settings(self.event, settings_dict)
-        return data

src/pretix/api/serializers/fields.py

@@ -1,29 +0,0 @@
-from collections import OrderedDict
-
-from rest_framework import serializers
-
-
-def remove_duplicates_from_list(data):
-    return list(OrderedDict.fromkeys(data))
-
-
-class ListMultipleChoiceField(serializers.MultipleChoiceField):
-    def to_internal_value(self, data):
-        if isinstance(data, str) or not hasattr(data, '__iter__'):
-            self.fail('not_a_list', input_type=type(data).__name__)
-        if not self.allow_empty and len(data) == 0:
-            self.fail('empty')
-
-        internal_value_data = [
-            super(serializers.MultipleChoiceField, self).to_internal_value(item)
-            for item in data
-        ]
-
-        return remove_duplicates_from_list(internal_value_data)
-
-    def to_representation(self, value):
-        representation_data = [
-            self.choice_strings_to_values.get(str(item), item) for item in value
-        ]
-
-        return remove_duplicates_from_list(representation_data)

src/pretix/api/serializers/item.py

@@ -2,15 +2,13 @@ from decimal import Decimal
 
 from django.core.exceptions import ValidationError
 from django.db import transaction
-from django.utils.functional import cached_property
+from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
-from pretix.api.serializers.event import MetaDataField
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.base.models import (
-    Item, ItemAddOn, ItemBundle, ItemCategory, ItemMetaValue, ItemVariation,
+    Item, ItemAddOn, ItemBundle, ItemCategory, ItemVariation, Question,
-    Question, QuestionOption, Quota,
+    QuestionOption, Quota,
 )
 
 
@@ -112,7 +110,6 @@ class ItemSerializer(I18nAwareModelSerializer):
     bundles = InlineItemBundleSerializer(many=True, required=False)
     variations = InlineItemVariationSerializer(many=True, required=False)
     tax_rate = ItemTaxRateField(source='*', read_only=True)
-    meta_data = MetaDataField(required=False, source='*')
 
     class Meta:
         model = Item
@@ -121,10 +118,12 @@ class ItemSerializer(I18nAwareModelSerializer):
                   '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',
+                  'addons', 'bundles', 'original_price', 'require_approval', 'generate_tickets')
-                  'show_quota_left', 'hidden_if_available', 'allow_waitinglist', 'issue_giftcard', 'meta_data')
         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):
@@ -134,17 +133,6 @@ class ItemSerializer(I18nAwareModelSerializer):
         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):
@@ -170,65 +158,18 @@ class ItemSerializer(I18nAwareModelSerializer):
                 ItemAddOn.clean_max_min_count(addon_data['max_count'], addon_data['min_count'])
         return value
 
-    @cached_property
-    def item_meta_properties(self):
-        return {
-            p.name: p for p in self.context['request'].event.item_meta_properties.all()
-        }
-
-    def validate_meta_data(self, value):
-        for key in value['meta_data'].keys():
-            if key not in self.item_meta_properties:
-                raise ValidationError(_('Item meta data property \'{name}\' does not exist.').format(name=key))
-        return value
-
     @transaction.atomic
     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 {}
-        meta_data = validated_data.pop('meta_data', None)
         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)
-
-        # Meta data
-        if meta_data is not None:
-            for key, value in meta_data.items():
-                ItemMetaValue.objects.create(
-                    property=self.item_meta_properties.get(key),
-                    value=value,
-                    item=item
-                )
-        return item
-
-    def update(self, instance, validated_data):
-        meta_data = validated_data.pop('meta_data', None)
-        item = super().update(instance, validated_data)
-
-        # Meta data
-        if meta_data is not None:
-            current = {mv.property: mv for mv in item.meta_values.select_related('property')}
-            for key, value in meta_data.items():
-                prop = self.item_meta_properties.get(key)
-                if prop in current:
-                    current[prop].value = value
-                    current[prop].save()
-                else:
-                    item.meta_values.create(
-                        property=self.item_meta_properties.get(key),
-                        value=value
-                    )
-
-            for prop, current_object in current.items():
-                if prop.name not in meta_data:
-                    current_object.delete()
-
         return item
 
 
@@ -259,25 +200,14 @@ 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',
+                  'ask_during_checkin', 'identifier', 'dependency_question', 'dependency_value')
-                  'hidden', 'dependency_value', 'print_on_invoice', 'help_text')
 
     def validate_identifier(self, value):
         Question._clean_identifier(self.context['event'], value, self.instance)
@@ -287,8 +217,8 @@ class QuestionSerializer(I18nAwareModelSerializer):
         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:
+        if value == self.instance:
-                raise ValidationError('A question cannot depend on itself.')
+            raise ValidationError('A question cannot depend on itself.')
         return value
 
     def validate(self, data):
@@ -307,9 +237,6 @@ class QuestionSerializer(I18nAwareModelSerializer):
 
         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:
@@ -317,9 +244,6 @@ class QuestionSerializer(I18nAwareModelSerializer):
                 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
 
@@ -337,7 +261,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:
@@ -349,7 +272,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,11 +1,9 @@
 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 gettext_lazy
+from django.utils.translation import ugettext_lazy
 from django_countries.fields import Country
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
@@ -14,22 +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,
+    OrderPosition, Question, QuestionAnswer, SubEvent,
 )
 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.locking import NoLockManager
-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):
@@ -39,7 +31,7 @@ class CompatibleCountryField(serializers.Field):
     def to_representation(self, instance: InvoiceAddress):
         if instance.country:
             return str(instance.country)
-        elif hasattr(instance, 'country_old'):
+        else:
             return instance.country_old
 
 
@@ -50,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')
+                  'vat_id', 'vat_id_validated', 'internal_reference')
-        read_only_fields = ('last_modified',)
+        read_only_fields = ('last_modified', 'vat_id_validated')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -66,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
 
 
@@ -97,22 +71,9 @@ class AnswerQuestionOptionsIdentifierField(serializers.Field):
         return [o.identifier for o in instance.options.all()]
 
 
-class AnswerQuestionOptionsField(serializers.Field):
-    def to_representation(self, instance: QuestionAnswer):
-        return [o.pk 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)
-    options = AnswerQuestionOptionsField(source='*', read_only=True)
 
     class Meta:
         model = QuestionAnswer
@@ -122,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):
@@ -196,11 +157,6 @@ class PdfDataSerializer(serializers.Field):
             for k, v in ev._cached_meta_data.items():
                 res['meta:' + k] = v
 
-            if not hasattr(instance.item, '_cached_meta_data'):
-                instance.item._cached_meta_data = instance.item.meta_data
-            for k, v in instance.item._cached_meta_data.items():
-                res['itemmeta:' + k] = v
-
         return res
 
 
@@ -210,15 +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)
-    country = CompatibleCountryField(source='*')
 
     class Meta:
         model = OrderPosition
         fields = ('id', 'order', 'positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
-                  'company', 'street', 'zipcode', 'city', 'country', 'state',
                   'attendee_email', 'voucher', 'tax_rate', 'tax_value', 'secret', 'addon_to', 'subevent', 'checkins',
-                  'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat', 'canceled')
+                  'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -298,36 +251,13 @@ class OrderPaymentDateField(serializers.DateField):
 class OrderFeeSerializer(I18nAwareModelSerializer):
     class Meta:
         model = OrderFee
-        fields = ('fee_type', 'value', 'description', 'internal_type', 'tax_rate', 'tax_value', 'tax_rule', 'canceled')
+        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',
+        fields = ('local_id', 'state', 'amount', 'created', 'payment_date', 'provider')
-                  'details')
 
 
 class OrderRefundSerializer(I18nAwareModelSerializer):
@@ -338,14 +268,6 @@ 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)
@@ -355,15 +277,13 @@ class OrderSerializer(I18nAwareModelSerializer):
     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)
 
     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',
+            'checkin_attention', 'last_modified', 'payments', 'refunds', 'require_approval', 'sales_channel'
-            'url'
         )
         read_only_fields = (
             'code', 'status', 'testmode', 'secret', 'datetime', 'expires', 'payment_date',
@@ -385,6 +305,7 @@ class OrderSerializer(I18nAwareModelSerializer):
         # 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']
+        print(validated_data)
 
         if 'invoice_address' in validated_data:
             iadata = validated_data.pop('invoice_address')
@@ -402,7 +323,7 @@ class OrderSerializer(I18nAwareModelSerializer):
                     }
                 try:
                     ia = instance.invoice_address
-                    if iadata.get('vat_id') != ia.vat_id and 'vat_id_validated' not in iadata:
+                    if iadata.get('vat_id') != ia.vat_id:
                         ia.vat_id_validated = False
                     self.fields['invoice_address'].update(ia, iadata)
                 except InvoiceAddress.DoesNotExist:
@@ -492,13 +413,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',
+        fields = ('fee_type', 'value', 'description', 'internal_type', 'tax_rule')
-                  '_treat_value_as_percentage', '_split_taxes_like_products')
 
     def validate_tax_rule(self, tr):
         if tr and tr.event != self.context['event']:
@@ -513,26 +430,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)
-    country = CompatibleCountryField(source='*')
 
     class Meta:
         model = OrderPosition
         fields = ('positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts', 'attendee_email',
-                  'company', 'street', 'zipcode', 'city', 'country', 'state',
+                  'secret', 'addon_to', 'subevent', 'answers')
-                  'secret', 'addon_to', 'subevent', 'answers', 'seat', 'voucher')
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        for k, v in self.fields.items():
-            if k in ('company', 'street', 'zipcode', 'city', 'country', 'state'):
-                v.required = False
-                v.allow_blank = True
-                v.allow_null = True
 
     def validate_secret(self, secret):
         if secret and OrderPosition.all.filter(order__event=self.context['event'], secret=secret).exists():
@@ -588,24 +490,6 @@ class OrderPositionCreateSerializer(I18nAwareModelSerializer):
             )
         if data.get('attendee_name_parts') and '_scheme' not in data.get('attendee_name_parts'):
             data['attendee_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
 
 
@@ -622,31 +506,9 @@ class CompatibleJSONField(serializers.JSONField):
         return value
 
 
-class WrappedList:
-    def __init__(self, data):
-        self._data = data
-
-    def all(self):
-        return self._data
-
-
-class WrappedModel:
-    def __init__(self, model):
-        self._wrapped = model
-
-    def __getattr__(self, item):
-        return getattr(self._wrapped, item)
-
-    def save(self, *args, **kwargs):
-        raise NotImplementedError
-
-    def delete(self, *args, **kwargs):
-        raise NotImplementedError
-
-
 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),
@@ -658,27 +520,18 @@ 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)
-    simulate = 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',
+                  'invoice_address', 'positions', 'checkin_attention', 'payment_info', 'payment_date', 'consume_carts', 'force')
-                  'force', 'send_mail', 'simulate')
 
     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
@@ -737,37 +590,18 @@ 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)
-        simulate = validated_data.pop('simulate', False)
-        self._send_mail = validated_data.pop('send_mail', False)
 
         if 'invoice_address' in validated_data:
             iadata = validated_data.pop('invoice_address')
@@ -780,21 +614,14 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         else:
             ia = None
 
-        lockfn = self.context['event'].lock
+        with self.context['event'].lock() as now_dt:
-        if simulate:
+            quotadiff = Counter()
-            lockfn = NoLockManager
+
-        with lockfn() as now_dt:
-            free_seats = set()
-            seats_seen = set()
             consume_carts = validated_data.pop('consume_carts', [])
             delete_cps = []
             quota_avail_cache = {}
-            v_budget = {}
-            voucher_usage = Counter()
             if consume_carts:
-                for cp in CartPosition.objects.filter(
+                for cp in CartPosition.objects.filter(event=self.context['event'], cart_id__in=consume_carts):
-                    event=self.context['event'], cart_id__in=consume_carts, expires__gt=now()
-                ):
                     quotas = (cp.variation.quotas.filter(subevent=cp.subevent)
                               if cp.variation else cp.item.quotas.filter(subevent=cp.subevent))
                     for quota in quotas:
@@ -802,112 +629,19 @@ 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:
+                        quotadiff.subtract(quotas)
-                            free_seats.add(cp.seat)
                     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']
-
-                    if pos_data.get('addon_to'):
-                        errs[i]['voucher'] = ['Vouchers are currently not supported for add-on products.']
-                        continue
-
-                    if not v.applies_to(pos_data['item'], pos_data.get('variation')):
-                        errs[i]['voucher'] = [error_messages['voucher_invalid_item']]
-                        continue
-
-                    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.'
-                            ]
-
-                    if v.budget is not None:
-                        price = pos_data.get('price')
-                        if price is None:
-                            price = get_price(
-                                item=pos_data.get('item'),
-                                variation=pos_data.get('variation'),
-                                voucher=v,
-                                custom_price=None,
-                                subevent=pos_data.get('subevent'),
-                                addon_to=pos_data.get('addon_to'),
-                                invoice_address=ia,
-                            ).gross
-                        pbv = get_price(
-                            item=pos_data['item'],
-                            variation=pos_data.get('variation'),
-                            voucher=None,
-                            custom_price=None,
-                            subevent=pos_data.get('subevent'),
-                            addon_to=pos_data.get('addon_to'),
-                            invoice_address=ia,
-                        )
-
-                        if v not in v_budget:
-                            v_budget[v] = v.budget - v.budget_used()
-                        disc = pbv.gross - price
-                        if disc > v_budget[v]:
-                            new_disc = v_budget[v]
-                            v_budget[v] -= new_disc
-                            if new_disc == Decimal('0.00') or pos_data.get('price') is not None:
-                                errs[i]['voucher'] = [
-                                    'The voucher has a remaining budget of {}, therefore a discount of {} can not be '
-                                    'given.'.format(v_budget[v] + new_disc, disc)
-                                ]
-                                continue
-                            pos_data['price'] = price + (disc - new_disc)
-                        else:
-                            v_budget[v] -= disc
-
-                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(sales_channel=validated_data.get('sales_channel', 'web'))) or seat in seats_seen:
-                            errs[i]['seat'] = [gettext_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'] = [gettext_lazy('The product "{}" is not assigned to a quota.').format(
+                        errs[i]['item'] = [ugettext_lazy('The product "{}" is not assigned to a quota.').format(
                             str(pos_data.get('item'))
                         )]
                     else:
@@ -919,11 +653,13 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                                 quota_avail_cache[quota][1] -= 1
                                 if quota_avail_cache[quota][1] < 0:
                                     errs[i]['item'] = [
-                                        gettext_lazy('There is not enough quota available on quota "{}" to perform the operation.').format(
+                                        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})
 
@@ -931,23 +667,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 simulate:
+
-                order = WrappedModel(order)
+            if order.total == Decimal('0.00') and validated_data.get('status') != Order.STATUS_PAID:
-                order.last_modified = now()
+                order.status = Order.STATUS_PAID
-                order.code = 'PREVIEW'
-            else:
                 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=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
+                )
 
             if ia:
-                if not simulate:
+                ia.order = order
-                    ia.order = order
+                ia.save()
-                    ia.save()
-                else:
-                    order.invoice_address = ia
-                    ia.last_modified = now()
-
             pos_map = {}
             for pos_data in positions_data:
                 answers_data = pos_data.pop('answers', [])
@@ -958,171 +709,32 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                         '_legacy': attendee_name
                     }
                 pos = OrderPosition(**pos_data)
-                if simulate:
+                pos.order = order
-                    pos.order = order._wrapped
+                pos._calculate_tax()
-                else:
-                    pos.order = order
                 if addon_to:
                     pos.addon_to = pos_map[addon_to]
-
+                pos.save()
-                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()
-
-                pos.price_before_voucher = get_price(
-                    item=pos.item,
-                    variation=pos.variation,
-                    voucher=None,
-                    custom_price=None,
-                    subevent=pos.subevent,
-                    addon_to=pos.addon_to,
-                    invoice_address=ia,
-                ).gross
-
-                if simulate:
-                    pos = WrappedModel(pos)
-                    pos.id = 0
-                    answers = []
-                    for answ_data in answers_data:
-                        options = answ_data.pop('options', [])
-                        answ = WrappedModel(QuestionAnswer(**answ_data))
-                        answ.options = WrappedList(options)
-                        answers.append(answ)
-                    pos.answers = answers
-                    pos.pseudonymization_id = "PREVIEW"
-                else:
-                    if pos.voucher:
-                        Voucher.objects.filter(pk=pos.voucher.pk).update(redeemed=F('redeemed') + 1)
-                    pos.save()
-                    for answ_data in answers_data:
-                        options = answ_data.pop('options', [])
-                        answ = pos.answers.create(**answ_data)
-                        answ.options.add(*options)
                 pos_map[pos.positionid] = pos
+                for answ_data in answers_data:
+                    options = answ_data.pop('options', [])
+                    answ = pos.answers.create(**answ_data)
+                    answ.options.add(*options)
 
-            if not simulate:
+            for cp in delete_cps:
-                for cp in delete_cps:
+                cp.delete()
-                    cp.delete()
-
-        order.total = sum([p.price for p in pos_map.values()])
-        fees = []
         for fee_data in fees_data:
-            is_percentage = fee_data.pop('_treat_value_as_percentage', False)
+            f = OrderFee(**fee_data)
-            if is_percentage:
+            f.order = order
-                fee_data['value'] = round_decimal(order.total * (fee_data['value'] / Decimal('100.00')),
+            f._calculate_tax()
-                                                  self.context['event'].currency)
+            f.save()
-            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._wrapped if simulate else order
-                    f._calculate_tax()
-                    fees.append(f)
-                    if not simulate:
-                        f.save()
-            else:
-                f = OrderFee(**fee_data)
-                f.order = order._wrapped if simulate else order
-                f._calculate_tax()
-                fees.append(f)
-                if not simulate:
-                    f.save()
-
-        order.total += sum([f.value for f in fees])
-        if simulate:
-            order.fees = fees
-            order.positions = pos_map.values()
-            return order  # ignore payments
-        else:
-            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
-            )
 
         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):
@@ -1138,20 +750,6 @@ class InvoiceSerializer(I18nAwareModelSerializer):
                   'internal_reference')
 
 
-class OrderPaymentCreateSerializer(I18nAwareModelSerializer):
-    provider = serializers.CharField(required=True, allow_null=False, allow_blank=False)
-    info = CompatibleJSONField(required=False)
-
-    class Meta:
-        model = OrderPayment
-        fields = ('state', 'amount', 'payment_date', 'provider', 'info')
-
-    def create(self, validated_data):
-        order = OrderPayment(order=self.context['order'], **validated_data)
-        order.save()
-        return order
-
-
 class OrderRefundCreateSerializer(I18nAwareModelSerializer):
     payment = serializers.IntegerField(required=False, allow_null=True)
     provider = serializers.CharField(required=True, allow_null=False, allow_blank=False)

src/pretix/api/serializers/organizer.py

@@ -1,169 +1,8 @@
-from decimal import Decimal
-
-from django.db.models import Q
-from django.utils.translation import get_language, gettext_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 Organizer
-from pretix.base.auth import get_auth_backends
-from pretix.base.models import (
-    GiftCard, Organizer, SeatingPlan, Team, TeamAPIToken, TeamInvite, User,
-)
-from pretix.base.models.seating import SeatingPlanLayoutValidator
-from pretix.base.services.mail import SendMailException, mail
-from pretix.helpers.urls import build_absolute_uri
 
 
 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, min_value=Decimal('0.00'))
-
-    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')
-
-
-class EventSlugField(serializers.SlugRelatedField):
-    def get_queryset(self):
-        return self.context['organizer'].events.all()
-
-
-class TeamSerializer(serializers.ModelSerializer):
-    limit_events = EventSlugField(slug_field='slug', many=True)
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    class Meta:
-        model = Team
-        fields = (
-            'id', 'name', 'all_events', 'limit_events', 'can_create_events', 'can_change_teams',
-            'can_change_organizer_settings', 'can_manage_gift_cards', 'can_change_event_settings',
-            'can_change_items', 'can_view_orders', 'can_change_orders', 'can_view_vouchers',
-            'can_change_vouchers'
-        )
-
-    def validate(self, data):
-        full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
-        full_data.update(data)
-        if full_data.get('limit_events') and full_data.get('all_events'):
-            raise ValidationError('Do not set both limit_events and all_events.')
-        return data
-
-
-class TeamInviteSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = TeamInvite
-        fields = (
-            'id', 'email'
-        )
-
-    def _send_invite(self, instance):
-        try:
-            mail(
-                instance.email,
-                _('pretix account invitation'),
-                'pretixcontrol/email/invitation.txt',
-                {
-                    'user': self,
-                    'organizer': self.context['organizer'].name,
-                    'team': instance.team.name,
-                    'url': build_absolute_uri('control:auth.invite', kwargs={
-                        'token': instance.token
-                    })
-                },
-                event=None,
-                locale=get_language()  # TODO: expose?
-            )
-        except SendMailException:
-            pass  # Already logged
-
-    def create(self, validated_data):
-        if 'email' in validated_data:
-            try:
-                user = User.objects.get(email__iexact=validated_data['email'])
-            except User.DoesNotExist:
-                if self.context['team'].invites.filter(email__iexact=validated_data['email']).exists():
-                    raise ValidationError(_('This user already has been invited for this team.'))
-                if 'native' not in get_auth_backends():
-                    raise ValidationError('Users need to have a pretix account before they can be invited.')
-
-                invite = self.context['team'].invites.create(email=validated_data['email'])
-                self._send_invite(invite)
-                invite.team.log_action(
-                    'pretix.team.invite.created',
-                    data={
-                        'email': validated_data['email']
-                    },
-                    **self.context['log_kwargs']
-                )
-                return invite
-            else:
-                if self.context['team'].members.filter(pk=user.pk).exists():
-                    raise ValidationError(_('This user already has permissions for this team.'))
-
-                self.context['team'].members.add(user)
-                self.context['team'].log_action(
-                    'pretix.team.member.added',
-                    data={
-                        'email': user.email,
-                        'user': user.pk,
-                    },
-                    **self.context['log_kwargs']
-                )
-                return TeamInvite(email=user.email)
-        else:
-            raise ValidationError('No email address given.')
-
-
-class TeamAPITokenSerializer(serializers.ModelSerializer):
-    active = serializers.BooleanField(default=True, read_only=True)
-
-    class Meta:
-        model = TeamAPIToken
-        fields = (
-            'id', 'name', 'active'
-        )
-
-
-class TeamMemberSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = User
-        fields = (
-            'id', 'email', 'fullname', 'require_2fa'
-        )

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'),
+            full_data.get('quota'), full_data.get('item'), full_data.get('variation')
-            block_quota=full_data.get('block_quota')
         )
         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,7 +2,6 @@ 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.base.signals import periodic_task
@@ -18,12 +17,10 @@ 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

@@ -7,8 +7,8 @@ from rest_framework import routers
 from pretix.api.views import cart
 
 from .views import (
-    checkin, device, event, item, oauth, order, organizer, user, version,
+    checkin, device, event, item, oauth, order, organizer, user, voucher,
-    voucher, waitinglist, webhooks,
+    waitinglist, webhooks,
 )
 
 router = routers.DefaultRouter()
@@ -18,14 +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)
-orga_router.register(r'teams', organizer.TeamViewSet)
-
-team_router = routers.DefaultRouter()
-team_router.register(r'members', organizer.TeamMemberViewSet)
-team_router.register(r'invites', organizer.TeamInviteViewSet)
-team_router.register(r'tokens', organizer.TeamAPITokenViewSet)
 
 event_router = routers.DefaultRouter()
 event_router.register(r'subevents', event.SubEventViewSet)
@@ -67,10 +59,7 @@ for app in apps.get_app_configs():
 urlpatterns = [
     url(r'^', include(router.urls)),
     url(r'^organizers/(?P<organizer>[^/]+)/', include(orga_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/settings/$', event.EventSettingsView.as_view(),
-        name="event.settings"),
     url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/', include(event_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/teams/(?P<team>[^/]+)/', include(team_router.urls)),
     url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/items/(?P<item>[^/]+)/', include(item_router.urls)),
     url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/questions/(?P<question>[^/]+)/',
         include(question_router.urls)),
@@ -85,5 +74,4 @@ urlpatterns = [
     url(r"^device/roll$", device.RollKeyView.as_view(), name="device.roll"),
     url(r"^device/revoke$", device.RevokeKeyView.as_view(), name="device.revoke"),
     url(r"^me$", user.MeView.as_view(), name="user.me"),
-    url(r"^version$", version.VersionView.as_view(), name="version"),
 ]

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,7 +6,6 @@ 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.fields import DateTimeField
@@ -25,11 +24,11 @@ from pretix.base.services.checkin import (
 )
 from pretix.helpers.database import FixedOrderBy
 
-with scopes_disabled():
+
-    class CheckinListFilter(FilterSet):
+class CheckinListFilter(FilterSet):
-        class Meta:
+    class Meta:
-            model = CheckinList
+        model = CheckinList
-            fields = ['subevent']
+        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):
@@ -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):
+    def has_checkin_qs(self, queryset, name, value):
-            return queryset.filter(last_checked_in__isnull=not value)
+        return queryset.filter(last_checked_in__isnull=not value)
 
 
 class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = CheckinListOrderPositionSerializer
-    queryset = OrderPosition.all.none()
+    queryset = OrderPosition.objects.none()
     filter_backends = (DjangoFilterBackend, RichOrderingFilter)
     ordering = ('attendee_name_cached', 'positionid')
     ordering_fields = (
@@ -231,7 +229,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                     )
                 ))
             ).select_related(
-                'item', 'variation', 'item__category', 'addon_to', 'order', 'order__invoice_address', 'seat'
+                'item', 'variation', 'item__category', 'addon_to', 'order', 'order__invoice_address'
             )
         else:
             qs = qs.prefetch_related(
@@ -241,7 +239,7 @@ 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', 'order')
 
         if not self.checkinlist.all_products:
             qs = qs.filter(item__in=self.checkinlist.limit_products.values_list('id', flat=True))
@@ -280,7 +278,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,
             )

src/pretix/api/views/event.py

@@ -3,15 +3,13 @@ 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 import filters, views, viewsets
 from rest_framework.exceptions import PermissionDenied
-from rest_framework.response import Response
 
 from pretix.api.auth.permission import EventCRUDPermission
 from pretix.api.serializers.event import (
-    CloneEventSerializer, EventSerializer, EventSettingsSerializer,
+    CloneEventSerializer, EventSerializer, SubEventSerializer,
-    SubEventSerializer, TaxRuleSerializer,
+    TaxRuleSerializer,
 )
 from pretix.api.views import ConditionalListView
 from pretix.base.models import (
@@ -19,53 +17,52 @@ from pretix.base.models import (
 )
 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:
+class EventFilter(FilterSet):
-            model = Event
+    is_past = django_filters.rest_framework.BooleanFilter(method='is_past_qs')
-            fields = ['is_public', 'live', 'has_subevents']
+    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):
+    class Meta:
-            expr = (
+        model = Event
-                Q(has_subevents=False) &
+        fields = ['is_public', 'live', 'has_subevents']
-                Q(
+
-                    Q(Q(date_to__isnull=True) & Q(date_from__gte=value))
+    def ends_after_qs(self, queryset, name, value):
-                    | Q(Q(date_to__isnull=False) & Q(date_to__gte=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):
+    def is_future_qs(self, queryset, name, value):
-            expr = (
+        expr = (
-                Q(has_subevents=False) &
+            Q(has_subevents=False) &
-                Q(
+            Q(
-                    Q(Q(date_to__isnull=True) & Q(date_from__lt=now()))
+                Q(Q(date_to__isnull=True) & Q(date_from__gte=now()))
-                    | Q(Q(date_to__isnull=False) & Q(date_to__lt=now()))
+                | Q(Q(date_to__isnull=False) & Q(date_to__gte=now()))
-                )
             )
-            if value:
+        )
-                return queryset.filter(expr)
+        if value:
-            else:
+            return queryset.filter(expr)
-                return queryset.exclude(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)
 
 
 class EventViewSet(viewsets.ModelViewSet):
@@ -75,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):
@@ -87,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):
@@ -134,7 +127,6 @@ class EventViewSet(viewsets.ModelViewSet):
 
     def perform_create(self, serializer):
         serializer.save(organizer=self.request.organizer)
-        serializer.instance.set_defaults()
         serializer.instance.log_action(
             'pretix.event.added',
             user=self.request.user,
@@ -188,42 +180,41 @@ class CloneEventViewSet(viewsets.ModelViewSet):
         )
 
 
-with scopes_disabled():
+class SubEventFilter(FilterSet):
-    class SubEventFilter(FilterSet):
+    is_past = django_filters.rest_framework.BooleanFilter(method='is_past_qs')
-        is_past = django_filters.rest_framework.BooleanFilter(method='is_past_qs')
+    is_future = django_filters.rest_framework.BooleanFilter(method='is_future_qs')
-        is_future = django_filters.rest_framework.BooleanFilter(method='is_future_qs')
+    ends_after = django_filters.rest_framework.IsoDateTimeFilter(method='ends_after_qs')
-        ends_after = django_filters.rest_framework.IsoDateTimeFilter(method='ends_after_qs')
 
-        class Meta:
+    class Meta:
-            model = SubEvent
+        model = SubEvent
-            fields = ['active', 'event__live']
+        fields = ['active', 'event__live']
 
-        def ends_after_qs(self, queryset, name, value):
+    def ends_after_qs(self, queryset, name, value):
-            expr = Q(
+        expr = Q(
-                Q(Q(date_to__isnull=True) & Q(date_from__gte=value))
+            Q(Q(date_to__isnull=True) & Q(date_from__gte=value))
-                | Q(Q(date_to__isnull=False) & Q(date_to__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):
+    def is_future_qs(self, queryset, name, value):
-            expr = Q(
+        expr = Q(
-                Q(Q(date_to__isnull=True) & Q(date_from__lt=now()))
+            Q(Q(date_to__isnull=True) & Q(date_from__gte=now()))
-                | Q(Q(date_to__isnull=False) & Q(date_to__lt=now()))
+            | Q(Q(date_to__isnull=False) & Q(date_to__gte=now()))
-            )
+        )
-            if value:
+        if value:
-                return queryset.filter(expr)
+            return queryset.filter(expr)
-            else:
+        else:
-                return queryset.exclude(expr)
+            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):
@@ -246,22 +237,13 @@ 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,
@@ -334,33 +316,3 @@ class TaxRuleViewSet(ConditionalListView, viewsets.ModelViewSet):
             auth=self.request.auth,
         )
         super().perform_destroy(instance)
-
-
-class EventSettingsView(views.APIView):
-    permission = 'can_change_event_settings'
-
-    def get(self, request, *args, **kwargs):
-        s = EventSettingsSerializer(instance=request.event.settings, event=request.event)
-        if 'explain' in request.GET:
-            return Response({
-                fname: {
-                    'value': s.data[fname],
-                    'label': getattr(field, '_label', fname),
-                    'help_text': getattr(field, '_help_text', None)
-                } for fname, field in s.fields.items()
-            })
-        return Response(s.data)
-
-    def patch(self, request, *wargs, **kwargs):
-        s = EventSettingsSerializer(instance=request.event.settings, data=request.data, partial=True,
-                                    event=request.event)
-        s.is_valid(raise_exception=True)
-        with transaction.atomic():
-            s.save()
-            self.request.event.log_action(
-                'pretix.event.settings', user=self.request.user, auth=self.request.auth, data={
-                    k: v for k, v in s.validated_data.items()
-                }
-            )
-        s = EventSettingsSerializer(instance=request.event.settings, event=request.event)
-        return Response(s.data)

src/pretix/api/views/item.py

@@ -3,7 +3,6 @@ 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.exceptions import PermissionDenied
@@ -22,19 +21,19 @@ from pretix.base.models import (
 )
 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):
+class ItemFilter(FilterSet):
-            if value in ("0", "None", "0.00"):
+    tax_rate = django_filters.CharFilter(method='tax_rate_qs')
-                return queryset.filter(Q(tax_rule__isnull=True) | Q(tax_rule__rate=0))
-            else:
-                return queryset.filter(tax_rule__rate=value)
 
-        class Meta:
+    def tax_rate_qs(self, queryset, name, value):
-            model = Item
+        if value in ("0", "None", "0.00"):
-            fields = ['active', 'category', 'admission', 'tax_rate', 'free_price']
+            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):
@@ -62,17 +61,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,
@@ -319,11 +312,10 @@ class ItemCategoryViewSet(ConditionalListView, viewsets.ModelViewSet):
         super().perform_destroy(instance)
 
 
-with scopes_disabled():
+class QuestionFilter(FilterSet):
-    class QuestionFilter(FilterSet):
+    class Meta:
-        class Meta:
+        model = Question
-            model = Question
+        fields = ['ask_during_checkin', 'required', 'identifier']
-            fields = ['ask_during_checkin', 'required', 'identifier']
 
 
 class QuestionViewSet(ConditionalListView, viewsets.ModelViewSet):
@@ -419,11 +411,10 @@ class QuestionOptionViewSet(viewsets.ModelViewSet):
         super().perform_destroy(instance)
 
 
-with scopes_disabled():
+class QuotaFilter(FilterSet):
-    class QuotaFilter(FilterSet):
+    class Meta:
-        class Meta:
+        model = Quota
-            model = Quota
+        fields = ['subevent']
-            fields = ['subevent']
 
 
 class QuotaViewSet(ConditionalListView, viewsets.ModelViewSet):
@@ -461,30 +452,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,

src/pretix/api/views/oauth.py

@@ -2,7 +2,7 @@ import logging
 
 from django import forms
 from django.conf import settings
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext as _
 from oauth2_provider.exceptions import OAuthToolkitError
 from oauth2_provider.forms import AllowForm
 from oauth2_provider.views import (

src/pretix/api/views/order.py

@@ -6,12 +6,11 @@ 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 gettext as _
+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.exceptions import (
@@ -23,16 +22,15 @@ from rest_framework.response import Response
 
 from pretix.api.models import OAuthAccessToken
 from pretix.api.serializers.order import (
-    InvoiceSerializer, OrderCreateSerializer, OrderPaymentCreateSerializer,
+    InvoiceSerializer, OrderCreateSerializer, OrderPaymentSerializer,
-    OrderPaymentSerializer, OrderPositionSerializer,
+    OrderPositionSerializer, OrderRefundCreateSerializer,
-    OrderRefundCreateSerializer, OrderRefundSerializer, OrderSerializer,
+    OrderRefundSerializer, OrderSerializer, PriceCalcSerializer,
-    PriceCalcSerializer,
 )
 from pretix.base.i18n import language
 from pretix.base.models import (
     CachedCombinedTicket, CachedTicket, Device, Event, Invoice, InvoiceAddress,
-    Order, OrderFee, OrderPayment, OrderPosition, OrderRefund, Quota,
+    Order, OrderPayment, OrderPosition, OrderRefund, Quota, TeamAPIToken,
-    TeamAPIToken, generate_position_secret, generate_secret,
+    generate_position_secret, generate_secret,
 )
 from pretix.base.payment import PaymentException
 from pretix.base.services import tickets
@@ -42,28 +40,27 @@ from pretix.base.services.invoices import (
 )
 from pretix.base.services.mail import SendMailException
 from pretix.base.services.orders import (
-    OrderChangeManager, OrderError, _order_placed_email,
+    OrderChangeManager, OrderError, approve_order, cancel_order, deny_order,
-    _order_placed_email_attendee, approve_order, cancel_order, deny_order,
+    extend_order, mark_order_expired, mark_order_refunded,
-    extend_order, mark_order_expired, mark_order_refunded, reactivate_order,
 )
 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,
+    order_modified, 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:
+class OrderFilter(FilterSet):
-            model = Order
+    email = django_filters.CharFilter(field_name='email', lookup_expr='iexact')
-            fields = ['code', 'status', 'email', 'locale', 'testmode', 'require_approval']
+    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']
 
 
 class OrderViewSet(viewsets.ModelViewSet):
@@ -83,29 +80,20 @@ class OrderViewSet(viewsets.ModelViewSet):
         return ctx
 
     def get_queryset(self):
-        if self.request.query_params.get('include_canceled_fees', 'false') == 'true':
-            fqs = OrderFee.all
-        else:
-            fqs = OrderFee.objects
         qs = self.request.event.orders.prefetch_related(
-            Prefetch('fees', queryset=fqs.all()),
+            'fees', 'payments', 'refunds', 'refunds__payment'
-            'payments', 'refunds', 'refunds__payment'
         ).select_related(
             'invoice_address'
         )
 
-        if self.request.query_params.get('include_canceled_positions', 'false') == 'true':
-            opq = OrderPosition.all
-        else:
-            opq = OrderPosition.objects
         if self.request.query_params.get('pdf_data', 'false') == 'true':
             qs = qs.prefetch_related(
                 Prefetch(
                     'positions',
-                    opq.all().prefetch_related(
+                    OrderPosition.objects.all().prefetch_related(
                         'checkins', 'item', 'variation', 'answers', 'answers__options', 'answers__question',
-                        'item__category', 'addon_to', 'seat',
+                        'item__category', 'addon_to',
-                        Prefetch('addons', opq.select_related('item', 'variation', 'seat'))
+                        Prefetch('addons', OrderPosition.objects.select_related('item', 'variation'))
                     )
                 )
             )
@@ -113,8 +101,8 @@ class OrderViewSet(viewsets.ModelViewSet):
             qs = qs.prefetch_related(
                 Prefetch(
                     'positions',
-                    opq.all().prefetch_related(
+                    OrderPosition.objects.all().prefetch_related(
-                        'checkins', 'item', 'variation', 'answers', 'answers__options', 'answers__question', 'seat',
+                        'checkins', 'item', 'variation', 'answers', 'answers__options', 'answers__question',
                     )
                 )
             )
@@ -158,16 +146,12 @@ class OrderViewSet(viewsets.ModelViewSet):
             generate.apply_async(args=('order', order.pk, provider.identifier))
             raise RetryException()
         else:
-            if ct.type == 'text/uri-list':
+            resp = FileResponse(ct.file.file, content_type=ct.type)
-                resp = HttpResponse(ct.file.file.read(), content_type='text/uri-list')
+            resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}{}"'.format(
-                return resp
+                self.request.event.slug.upper(), order.code,
-            else:
+                provider.identifier, ct.extension
-                resp = FileResponse(ct.file.file, content_type=ct.type)
+            )
-                resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}{}"'.format(
+            return resp
-                    self.request.event.slug.upper(), order.code,
-                    provider.identifier, ct.extension
-                )
-                return resp
 
     @action(detail=True, methods=['POST'])
     def mark_paid(self, request, **kwargs):
@@ -183,26 +167,9 @@ class OrderViewSet(viewsets.ModelViewSet):
                     amount=ps
                 )
             except OrderPayment.DoesNotExist:
-                for p in order.payments.filter(state__in=(OrderPayment.PAYMENT_STATE_PENDING,
+                order.payments.filter(state__in=(OrderPayment.PAYMENT_STATE_PENDING,
-                                                          OrderPayment.PAYMENT_STATE_CREATED)):
+                                                 OrderPayment.PAYMENT_STATE_CREATED)) \
-                    try:
+                    .update(state=OrderPayment.PAYMENT_STATE_CANCELED)
-                        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
-                        )
                 p = order.payments.create(
                     state=OrderPayment.PAYMENT_STATE_CREATED,
                     provider='manual',
@@ -261,29 +228,6 @@ class OrderViewSet(viewsets.ModelViewSet):
             )
         return self.retrieve(request, [], **kwargs)
 
-    @action(detail=True, methods=['POST'])
-    def reactivate(self, request, **kwargs):
-
-        order = self.get_object()
-        if order.status != Order.STATUS_CANCELED:
-            return Response(
-                {'detail': 'The order is not allowed to be reactivated.'},
-                status=status.HTTP_400_BAD_REQUEST
-            )
-
-        try:
-            reactivate_order(
-                order,
-                user=request.user if request.user.is_authenticated else None,
-                auth=request.auth if isinstance(request.auth, (Device, TeamAPIToken, OAuthAccessToken)) else None,
-            )
-        except OrderError as e:
-            return Response(
-                {'detail': str(e)},
-                status=status.HTTP_400_BAD_REQUEST
-            )
-        return self.retrieve(request, [], **kwargs)
-
     @action(detail=True, methods=['POST'])
     def approve(self, request, **kwargs):
         send_mail = request.data.get('send_email', True)
@@ -486,64 +430,22 @@ 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)
-            if not order.pk:
-                # Simulation
-                return Response(serializer.data, status=status.HTTP_201_CREATED)
 
             order.log_action(
                 'pretix.event.order.placed',
                 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):
+        gen_invoice = invoice_qualified(order) and (
-            order_placed.send(self.request.event, order=order)
+            (order.event.settings.get('invoice_generate') == 'True') or
-            if order.status == Order.STATUS_PAID:
+            (order.event.settings.get('invoice_generate') == 'paid' and order.status == Order.STATUS_PAID)
-                order_paid.send(self.request.event, order=order)
+        ) and not order.invoices.last()
-
+        if gen_invoice:
-            gen_invoice = invoice_qualified(order) and (
+            generate_invoice(order, trigger_pdf=True)
-                (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)
 
         headers = self.get_success_headers(serializer.data)
         return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
@@ -580,7 +482,6 @@ class OrderViewSet(viewsets.ModelViewSet):
                 )
 
             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,
@@ -629,49 +530,48 @@ 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):
-    class OrderPositionFilter(FilterSet):
+    order = django_filters.CharFilter(field_name='order', lookup_expr='code__iexact')
-        order = django_filters.CharFilter(field_name='order', lookup_expr='code__iexact')
+    has_checkin = django_filters.rest_framework.BooleanFilter(method='has_checkin_qs')
-        has_checkin = django_filters.rest_framework.BooleanFilter(method='has_checkin_qs')
+    attendee_name = django_filters.CharFilter(method='attendee_name_qs')
-        attendee_name = django_filters.CharFilter(method='attendee_name_qs')
+    search = django_filters.CharFilter(method='search_qs')
-        search = django_filters.CharFilter(method='search_qs')
 
-        def search_qs(self, queryset, name, value):
+    def search_qs(self, queryset, name, value):
-            return queryset.filter(
+        return queryset.filter(
-                Q(secret__istartswith=value)
+            Q(secret__istartswith=value)
-                | Q(attendee_name_cached__icontains=value)
+            | Q(attendee_name_cached__icontains=value)
-                | Q(addon_to__attendee_name_cached__icontains=value)
+            | Q(addon_to__attendee_name_cached__icontains=value)
-                | Q(attendee_email__icontains=value)
+            | Q(attendee_email__icontains=value)
-                | Q(addon_to__attendee_email__icontains=value)
+            | Q(addon_to__attendee_email__icontains=value)
-                | Q(order__code__istartswith=value)
+            | Q(order__code__istartswith=value)
-                | Q(order__invoice_address__name_cached__icontains=value)
+            | Q(order__invoice_address__name_cached__icontains=value)
-                | Q(order__email__icontains=value)
+            | Q(order__email__icontains=value)
-            )
+        )
 
-        def has_checkin_qs(self, queryset, name, value):
+    def has_checkin_qs(self, queryset, name, value):
-            return queryset.filter(checkins__isnull=not value)
+        return queryset.filter(checkins__isnull=not value)
 
-        def attendee_name_qs(self, queryset, name, 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))
+        return queryset.filter(Q(attendee_name_cached__iexact=value) | Q(addon_to__attendee_name_cached__iexact=value))
 
-        class Meta:
+    class Meta:
-            model = OrderPosition
+        model = OrderPosition
-            fields = {
+        fields = {
-                'item': ['exact', 'in'],
+            'item': ['exact', 'in'],
-                'variation': ['exact', 'in'],
+            'variation': ['exact', 'in'],
-                'secret': ['exact'],
+            'secret': ['exact'],
-                'order__status': ['exact', 'in'],
+            'order__status': ['exact', 'in'],
-                'addon_to': ['exact', 'in'],
+            'addon_to': ['exact', 'in'],
-                'subevent': ['exact', 'in'],
+            'subevent': ['exact', 'in'],
-                'pseudonymization_id': ['exact'],
+            'pseudonymization_id': ['exact'],
-                'voucher__code': ['exact'],
+            'voucher__code': ['exact'],
-                'voucher': ['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',)
@@ -690,16 +590,11 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, viewsets.ReadOnlyModelViewS
     }
 
     def get_queryset(self):
-        if self.request.query_params.get('include_canceled_positions', 'false') == 'true':
+        qs = OrderPosition.objects.filter(order__event=self.request.event)
-            qs = OrderPosition.all
-        else:
-            qs = OrderPosition.objects
-
-        qs = qs.filter(order__event=self.request.event)
         if self.request.query_params.get('pdf_data', 'false') == 'true':
             qs = qs.prefetch_related(
                 'checkins', 'answers', 'answers__options', 'answers__question',
-                Prefetch('addons', qs.select_related('item', 'variation')),
+                Prefetch('addons', OrderPosition.objects.select_related('item', 'variation')),
                 Prefetch('order', Order.objects.select_related('invoice_address').prefetch_related(
                     Prefetch(
                         'event',
@@ -707,19 +602,19 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, viewsets.ReadOnlyModelViewS
                     ),
                     Prefetch(
                         'positions',
-                        qs.prefetch_related(
+                        OrderPosition.objects.prefetch_related(
                             'checkins', 'item', 'variation', 'answers', 'answers__options', 'answers__question',
                         )
                     )
                 ))
             ).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',
+                '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
 
@@ -825,16 +720,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 = FileResponse(ct.file.file, content_type=ct.type)
-                resp = HttpResponse(ct.file.file.read(), content_type='text/uri-list')
+            resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}-{}{}"'.format(
-                return resp
+                self.request.event.slug.upper(), pos.order.code, pos.positionid,
-            else:
+                provider.identifier, ct.extension
-                resp = FileResponse(ct.file.file, content_type=ct.type)
+            )
-                resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}-{}{}"'.format(
+            return resp
-                    self.request.event.slug.upper(), pos.order.code, pos.positionid,
-                    provider.identifier, ct.extension
-                )
-                return resp
 
     def perform_destroy(self, instance):
         try:
@@ -852,62 +743,17 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, viewsets.ReadOnlyModelViewS
             raise ValidationError(str(e))
 
 
-class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
+class PaymentViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = OrderPaymentSerializer
     queryset = OrderPayment.objects.none()
     permission = 'can_view_orders'
     write_permission = 'can_change_orders'
     lookup_field = 'local_id'
 
-    def get_serializer_context(self):
-        ctx = super().get_serializer_context()
-        ctx['order'] = get_object_or_404(Order, code=self.kwargs['order'], event=self.request.event)
-        return ctx
-
     def get_queryset(self):
         order = get_object_or_404(Order, code=self.kwargs['order'], event=self.request.event)
         return order.payments.all()
 
-    def create(self, request, *args, **kwargs):
-        serializer = OrderPaymentCreateSerializer(data=request.data, context=self.get_serializer_context())
-        serializer.is_valid(raise_exception=True)
-        with transaction.atomic():
-            mark_confirmed = False
-            if serializer.validated_data['state'] == OrderPayment.PAYMENT_STATE_CONFIRMED:
-                serializer.validated_data['state'] = OrderPayment.PAYMENT_STATE_PENDING
-                mark_confirmed = True
-            self.perform_create(serializer)
-            r = serializer.instance
-            if mark_confirmed:
-                try:
-                    r.confirm(
-                        user=self.request.user if self.request.user.is_authenticated else None,
-                        auth=self.request.auth,
-                        count_waitinglist=False,
-                        force=request.data.get('force', False)
-                    )
-                except Quota.QuotaExceededException:
-                    pass
-                except SendMailException:
-                    pass
-
-            serializer = OrderPaymentSerializer(r, context=serializer.context)
-
-            r.order.log_action(
-                'pretix.event.order.payment.started', {
-                    'local_id': r.local_id,
-                    'provider': r.provider,
-                },
-                user=request.user if request.user.is_authenticated else None,
-                auth=request.auth
-            )
-
-        headers = self.get_success_headers(serializer.data)
-        return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
-
-    def perform_create(self, serializer):
-        serializer.save()
-
     @action(detail=True, methods=['POST'])
     def confirm(self, request, **kwargs):
         payment = self.get_object()
@@ -1001,16 +847,13 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
         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():
-            with transaction.atomic():
+            payment.state = OrderPayment.PAYMENT_STATE_CANCELED
-                payment.payment_provider.cancel_payment(payment)
+            payment.save()
-                payment.order.log_action('pretix.event.order.payment.canceled', {
+            payment.order.log_action('pretix.event.order.payment.canceled', {
-                    'local_id': payment.local_id,
+                'local_id': payment.local_id,
-                    'provider': payment.provider,
+                'provider': payment.provider,
-                }, user=self.request.user if self.request.user.is_authenticated else None, auth=self.request.auth)
+            }, 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)
         return self.retrieve(request, [], **kwargs)
 
 
@@ -1087,7 +930,6 @@ class RefundViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
             mark_refunded = request.data.pop('mark_refunded', False)
         else:
             mark_refunded = request.data.pop('mark_canceled', False)
-        mark_pending = request.data.pop('mark_pending', False)
         serializer = OrderRefundCreateSerializer(data=request.data, context=self.get_serializer_context())
         serializer.is_valid(raise_exception=True)
         with transaction.atomic():
@@ -1104,23 +946,11 @@ class RefundViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
                 auth=request.auth
             )
             if mark_refunded:
-                try:
+                mark_order_refunded(
-                    mark_order_refunded(
+                    r.order,
-                        r.order,
+                    user=request.user if request.user.is_authenticated else None,
-                        user=request.user if request.user.is_authenticated else None,
+                    auth=(request.auth if request.auth else None),
-                        auth=(request.auth if request.auth else None),
+                )
-                    )
-                except OrderError as e:
-                    raise ValidationError(str(e))
-            elif mark_pending:
-                if r.order.status == Order.STATUS_PAID and r.order.pending_sum > 0:
-                    r.order.status = Order.STATUS_PENDING
-                    r.order.set_expires(
-                        now(),
-                        r.order.event.subevents.filter(
-                            id__in=r.order.positions.values_list('subevent_id', flat=True))
-                    )
-                    r.order.save(update_fields=['status', 'expires'])
 
         headers = self.get_success_headers(serializer.data)
         return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
@@ -1129,23 +959,22 @@ class RefundViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
         serializer.save()
 
 
-with scopes_disabled():
+class InvoiceFilter(FilterSet):
-    class InvoiceFilter(FilterSet):
+    refers = django_filters.CharFilter(method='refers_qs')
-        refers = django_filters.CharFilter(method='refers_qs')
+    number = django_filters.CharFilter(method='nr_qs')
-        number = django_filters.CharFilter(method='nr_qs')
+    order = django_filters.CharFilter(field_name='order', lookup_expr='code__iexact')
-        order = django_filters.CharFilter(field_name='order', lookup_expr='code__iexact')
 
-        def refers_qs(self, queryset, name, value):
+    def refers_qs(self, queryset, name, value):
-            return queryset.annotate(
+        return queryset.annotate(
-                refers_nr=Concat('refers__prefix', 'refers__invoice_no')
+            refers_nr=Concat('refers__prefix', 'refers__invoice_no')
-            ).filter(refers_nr__iexact=value)
+        ).filter(refers_nr__iexact=value)
 
-        def nr_qs(self, queryset, name, value):
+    def nr_qs(self, queryset, name, value):
-            return queryset.filter(nr__iexact=value)
+        return queryset.filter(nr__iexact=value)
 
-        class Meta:
+    class Meta:
-            model = Invoice
+        model = Invoice
-            fields = ['order', 'number', 'is_cancellation', 'refers', 'locale']
+        fields = ['order', 'number', 'is_cancellation', 'refers', 'locale']
 
 
 class RetryException(APIException):

src/pretix/api/views/organizer.py

@@ -1,27 +1,8 @@
-from decimal import Decimal
+from rest_framework import viewsets
-
-import django_filters
-from django.db import transaction
-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 filters, serializers, status, viewsets
-from rest_framework.decorators import action
-from rest_framework.exceptions import MethodNotAllowed, PermissionDenied
-from rest_framework.mixins import CreateModelMixin, DestroyModelMixin
-from rest_framework.response import Response
 
 from pretix.api.models import OAuthAccessToken
-from pretix.api.serializers.organizer import (
+from pretix.api.serializers.organizer import OrganizerSerializer
-    GiftCardSerializer, OrganizerSerializer, SeatingPlanSerializer,
+from pretix.base.models import Organizer
-    TeamAPITokenSerializer, TeamInviteSerializer, TeamMemberSerializer,
-    TeamSerializer,
-)
-from pretix.base.models import (
-    GiftCard, Organizer, SeatingPlan, Team, TeamAPIToken, TeamInvite, User,
-)
-from pretix.helpers.dicts import merge_dicts
 
 
 class OrganizerViewSet(viewsets.ReadOnlyModelViewSet):
@@ -29,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:
@@ -49,306 +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.order_by('name')
-
-    def get_serializer_context(self):
-        ctx = super().get_serializer_context()
-        ctx['organizer'] = self.request.organizer
-        return ctx
-
-    @transaction.atomic()
-    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})
-        )
-
-    @transaction.atomic()
-    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
-
-    @transaction.atomic()
-    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()
-
-
-with scopes_disabled():
-    class GiftCardFilter(FilterSet):
-        secret = django_filters.CharFilter(field_name='secret', lookup_expr='iexact')
-
-        class Meta:
-            model = GiftCard
-            fields = ['secret', 'testmode']
-
-
-class GiftCardViewSet(viewsets.ModelViewSet):
-    serializer_class = GiftCardSerializer
-    queryset = GiftCard.objects.none()
-    permission = 'can_manage_gift_cards'
-    write_permission = 'can_manage_gift_cards'
-    filter_backends = (DjangoFilterBackend,)
-    filterset_class = GiftCardFilter
-
-    def get_queryset(self):
-        if self.request.GET.get('include_accepted') == 'true':
-            qs = self.request.organizer.accepted_gift_cards
-        else:
-            qs = self.request.organizer.issued_gift_cards.all()
-        return qs
-
-    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):
-        if 'include_accepted' in self.request.GET:
-            raise PermissionDenied("Accepted gift cards cannot be updated, use transact instead.")
-        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')
-        )
-        text = serializers.CharField(allow_blank=True, allow_null=True).to_internal_value(
-            request.data.get('text', '')
-        )
-        if gc.value + value < Decimal('0.00'):
-            return Response({
-                'value': ['The gift card does not have sufficient credit for this operation.']
-            }, status=status.HTTP_409_CONFLICT)
-        gc.transactions.create(value=value, text=text)
-        gc.log_action(
-            'pretix.giftcards.transaction.manual',
-            user=self.request.user,
-            auth=self.request.auth,
-            data={'value': value, 'text': text}
-        )
-        return Response(GiftCardSerializer(gc).data, status=status.HTTP_200_OK)
-
-    def perform_destroy(self, instance):
-        raise MethodNotAllowed("Gift cards cannot be deleted.")
-
-
-class TeamViewSet(viewsets.ModelViewSet):
-    serializer_class = TeamSerializer
-    queryset = Team.objects.none()
-    permission = 'can_change_teams'
-    write_permission = 'can_change_teams'
-
-    def get_queryset(self):
-        return self.request.organizer.teams.order_by('pk')
-
-    def get_serializer_context(self):
-        ctx = super().get_serializer_context()
-        ctx['organizer'] = self.request.organizer
-        return ctx
-
-    @transaction.atomic()
-    def perform_create(self, serializer):
-        inst = serializer.save(organizer=self.request.organizer)
-        inst.log_action(
-            'pretix.team.created',
-            user=self.request.user,
-            auth=self.request.auth,
-            data=merge_dicts(self.request.data, {'id': inst.pk})
-        )
-
-    @transaction.atomic()
-    def perform_update(self, serializer):
-        inst = serializer.save()
-        inst.log_action(
-            'pretix.team.changed',
-            user=self.request.user,
-            auth=self.request.auth,
-            data=self.request.data
-        )
-        return inst
-
-    def perform_destroy(self, instance):
-        instance.log_action('pretix.team.deleted', user=self.request.user, auth=self.request.auth)
-        instance.delete()
-
-
-class TeamMemberViewSet(DestroyModelMixin, viewsets.ReadOnlyModelViewSet):
-    serializer_class = TeamMemberSerializer
-    queryset = User.objects.none()
-    permission = 'can_change_teams'
-    write_permission = 'can_change_teams'
-
-    @cached_property
-    def team(self):
-        return get_object_or_404(self.request.organizer.teams, pk=self.kwargs.get('team'))
-
-    def get_queryset(self):
-        return self.team.members.all()
-
-    def get_serializer_context(self):
-        ctx = super().get_serializer_context()
-        ctx['organizer'] = self.request.organizer
-        return ctx
-
-    @transaction.atomic()
-    def perform_destroy(self, instance):
-        self.team.members.remove(instance)
-        self.team.log_action(
-            'pretix.team.member.removed', user=self.request.user, auth=self.request.auth, data={
-                'email': instance.email,
-                'user': instance.pk
-            }
-        )
-
-
-class TeamInviteViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnlyModelViewSet):
-    serializer_class = TeamInviteSerializer
-    queryset = TeamInvite.objects.none()
-    permission = 'can_change_teams'
-    write_permission = 'can_change_teams'
-
-    @cached_property
-    def team(self):
-        return get_object_or_404(self.request.organizer.teams, pk=self.kwargs.get('team'))
-
-    def get_queryset(self):
-        return self.team.invites.order_by('email')
-
-    def get_serializer_context(self):
-        ctx = super().get_serializer_context()
-        ctx['organizer'] = self.request.organizer
-        ctx['team'] = self.team
-        ctx['log_kwargs'] = {
-            'user': self.request.user,
-            'auth': self.request.auth,
-        }
-        return ctx
-
-    @transaction.atomic()
-    def perform_destroy(self, instance):
-        self.team.log_action(
-            'pretix.team.invite.deleted', user=self.request.user, auth=self.request.auth, data={
-                'email': instance.email,
-            }
-        )
-        instance.delete()
-
-    @transaction.atomic()
-    def perform_create(self, serializer):
-        serializer.save(team=self.team)
-
-
-class TeamAPITokenViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnlyModelViewSet):
-    serializer_class = TeamAPITokenSerializer
-    queryset = TeamAPIToken.objects.none()
-    permission = 'can_change_teams'
-    write_permission = 'can_change_teams'
-
-    @cached_property
-    def team(self):
-        return get_object_or_404(self.request.organizer.teams, pk=self.kwargs.get('team'))
-
-    def get_queryset(self):
-        return self.team.tokens.order_by('name')
-
-    def get_serializer_context(self):
-        ctx = super().get_serializer_context()
-        ctx['organizer'] = self.request.organizer
-        ctx['team'] = self.team
-        ctx['log_kwargs'] = {
-            'user': self.request.user,
-            'auth': self.request.auth,
-        }
-        return ctx
-
-    @transaction.atomic()
-    def perform_destroy(self, instance):
-        instance.active = False
-        instance.save()
-        self.team.log_action(
-            'pretix.team.token.deleted', user=self.request.user, auth=self.request.auth, data={
-                'name': instance.name,
-            }
-        )
-
-    @transaction.atomic()
-    def perform_create(self, serializer):
-        instance = serializer.save(team=self.team)
-        self.team.log_action(
-            'pretix.team.token.created', auth=self.request.auth, user=self.request.user, data={
-                'name': instance.name,
-                'id': instance.pk
-            }
-        )
-
-    def create(self, request, *args, **kwargs):
-        serializer = self.get_serializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-        self.perform_create(serializer)
-        headers = self.get_success_headers(serializer.data)
-        d = serializer.data
-        d['token'] = serializer.instance.token
-        return Response(d, status=status.HTTP_201_CREATED, headers=headers)
-
-    def destroy(self, request, *args, **kwargs):
-        instance = self.get_object()
-        self.perform_destroy(instance)
-        serializer = self.get_serializer_class()(instance)
-        headers = self.get_success_headers(serializer.data)
-        return Response(serializer.data, status=status.HTTP_200_OK, headers=headers)

src/pretix/api/views/version.py

@@ -1,56 +0,0 @@
-from oauth2_provider.contrib.rest_framework import OAuth2Authentication
-from packaging import version
-from rest_framework.authentication import SessionAuthentication
-from rest_framework.response import Response
-from rest_framework.views import APIView
-
-from pretix import __version__
-from pretix.api.auth.device import DeviceTokenAuthentication
-from pretix.api.auth.token import TeamTokenAuthentication
-
-
-def numeric_version(v):
-    # Converts a pretix version to a large int
-    # e.g. 30060001000
-    #      |--------------------- Major version
-    #       |-|------------------ Minor version
-    #          |-|--------------- Patch version
-    #             ||------------- Stage (10 dev, 20 alpha, 30 beta, 40 rc, 50 release, 60 post)
-    #               ||----------- Stage version (number of dev/alpha/beta/rc/post release)
-    v = version.parse(v)
-    phases = {
-        'dev': 10,
-        'a': 20,
-        'b': 30,
-        'rc': 40,
-        'release': 50,
-        'post': 60
-    }
-    vnum = 0
-
-    if v.is_postrelease:
-        vnum += v.post
-        vnum += phases['post'] * 100
-    elif v.dev is not None:
-        vnum += v.dev
-        vnum += phases['dev'] * 100
-    elif v.is_prerelease and v.pre:
-        vnum += v.pre[0]
-        vnum += phases[v.pre[1]] * 100
-    else:
-        vnum += phases['release'] * 100
-    for i, part in enumerate(reversed(v.release)):
-        vnum += part * (1000 ** i) * 10000
-    return vnum
-
-
-class VersionView(APIView):
-    authentication_classes = (
-        SessionAuthentication, OAuth2Authentication, DeviceTokenAuthentication, TeamTokenAuthentication
-    )
-
-    def get(self, request, format=None):
-        return Response({
-            'pretix': __version__,
-            'pretix_numeric': numeric_version(__version__),
-        })

src/pretix/api/views/voucher.py

@@ -6,7 +6,6 @@ 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.exceptions import PermissionDenied
@@ -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:
+class VoucherFilter(FilterSet):
-            model = Voucher
+    active = BooleanFilter(method='filter_active')
-            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):
+    class Meta:
-            if value:
+        model = Voucher
-                return queryset.filter(Q(redeemed__lt=F('max_usages')) &
+        fields = ['code', 'max_usages', 'redeemed', 'block_quota', 'allow_ignore_quota',
-                                       (Q(valid_until__isnull=True) | Q(valid_until__gt=now())))
+                  'price_mode', 'value', 'item', 'variation', 'quota', 'tag', 'subevent']
-            else:
+
-                return queryset.filter(Q(redeemed__gte=F('max_usages')) |
+    def filter_active(self, queryset, name, value):
-                                       (Q(valid_until__isnull=False) & Q(valid_until__lte=now())))
+        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

src/pretix/api/views/waitinglist.py

@@ -1,6 +1,5 @@
 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.exceptions import PermissionDenied, ValidationError
@@ -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):
+class WaitingListFilter(FilterSet):
-            return queryset.filter(voucher__isnull=not value)
+    has_voucher = django_filters.rest_framework.BooleanFilter(method='has_voucher_qs')
 
-        class Meta:
+    def has_voucher_qs(self, queryset, name, value):
-            model = WaitingListEntry
+        return queryset.filter(voucher__isnull=not value)
-            fields = ['item', 'variation', 'email', 'locale', 'has_voucher', 'subevent']
+
+    class Meta:
+        model = WaitingListEntry
+        fields = ['item', 'variation', 'email', 'locale', 'has_voucher', 'subevent']
 
 
 class WaitingListViewSet(viewsets.ModelViewSet):

src/pretix/api/webhooks.py

@@ -7,8 +7,7 @@ import requests
 from celery.exceptions import MaxRetriesExceededError
 from django.db.models import Exists, OuterRef, Q
 from django.dispatch import receiver
-from django.utils.translation import gettext_lazy as _
+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
@@ -125,10 +124,6 @@ def register_default_webhook_events(sender, **kwargs):
             'pretix.event.order.canceled',
             _('Order canceled'),
         ),
-        ParametrizedOrderWebhookEvent(
-            'pretix.event.order.reactivated',
-            _('Order reactivated'),
-        ),
         ParametrizedOrderWebhookEvent(
             'pretix.event.order.expired',
             _('Order expired'),
@@ -208,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():
+    logentry = LogEntry.all.get(id=logentry_id)
-        webhook = WebHook.objects.get(id=webhook_id)
+    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
 
-        payload = event_type.build_payload(logentry)
+    types = get_all_webhook_events()
-        t = time.time()
+    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(
-                resp = requests.post(
+                webhook.target_url,
-                    webhook.target_url,
+                json=payload,
-                    json=payload,
+                allow_redirects=False
-                    allow_redirects=False
+            )
-                )
+            WebHookCall.objects.create(
-                WebHookCall.objects.create(
+                webhook=webhook,
-                    webhook=webhook,
+                action_type=logentry.action_type,
-                    action_type=logentry.action_type,
+                target_url=webhook.target_url,
-                    target_url=webhook.target_url,
+                is_retry=self.request.retries > 0,
-                    is_retry=self.request.retries > 0,
+                execution_time=time.time() - t,
-                    execution_time=time.time() - t,
+                return_code=resp.status_code,
-                    return_code=resp.status_code,
+                payload=json.dumps(payload),
-                    payload=json.dumps(payload),
+                response_body=resp.text[:1024 * 1024],
-                    response_body=resp.text[:1024 * 1024],
+                success=200 <= resp.status_code <= 299
-                    success=200 <= resp.status_code <= 299
+            )
-                )
+            if resp.status_code == 410:
-                if resp.status_code == 410:
+                webhook.enabled = False
-                    webhook.enabled = False
+                webhook.save()
-                    webhook.save()
+            elif resp.status_code > 299:
-                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]
-                )
                 raise self.retry(countdown=2 ** (self.request.retries * 2))
-        except MaxRetriesExceededError:
+        except RequestException as e:
-            pass
+            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

@@ -1,4 +1,5 @@
 from django.apps import AppConfig
+from django.conf import settings
 
 
 class PretixBaseConfig(AppConfig):
@@ -12,8 +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, orderimport, 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
-        from django.conf import settings
 
         try:
             from .celery_app import app as celery_app  # NOQA

src/pretix/base/auth.py

@@ -1,119 +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
-
-    def get_next_url(self, request):
-        """
-        This method will be called after a successful login to determine the next URL. Pretix in general uses the
-        ``'next'`` query parameter. However, external authentication methods could use custom attributes with hardcoded
-        names for security purposes. For example, OAuth uses ``'state'`` for keeping track of application state.
-        """
-        if "next" in request.GET:
-            return request.GET.get("next")
-        return None
-
-
-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

@@ -2,7 +2,7 @@ import logging
 from collections import OrderedDict
 
 from django.dispatch import receiver
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 from pretix.base.signals import register_sales_channels
 
@@ -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,23 +1,15 @@
-import inspect
 import logging
-from datetime import timedelta
-from decimal import Decimal
 from smtplib import SMTPResponseException
 
 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 django.utils.translation import get_language, gettext_lazy as _
 from inlinestyler.utils import inline_css
 
-from pretix.base.i18n import LazyCurrencyNumber, LazyDate, LazyNumber
+from pretix.base.models import Event, Order
-from pretix.base.models import Event
+from pretix.base.signals import register_html_mail_renderers
-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
 
 logger = logging.getLogger('pretix.base.email')
@@ -52,8 +44,7 @@ class BaseHTMLMailRenderer:
     def __str__(self):
         return self.identifier
 
-    def render(self, plain_body: str, plain_signature: str, subject: str, order=None,
+    def render(self, plain_body: str, plain_signature: str, subject: str, order: Order=None) -> str:
-               position=None) -> str:
         """
         This method should generate the HTML part of the email.
 
@@ -61,7 +52,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,15 +95,14 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
     def template_name(self):
         raise NotImplementedError()
 
-    def render(self, plain_body: str, plain_signature: str, subject: str, order, position) -> str:
+    def render(self, plain_body: str, plain_signature: str, subject: str, order: Order) -> str:
         body_md = markdown_compile_email(plain_body)
         htmlctx = {
             'site': settings.PRETIX_INSTANCE_NAME,
             'site_url': settings.SITE_URL,
             'body': body_md,
             'subject': str(subject),
-            'color': '#8E44B3',
+            'color': '#8E44B3'
-            'rtl': get_language() in settings.LANGUAGES_RTL
         }
         if self.event:
             htmlctx['event'] = self.event
@@ -127,339 +116,18 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
         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
 
 
 class ClassicMailRenderer(TemplateBasedMailRenderer):
-    verbose_name = _('Default')
+    verbose_name = _('pretix default')
     identifier = 'classic'
     thumbnail_filename = 'pretixbase/email/thumb.png'
     template_name = 'pretixbase/email/plainwrapper.html'
 
 
-class UnembellishedMailRenderer(TemplateBasedMailRenderer):
-    verbose_name = _('Simple with logo')
-    identifier = 'simple_logo'
-    thumbnail_filename = 'pretixbase/email/thumb_simple_logo.png'
-    template_name = 'pretixbase/email/simple_logo.html'
-
-
 @receiver(register_html_mail_renderers, dispatch_uid="pretixbase_email_renderers")
 def base_renderers(sender, **kwargs):
-    return [ClassicMailRenderer, UnembellishedMailRenderer]
+    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', ['event_or_subevent'], lambda event_or_subevent: event_or_subevent.name,
-            lambda event_or_subevent: event_or_subevent.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(
-            'refund_amount', ['event_or_subevent', 'refund_amount'],
-            lambda event_or_subevent, refund_amount: LazyCurrencyNumber(refund_amount, event_or_subevent.currency),
-            lambda event_or_subevent: LazyCurrencyNumber(Decimal('42.23'), event_or_subevent.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

@@ -1,13 +1,11 @@
 import io
 import tempfile
 from collections import OrderedDict
-from decimal import Decimal
 from typing import Tuple
 
 from defusedcsv import csv
 from django import forms
-from django.utils.formats import localize
+from django.utils.translation import ugettext, ugettext_lazy as _
-from django.utils.translation import gettext, gettext_lazy as _
 from openpyxl import Workbook
 from openpyxl.cell.cell import KNOWN_TYPES
 
@@ -73,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
@@ -113,32 +109,18 @@ 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):
+    def _render_csv(self, form_data, **kwargs):
-        if output_file:
+        output = io.StringIO()
-            writer = csv.writer(output_file, **kwargs)
+        writer = csv.writer(output, **kwargs)
-            for line in self.iterate_list(form_data):
+        for line in self.iterate_list(form_data):
-                line = [
+            writer.writerow(line)
-                    localize(f) if isinstance(f, Decimal) else f
+        return self.get_filename() + '.csv', 'text/csv', output.getvalue().encode("utf-8")
-                    for f in line
-                ]
-                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):
-                line = [
-                    localize(f) if isinstance(f, Decimal) else f
-                    for f in line
-                ]
-                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.active
+        ws = wb.get_active_sheet()
         try:
             ws.title = str(self.verbose_name)
         except:
@@ -147,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:
+        with tempfile.NamedTemporaryFile(suffix='.xlsx') as f:
-            wb.save(output_file)
+            wb.save(f.name)
-            return self.get_filename() + '.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', None
+            f.seek(0)
-        else:
+            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):
@@ -180,9 +158,9 @@ class MultiSheetListExporter(ListExporter):
         ]
         for s, l in self.sheets:
             choices += [
-                (s + ':default', str(l) + ' – ' + gettext('CSV (with commas)')),
+                (s + ':default', str(l) + ' – ' + ugettext('CSV (with commas)')),
-                (s + ':excel', str(l) + ' – ' + gettext('CSV (Excel-style)')),
+                (s + ':excel', str(l) + ' – ' + ugettext('CSV (Excel-style)')),
-                (s + ':semicolon', str(l) + ' – ' + gettext('CSV (with semicolons)')),
+                (s + ':semicolon', str(l) + ' – ' + ugettext('CSV (with semicolons)')),
             ]
         ff = OrderedDict(
             [
@@ -202,30 +180,16 @@ 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):
+    def _render_sheet_csv(self, form_data, sheet, **kwargs):
-        if output_file:
+        output = io.StringIO()
-            writer = csv.writer(output_file, **kwargs)
+        writer = csv.writer(output, **kwargs)
-            for line in self.iterate_sheet(form_data, sheet):
+        for line in self.iterate_sheet(form_data, sheet):
-                line = [
+            writer.writerow(line)
-                    localize(f) if isinstance(f, Decimal) else f
+        return self.get_filename() + '.csv', 'text/csv', output.getvalue().encode("utf-8")
-                    for f in line
-                ]
-                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):
-                line = [
-                    localize(f) if isinstance(f, Decimal) else f
-                    for f in line
-                ]
-                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.active
+        ws = wb.get_active_sheet()
         wb.remove(ws)
         for s, l in self.sheets:
             ws = wb.create_sheet(str(l))
@@ -233,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:
+        with tempfile.NamedTemporaryFile(suffix='.xlsx') as f:
-            wb.save(output_file)
+            wb.save(f.name)
-            return self.get_filename() + '.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', None
+            f.seek(0)
-        else:
+            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=',',
+                return self._render_sheet_csv(form_data, sheet, quoting=csv.QUOTE_NONNUMERIC, delimiter=',')
-                                              output_file=output_file)
             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=';')