Remove eu_reverse_charge rule

.dockerignore

@@ -1,10 +1,3 @@
 doc/
 env/
 res/
-local/
-.git/
-pretixeu/
-src/data/
-src/pretix/static.dist/
-src/dist/
-

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,23 +0,0 @@
----
-name: Bug report
-about: Please only create issues for bug reports. Feature requests or general questions
-  should start as a "Discussion" on GitHub.
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!-- Please only create issues for bug reports. Feature requests or general questions should start as a "Discussion" on GitHub. -->
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Additional context**
-Add any other context about the problem here.

.github/workflows/docs.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Install system packages
         run: sudo apt update && sudo apt install enchant hunspell aspell-en
       - name: Install Dependencies
-        run: pip3 install -Ur doc/requirements.txt
+        run: pip3 install --no-use-pep517 -Ur doc/requirements.txt
       - name: Spellcheck docs
         run: make spelling
         working-directory: ./doc

.github/workflows/strings.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Install system packages
         run: sudo apt update && sudo apt install gettext
       - name: Install Dependencies
-        run: pip3 install -Ur src/requirements.txt
+        run: pip3 install --no-use-pep517 -Ur src/requirements.txt
       - name: Compile messages
         run: python manage.py compilemessages
         working-directory: ./src
@@ -56,7 +56,7 @@ jobs:
       - name: Install system packages
         run: sudo apt update && sudo apt install enchant hunspell hunspell-de-de aspell-en aspell-de
       - name: Install Dependencies
-        run: pip3 install -Ur src/requirements/dev.txt
+        run: pip3 install --no-use-pep517 -Ur src/requirements/dev.txt
       - name: Spellcheck translations
         run: potypo
         working-directory: ./src

.github/workflows/style.yml

@@ -29,7 +29,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install Dependencies
-        run: pip3 install -Ur src/requirements/dev.txt
+        run: pip3 install --no-use-pep517 -Ur src/requirements/dev.txt
       - name: Run isort
         run: isort -c .
         working-directory: ./src
@@ -49,7 +49,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install Dependencies
-        run: pip3 install -r src/requirements.txt -Ur src/requirements/dev.txt
+        run: pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt
       - name: Run flake8
         run: flake8 .
         working-directory: ./src

.github/workflows/tests.yml

@@ -57,13 +57,10 @@ jobs:
       - name: Install system dependencies
         run: sudo apt update && sudo apt install gettext mysql-client
       - name: Install Python dependencies
-        run: pip3 install -r src/requirements.txt -Ur src/requirements/dev.txt mysqlclient psycopg2-binary
+        run: pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt mysqlclient psycopg2-binary
       - name: Run checks
         run: python manage.py check
         working-directory: ./src
-      - name: Install JS dependencies
-        working-directory: ./src
-        run: make npminstall
       - name: Compile
         working-directory: ./src
         run: make all compress

.gitlab-ci.yml

@@ -28,7 +28,6 @@ pypi:
         - python -m pretix migrate
         - python -m pretix check
         - check-manifest
-        - make npminstall
         - python setup.py sdist bdist_wheel
         - twine check dist/*
         - twine upload dist/*

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.6
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -30,12 +30,7 @@ RUN apt-get update && \
     mkdir /data && \
     useradd -ms /bin/bash -d /pretix -u 15371 pretixuser && \
     echo 'pretixuser ALL=(ALL) NOPASSWD:SETENV: /usr/bin/supervisord' >> /etc/sudoers && \
-    mkdir /static && \
-    mkdir /etc/supervisord && \
-	curl -fsSL https://deb.nodesource.com/setup_15.x | sudo -E bash - && \
-    apt-get install -y nodejs && \
-    curl -qL https://www.npmjs.com/install.sh | sh
-
+    mkdir /static
 
 ENV LC_ALL=C.UTF-8 \
     DJANGO_SETTINGS_MODULE=production_settings
@@ -52,13 +47,12 @@ RUN pip3 install -U \
         -r requirements.txt \
         -r requirements/memcached.txt \
         -r requirements/mysql.txt \
-        gunicorn django-extensions ipython && \
+        -r requirements/redis.txt \
+        gunicorn && \
     rm -rf ~/.cache/pip
 
 COPY deployment/docker/pretix.bash /usr/local/bin/pretix
-COPY deployment/docker/supervisord /etc/supervisord
-COPY deployment/docker/supervisord.all.conf /etc/supervisord.all.conf
-COPY deployment/docker/supervisord.web.conf /etc/supervisord.web.conf
+COPY deployment/docker/supervisord.conf /etc/supervisord.conf
 COPY deployment/docker/nginx.conf /etc/nginx/nginx.conf
 COPY deployment/docker/production_settings.py /pretix/src/production_settings.py
 COPY src /pretix/src

deployment/docker/nginx.conf

@@ -1,13 +1,10 @@
 user www-data www-data;
-worker_processes auto;
+worker_processes 1;
 pid /var/run/nginx.pid;
 daemon off;
-worker_rlimit_nofile 262144;
 
 events {
-    worker_connections 16384;
-    multi_accept on;
-    use epoll;
+	worker_connections 4096;
 }
 
 http {

deployment/docker/pretix.bash

@@ -3,10 +3,7 @@ cd /pretix/src
 export DJANGO_SETTINGS_MODULE=production_settings
 export DATA_DIR=/data/
 export HOME=/pretix
-
-AUTOMIGRATE=${AUTOMIGRATE:-yes}
-NUM_WORKERS_DEFAULT=$((2 * $(nproc --all)))
-export NUM_WORKERS=${NUM_WORKERS:-$NUM_WORKERS_DEFAULT}
+export NUM_WORKERS=$((2 * $(nproc --all)))
 
 if [ ! -d /data/logs ]; then
     mkdir /data/logs;
@@ -19,16 +16,10 @@ if [ "$1" == "cron" ]; then
     exec python3 -m pretix runperiodic
 fi
 
-if [ "$AUTOMIGRATE" != "skip" ]; then
-  python3 -m pretix migrate --noinput
-fi
+python3 -m pretix migrate --noinput
 
 if [ "$1" == "all" ]; then
-    exec sudo -E /usr/bin/supervisord -n -c /etc/supervisord.all.conf
-fi
-
-if [ "$1" == "web" ]; then
-    exec sudo -E /usr/bin/supervisord -n -c /etc/supervisord.web.conf
+    exec sudo -E /usr/bin/supervisord -n -c /etc/supervisord.conf
 fi
 
 if [ "$1" == "webworker" ]; then
@@ -46,6 +37,10 @@ if [ "$1" == "taskworker" ]; then
     exec celery -A pretix.celery_app worker -l info "$@"
 fi
 
+if [ "$1" == "shell" ]; then
+    exec python3 -m pretix shell
+fi
+
 if [ "$1" == "upgrade" ]; then
     exec python3 -m pretix updatestyles
 fi

deployment/docker/supervisord.all.conf

@@ -1,2 +0,0 @@
-[include]
-files = /etc/supervisord/*.conf

deployment/docker/supervisord.conf

@@ -0,0 +1,44 @@
+[unix_http_server]
+file=/tmp/supervisor.sock
+
+[supervisord]
+logfile=/tmp/supervisord.log
+logfile_maxbytes=50MB
+logfile_backups=10
+loglevel=info
+pidfile=/tmp/supervisord.pid
+nodaemon=false
+minfds=1024
+minprocs=200
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///tmp/supervisor.sock
+
+[program:pretixweb]
+command=/usr/local/bin/pretix webworker
+autostart=true
+autorestart=true
+priority=5
+user=pretixuser
+environment=HOME=/pretix
+
+[program:pretixtask]
+command=/usr/local/bin/pretix taskworker
+autostart=true
+autorestart=true
+priority=5
+user=pretixuser
+
+[program:nginx]
+command=/usr/sbin/nginx
+autostart=true
+autorestart=true
+priority=10
+stdout_events_enabled=true
+stderr_events_enabled=true
+
+[include]
+files = /etc/supervisord-*.conf

deployment/docker/supervisord.web.conf

@@ -1,2 +0,0 @@
-[include]
-files = /etc/supervisord/base.conf /etc/supervisord/nginx.conf /etc/supervisord/pretixweb.conf

deployment/docker/supervisord/base.conf

@@ -1,17 +0,0 @@
-[unix_http_server]
-file=/tmp/supervisor.sock
-
-[supervisord]
-logfile=/dev/stdout
-logfile_maxbytes=0
-loglevel=info
-pidfile=/tmp/supervisord.pid
-nodaemon=false
-minfds=1024
-minprocs=200
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[supervisorctl]
-serverurl=unix:///tmp/supervisor.sock

deployment/docker/supervisord/nginx.conf

@@ -1,9 +0,0 @@
-[program:nginx]
-command=/usr/sbin/nginx
-autostart=true
-autorestart=true
-priority=10
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/fd/2
-stderr_logfile_maxbytes=0

deployment/docker/supervisord/pretixtask.conf

@@ -1,10 +0,0 @@
-[program:pretixtask]
-command=/usr/local/bin/pretix taskworker
-autostart=true
-autorestart=true
-priority=5
-user=pretixuser
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/fd/2
-stderr_logfile_maxbytes=0

deployment/docker/supervisord/pretixweb.conf

@@ -1,11 +0,0 @@
-[program:pretixweb]
-command=/usr/local/bin/pretix webworker
-autostart=true
-autorestart=true
-priority=5
-user=pretixuser
-environment=HOME=/pretix
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/fd/2
-stderr_logfile_maxbytes=0

doc/admin/config.rst

@@ -23,14 +23,6 @@ The config file may contain the following sections (all settings are optional an
 default values). We suggest that you start from the examples given in one of the
 installation tutorials.
 
-.. note::
-
-    The configuration file is the recommended way to configure pretix. However, you can
-    also set them through environment variables. In this case, the syntax is
-    ``PRETIX_SECTION_CONFIG``. For example, to configure the setting ``password_reset``
-    from the ``[pretix]`` section, set ``PRETIX_PRETIX_PASSWORD_RESET=off`` in your
-    environment.
-
 pretix settings
 ---------------
 
@@ -105,12 +97,7 @@ Example::
 
 ``csp_log``
     Log violations of the Content Security Policy (CSP). Defaults to ``on``.
-
-``csp_additional_header``
-    Specifies a CSP header that will be **merged** with pretix's default header. For example, if you set this
-    to ``script-src https://mycdn.com``, pretix will add ``https://mycdn.com`` as an **additional** allowed source
-    to all CSP headers. Empty by default.
-
+    
 ``loglevel``
     Set console and file log level (``DEBUG``, ``INFO``, ``WARNING``, ``ERROR`` or ``CRITICAL``). Defaults to ``INFO``.
 

doc/admin/indexes.rst

@@ -60,10 +60,6 @@ Here is the currently recommended set of commands::
     CREATE INDEX CONCURRENTLY pretix_addidx_ia_company
         ON pretixbase_invoiceaddress
         USING gin (upper("company") gin_trgm_ops);
-    CREATE INDEX CONCURRENTLY pretix_addidx_orderpos_email_upper
-        ON public.pretixbase_orderposition (upper((attendee_email)::text));
-    CREATE INDEX CONCURRENTLY pretix_addidx_voucher_code_upper
-        ON public.pretixbase_voucher (upper((code)::text));
 
 
 Also, if you use our ``pretix-shipping`` plugin::

doc/admin/installation/docker_smallscale.rst

@@ -135,7 +135,7 @@ Fill the configuration file ``/etc/pretix/pretix.cfg`` with the following conten
     user=pretix
     ; Replace with the password you chose above
     password=*********
-    ; In most docker setups, 172.17.0.1 is the address of the docker host. Adjust
+    ; In most docker setups, 172.17.0.1 is the address of the docker host. Adjuts
     ; this to wherever your database is running, e.g. the name of a linked container
     ; or of a mounted MySQL socket.
     host=172.17.0.1
@@ -284,26 +284,6 @@ Then, go to that directory and build the image::
 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.
 
-Scaling up
-----------
-
-If you need to scale to multiple machines, please first read our :ref:`scaling guide <scaling>`.
-
-If you run the official docker container on multiple machines, it is recommended to set the environment
-variable ``AUTOMIGRATE=skip`` on all containers and run ``docker exec -it pretix.service pretix migrate``
-on one machine after each upgrade manually, otherwise multiple containers might try to upgrade the
-database schema at the same time.
-
-To run only the ``pretix-web`` component of pretix as well as a nginx server serving static files, you
-can invoke the container with ``docker run … pretix/standalone:stable web`` (instead of ``all``). You
-can adjust the number of ``gunicorn`` processes with the ``NUM_WORKERS`` environment variable (defaults to
-two times the number of CPUs detected).
-
-To run only ``pretix-worker``, you can run ``docker run … pretix/standalone:stable taskworker``. You can
-also pass arguments to limit the worker to specific queues or to change the number of concurrent task
-workers, e.g. ``docker run … taskworker -Q notifications --concurrency 32``.
-
-
 .. _Docker: https://docs.docker.com/engine/installation/linux/debian/
 .. _Postfix: https://www.digitalocean.com/community/tutorials/how-to-install-and-configure-postfix-as-a-send-only-smtp-server-on-ubuntu-16-04
 .. _nginx: https://botleg.com/stories/https-with-lets-encrypt-and-nginx/

doc/admin/maintainance.rst

@@ -95,12 +95,6 @@ pretix_model_instances
     the ``model`` name. Starting with pretix 3.11, these numbers might only be approximate for
     most tables when running on PostgreSQL to mitigate performance impact.
 
-pretix_celery_tasks_queued_count
-    The number of background tasks in the worker queue, labeled with ``queue``.
-
-pretix_celery_tasks_queued_age_seconds
-    The age of the longest-waiting in the worker queue in seconds, labeled with ``queue``.
-
 .. _metric types: https://prometheus.io/docs/concepts/metric_types/
 .. _Prometheus: https://prometheus.io/
 .. _cProfile: https://docs.python.org/3/library/profile.html

doc/api/fundamentals.rst

@@ -183,9 +183,6 @@ Relative date         *either* String in ISO 8601  ``"2017-12-27"``,
                       constructed from a number of
                       days before the base point
                       and the base point.
-File                  URL in responses, ``file:``  ``"https://…"``, ``"file:…"``
-                      specifiers in requests
-                      (see below).
 ===================== ============================ ===================================
 
 Query parameters
@@ -230,48 +227,4 @@ We store idempotency keys for 24 hours, so you should never retry a request afte
 All ``POST``, ``PUT``, ``PATCH``, or ``DELETE`` api calls support idempotency keys. Adding an idempotency key to a
 ``GET``, ``HEAD``, or ``OPTIONS`` request has no effect.
 
-
-File upload
------------
-
-In some places, the API supports working with files, for example when setting the picture of a product. In this case,
-you will first need to make a separate request to our file upload endpoint:
-
-.. sourcecode:: http
-
-   POST /api/v1/upload HTTP/1.1
-   Host: pretix.eu
-   Authorization: Token e1l6gq2ye72thbwkacj7jbri7a7tvxe614ojv8ybureain92ocub46t5gab5966k
-   Content-Type: image/png
-   Content-Disposition: attachment; filename="logo.png"
-   Content-Length: 1234
-
-   <raw file content>
-
-Note that the ``Content-Type`` and ``Content-Disposition`` headers are required. If the upload was successful, you will
-receive a JSON response with the ID of the file:
-
-.. sourcecode:: http
-
-   HTTP/1.1 201 Created
-   Content-Type: application/json
-
-   {
-     "id": "file:1cd99455-1ebd-4cda-b1a2-7a7d2a969ad1"
-   }
-
-You can then use this file ID in the request you want to use it in. File IDs are currently valid for 24 hours and can only
-be used using the same authorization method and user that was used to upload them.
-
-.. sourcecode:: http
-
-   PATCH /api/v1/organizers/test/events/test/items/3/ HTTP/1.1
-   Host: pretix.eu
-   Content-Type: application/json
-
-   {
-     "picture": "file:1cd99455-1ebd-4cda-b1a2-7a7d2a969ad1"
-   }
-
-
 .. _CSRF policies: https://docs.djangoproject.com/en/1.11/ref/csrf/#ajax

doc/api/guides/index.rst

@@ -8,5 +8,4 @@ This part of the documentation contains how-to guides on some special use cases
 .. toctree::
    :maxdepth: 2
 
-   order_lifecycle
    custom_checkout

doc/api/guides/order_lifecycle.rst

@@ -1,56 +0,0 @@
-Understanding the life cycle of orders
-======================================
-
-When integrating pretix with other systems, it is important that you understand how orders and related objects
-such as order positions, fees, payments, refunds, and invoices work together, in order to react to their changes
-properly and map them to processes in your system.
-
-Order states
-------------
-
-Generally, an order can be in six states. For compatibility reasons, the ``status`` field only allows four values
-and the two remaining states are modeled through the ``require_approval`` field and the number of positions within
-an order. The states and their allowed changes are shown in the following graph:
-
-.. image:: /images/order_states.png
-
-
-Object types
-------------
-
-Order
-    One order represents one purchase. It's the main object you interact with and bundles all the other objects
-    together. Orders can change in many ways during their lifetime, but will never be deleted (unless ``testmode``
-    is set to ``true``).
-
-Order position
-    An order position represents one product contained in the order. Orders can usually have multiple positions.
-    There might be a parent-child relation between order positions if one position is an add-on to another position.
-    Order positions can change in many ways during their lifetime, and can also be removed or added to an order.
-
-Order fees
-    A fee represents a charge that is not related to a product. Examples include shipping fees, service fees, and
-    cancellation fees.
-    Order fees can change in many ways during their lifetime, and can also be removed or added to an order.
-
-Order payment
-    An order payment represents one payment attempt with a specific payment method and amount. An order can have
-    multiple payments attached.
-    Order payments have their own state diagram. Apart from their state and their meta information (e.g. used
-    credit card, …) they usually don't change. They may be added at any time, but will never be deleted.
-
-Order refund
-    An order payment represents one refund attempt with a specific payment method and amount. An order can have
-    multiple refunds attached.
-    Order refunds have their own state diagram. Apart from their state and their meta information (e.g. used
-    credit card, …) they usually don't change. They may be added at any time, but will never be deleted.
-
-Invoice
-    An invoice represents a legal document stating the contents of an order. While the backend technically allows
-    to update an invoice in some situations, invoices are generally considered immutable. Once they are issued,
-    they no longer change. If the order changes substantially (e.g. prices change), an invoice is canceled through
-    creation of a new invoice with the opposite amount, plus the issuance of a new invoice.
-
-Here's an example of how they all play together:
-
-.. image:: /images/order_objects.png

doc/api/resources/carts.rst

@@ -42,6 +42,10 @@ seat                                  objects                    The assigned se
 └ 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.

doc/api/resources/categories.rst

@@ -25,6 +25,14 @@ is_addon                              boolean                    If ``true``, it
                                                                  defining add-ons for other products.
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 1.14
+
+   The operations POST, PATCH, PUT and DELETE have been added.
+
+.. versionchanged:: 1.16
+
+   The field ``internal_name`` has been added.
+
 
 Endpoints
 ---------

doc/api/resources/checkinlists.rst

@@ -36,6 +36,22 @@ rules                                 object                     Custom check-in
 exit_all_at                           datetime                   Automatically check out (i.e. perform an exit scan) at this point in time. After this happened, this property will automatically be set exactly one day into the future. Note that this field is considered "internal configuration" and if you pull the list with ``If-Modified-Since``, the daily change in this field will not trigger a response.
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 1.10
+
+   This resource has been added.
+
+.. versionchanged:: 1.11
+
+   The ``positions`` endpoints have been added.
+
+.. versionchanged:: 1.13
+
+   The ``include_pending`` field has been added.
+
+.. versionchanged:: 3.2
+
+    The ``auto_checkin_sales_channels`` field has been added.
+
 .. versionchanged:: 3.9
 
     The ``subevent`` attribute may now be ``null`` inside event series. The ``allow_multiple_entries``,
@@ -49,13 +65,13 @@ exit_all_at                           datetime                   Automatically c
 
     The ``exit_all_at`` attribute has been added.
 
-.. versionchanged:: 3.17
-
-    The ``ends_after`` and ``expand`` query parameters have been added.
-
 Endpoints
 ---------
 
+.. versionchanged:: 1.15
+
+   The ``../status/`` detail endpoint has been added.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/checkinlists/
 
    Returns a list of all check-in lists within a given event.
@@ -104,8 +120,6 @@ Endpoints
    :query integer page: The page number in case of a multi-page result set, default is 1
    :query integer subevent: Only return check-in lists of the sub-event with the given ID
    :query integer subevent_match: Only return check-in lists that are valid for the sub-event with the given ID (i.e. also lists valid for all subevents)
-   :query string ends_after: Exclude all check-in lists attached to a sub-event that is already in the past at the given time.
-   :query string expand: Expand a field into a full object. Currently only ``subevent`` is supported. Can be passed multiple times.
    :query string exclude: Exclude a field from the output, e.g. ``checkin_count``. Can be used as a performance optimization. Can be passed multiple times.
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
@@ -366,6 +380,29 @@ Endpoints
 Order position endpoints
 ------------------------
 
+.. versionchanged:: 1.15
+
+   The order positions endpoint has been extended by the filter queries ``item__in``, ``variation__in``,
+   ``order__status__in``, ``subevent__in``, ``addon_to__in``, and ``search``. The search for attendee names and order
+   codes is now case-insensitive.
+
+   The ``.../redeem/`` endpoint has been added.
+
+.. versionchanged:: 2.0
+
+   The order positions endpoint has been extended by the filter queries ``voucher`` and ``voucher__code``.
+
+.. versionchanged:: 2.7
+
+   The resource now contains the new attributes ``require_attention`` and ``order__status`` and accepts the new
+   ``ignore_status`` filter. The ``attendee_name`` field is now "smart" (see below) and the redemption endpoint
+   returns ``400`` instead of ``404`` on tickets which are known but not paid.
+
+.. versionchanged:: 3.2
+
+    The ``checkins`` dict now also contains a ``auto_checked_in`` value to indicate if the check-in has been performed
+    automatically by the system.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/checkinlists/(list)/positions/
 
    Returns a list of all order positions within a given event. The result is the same as
@@ -453,7 +490,6 @@ Order position endpoints
                            ``attendee_name,positionid``
    :query string order: Only return positions of the order with the given order code
    :query string search: Fuzzy search matching the attendee name, order code, invoice address name as well as to the beginning of the secret.
-   :query string expand: Expand a field into a full object. Currently only ``subevent``, ``item``, and ``variation`` are supported. Can be passed multiple times.
    :query integer item: Only return positions with the purchased item matching the given ID.
    :query integer item__in: Only return positions with the purchased item matching one of the given comma-separated IDs.
    :query integer variation: Only return positions with the purchased item variation matching the given ID.

doc/api/resources/events.rst

@@ -47,11 +47,34 @@ item_meta_properties                  object                     Item-specific m
 valid_keys                            object                     Cryptographic keys for non-default signature schemes.
                                                                  For performance reason, value is omitted in lists and
                                                                  only contained in detail views. Value can be cached.
-sales_channels                        list                       A list of sales channels this event is available for
-                                                                 sale on.
 ===================================== ========================== =======================================================
 
 
+.. versionchanged:: 1.7
+
+   The ``meta_data`` field has been added.
+
+.. versionchanged:: 1.15
+
+   The ``plugins`` field has been added.
+   The operations POST, PATCH, PUT and DELETE have been added.
+
+.. versionchanged:: 2.1
+
+   Filters have been added to the list of events.
+
+.. versionchanged:: 2.5
+
+   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.
@@ -68,11 +91,6 @@ sales_channels                        list                       A list of sales
 
    The attribute ``valid_keys`` has been added.
 
-.. versionchanged:: 3.14
-
-    The attribute ``sales_channels`` has been added.
-
-
 Endpoints
 ---------
 
@@ -129,16 +147,11 @@ Endpoints
             "timezone": "Europe/Berlin",
             "item_meta_properties": {},
             "plugins": [
-              "pretix.plugins.banktransfer",
-              "pretix.plugins.stripe",
-              "pretix.plugins.paypal",
+              "pretix.plugins.banktransfer"
+              "pretix.plugins.stripe"
+              "pretix.plugins.paypal"
               "pretix.plugins.ticketoutputpdf"
             ],
-            "sales_channels": [
-              "web",
-              "pretixpos",
-              "resellers"
-            ]
           }
         ]
       }
@@ -157,7 +170,6 @@ Endpoints
         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.
-   :query sales_channel: If set to a sales channel identifier, only events allowed to be sold on the specified sales channel are returned.
    :param organizer: The ``slug`` field of a valid organizer
    :statuscode 200: no error
    :statuscode 401: Authentication failure
@@ -207,21 +219,16 @@ Endpoints
         "timezone": "Europe/Berlin",
         "item_meta_properties": {},
         "plugins": [
-          "pretix.plugins.banktransfer",
-          "pretix.plugins.stripe",
-          "pretix.plugins.paypal",
+          "pretix.plugins.banktransfer"
+          "pretix.plugins.stripe"
+          "pretix.plugins.paypal"
           "pretix.plugins.ticketoutputpdf"
         ],
         "valid_keys": {
           "pretix_sig1": [
             "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUNvd0JRWURLMlZ3QXlFQTdBRDcvdkZBMzNFc1k0ejJQSHI3aVpQc1o4bjVkaDBhalA4Z3l6Tm1tSXM9Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo="
           ]
-        },
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
-        ]
+        }
       }
 
    :param organizer: The ``slug`` field of the organizer to fetch
@@ -272,11 +279,6 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
-        ],
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 
@@ -312,11 +314,6 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
-        ],
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 
@@ -372,11 +369,6 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
-        ],
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 
@@ -412,11 +404,6 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
-        ],
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 
@@ -486,11 +473,6 @@ Endpoints
           "pretix.plugins.stripe",
           "pretix.plugins.paypal",
           "pretix.plugins.pretixdroid"
-        ],
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 

doc/api/resources/exporters.rst

@@ -1,215 +0,0 @@
-.. spelling:: checkin
-
-Data exporters
-==============
-
-pretix and it's plugins include a number of data exporters that allow you to bulk download various data from pretix in
-different formats. This page shows you how to use these exporters through the API.
-
-.. versionchanged:: 3.13
-
-   This feature has been added to the API.
-
-.. warning::
-
-   While we consider the methods listed on this page to be a stable API, the availability and specific input field
-   requirements of individual exporters is **not considered a stable API**. Specific exporters and their input parameters
-   may change at any time without warning.
-
-Listing available exporters
----------------------------
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/exporters/
-
-   Returns a list of all exporters available for a given event. You will receive a list of export methods as well as their
-   supported input fields. Note that the exact type and validation requirements of the input fields are not given in the
-   response, and you might need to look into the pretix web interface to figure out the exact input required.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/exporters/ 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": [
-          {
-            "identifier": "orderlist",
-            "verbose_name": "Order data",
-            "input_parameters": [
-              {
-                "name": "_format",
-                "required": true,
-                "choices": [
-                  "xlsx",
-                  "orders:default",
-                  "orders:excel",
-                  "orders:semicolon",
-                  "positions:default",
-                  "positions:excel",
-                  "positions:semicolon",
-                  "fees:default",
-                  "fees:excel",
-                  "fees:semicolon"
-                ]
-              },
-              {
-                "name": "paid_only",
-                "required": false
-              }
-            ]
-          }
-        ]
-      }
-
-   :query integer page: The page number in case of a multi-page result set, default is 1
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :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)/exporters/
-
-   Returns a list of all cross-event exporters available for a given organizer. You will receive a list of export methods as well as their
-   supported input fields. Note that the exact type and validation requirements of the input fields are not given in the
-   response, and you might need to look into the pretix web interface to figure out the exact input required.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/exporters/ 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": [
-          {
-            "identifier": "orderlist",
-            "verbose_name": "Order data",
-            "input_parameters": [
-              {
-                "name": "events",
-                "required": true
-              },
-              {
-                "name": "_format",
-                "required": true,
-                "choices": [
-                  "xlsx",
-                  "orders:default",
-                  "orders:excel",
-                  "orders:semicolon",
-                  "positions:default",
-                  "positions:excel",
-                  "positions:semicolon",
-                  "fees:default",
-                  "fees:excel",
-                  "fees:semicolon"
-                ]
-              },
-              {
-                "name": "paid_only",
-                "required": false
-              }
-            ]
-          }
-        ]
-      }
-
-   :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/event does not exist **or** you have no permission to view this resource.
-
-Running an export
------------------
-
-Since exports often include large data sets, they might take longer than the duration of an HTTP request. Therefore,
-creating an export is a two-step process. First you need to start an export task with one of the following to API
-endpoints:
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/exporters/(identifier)/run/
-
-   Starts an export task. If your input parameters validate correctly, a ``202 Accepted`` status code is returned.
-   The body points you to the download URL of the result.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/exporters/orderlist/run/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "_format": "xlsx"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "download": "https://pretix.eu/api/v1/organizers/bigevents/events/sampleconf/orderlist/download/29891ede-196f-4942-9e26-d055a36e98b8/3f279f13-c198-4137-b49b-9b360ce9fcce/"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param identifier: The ``identifier`` field of the exporter to run
-   :statuscode 202: no error
-   :statuscode 400: Invalid input options
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/organizers/(organizer)/exporters/(identifier)/run/
-
-   The endpoint for organizer-level exports works just like event-level exports (see above).
-
-
-Downloading the result
-----------------------
-
-When starting an export, you receive a ``url`` for downloading the result. Running a ``GET`` request on that result will
-yield one of the following status codes:
-
-* ``200 OK`` – The export succeeded. The body will be your resulting file. Might be large!
-* ``409 Conflict`` – Your export is still running. The body will be JSON with the structure ``{"status": "running", "percentage": 40}``. ``percentage`` can be ``null`` if it is not known and ``status`` can be ``waiting`` before the task is actually being processed. Please retry, but wait at least one second before you do.
-* ``410 Gone`` – Running the export has failed permanently. The body will be JSON with the structure ``{"status": "failed", "message": "Error message"}``
-* ``404 Not Found`` – The export does not exist / is expired.
-
-.. warning::
-
-   Running exports puts a lot of stress on the system, we kindly ask you not to run more than two exports at the same time.
-

doc/api/resources/giftcards.rst

@@ -22,28 +22,9 @@ expires                               datetime                   Expiry date (or
 conditions                            string                     Special terms and conditions for this card (or ``null``)
 ===================================== ========================== =======================================================
 
-The gift card transaction resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the gift card transaction
-datetime                              datetime                   Creation date of the transaction
-value                                 money (string)             Transaction amount
-event                                 string                     Event slug, if the gift card was used in the web shop (or ``null``)
-order                                 string                     Order code, if the gift card was used in the web shop (or ``null``)
-text                                  string                     Custom text of the transaction (or ``null``)
-===================================== ========================== =======================================================
-
 Endpoints
 ---------
 
-.. versionadded:: 3.14
-
-   The transaction list endpoint was added.
-
 .. http:get:: /api/v1/organizers/(organizer)/giftcards/
 
    Returns a list of all gift cards issued by a given organizer.
@@ -269,45 +250,3 @@ Endpoints
    :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.
-
-.. http:get:: /api/v1/organizers/(organizer)/giftcards/(id)/transactions/
-
-   List all transactions of a gift card.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/giftcards/1/transactions/ 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": 82,
-            "datetime": "2020-06-22T15:41:42.800534Z",
-            "value": "50.00",
-            "event": "democon",
-            "order": "FXQYW",
-            "text": null
-          }
-        ]
-      }
-
-   :param organizer: The ``slug`` field of the organizer to view
-   :param id: The ``id`` field of the gift card to view
-   :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.

doc/api/resources/index.rst

@@ -27,6 +27,5 @@ Resources and endpoints
    devices
    webhooks
    seatingplans
-   exporters
    billing_invoices
    billing_var

doc/api/resources/invoices.rst

@@ -15,24 +15,8 @@ number                                string                     Invoice number
 order                                 string                     Order code of the order this invoice belongs to
 is_cancellation                       boolean                    ``true``, if this invoice is the cancellation of a
                                                                  different invoice.
-invoice_from_name                     string                     Sender address: Name
-invoice_from                          string                     Sender address: Address lines
-invoice_from_zipcode                  string                     Sender address: ZIP code
-invoice_from_city                     string                     Sender address: City
-invoice_from_country                  string                     Sender address: Country code
-invoice_from_tax_id                   string                     Sender address: Local Tax ID
-invoice_from_vat_id                   string                     Sender address: EU VAT ID
-invoice_to                            string                     Full recipient address
-invoice_to_company                    string                     Recipient address: Company name
-invoice_to_name                       string                     Recipient address: Person name
-invoice_to_street                     string                     Recipient address: Address lines
-invoice_to_zipcode                    string                     Recipient address: ZIP code
-invoice_to_city                       string                     Recipient address: City
-invoice_to_state                      string                     Recipient address: State (only used in some countries)
-invoice_to_country                    string                     Recipient address: Country code
-invoice_to_vat_id                     string                     Recipient address: EU VAT ID
-invoice_to_beneficiary                string                     Invoice beneficiary
-custom_field                          string                     Custom invoice address field
+invoice_from                          string                     Sender address
+invoice_to                            string                     Receiver address
 date                                  date                       Invoice date
 refers                                string                     Invoice number of an invoice this invoice refers to
                                                                  (for example a cancellation refers to the invoice it
@@ -46,31 +30,6 @@ footer_text                           string                     Text to be prin
 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)
-├ item                                integer                    Product used to create this line. Note that everything
-                                                                 about the product might have changed since the creation
-                                                                 of the invoice. Can be ``null`` for all invoice lines
-                                                                 created before this field was introduced as well as for
-                                                                 all lines not created by a product (e.g. a shipping or
-                                                                 cancellation fee).
-├ variation                           integer                    Product variation used to create this line. Note that everything
-                                                                 about the product might have changed since the creation
-                                                                 of the invoice. Can be ``null`` for all invoice lines
-                                                                 created before this field was introduced as well as for
-                                                                 all lines not created by a product (e.g. a shipping or
-                                                                 cancellation fee).
-├ event_date_from                     datetime                   Start date of the (sub)event this line was created for as it
-                                                                 was set during invoice creation. Can be ``null`` for all invoice
-                                                                 lines created before this was introduced as well as for lines in
-                                                                 an event series not created by a product (e.g. shipping or
-                                                                 cancellation fees).
-├ event_date_to                       datetime                   End date of the (sub)event this line was created for as it
-                                                                 was set during invoice creation. Can be ``null`` for all invoice
-                                                                 lines created before this was introduced as well as for lines in
-                                                                 an event series not created by a product (e.g. shipping or
-                                                                 cancellation fees) as well as whenever the respective (sub)event
-                                                                 has no end date set.
-├ attendee_name                       string                     Attendee name at time of invoice creation. Can be ``null`` if no
-                                                                 name was set or if names are configured to not be added to invoices.
 ├ gross_value                         money (string)             Price including taxes
 ├ tax_value                           money (string)             Tax amount included
 ├ tax_name                            string                     Name of used tax rate (e.g. "VAT")
@@ -87,16 +46,28 @@ internal_reference                    string                     Customer's refe
 ===================================== ========================== =======================================================
 
 
+.. versionchanged:: 1.6
+
+   The attribute ``invoice_no`` has been dropped in favor of ``number`` which includes the number including the prefix,
+   since the prefix can now vary. Also, invoices now need to be identified by their ``number`` instead of the raw
+   number.
+
+
+.. versionchanged:: 1.7
+
+   The attributes ``lines.tax_name``, ``foreign_currency_display``, ``foreign_currency_rate``, and
+   ``foreign_currency_rate_date`` have been added.
+
+
+.. versionchanged:: 1.9
+
+   The attribute ``internal_reference`` has been added.
+
+
 .. versionchanged:: 3.4
 
    The attribute ``lines.number`` has been added.
 
-.. versionchanged:: 3.17
-
-   The attribute ``invoice_to_*``, ``invoice_from_*``, ``custom_field``, ``lines.item``, ``lines.variation``, ``lines.event_date_from``,
-   ``lines.event_date_to``, and ``lines.attendee_name`` have been added.
-   ``refers`` now returns an invoice number including the prefix.
-
 
 Endpoints
 ---------
@@ -130,24 +101,8 @@ Endpoints
             "number": "SAMPLECONF-00001",
             "order": "ABC12",
             "is_cancellation": false,
-            "invoice_from_name": "Big Events LLC",
-            "invoice_from": "Demo street 12",
-            "invoice_from_zipcode":"",
-            "invoice_from_city":"Demo town",
-            "invoice_from_country":"US",
-            "invoice_from_tax_id":"",
-            "invoice_from_vat_id":"",
-            "invoice_to": "Sample company\nJohn Doe\nTest street 12\n12345 Testington\nTestikistan\nVAT-ID: EU123456789",
-            "invoice_to_company": "Sample company",
-            "invoice_to_name": "John Doe",
-            "invoice_to_street": "Test street 12",
-            "invoice_to_zipcode": "12345",
-            "invoice_to_city": "Testington",
-            "invoice_to_state": null,
-            "invoice_to_country": "TE",
-            "invoice_to_vat_id": "EU123456789",
-            "invoice_to_beneficiary": "",
-            "custom_field": null,
+            "invoice_from": "Big Events LLC\nDemo street 12\nDemo town",
+            "invoice_to": "Sample company\nJohn Doe\nTest street 12\n12345 Testington\nTestikistan\nVAT ID: EU123456789",
             "date": "2017-12-01",
             "refers": null,
             "locale": "en",
@@ -160,11 +115,6 @@ Endpoints
               {
                 "position": 1,
                 "description": "Budget Ticket",
-                "item": 1234,
-                "variation": 245,
-                "event_date_from": "2017-12-27T10:00:00Z",
-                "event_date_to": null,
-                "attendee_name": null,
                 "gross_value": "23.00",
                 "tax_value": "0.00",
                 "tax_name": "VAT",
@@ -216,24 +166,8 @@ Endpoints
         "number": "SAMPLECONF-00001",
         "order": "ABC12",
         "is_cancellation": false,
-        "invoice_from_name": "Big Events LLC",
-        "invoice_from": "Demo street 12",
-        "invoice_from_zipcode":"",
-        "invoice_from_city":"Demo town",
-        "invoice_from_country":"US",
-        "invoice_from_tax_id":"",
-        "invoice_from_vat_id":"",
-        "invoice_to": "Sample company\nJohn Doe\nTest street 12\n12345 Testington\nTestikistan\nVAT-ID: EU123456789",
-        "invoice_to_company": "Sample company",
-        "invoice_to_name": "John Doe",
-        "invoice_to_street": "Test street 12",
-        "invoice_to_zipcode": "12345",
-        "invoice_to_city": "Testington",
-        "invoice_to_state": null,
-        "invoice_to_country": "TE",
-        "invoice_to_vat_id": "EU123456789",
-        "invoice_to_beneficiary": "",
-        "custom_field": null,
+        "invoice_from": "Big Events LLC\nDemo street 12\nDemo town",
+        "invoice_to": "Sample company\nJohn Doe\nTest street 12\n12345 Testington\nTestikistan\nVAT ID: EU123456789",
         "date": "2017-12-01",
         "refers": null,
         "locale": "en",
@@ -246,11 +180,6 @@ Endpoints
           {
             "position": 1,
             "description": "Budget Ticket",
-            "item": 1234,
-            "variation": 245,
-            "event_date_from": "2017-12-27T10:00:00Z",
-            "event_date_to": null,
-            "attendee_name": null,
             "gross_value": "23.00",
             "tax_value": "0.00",
             "tax_name": "VAT",

doc/api/resources/item_add-ons.rst

@@ -28,6 +28,10 @@ multi_allowed                         boolean                    Adding the same
 price_included                        boolean                    Adding this add-on to the item is free
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 1.12
+
+   This resource has been added.
+
 Endpoints
 ---------
 

doc/api/resources/item_bundles.rst

@@ -30,6 +30,10 @@ designated_price                      money (string)             Designated pric
                                                                  taxation. This is not added to the price.
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 2.6
+
+   This resource has been added.
+
 Endpoints
 ---------
 

doc/api/resources/item_variations.rst

@@ -26,6 +26,14 @@ description                           multi-lingual string       A public descri
 position                              integer                    An integer, used for sorting
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 2.7
+
+   The attribute ``original_price`` has been added.
+
+.. versionchanged:: 1.12
+
+   This resource has been added.
+
 Endpoints
 ---------
 

doc/api/resources/items.rst

@@ -36,8 +36,8 @@ admission                             boolean                    ``true`` for it
                                                                  (such as primary tickets) and ``false`` for others
                                                                  (such as add-ons or merchandise).
 position                              integer                    An integer, used for sorting
-picture                               file                       A product picture to be displayed in the shop
-                                                                 (can be ``null``).
+picture                               string                     A product picture to be displayed in the shop
+                                                                 (read-only, can be ``null``).
 sales_channels                        list of strings            Sales channels this product is available on, such as
                                                                  ``"web"`` or ``"resellers"``. Defaults to ``["web"]``.
 available_from                        datetime                   The first date time at which this item can be bought
@@ -118,6 +118,44 @@ bundles                               list of objects            Definition of b
 meta_data                             object                     Values set for event-specific meta data parameters.
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 2.7
+
+   The attribute ``original_price`` has been added for ``variations``.
+
+.. versionchanged:: 1.7
+
+   The attribute ``tax_rule`` has been added. ``tax_rate`` is kept for compatibility. The attribute
+   ``checkin_attention`` has been added.
+
+.. versionchanged:: 1.12
+
+   The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
+   The attribute ``price_included`` has been added to ``addons``.
+
+.. versionchanged:: 1.16
+
+   The ``internal_name`` and ``original_price`` fields have been added.
+
+.. versionchanged:: 2.0
+
+   The field ``require_approval`` has been added.
+
+.. versionchanged:: 2.3
+
+   The ``sales_channels`` attribute has been added.
+
+.. versionchanged:: 2.4
+
+   The ``generate_tickets`` attribute has been added.
+
+.. versionchanged:: 2.6
+
+   The ``bundles`` and ``require_bundling`` attributes have been added.
+
+.. versionchanged:: 3.0
+
+   The ``show_quota_left``, ``allow_waitinglist``, and ``hidden_if_available`` attributes have been added.
+
 .. versionchanged:: 3.7
 
    The attribute ``meta_data`` has been added.

doc/api/resources/orders.rst

@@ -30,7 +30,6 @@ testmode                              boolean                    If ``true``, th
                                                                  test mode. Only orders in test mode can be deleted.
 secret                                string                     The secret contained in the link sent to the customer
 email                                 string                     The customer email address
-phone                                 string                     The customer phone number
 locale                                string                     The locale used for communication with this customer
 sales_channel                         string                     Channel this sale was created through, such as
                                                                  ``"web"``.
@@ -94,6 +93,60 @@ last_modified                         datetime                   Last modificati
 ===================================== ========================== =======================================================
 
 
+.. versionchanged:: 1.6
+
+   The ``invoice_address.country`` attribute contains a two-letter country code for all new orders. For old orders,
+   a custom text might still be returned.
+
+.. versionchanged:: 1.7
+
+   The attributes ``invoice_address.vat_id_validated`` and ``invoice_address.is_business`` have been added.
+   The attributes ``order.payment_fee``, ``order.payment_fee_tax_rate`` and ``order.payment_fee_tax_value`` have been
+   deprecated in favor of the new ``fees`` attribute but will still be served and removed in 1.9.
+
+.. versionchanged:: 1.9
+
+   First write operations (``…/mark_paid/``, ``…/mark_pending/``, ``…/mark_canceled/``, ``…/mark_expired/``) have been added.
+   The attribute ``invoice_address.internal_reference`` has been added.
+
+.. versionchanged:: 1.13
+
+   The field ``checkin_attention`` has been added.
+
+.. versionchanged:: 1.15
+
+   The attributes ``order.payment_fee``, ``order.payment_fee_tax_rate``, ``order.payment_fee_tax_value`` and
+   ``order.payment_fee_tax_rule`` have finally been removed.
+
+.. versionchanged:: 1.16
+
+   The attributes ``order.last_modified`` as well as the corresponding filters to the resource have been added.
+   An endpoint for order creation as well as ``…/mark_refunded/`` has been added.
+
+.. versionchanged:: 2.0
+
+   The ``order.payment_date`` and ``order.payment_provider`` attributes have been deprecated in favor of the new
+   nested ``payments`` and ``refunds`` resources, but will still be served and removed in 2.2. The ``require_approval``
+   attribute has been added, as have been the ``…/approve/`` and ``…/deny/`` endpoints.
+
+.. versionchanged:: 2.3
+
+   The ``sales_channel`` attribute has been added.
+
+.. 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
+
+   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.
@@ -110,14 +163,6 @@ last_modified                         datetime                   Last modificati
 
    The ``exclude`` and ``subevent_after`` query parameter has been added.
 
-.. versionchanged:: 3.13
-
-   The ``subevent_before`` query parameter has been added.
-
-.. versionchanged:: 3.14
-
-   The ``phone`` attribute has been added.
-
 
 .. _order-position-resource:
 
@@ -166,7 +211,7 @@ downloads                             list of objects            List of ticket
 └ url                                 string                     Download URL
 answers                               list of objects            Answers to user-defined questions
 ├ question                            integer                    Internal ID of the answered question
-├ answer                              string                     Text representation of the answer (URL if answer is a file)
+├ answer                              string                     Text representation of the answer
 ├ 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
@@ -179,6 +224,30 @@ pdf_data                              object                     Data object req
                                                                  ``pdf_data=true`` query parameter to your request.
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 1.7
+
+   The attribute ``tax_rule`` has been added.
+
+.. versionchanged:: 1.11
+
+   The attribute ``checkins.list`` has been added.
+
+.. versionchanged:: 1.14
+
+  The attributes ``answers.question_identifier`` and ``answers.option_identifiers`` have been added.
+
+.. versionchanged:: 1.16
+
+  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
@@ -196,10 +265,6 @@ pdf_data                              object                     Data object req
 
   The ``checkin.type`` attribute has been added.
 
-.. versionchanged:: 3.16
-
-   Answers to file questions are now returned as an URL.
-
 .. _order-payment-resource:
 
 Order payment resource
@@ -228,6 +293,14 @@ details                               object                     Payment-specifi
                                                                  the object is empty.
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 2.0
+
+  This resource has been added.
+
+.. versionchanged:: 3.1
+
+  The attributes ``payment_url`` and ``details`` have been added.
+
 .. _order-refund-resource:
 
 Order refund resource
@@ -243,14 +316,21 @@ state                                 string                     Payment state,
 source                                string                     How this refund has been created, one of ``buyer``, ``admin``, or ``external``
 amount                                money (string)             Payment amount
 created                               datetime                   Date and time of creation of this payment
-comment                               string                     Reason for refund (shown to the customer in some cases, can be ``null``).
-execution_date                        datetime                   Date and time of completion of this refund (or ``null``)
+payment_date                          datetime                   Date and time of completion of this payment (or ``null``)
 provider                              string                     Identification string of the payment provider
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 2.0
+
+  This resource has been added.
+
 List of all orders
 ------------------
 
+.. versionchanged:: 1.15
+
+   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.
@@ -288,7 +368,6 @@ List of all orders
             "secret": "k24fiuwvu8kxz3y1",
             "url": "https://test.pretix.eu/dummy/dummy/order/ABC12/k24fiuwvu8kxz3y1/",
             "email": "tester@example.org",
-            "phone": "+491234567",
             "locale": "en",
             "sales_channel": "web",
             "datetime": "2017-12-01T10:00:00Z",
@@ -411,8 +490,7 @@ List of all orders
        recommend using this in combination with ``testmode=false``, since test mode orders can vanish at any time and
        you will not notice it using this method.
    :query datetime created_since: Only return orders that have been created since the given date.
-   :query datetime subevent_after: Only return orders that contain a ticket for a subevent taking place after the given date. This is an exclusive after, and it considers the **end** of the subevent (or its start, if the end is not set).
-   :query datetime subevent_before: Only return orders that contain a ticket for a subevent taking place after the given date. This is an exclusive before, and it considers the **start** of the subevent.
+   :query datetime subevent_after: Only return orders that contain a ticket for a subevent taking place after the given date.
    :query string exclude: Exclude a field from the output, e.g. ``fees`` or ``positions.downloads``. Can be used as a performance optimization. Can be passed multiple times.
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
@@ -456,7 +534,6 @@ Fetching individual orders
         "secret": "k24fiuwvu8kxz3y1",
         "url": "https://test.pretix.eu/dummy/dummy/order/ABC12/k24fiuwvu8kxz3y1/",
         "email": "tester@example.org",
-        "phone": "+491234567",
         "locale": "en",
         "sales_channel": "web",
         "datetime": "2017-12-01T10:00:00Z",
@@ -623,8 +700,6 @@ Updating order fields
 
    * ``email``
 
-   * ``phone``
-
    * ``checkin_attention``
 
    * ``locale``
@@ -860,9 +935,9 @@ Creating orders
         during order generation and is not respected automatically when the order changes later.)
 
    * ``force`` (optional). If set to ``true``, quotas will be ignored.
-   * ``send_email`` (optional). If set to ``true``, the same emails will be sent as for a regular order, regardless of
+   * ``send_mail`` (optional). If set to ``true``, the same emails will be sent as for a regular order, regardless of
      whether these emails are enabled for certain sales channels. Defaults to
-     ``false``. Used to be ``send_mail`` before pretix 3.14.
+     ``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
@@ -1356,6 +1431,21 @@ Sending e-mails
 List of all order positions
 ---------------------------
 
+.. versionchanged:: 1.15
+
+   The order positions endpoint has been extended by the filter queries ``item__in``, ``variation__in``,
+   ``order__status__in``, ``subevent__in``, ``addon_to__in`` and ``search``. The search for attendee names and order
+   codes is now case-insensitive.
+
+.. versionchanged:: 2.0
+
+   The order positions endpoint has been extended by the filter queries ``voucher``, ``voucher__code`` and
+   ``pseudonymization_id``.
+
+.. versionchanged:: 3.2
+
+  The value ``auto_checked_in`` has been added to the ``checkins``-attribute.
+
 .. versionchanged:: 3.5
 
    The ``include_canceled_positions`` and ``include_canceled_fees`` query parameters have been added.
@@ -1602,67 +1692,6 @@ Order position ticket download
 Manipulating individual positions
 ---------------------------------
 
-.. versionchanged:: 3.15
-
-   The ``PATCH`` method has been added for individual positions.
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/(id)/
-
-   Updates specific fields on an order position. Currently, only the following fields are supported:
-
-   * ``attendee_email``
-
-   * ``attendee_name_parts`` or ``attendee_name``
-
-   * ``company``
-
-   * ``street``
-
-   * ``zipcode``
-
-   * ``city``
-
-   * ``country``
-
-   * ``state``
-
-   * ``answers``: If specified, you will need to provide **all** answers for this order position.
-     Validation is handled the same way as when creating orders through the API. You are therefore
-     expected to provide ``question``, ``answer``, and possibly ``options``. ``question_identifier``
-     and ``option_identifiers`` will be ignored.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/orderpositions/23442/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "attendee_email": "other@example.org"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      (Full order resource, see above.)
-
-   :param organizer: The ``slug`` field of the organizer of the event
-   :param event: The ``slug`` field of the event
-   :param id: The ``id`` field of the order position to update
-
-   :statuscode 200: no error
-   :statuscode 400: The order could not be updated due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to update this order.
-
 .. http:delete:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/(id)/
 
    Deletes an order position, identified by its internal ID.
@@ -1695,6 +1724,10 @@ Manipulating individual positions
 Order payment endpoints
 -----------------------
 
+.. versionchanged:: 2.0
+
+  These endpoints have been added.
+
 .. versionchanged:: 3.6
 
    Payments can now be created through the API.
@@ -1938,7 +1971,6 @@ Order payment endpoints
         "amount": "23.00",
         "payment_date": "2017-12-04T12:13:12Z",
         "info": {},
-        "send_email": false,
         "provider": "banktransfer"
       }
 
@@ -1974,6 +2006,10 @@ Order payment endpoints
 Order refund endpoints
 ----------------------
 
+.. versionchanged:: 2.0
+
+  These endpoints have been added.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/refunds/
 
    Returns a list of all refunds for an order.
@@ -2007,7 +2043,6 @@ Order refund endpoints
             "payment": 1,
             "created": "2017-12-01T10:00:00Z",
             "execution_date": "2017-12-04T12:13:12Z",
-            "comment": "Cancellation",
             "provider": "banktransfer"
           }
         ]
@@ -2050,7 +2085,6 @@ Order refund endpoints
         "payment": 1,
         "created": "2017-12-01T10:00:00Z",
         "execution_date": "2017-12-04T12:13:12Z",
-        "comment": "Cancellation",
         "provider": "banktransfer"
       }
 
@@ -2085,7 +2119,6 @@ Order refund endpoints
         "amount": "23.00",
         "payment": 1,
         "execution_date": null,
-        "comment": "Cancellation",
         "provider": "manual",
         "mark_canceled": false,
         "mark_pending": true
@@ -2107,7 +2140,6 @@ Order refund endpoints
         "payment": 1,
         "created": "2017-12-01T10:00:00Z",
         "execution_date": null,
-        "comment": "Cancellation",
         "provider": "manual"
       }
 

doc/api/resources/organizers.rst

@@ -90,120 +90,3 @@ Endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer does not exist **or** you have no permission to view it.
-
-Organizer settings
-------------------
-
-pretix organizers and 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 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 organizer 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 shops using this API by creating situations of conflicting settings. Please take care.
-
-.. versionchanged:: 3.14
-
-   Initial support for settings has been added to the API.
-
-.. http:get:: /api/v1/organizers/(organizer)/settings/
-
-   Get current values of organizer settings.
-
-   Permission required: "Can change organizer settings"
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/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
-
-      {
-        "event_list_type": "calendar",
-        …
-      }
-
-   **Example verbose response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "event_list_type":
-          {
-            "value": "calendar",
-            "label": "Default overview style",
-            "help_text": "If your event series has more than 50 dates in the future, only the month or week calendar can be used."
-          }
-        },
-        …
-      }
-
-   :param organizer: The ``slug`` field of the organizer 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 does not exist **or** you have no permission to view this resource.
-
-.. http:patch:: /api/v1/organizers/(organizer)/settings/
-
-   Updates organizer 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 organizer level, a default setting
-       from a higher level (global) will be returned. If you explicitly set a setting on organizer 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 organizer level. To unset a settings, pass ``null``.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/settings/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "event_list_type": "calendar"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "event_list_type": "calendar",
-        …
-      }
-
-   :param organizer: The ``slug`` field of the organizer to update
-   :statuscode 200: no error
-   :statuscode 400: The organizer could not be updated 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.

doc/api/resources/question_options.rst

@@ -19,6 +19,10 @@ identifier                            string                     An arbitrary st
 answer                                multi-lingual string       The displayed value of this option
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 1.12
+
+   This resource has been added.
+
 Endpoints
 ---------
 

doc/api/resources/questions.rst

@@ -1,7 +1,4 @@
-.. spelling::
-
-   checkin
-   datetime
+.. spelling:: checkin
 
 .. _rest-questions:
 
@@ -56,12 +53,6 @@ options                               list of objects            In case of ques
 ├ identifier                          string                     An arbitrary string that can be used for matching with
                                                                  other sources.
 └ answer                              multi-lingual string       The displayed value of this option
-valid_number_min                      string                     Minimum value for number questions (optional)
-valid_number_max                      string                     Maximum value for number questions (optional)
-valid_date_min                        date                       Minimum value for date questions (optional)
-valid_date_max                        date                       Maximum value for date questions (optional)
-valid_datetime_min                    datetime                   Minimum value for date and time questions (optional)
-valid_datetime_max                    datetime                   Maximum value for date and time questions (optional)
 dependency_question                   integer                    Internal ID of a different question. The current
                                                                  question will only be shown if the question given in
                                                                  this attribute is set to the value given in
@@ -75,14 +66,32 @@ dependency_value                      string                     An old version
                                                                  for one value. **Deprecated.**
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 1.12
+
+  The values ``D``, ``H``, and ``W`` for the field ``type`` are now allowed and the ``ask_during_checkin`` field has
+  been added.
+
+.. versionchanged:: 1.14
+
+  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.
 
-.. versionchanged:: 3.14
-
-  The attributes ``valid_*`` have been added.
-
 Endpoints
 ---------
 
@@ -128,12 +137,6 @@ Endpoints
             "ask_during_checkin": false,
             "hidden": false,
             "print_on_invoice": false,
-            "valid_number_min": null,
-            "valid_number_max": null,
-            "valid_date_min": null,
-            "valid_date_max": null,
-            "valid_datetime_min": null,
-            "valid_datetime_max": null,
             "dependency_question": null,
             "dependency_value": null,
             "dependency_values": [],
@@ -205,12 +208,6 @@ Endpoints
         "ask_during_checkin": false,
         "hidden": false,
         "print_on_invoice": false,
-        "valid_number_min": null,
-        "valid_number_max": null,
-        "valid_date_min": null,
-        "valid_date_max": null,
-        "valid_datetime_min": null,
-        "valid_datetime_max": null,
         "dependency_question": null,
         "dependency_value": null,
         "dependency_values": [],
@@ -305,12 +302,6 @@ Endpoints
         "dependency_question": null,
         "dependency_value": null,
         "dependency_values": [],
-        "valid_number_min": null,
-        "valid_number_max": null,
-        "valid_date_min": null,
-        "valid_date_max": null,
-        "valid_datetime_min": null,
-        "valid_datetime_max": null,
         "options": [
           {
             "id": 1,
@@ -386,12 +377,6 @@ Endpoints
         "dependency_question": null,
         "dependency_value": null,
         "dependency_values": [],
-        "valid_number_min": null,
-        "valid_number_max": null,
-        "valid_date_min": null,
-        "valid_date_max": null,
-        "valid_datetime_min": null,
-        "valid_datetime_max": null,
         "options": [
           {
             "id": 1,

doc/api/resources/quotas.rst

@@ -30,6 +30,14 @@ release_after_exit                    boolean                    Whether the quo
                                                                  have been scanned at an exit.
 ===================================== ========================== =======================================================
 
+.. 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.
+
 .. versionchanged:: 3.10
 
    The attribute ``release_after_exit`` has been added.

doc/api/resources/seatingplans.rst

@@ -20,6 +20,10 @@ layout                                object                     JSON representa
                                                                  still evolves. The version in use can be found `here`_.
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 3.0
+
+   This endpoint has been added.
+
 Endpoints
 ---------
 

doc/api/resources/subevents.rst

@@ -33,7 +33,6 @@ date_to                               datetime                   The sub-event's
 date_admission                        datetime                   The sub-event's admission date (or ``null``)
 presale_start                         datetime                   The sub-date at which the ticket shop opens (or ``null``)
 presale_end                           datetime                   The sub-date at which the ticket shop closes (or ``null``)
-frontpage_text                        multi-lingual string       The description of the event (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``)
@@ -55,6 +54,25 @@ seat_category_mapping                 object                     An object mappi
 last_modified                         datetime                   Last modification of this object
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 1.7
+
+   The ``meta_data`` field has been added.
+
+.. versionchanged:: 2.1
+
+   The ``event`` field has been added, together with filters on the list of dates and an organizer-level list.
+
+.. versionchanged:: 2.6
+   The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
+
+.. versionchanged:: 2.7
+
+   The attribute ``is_public`` has been added.
+
+.. versionchanged:: 3.0
+
+   The attributes ``seating_plan`` and ``seat_category_mapping`` have been added.
+
 .. versionchanged:: 3.3
 
    The attributes ``geo_lat`` and ``geo_lon`` have been added.

doc/api/resources/taxrules.rst

@@ -24,6 +24,14 @@ home_country                          string                     Merchant countr
                                                                  ``null`` or empty string
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 1.7
+
+   This resource has been added.
+
+.. versionchanged:: 1.9
+
+   The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
+
 
 Endpoints
 ---------

doc/api/resources/teams.rst

@@ -1,4 +1,4 @@
-.. spelling:: fullname checkin
+.. spelling:: fullname
 
 .. _`rest-teams`:
 
@@ -32,7 +32,6 @@ can_view_orders                       boolean
 can_change_orders                     boolean
 can_view_vouchers                     boolean
 can_change_vouchers                   boolean
-can_checkin_orders                    boolean
 ===================================== ========================== =======================================================
 
 Team member resource

doc/api/resources/vouchers.rst

@@ -46,6 +46,14 @@ show_hidden_items                     boolean                    Only if set to
 ===================================== ========================== =======================================================
 
 
+.. versionchanged:: 1.9
+
+   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.

doc/api/resources/waitinglist.rst

@@ -13,10 +13,7 @@ Field                                 Type                       Description
 ===================================== ========================== =======================================================
 id                                    integer                    Internal ID of the waiting list entry
 created                               datetime                   Creation date of the waiting list entry
-name                                  string                     Name of the user on the waiting list (or ``null``)
-name_parts                            object of strings          Decomposition of name of the user (or ``null``)
 email                                 string                     Email address of the user on the waiting list
-phone                                 string                     Phone number of the user on the waiting list (or ``null``)
 voucher                               integer                    Internal ID of the voucher sent to this user. If
                                                                  this field is set, the user has been sent a voucher
                                                                  and is no longer waiting. If it is ``null``, the

doc/api/resources/webhooks.rst

@@ -31,10 +31,8 @@ action_types                          list of strings            A list of actio
 The following values for ``action_types`` are valid with pretix core:
 
     * ``pretix.event.order.placed``
-    * ``pretix.event.order.placed.require_approval``
     * ``pretix.event.order.paid``
     * ``pretix.event.order.canceled``
-    * ``pretix.event.order.reactivated``
     * ``pretix.event.order.expired``
     * ``pretix.event.order.modified``
     * ``pretix.event.order.contact.changed``
@@ -44,12 +42,6 @@ The following values for ``action_types`` are valid with pretix core:
     * ``pretix.event.order.denied``
     * ``pretix.event.checkin``
     * ``pretix.event.checkin.reverted``
-    * ``pretix.event.added``
-    * ``pretix.event.changed``
-    * ``pretix.event.deleted``
-    * ``pretix.subevent.added``
-    * ``pretix.subevent.changed``
-    * ``pretix.subevent.deleted``
 
 Installed plugins might register more valid values.
 

doc/development/api/customview.rst

@@ -14,9 +14,7 @@ Control panel views
 -------------------
 
 If you want to add a custom view to the control area of an event, just register an URL in your
-``urls.py`` that lives in the ``/control/`` subpath:
-
-.. code-block:: python
+``urls.py`` that lives in the ``/control/`` subpath::
 
     from django.conf.urls import url
 
@@ -46,9 +44,7 @@ If only the ``organizer`` parameter is present, it will be ensured that:
 * The user has permission to access view the current organizer
 
 If you want to require specific permission types, we provide you with a decorator or a mixin for
-your views:
-
-.. code-block:: python
+your views::
 
     from pretix.control.permissions import (
         event_permission_required, EventPermissionRequiredMixin
@@ -65,9 +61,8 @@ your views:
         ...
 
 Similarly, there is ``organizer_permission_required`` and ``OrganizerPermissionRequiredMixin``. In case of
-event-related views, there is also a signal that allows you to add the view to the event navigation like this:
+event-related views, there is also a signal that allows you to add the view to the event navigation like this::
 
-.. code-block:: python
 
     from django.urls import resolve, reverse
     from django.dispatch import receiver
@@ -95,9 +90,7 @@ Event settings view
 -------------------
 
 A special case of a control panel view is a view hooked into the event settings page. For this case, there is a
-special navigation signal:
-
-.. code-block:: python
+special navigation signal::
 
     @receiver(nav_event_settings, dispatch_uid='friends_tickets_nav_settings')
     def navbar_settings(sender, request, **kwargs):
@@ -112,9 +105,7 @@ special navigation signal:
         }]
 
 Also, your view should inherit from ``EventSettingsViewMixin`` and your template from ``pretixcontrol/event/settings_base.html``
-for good integration. If you just want to display a form, you could do it like the following:
-
-.. code-block:: python
+for good integration. If you just want to display a form, you could do it like the following::
 
     class MySettingsView(EventSettingsViewMixin, EventSettingsFormView):
         model = Event
@@ -156,9 +147,7 @@ Including a custom view into the participant-facing frontend is a little bit dif
 no path prefix like ``control/``.
 
 First, define your URL in your ``urls.py``, but this time in the ``event_patterns`` section and wrapped by
-``event_url``:
-
-.. code-block:: python
+``event_url``::
 
     from pretix.multidomain import event_url
 
@@ -193,9 +182,8 @@ standard Django request handling: There are `ViewSets`_ to group related views i
 automatically build URL configurations from them.
 
 To integrate a custom viewset with pretix' REST API, you can just register with one of our routers within the
-``urls.py`` module of your plugin:
+``urls.py`` module of your plugin::
 
-.. code-block:: python
 
     from pretix.api.urls import event_router, router, orga_router
 
@@ -212,9 +200,7 @@ in the control panel. However, you need to make sure on your own only to return
 .event`` and ``request.organizer`` are available as usual.
 
 To require a special permission like ``can_view_orders``, you do not need to inherit from a special ViewSet base
-class, you can just set the ``permission`` attribute on your viewset:
-
-.. code-block:: python
+class, you can just set the ``permission`` attribute on your viewset::
 
     class MyViewSet(ModelViewSet):
         permission = 'can_view_orders'
@@ -222,9 +208,8 @@ class, you can just set the ``permission`` attribute on your viewset:
 
 If you want to check the permission only for some methods of your viewset, you have to do it yourself. Note here that
 API authentications can be done via user sessions or API tokens and you should therefore check something like the
-following:
+following::
 
-.. code-block:: python
 
     perm_holder = (request.auth if isinstance(request.auth, TeamAPIToken) else request.user)
     if perm_holder.has_event_permission(request.event.organizer, request.event, 'can_view_orders'):

doc/development/api/email.rst

@@ -15,9 +15,7 @@ Output registration
 The email HTML renderer API does not make a lot of usage from signals, however, it
 does use a signal to get a list of all available email renderers. Your plugin
 should listen for this signal and return the subclass of ``pretix.base.email.BaseHTMLMailRenderer``
-that we'll provide in this plugin:
-
-.. code-block:: python
+that we'll provide in this plugin::
 
     from django.dispatch import receiver
 
@@ -74,9 +72,7 @@ class ``TemplateBasedMailRenderer`` that you can re-use to perform the following
 * Call `inlinestyler`_ to convert all ``<style>`` style sheets to inline ``style=""``
   attributes for better compatibility
 
-To use it, you just need to implement some variables:
-
-.. code-block:: python
+To use it, you just need to implement some variables::
 
     class ClassicMailRenderer(TemplateBasedMailRenderer):
         verbose_name = _('pretix default')

doc/development/api/exporter.rst

@@ -17,9 +17,7 @@ Exporter registration
 The exporter API does not make a lot of usage from signals, however, it does use a signal to get a list of
 all available exporters. Your plugin should listen for this signal and return the subclass of
 ``pretix.base.exporter.BaseExporter``
-that we'll provide in this plugin:
-
-.. code-block:: python
+that we'll provide in this plugin::
 
     from django.dispatch import receiver
 
@@ -33,9 +31,7 @@ that we'll provide in this plugin:
 
 Some exporters might also prove to be useful, when provided on an organizer-level. In order to declare your
 exporter as capable of providing exports spanning multiple events, your plugin should listen for this signal
-and return the subclass of ``pretix.base.exporter.BaseExporter`` that we'll provide in this plugin:
-
-.. code-block:: python
+and return the subclass of ``pretix.base.exporter.BaseExporter`` that we'll provide in this plugin::
 
     from django.dispatch import receiver
 

doc/development/api/general.rst

@@ -34,7 +34,7 @@ Frontend
 --------
 
 .. automodule:: pretix.presale.signals
-   :members: html_head, html_footer, footer_link, global_footer_link, front_page_top, front_page_bottom, front_page_bottom_widget, fee_calculation_for_cart, contact_form_fields, question_form_fields, contact_form_fields_overrides, question_form_fields_overrides, 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, global_html_head, global_html_footer, global_html_page_header
+   :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, contact_form_fields_overrides, question_form_fields_overrides, 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, global_html_head, global_html_footer, global_html_page_header
 
 
 .. automodule:: pretix.presale.signals
@@ -58,7 +58,7 @@ Backend
 .. automodule:: pretix.control.signals
    :members: nav_event, html_head, html_page_start, quota_detail_html, nav_topbar, nav_global, nav_organizer, nav_event_settings,
              order_info, event_settings_widget, oauth_application_registered, order_position_buttons, subevent_forms,
-             item_formsets, order_search_filter_q, order_search_forms
+             item_formsets, order_search_filter_q
 
 .. automodule:: pretix.base.signals
    :members: logentry_display, logentry_object_link, requiredaction_display, timeline_events
@@ -79,7 +79,7 @@ Ticket designs
 """"""""""""""
 
 .. automodule:: pretix.base.signals
-   :members: layout_text_variables, layout_image_variables
+   :members: layout_text_variables
 
 .. automodule:: pretix.plugins.ticketoutputpdf.signals
    :members: override_layout

doc/development/api/invoice.rst

@@ -15,9 +15,7 @@ Output registration
 The invoice renderer API does not make a lot of usage from signals, however, it
 does use a signal to get a list of all available invoice renderers. Your plugin
 should listen for this signal and return the subclass of ``pretix.base.invoice.BaseInvoiceRenderer``
-that we'll provide in this plugin:
-
-.. code-block:: python
+that we'll provide in this plugin::
 
     from django.dispatch import receiver
 

doc/development/api/payment.rst

@@ -19,9 +19,7 @@ Provider registration
 The payment provider API does not make a lot of usage from signals, however, it
 does use a signal to get a list of all available payment providers. Your plugin
 should listen for this signal and return the subclass of ``pretix.base.payment.BasePaymentProvider``
-that the plugin will provide:
-
-.. code-block:: python
+that the plugin will provide::
 
     from django.dispatch import receiver
 
@@ -106,22 +104,14 @@ The provider class
 
    .. automethod:: payment_control_render
 
-   .. automethod:: payment_control_render_short
-
    .. automethod:: payment_refund_supported
 
    .. automethod:: payment_partial_refund_supported
 
-   .. automethod:: payment_presale_render
-
    .. automethod:: execute_refund
 
    .. automethod:: refund_control_render
 
-   .. automethod:: new_refund_control_form_render
-
-   .. automethod:: new_refund_control_form_process
-
    .. automethod:: api_payment_details
 
    .. automethod:: matching_id
@@ -150,9 +140,7 @@ it is necessary to introduce additional views. One example is the PayPal
 provider. It redirects the user to a PayPal website in the
 :py:meth:`BasePaymentProvider.checkout_prepare` step of the checkout process
 and provides PayPal with a URL to redirect back to. This URL points to a
-view which looks roughly like this:
-
-.. code-block:: python
+view which looks roughly like this::
 
     @login_required
     def success(request):

doc/development/api/placeholder.rst

@@ -13,9 +13,7 @@ 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``:
-
-.. code-block:: python
+should listen for this signal and return an instance of a subclass of ``pretix.base.email.BaseMailTextPlaceholder``::
 
     from django.dispatch import receiver
 
@@ -73,9 +71,7 @@ Helper class for simple placeholders
 ------------------------------------
 
 pretix ships with a helper class that makes it easy to provide placeholders based on simple
-functions:
-
-.. code-block:: python
+functions::
 
      placeholder = SimpleFunctionalMailTextPlaceholder(
          'code', ['order'], lambda order: order.code, sample='F8VVL'

doc/development/api/plugins.rst

@@ -55,9 +55,7 @@ restricted         boolean (optional)   ``False`` by default, restricts a plugin
 compatibility      string               Specifier for compatible pretix versions.
 ================== ==================== ===========================================================
 
-A working example would be:
-
-.. code-block:: python
+A working example would be::
 
     try:
         from pretix.base.plugins import PluginConfig
@@ -83,7 +81,7 @@ A working example would be:
 
     default_app_config = 'pretix_paypal.PaypalApp'
 
-The ``AppConfig`` class may implement a property ``compatibility_errors``, that checks
+The ``AppConfig`` class may implement a property ``compatiblity_errors``, that checks
 whether the pretix installation meets all requirements of the plugin. If so,
 it should contain ``None`` or an empty list, otherwise a list of strings containing
 human-readable error messages. We recommend using the ``django.utils.functional.cached_property``
@@ -98,9 +96,7 @@ Plugin registration
 
 Somehow, pretix needs to know that your plugin exists at all. For this purpose, we
 make use of the `entry point`_ feature of setuptools. To register a plugin that lives
-in a separate python package, your ``setup.py`` should contain something like this:
-
-.. code-block:: python
+in a separate python package, your ``setup.py`` should contain something like this::
 
     setup(
         args...,
@@ -122,9 +118,7 @@ The various components of pretix define a number of signals which your plugin ca
 listen for. We will go into the details of the different signals in the following
 pages. We suggest that you put your signal receivers into a ``signals`` submodule
 of your plugin. You should extend your ``AppConfig`` (see above) by the following
-method to make your receivers available:
-
-.. code-block:: python
+method to make your receivers available::
 
     class PaypalApp(AppConfig):
         …
@@ -133,9 +127,7 @@ method to make your receivers available:
             from . import signals  # NOQA
 
 You can optionally specify code that is executed when your plugin is activated for an event
-in the ``installed`` method:
-
-.. code-block:: python
+in the ``installed`` method::
 
     class PaypalApp(AppConfig):
         …

doc/development/api/shredder.rst

@@ -74,7 +74,7 @@ looks like this:
 
         def generate_files(self) -> List[Tuple[str, str, str]]:
             yield 'invoice-addresses.json', 'application/json', json.dumps({
-                ia.order.code: InvoiceAddressSerializer(ia).data
+                ia.order.code: InvoiceAdddressSerializer(ia).data
                 for ia in InvoiceAddress.objects.filter(order__event=self.event)
             }, indent=4)
 

doc/development/api/ticketoutput.rst

@@ -17,9 +17,7 @@ Output registration
 The ticket output API does not make a lot of usage from signals, however, it
 does use a signal to get a list of all available ticket outputs. Your plugin
 should listen for this signal and return the subclass of ``pretix.base.ticketoutput.BaseTicketOutput``
-that we'll provide in this plugin:
-
-.. code-block:: python
+that we'll provide in this plugin::
 
     from django.dispatch import receiver
 

doc/development/concepts.rst

@@ -82,15 +82,11 @@ Orders
 ^^^^^^
 
 If a customer completes the checkout process, an **Order** will be created containing all the entered information.
-An order can be in one of currently six states that are listed in the diagram below:
+An order can be in one of currently four states that are listed in the diagram below:
 
 .. image:: /images/order_states.png
 
-The dotted lines represent status changes that usually do not happen as part of the regular process, but can be
-performed manually in the admin backend.
-
-For historical reasons, there are only four valid values of the ``status`` field, and the two additional states are
-represented differently:
+There are additional "fake" states that are displayed like states but not represented as states in the system:
 
 * An order is considered **canceled (with paid fee)** if it is in **paid** status but does not include any non-cancelled positions.
 

doc/development/implementation/background.rst

@@ -12,9 +12,7 @@ Implementing a task
 -------------------
 
 A common pattern for implementing asynchronous tasks can be seen a lot in ``pretix.base.services``
-and looks like this:
-
-.. code-block:: python
+and looks like this::
 
     from pretix.celery_app import app
 
@@ -36,15 +34,13 @@ If your user needs to wait for the response of the asynchronous task, there are
 that will probably move to ``pretix.base`` at some point. They consist of the view mixin ``AsyncAction`` that allows
 you to easily write a view that kicks off and waits for an asynchronous task. ``AsyncAction`` will determine whether
 to run the task asynchronously or not and will do some magic to look nice for users with and without JavaScript support.
-A usage example taken directly from the code is:
-
-.. code-block:: python
+A usage example taken directly from the code is::
 
     class OrderCancelDo(EventViewMixin, OrderDetailMixin, AsyncAction, View):
         """
         A view that executes a task asynchronously. A POST request will kick off the
         task into the background or run it in the foreground if celery is not installed.
-        In the former case, subsequent GET calls can be used to determine the current
+        In the former case, subsequent GET calls can be used to determinine the current
         status of the task.
         """
 
@@ -83,9 +79,7 @@ A usage example taken directly from the code is:
             return super().get_error_message(exception)
 
 On the client side, this can be used by simply adding a ``data-asynctask`` attribute to an HTML form. This will enable
-AJAX sending of the form and display a loading indicator:
-
-.. code-block:: html
+AJAX sending of the form and display a loading indicator::
 
     <form method="post" data-asynctask
           action="{% eventurl request.event "presale:event.order.cancel.do" … %}">

doc/development/implementation/i18n.rst

@@ -27,9 +27,7 @@ numbers and dates, ``LazyDate`` and ``LazyNumber``. There also is a ``LazyLocale
 exceptions with gettext-localized exception messages.
 
 Last, but definitely not least, we have the ``language`` context manager (``pretix.base.i18n.language``) that allows
-you to execute a piece of code with a different locale:
-
-.. code-block:: python
+you to execute a piece of code with a different locale::
 
     with language('de'):
         render_mail_template()

doc/development/implementation/logging.rst

@@ -16,9 +16,7 @@ We recommend all relevant models to inherit from ``LoggedModel`` as it simplifie
 .. autoclass:: pretix.base.models.LoggedModel
    :members: log_action, all_logentries
 
-To actually log an action, you can just call the ``log_action`` method on your object:
-
-.. code-block:: python
+To actually log an action, you can just call the ``log_action`` method on your object::
 
    order.log_action('pretix.event.order.canceled', user=user, data={})
 
@@ -31,9 +29,7 @@ Logging form actions
 """"""""""""""""""""
 
 A very common use case is to log the changes to a model that have been done in a ``ModelForm``. In this case,
-we generally use a custom ``form_valid`` method on our ``FormView`` that looks like this:
-
-.. code-block:: python
+we generally use a custom ``form_valid`` method on our ``FormView`` that looks like this::
 
     @transaction.atomic
     def form_valid(self, form):
@@ -44,9 +40,7 @@ we generally use a custom ``form_valid`` method on our ``FormView`` that looks l
         messages.success(self.request, _('Your changes have been saved.'))
         return super().form_valid(form)
 
-It gets a little bit more complicated if your form allows file uploads:
-
-.. code-block:: python
+It gets a little bit more complicated if your form allows file uploads::
 
     @transaction.atomic
     def form_valid(self, form):
@@ -73,9 +67,7 @@ following ready-to-include template::
 
 We now need a way to translate the action codes like ``pretix.event.changed`` into human-readable
 strings. The :py:attr:`pretix.base.signals.logentry_display` signals allows you to do so. A simple
-implementation could look like:
-
-.. code-block:: python
+implementation could look like::
 
     from django.utils.translation import gettext as _
     from pretix.base.signals import logentry_display
@@ -96,9 +88,7 @@ Sending notifications
 
 If you think that the logged information might be important or urgent enough to send out a notification to interested
 organizers. In this case, you should listen for the :py:attr:`pretix.base.signals.register_notification_types` signal
-to register a notification type:
-
-.. code-block:: python
+to register a notification type::
 
     @receiver(register_notification_types)
     def register_my_notification_types(sender, **kwargs):
@@ -113,9 +103,7 @@ You should subclass the base ``NotificationType`` class and implement all its me
 .. autoclass:: pretix.base.notifications.NotificationType
    :members: action_type, verbose_name, required_permission, build_notification
 
-A simple implementation could look like this:
-
-.. code-block:: python
+A simple implementation could look like this::
 
     class MyNotificationType(NotificationType):
         required_permission = "can_view_orders"
@@ -155,9 +143,7 @@ Logging technical information
 -----------------------------
 
 If you just want to log technical information to a log file on disk that does not need to be parsed
-and displayed later, you can just use Python's ``logging`` module:
-
-.. code-block:: python
+and displayed later, you can just use Python's ``logging`` module::
 
    import logging
 
@@ -165,9 +151,7 @@ and displayed later, you can just use Python's ``logging`` module:
 
    logger.info('Startup complete.')
 
-This is also very useful to provide debugging information when an exception occurs:
-
-.. code-block:: python
+This is also very useful to provide debugging information when an exception occurs::
 
    try:
       foo()

doc/development/implementation/permissions.rst

@@ -15,9 +15,7 @@ Requiring permissions for a view
 --------------------------------
 
 pretix provides a number of useful mixins and decorators that allow you to specify that a user needs a certain
-permission level to access a view:
-
-.. code-block:: python
+permission level to access a view::
 
     from pretix.control.permissions import (
         OrganizerPermissionRequiredMixin, organizer_permission_required
@@ -46,9 +44,7 @@ permission level to access a view:
         # Only users with *any* permission on this organizer can access this
 
 
-Of course, the same is available on event level:
-
-.. code-block:: python
+Of course, the same is available on event level::
 
     from pretix.control.permissions import (
         EventPermissionRequiredMixin, event_permission_required
@@ -77,9 +73,7 @@ Of course, the same is available on event level:
         # Only users with *any* permission on this event can access this
 
 You can also require that this view is only accessible by system administrators with an active "admin session"
-(see below for what this means):
-
-.. code-block:: python
+(see below for what this means)::
 
     from pretix.control.permissions import (
         AdministratorPermissionRequiredMixin, administrator_permission_required
@@ -95,9 +89,7 @@ You can also require that this view is only accessible by system administrators
         # ...
 
 In rare cases it might also be useful to expose a feature only to people who have a staff account but do not
-necessarily have an active admin session:
-
-.. code-block:: python
+necessarily have an active admin session::
 
     from pretix.control.permissions import (
         StaffMemberRequiredMixin, staff_member_required

doc/development/implementation/settings.rst

@@ -39,9 +39,7 @@ subclass that also adds support for internationalized fields:
 
 .. autoclass:: pretix.base.forms.SettingsForm
 
-You can simply use it like this:
-
-.. code-block:: python
+You can simply use it like this::
 
    class EventSettingsForm(SettingsForm):
        show_date_to = forms.BooleanField(
@@ -58,9 +56,7 @@ You can simply use it like this:
 Defaults in plugins
 -------------------
 
-Plugins can add custom hardcoded defaults in the following way:
-
-.. code-block:: python
+Plugins can add custom hardcoded defaults in the following way::
 
     from pretix.base.settings import settings_hierarkey
 

doc/development/setup.rst

@@ -67,10 +67,6 @@ Then, create the local database::
 A first user with username ``admin@localhost`` and password ``admin`` will be automatically
 created.
 
-You will also need to install a few JavaScript dependencies::
-
-    make npminstall
-
 If you want to see pretix in a different language than English, you have to compile our language
 files::
 

doc/images/order_objects.puml

@@ -1,34 +0,0 @@
-@startuml
-
-participant User
-collections "OrderPayment\nOrderRefund" as P
-collections "Order\nOrderPosition" as O
-collections "Invoice\nInvoiceLine" as I
-
-User -> O: Order placed (€100)
-rnote over O #6DD96D: Order A1B2C\nstatus = **n**\ntotal = €100
-O -> P: Payment created
-O -> I: Invoice created\n(can also happen later)
-rnote over I #6DD96D: Invoice 00001\n€100
-rnote over P #6DD96D: OrderPayment A1B2C-P-1\nstate = **created**
-P -> User: Payment details (web, email)
-User -> P: Payment performed
-rnote over P #EFF46B: OrderPayment A1B2C-P-1\nstate = **confirmed**
-P -> O: Order marked as paid
-rnote over O #EFF46B: Order A1B2C\nstatus = **p**\ntotal = €100
-User -> O: Data change (e.g. invoice address)
-O -> I: Invoice reissued
-rnote over I #6DD96D: Invoice 00002\n€-100
-rnote over I #6DD96D: Invoice 00003\n€100
-rnote over O #EFF46B: Order A1B2C\nstatus = **p**\ntotal = €100
-User -> O: Order canceled
-rnote over O #EFF46B: Order A1B2C\nstatus = **c**
-O -> I: Invoice canceled
-rnote over I #6DD96D: Invoice 00004\n€-100
-O -> P: Refund started
-rnote over P #6DD96D: OrderRefund\nA1B2C-R-1\nstate = **created**
-P -> User: Money sent
-rnote over P #EFF46B: OrderRefund\nA1B2C-R-1\nstate = **done**
-
-@enduml
-

doc/images/order_states.puml

@@ -1,39 +1,19 @@
 @startuml
 
-state "Approval Pending" as AP
-state "Canceled (with paid fee)" as CP
-AP: status = "n"
-AP: require_approval = true
-Pending: status = "n"
-Pending: require_approval = false
-Pending: Tickets reserved: yes
-Expired: status = "e"
-Expired: Tickets reserved: no
-Paid: status = "p"
-Paid: count(positions | !canceled) > 0
-Paid: Tickets reserved: yes
-CP: status = "p"
-CP: count(positions | !canceled) = 0
-Canceled: status = "c"
-Canceled: Tickets reserved: no
+Pending: Order is expecting payment\nOrder reduces quotas
+Expired: Payment period is over\nOrder does not affect quotas
+Paid: Order was successful\nOrder reduces quotas
+Canceled: Order has been canceled\nOrder does not affect quotas
 
-
-[*] -> Pending: order placed\ntotal > 0
-[*] -> Paid: order placed\ntotal = 0
-[*] -> AP: order placed\napproval required
-Pending --> Paid: order paid
-Pending --> Expired: after payment\ndeadline
-Expired --> Paid: order paid\n(only if quota left)
-Expired -[dashed]-> Canceled
-Expired -[dashed]-> Pending: order extended
-Paid --> Canceled: order canceled
-Pending --> Canceled: order canceled
-Paid -[dashed]-> Pending: refund
-AP --> Pending: order approved
-AP --> Canceled: order denied
-Paid --> CP: order canceled\n(with cancellation fee)
-Canceled -[dashed]-> Pending: order reactivated
-Canceled -[dashed]-> Paid: order reactivated
-CP -[dashed]-> Canceled: fee canceled
+[*] --> Pending: customer\nplaces order
+Pending --> Paid: successful payment
+Pending --> Expired: automatically\nor manually\non admin action
+Expired --> Paid: if payment is received\nonly if quota left
+Expired --> Canceled
+Expired --> Pending: manually\non admin action
+Paid --> Canceled: manually on\nadmin action\nor if an external\npayment provider\nnotifies about a\npayment refund
+Pending --> Canceled: on admin or\ncustomer action
+Paid -> Pending: manually on admin action
+[*] --> Paid: customer\nplaces free order
 
 @enduml

doc/plugins/badges.rst

@@ -22,6 +22,10 @@ item_assignments                      list of objects            Products this l
 └ item                                integer                    Item ID
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 1.16
+
+   This resource has been added.
+
 
 Endpoints
 ---------

doc/plugins/ticketoutputpdf.rst

@@ -24,6 +24,14 @@ item_assignments                      list of objects            Products this l
 └ item                                integer                    Item ID
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 1.16
+
+   This resource has been added.
+
+.. versionchanged:: 2.3
+
+   The ``item_assignments.sales_channel`` field has been added.
+
 
 Endpoints
 ---------

doc/user/events/email.rst

@@ -64,35 +64,20 @@ is valid in every text):
 Placeholder                    Description
 ============================== ===============================================================================
 event                          The event name
-event_slug                     The event's short form
-code                           In case of the waiting list, the voucher code to redeem
-currency                       The currency used for the event (three-letter code)
 total                          The order's total value
 total_with_currency            The order's total value with a localized currency sign
-refund_amount                  (For cancellation emails) The amount of money that will be refunded, including
-                               the currency
+currency                       The currency used for the event (three-letter code)
 payment_info                   Information text specific to the payment method (e.g. banking details)
 url                            An URL pointing to the download/status page of the order
-url_info_change                An URL pointing to the page of the order that can be used to change ticket
-                               information
-url_products_change            An URL pointing to the page of the order that can be used to change the products
-                               in the order
-url_cancel                     An URL pointing to the page of the order that can be used to cancel the order
-name, name_*                   Any name that can be used to address the recipient (e.g. name from invoice address,
-                               name from first ticket, …)
-invoice_name, invoice_name_*   The name field of the invoice address
+invoice_name                   The name field of the invoice address
 invoice_company                The company field of the invoice address
-attendee_name, attendee_name_* The name of the attendee represented by the ticket
 expire_date                    The order's expiration date
-comment                        When rejecting an order, this will contain the reason for the rejection
 date                           The same as ``expire_date``, but in a different e-mail (for backwards
                                compatibility)
 orders                         A list of orders including links to their status pages, specific to the "resend
                                link (requested by user)" e-mail
+code                           In case of the waiting list, the voucher code to redeem
 hours                          In case of the waiting list, the number of hours the voucher code is valid
-product                        In case of the waiting list, the product that has become available
-voucher_list                   When sending out vouchers in bulk, this will be replaced with the list of
-                               vouchers
 ============================== ===============================================================================
 
 The different e-mails are explained in the following:

doc/user/events/widget.rst

@@ -88,15 +88,6 @@ website. If you confident to have a good reason for not using SSL, you can overr
 
    <pretix-widget event="https://pretix.eu/demo/democon/" skip-ssl-check></pretix-widget>
 
-Always open a new tab
----------------------
-
-If you want the checkout process to always open a new tab regardless of screen size, you can pass the ``disable-iframe``
-attribute::
-
-   <pretix-widget event="https://pretix.eu/demo/democon/" disable-iframe></pretix-widget>
-
-
 Pre-selecting a voucher
 -----------------------
 
@@ -206,10 +197,7 @@ should be added to the cart. The syntax of this attribute is ``item_ITEMID=1,ite
 where ``ITEMID`` are the internal IDs of items to be added and ``VARID`` are the internal IDs of variations of those
 items, if the items have variations. If you omit the ``items`` attribute, the general start page will be presented.
 
-In case you are using an event-series, you will need to specify the subevent for which the item(s) should be put in the
-cart. This can be done by specifying the ``subevent``-attribute.
-
-Just as the widget, the button supports the optional attributes ``voucher``, ``disable-iframe``, and ``skip-ssl-check``.
+Just as the widget, the button supports the optional attributes ``voucher`` and ``skip-ssl-check``.
 
 You can style the button using the ``pretix-button`` CSS class.
 
@@ -316,92 +304,8 @@ Hosted or pretix Enterprise are active, you can pass the following fields:
 * If you use the campaigns plugin, you can pass a campaign ID as a value to ``data-campaign``. This way, all orders
   made through this widget will be counted towards this campaign.
 
-* If you use the tracking plugin, you can enable cross-domain tracking. To do so, you need to initialize the 
-  pretix-widget manually. Use the html code to embed the widget and add one the following code snippets. Make sure to
-  replace all occurrences of <MEASUREMENT_ID> with your Google Analytics MEASUREMENT_ID (UA-XXXXXXX-X or G-XXXXXXXX)
-
-  Please also make sure to add the embedding website to your `Referral exclusions
-  <https://support.google.com/analytics/answer/2795830>`_ in your Google Analytics settings.
-
-  If you use Google Analytics 4 (GA4 – G-XXXXXXXX)::
-
-    <script async src="https://www.googletagmanager.com/gtag/js?id=<MEASUREMENT_ID>"></script>
-    <script type="text/javascript">
-        window.dataLayer = window.dataLayer || [];
-        function gtag(){dataLayer.push(arguments);}
-        gtag('js', new Date());
-        gtag('config', '<MEASUREMENT_ID>');
-
-        window.pretixWidgetCallback = function () {
-            window.PretixWidget.build_widgets = false;
-            window.addEventListener('load', function() { // Wait for GA to be loaded
-                if (!window['google_tag_manager']) {
-                    window.PretixWidget.buildWidgets();
-                    return;
-                }
-
-                var clientId;
-                var sessionId;
-                var loadingTimeout;
-                function build() {
-                    // use loadingTimeout to make sure build() is only called once
-                    if (!loadingTimeout) return;
-                    window.clearTimeout(loadingTimeout);
-                    loadingTimeout = null;
-                    if (clientId) window.PretixWidget.widget_data["tracking-ga-id"] = clientId;
-                    if (sessionId) window.PretixWidget.widget_data["tracking-ga-sessid"] = sessionId;
-                    window.PretixWidget.buildWidgets();
-                };
-                // make sure to build pretix-widgets if gtag fails to load either client_id or session_id
-                loadingTimeout = window.setTimeout(build, 2000);
-
-                gtag('get', '<MEASUREMENT_ID>', 'client_id', function(id) {
-                    clientId = id;
-                    if (sessionId !== undefined) build();
-                });
-                gtag('get', '<MEASUREMENT_ID>', 'session_id', function(id) {
-                    sessionId = id;
-                    if (clientId !== undefined) build();
-                });
-            });
-        };
-    </script>
-
-  If you use Universal Analytics with ``gtag.js`` (UA-XXXXXXX-X)::
-
-    <script async src="https://www.googletagmanager.com/gtag/js?id=<MEASUREMENT_ID>"></script>
-    <script type="text/javascript">
-        window.dataLayer = window.dataLayer || [];
-        function gtag(){dataLayer.push(arguments);}
-        gtag('js', new Date());
-        gtag('config', '<MEASUREMENT_ID>');
-
-        window.pretixWidgetCallback = function () {
-            window.PretixWidget.build_widgets = false;
-            window.addEventListener('load', function() { // Wait for GA to be loaded
-                if (!window['google_tag_manager']) {
-                    window.PretixWidget.buildWidgets();
-                    return;
-                }
-
-                // make sure to build pretix-widgets if gtag fails to load client_id
-                var loadingTimeout = window.setTimeout(function() {
-                    loadingTimeout = null;
-                    window.PretixWidget.buildWidgets();
-                }, 1000);
-
-                gtag('get', '<MEASUREMENT_ID>', 'client_id', function(id) {
-                    if (loadingTimeout) {
-                        window.clearTimeout(loadingTimeout);
-                        window.PretixWidget.widget_data["tracking-ga-id"] = id;
-                        window.PretixWidget.buildWidgets();
-                    }
-                });
-            });
-        };
-    </script>
-
-  If you use ```analytics.js` (Universal Analytics)::
+* If you use the tracking plugin, you can pass a Google Analytics User ID to enable cross-domain tracking. This will
+  require you to dynamically load the widget, like this::
 
     <script>
         (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -409,33 +313,32 @@ Hosted or pretix Enterprise are active, you can pass the following fields:
         m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
         })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
-        ga('create', '<MEASUREMENT_ID>', 'auto');
+        ga('create', 'UA-XXXXXX-1', 'auto');
         ga('send', 'pageview');
 
         window.pretixWidgetCallback = function () {
             window.PretixWidget.build_widgets = false;
             window.addEventListener('load', function() { // Wait for GA to be loaded
-                if (!window['ga'] || !ga.create) {
-                    // Tracking is probably blocked
-                    window.PretixWidget.buildWidgets()
-                    return;
-                }
-
-                var loadingTimeout = window.setTimeout(function() {
-                    loadingTimeout = null;
-                    window.PretixWidget.buildWidgets();
-                }, 1000);
-                ga(function(tracker) {
-                    if (loadingTimeout) {
-                        window.clearTimeout(loadingTimeout);
+                if(window.ga && ga.create) {
+                    ga(function(tracker) {
                         window.PretixWidget.widget_data["tracking-ga-id"] = tracker.get('clientId');
-                        window.PretixWidget.buildWidgets();
-                    }
-                });
+                        window.PretixWidget.buildWidgets()
+                    });
+                } else { // Tracking is probably blocked
+                       window.PretixWidget.buildWidgets()
+                }
             });
         };
     </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
 

doc/user/organizers/teams.rst

@@ -59,8 +59,6 @@ Permissions separate into two areas:
    * Can view vouchers – This permission allows viewing the list of vouchers including the voucher codes themselves and
      their redemption status.
 
-   * Can perform check-ins – This permission allows using web-based features to perform ticket search and check-in.
-
    * Can change vouchers – This permission allows to create and modify vouchers in all their details. It only works
      properly if the same users also have the "Can view vouchers" permission.
 

src/.gitignore

@@ -8,5 +8,3 @@ dist/
 *.egg-info/
 *.bak
 pretix/static/jsi18n/
-node_modules/
-

src/MANIFEST.in

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

src/Makefile

@@ -6,13 +6,13 @@ localecompile:
 	./manage.py compilemessages
 
 localegen:
-	./manage.py makemessages --keep-pot --ignore "pretix/helpers/*" --ignore "pretix/static/npm_dir/*" $(LNGS)
-	./manage.py makemessages --keep-pot -d djangojs --ignore "pretix/static/npm_dir/*" --ignore "pretix/helpers/*" --ignore "pretix/static/jsi18n/*" --ignore "pretix/static/jsi18n/*" --ignore "pretix/static.dist/*" --ignore "data/*" --ignore "pretix/static/rrule/*" --ignore "build/*" $(LNGS)
+	./manage.py makemessages --keep-pot --ignore "pretix/helpers/*" $(LNGS)
+	./manage.py makemessages --keep-pot -d djangojs --ignore "pretix/helpers/*" --ignore "pretix/static/jsi18n/*" --ignore "pretix/static/jsi18n/*" --ignore "pretix/static.dist/*" --ignore "data/*" --ignore "build/*" $(LNGS)
 
 staticfiles: jsi18n
 	./manage.py collectstatic --noinput
 
-compress: npminstall
+compress:
 	./manage.py compress
 
 jsi18n: localecompile
@@ -23,10 +23,3 @@ test:
 
 coverage:
 	coverage run -m py.test
-
-npminstall:
-	# keep this in sync with setup.py!
-	mkdir -p pretix/static.dist/node_prefix/
-	cp -r pretix/static/npm_dir/* pretix/static.dist/node_prefix/
-	npm install --prefix=pretix/static.dist/node_prefix
-

src/pretix/__init__.py

@@ -1 +1 @@
-__version__ = "3.17.2"
+__version__ = "3.13.0.dev0"

src/pretix/api/auth/devicesecurity.py

@@ -10,7 +10,7 @@ class FullAccessSecurityProfile:
 
 
 class AllowListSecurityProfile:
-    allowlist = ()
+    allowlist = tuple()
 
     def is_allowed(self, request):
         key = (request.method, f"{request.resolver_match.namespace}:{request.resolver_match.url_name}")
@@ -41,9 +41,7 @@ class PretixScanSecurityProfile(AllowListSecurityProfile):
         ('POST', 'api-v1:checkinlistpos-redeem'),
         ('GET', 'api-v1:revokedsecrets-list'),
         ('GET', 'api-v1:order-list'),
-        ('GET', 'api-v1:orderposition-pdf_image'),
         ('GET', 'api-v1:event.settings'),
-        ('POST', 'api-v1:upload'),
     )
 
 
@@ -69,9 +67,7 @@ class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:checkinlist-status'),
         ('POST', 'api-v1:checkinlistpos-redeem'),
         ('GET', 'api-v1:revokedsecrets-list'),
-        ('GET', 'api-v1:orderposition-pdf_image'),
         ('GET', 'api-v1:event.settings'),
-        ('POST', 'api-v1:upload'),
     )
 
 
@@ -95,34 +91,23 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:taxrule-list'),
         ('GET', 'api-v1:ticketlayout-list'),
         ('GET', 'api-v1:ticketlayoutitem-list'),
-        ('GET', 'api-v1:badgelayout-list'),
-        ('GET', 'api-v1:badgeitem-list'),
         ('GET', 'api-v1:order-list'),
         ('POST', 'api-v1:order-list'),
         ('GET', 'api-v1:order-detail'),
         ('DELETE', 'api-v1:orderposition-detail'),
-        ('GET', 'api-v1:orderposition-pdf_image'),
         ('POST', 'api-v1:order-mark_canceled'),
-        ('POST', 'api-v1:orderpayment-list'),
         ('POST', 'api-v1:orderrefund-list'),
         ('POST', 'api-v1:orderrefund-done'),
         ('POST', 'api-v1:cartposition-list'),
         ('DELETE', 'api-v1:cartposition-detail'),
         ('GET', 'api-v1:giftcard-list'),
         ('POST', 'api-v1:giftcard-transact'),
-        ('GET', 'plugins:pretix_posbackend:posclosing-list'),
         ('POST', 'plugins:pretix_posbackend:posreceipt-list'),
         ('POST', 'plugins:pretix_posbackend:posclosing-list'),
         ('POST', 'plugins:pretix_posbackend:posdebugdump-list'),
-        ('GET', 'plugins:pretix_posbackend:poscashier-list'),
         ('POST', 'plugins:pretix_posbackend:stripeterminal.token'),
         ('GET', 'api-v1:revokedsecrets-list'),
         ('GET', 'api-v1:event.settings'),
-        ('GET', 'plugins:pretix_seating:event.event'),
-        ('GET', 'plugins:pretix_seating:event.event.subevent'),
-        ('GET', 'plugins:pretix_seating:event.plan'),
-        ('GET', 'plugins:pretix_seating:selection.simple'),
-        ('POST', 'api-v1:upload'),
     )
 
 

src/pretix/api/auth/permission.py

@@ -46,12 +46,8 @@ class EventPermission(BasePermission):
             else:
                 request.eventpermset = perm_holder.get_event_permission_set(request.organizer, request.event)
 
-            if isinstance(required_permission, (list, tuple)):
-                if not any(p in request.eventpermset for p in required_permission):
-                    return False
-            else:
-                if required_permission and required_permission not in request.eventpermset:
-                    return False
+            if required_permission and required_permission not in request.eventpermset:
+                return False
 
         elif 'organizer' in request.resolver_match.kwargs:
             if not request.organizer or not perm_holder.has_organizer_permission(request.organizer, request=request):
@@ -61,12 +57,8 @@ class EventPermission(BasePermission):
             else:
                 request.orgapermset = perm_holder.get_organizer_permission_set(request.organizer)
 
-            if isinstance(required_permission, (list, tuple)):
-                if not any(p in request.eventpermset for p in required_permission):
-                    return False
-            else:
-                if required_permission and required_permission not in request.orgapermset:
-                    return False
+            if required_permission and required_permission not in request.orgapermset:
+                return False
 
         if isinstance(request.auth, OAuthAccessToken):
             if not request.auth.allow_scopes(['write']) and request.method not in SAFE_METHODS:
@@ -97,38 +89,10 @@ class EventCRUDPermission(EventPermission):
 class ProfilePermission(BasePermission):
 
     def has_permission(self, request, view):
-        if not request.user.is_authenticated and not isinstance(request.auth, (Device, TeamAPIToken)):
+        if not request.user.is_authenticated:
             return False
 
-        if request.user.is_authenticated:
-            try:
-                # If this logic is updated, make sure to also update the logic in pretix/control/middleware.py
-                assert_session_valid(request)
-            except SessionInvalid:
-                return False
-            except SessionReauthRequired:
-                return False
-
         if isinstance(request.auth, OAuthAccessToken):
             if not (request.auth.allow_scopes(['read']) or request.auth.allow_scopes(['profile'])) and request.method in SAFE_METHODS:
                 return False
-
-        return True
-
-
-class AnyAuthenticatedClientPermission(BasePermission):
-
-    def has_permission(self, request, view):
-        if not request.user.is_authenticated and not isinstance(request.auth, (Device, TeamAPIToken)):
-            return False
-
-        if request.user.is_authenticated:
-            try:
-                # If this logic is updated, make sure to also update the logic in pretix/control/middleware.py
-                assert_session_valid(request)
-            except SessionInvalid:
-                return False
-            except SessionReauthRequired:
-                return False
-
         return True

src/pretix/api/serializers/cart.py

@@ -1,6 +1,5 @@
 from datetime import timedelta
 
-from django.core.files import File
 from django.utils.crypto import get_random_string
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy
@@ -88,10 +87,7 @@ class CartPositionCreateSerializer(I18nAwareModelSerializer):
                     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'),
-                        distance_ignore_cart_id=validated_data['cart_id'],
-                    ):
+                    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.')
@@ -101,21 +97,13 @@ class CartPositionCreateSerializer(I18nAwareModelSerializer):
 
         for answ_data in answers_data:
             options = answ_data.pop('options')
-            if isinstance(answ_data['answer'], File):
-                an = answ_data.pop('answer')
-                answ = cp.answers.create(**answ_data, answer='')
-                answ.file.save(an.name, an, save=False)
-                answ.answer = 'file://' + answ.file.name
-                answ.save()
-            else:
-                answ = cp.answers.create(**answ_data)
-                answ.options.add(*options)
+            answ = cp.answers.create(**answ_data)
+            answ.options.add(*options)
         return cp
 
     def validate_cart_id(self, cid):
         if cid and not cid.endswith('@api'):
             raise ValidationError('Cart ID should end in @api or be empty.')
-        return cid
 
     def validate_item(self, item):
         if item.event != self.context['event']:

src/pretix/api/serializers/checkin.py

@@ -2,7 +2,6 @@ from django.utils.translation import gettext as _
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
-from pretix.api.serializers.event import SubEventSerializer
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.models import CheckinList
@@ -21,9 +20,6 @@ class CheckinListSerializer(I18nAwareModelSerializer):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        if 'subevent' in self.context['request'].query_params.getlist('expand'):
-            self.fields['subevent'] = SubEventSerializer(read_only=True)
-
         for exclude_field in self.context['request'].query_params.getlist('exclude'):
             p = exclude_field.split('.')
             if p[0] in self.fields:
@@ -54,6 +50,4 @@ class CheckinListSerializer(I18nAwareModelSerializer):
             if channel not in get_all_sales_channels():
                 raise ValidationError(_('Unknown sales channel.'))
 
-        CheckinList.validate_rules(data.get('rules'))
-
         return data

src/pretix/api/serializers/event.py

@@ -1,29 +1,25 @@
-import logging
-
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import transaction
-from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
 from django.utils.translation import gettext as _
 from django_countries.serializers import CountryFieldMixin
+from hierarkey.proxy import HierarkeyProxy
 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.api.serializers.settings import SettingsSerializer
-from pretix.base.models import Device, Event, TaxRule, TeamAPIToken
+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 validate_event_settings
+from pretix.base.settings import DEFAULTS, validate_settings
 from pretix.base.signals import api_event_settings_fields
 
-logger = logging.getLogger(__name__)
-
 
 class MetaDataField(Field):
 
@@ -128,8 +124,7 @@ class EventSerializer(I18nAwareModelSerializer):
         fields = ('name', 'slug', 'live', 'testmode', 'currency', 'date_from',
                   'date_to', 'date_admission', 'is_public', 'presale_start',
                   'presale_end', 'location', 'geo_lat', 'geo_lon', 'has_subevents', 'meta_data', 'seating_plan',
-                  'plugins', 'seat_category_mapping', 'timezone', 'item_meta_properties', 'valid_keys',
-                  'sales_channels')
+                  'plugins', 'seat_category_mapping', 'timezone', 'item_meta_properties', 'valid_keys')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -174,12 +169,9 @@ class EventSerializer(I18nAwareModelSerializer):
         }
 
     def validate_meta_data(self, value):
-        for key, v in value['meta_data'].items():
+        for key in value['meta_data'].keys():
             if key not in self.meta_properties:
                 raise ValidationError(_('Meta data property \'{name}\' does not exist.').format(name=key))
-            if self.meta_properties[key].allowed_values:
-                if v not in [_v.strip() for _v in self.meta_properties[key].allowed_values.splitlines()]:
-                    raise ValidationError(_('Meta data property \'{name}\' does not allow value \'{value}\'.').format(name=key, value=v))
         return value
 
     @cached_property
@@ -226,14 +218,6 @@ class EventSerializer(I18nAwareModelSerializer):
 
         return value
 
-    @cached_property
-    def ignored_meta_properties(self):
-        perm_holder = (self.context['request'].auth if isinstance(self.context['request'].auth, (Device, TeamAPIToken))
-                       else self.context['request'].user)
-        if perm_holder.has_organizer_permission('can_change_organizer_settings', request=self.context['request']):
-            return []
-        return [k for k, p in self.meta_properties.items() if p.protected]
-
     @transaction.atomic
     def create(self, validated_data):
         meta_data = validated_data.pop('meta_data', None)
@@ -249,11 +233,10 @@ class EventSerializer(I18nAwareModelSerializer):
         # Meta data
         if meta_data is not None:
             for key, value in meta_data.items():
-                if key not in self.ignored_meta_properties:
-                    event.meta_values.create(
-                        property=self.meta_properties.get(key),
-                        value=value
-                    )
+                event.meta_values.create(
+                    property=self.meta_properties.get(key),
+                    value=value
+                )
 
         # Item Meta properties
         if item_meta_properties is not None:
@@ -291,25 +274,23 @@ class EventSerializer(I18nAwareModelSerializer):
         if meta_data is not None:
             current = {mv.property: mv for mv in event.meta_values.select_related('property')}
             for key, value in meta_data.items():
-                if key not in self.ignored_meta_properties:
-                    prop = self.meta_properties.get(key)
-                    if prop in current:
-                        current[prop].value = value
-                        current[prop].save()
-                    else:
-                        event.meta_values.create(
-                            property=self.meta_properties.get(key),
-                            value=value
-                        )
+                prop = self.meta_properties.get(key)
+                if prop in current:
+                    current[prop].value = value
+                    current[prop].save()
+                else:
+                    event.meta_values.create(
+                        property=self.meta_properties.get(key),
+                        value=value
+                    )
 
             for prop, current_object in current.items():
-                if prop.name not in self.ignored_meta_properties:
-                    if prop.name not in meta_data:
-                        current_object.delete()
+                if prop.name not in meta_data:
+                    current_object.delete()
 
         # Item Meta properties
         if item_meta_properties is not None:
-            current = list(event.item_meta_properties.all())
+            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:
@@ -409,8 +390,8 @@ class SubEventSerializer(I18nAwareModelSerializer):
         model = SubEvent
         fields = ('id', 'name', 'date_from', 'date_to', 'active', 'date_admission',
                   'presale_start', 'presale_end', 'location', 'geo_lat', 'geo_lon', 'event', 'is_public',
-                  'frontpage_text', 'seating_plan', 'item_price_overrides', 'variation_price_overrides',
-                  'meta_data', 'seat_category_mapping', 'last_modified')
+                  'seating_plan', 'item_price_overrides', 'variation_price_overrides', 'meta_data',
+                  'seat_category_mapping', 'last_modified')
 
     def validate(self, data):
         data = super().validate(data)
@@ -458,22 +439,11 @@ class SubEventSerializer(I18nAwareModelSerializer):
         }
 
     def validate_meta_data(self, value):
-        for key, v in value['meta_data'].items():
+        for key in value['meta_data'].keys():
             if key not in self.meta_properties:
                 raise ValidationError(_('Meta data property \'{name}\' does not exist.').format(name=key))
-            if self.meta_properties[key].allowed_values:
-                if v not in [_v.strip() for _v in self.meta_properties[key].allowed_values.splitlines()]:
-                    raise ValidationError(_('Meta data property \'{name}\' does not allow value \'{value}\'.').format(name=key, value=v))
         return value
 
-    @cached_property
-    def ignored_meta_properties(self):
-        perm_holder = (self.context['request'].auth if isinstance(self.context['request'].auth, (Device, TeamAPIToken))
-                       else self.context['request'].user)
-        if perm_holder.has_organizer_permission('can_change_organizer_settings', request=self.context['request']):
-            return []
-        return [k for k, p in self.meta_properties.items() if p.protected]
-
     @transaction.atomic
     def create(self, validated_data):
         item_price_overrides_data = validated_data.pop('subeventitem_set') if 'subeventitem_set' in validated_data else {}
@@ -490,11 +460,10 @@ class SubEventSerializer(I18nAwareModelSerializer):
         # Meta data
         if meta_data is not None:
             for key, value in meta_data.items():
-                if key not in self.ignored_meta_properties:
-                    subevent.meta_values.create(
-                        property=self.meta_properties.get(key),
-                        value=value
-                    )
+                subevent.meta_values.create(
+                    property=self.meta_properties.get(key),
+                    value=value
+                )
 
         # Seats
         if subevent.seating_plan:
@@ -540,21 +509,19 @@ class SubEventSerializer(I18nAwareModelSerializer):
         if meta_data is not None:
             current = {mv.property: mv for mv in subevent.meta_values.select_related('property')}
             for key, value in meta_data.items():
-                if key not in self.ignored_meta_properties:
-                    prop = self.meta_properties.get(key)
-                    if prop in current:
-                        current[prop].value = value
-                        current[prop].save()
-                    else:
-                        subevent.meta_values.create(
-                            property=self.meta_properties.get(key),
-                            value=value
-                        )
+                prop = self.meta_properties.get(key)
+                if prop in current:
+                    current[prop].value = value
+                    current[prop].save()
+                else:
+                    subevent.meta_values.create(
+                        property=self.meta_properties.get(key),
+                        value=value
+                    )
 
             for prop, current_object in current.items():
-                if prop.name not in self.ignored_meta_properties:
-                    if prop.name not in meta_data:
-                        current_object.delete()
+                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):
@@ -587,16 +554,15 @@ class SubEventSerializer(I18nAwareModelSerializer):
 class TaxRuleSerializer(CountryFieldMixin, I18nAwareModelSerializer):
     class Meta:
         model = TaxRule
-        fields = ('id', 'name', 'rate', 'price_includes_tax', 'eu_reverse_charge', 'home_country')
+        fields = ('id', 'name', 'rate', 'price_includes_tax')
 
 
-class EventSettingsSerializer(SettingsSerializer):
+class EventSettingsSerializer(serializers.Serializer):
     default_fields = [
         'imprint_url',
         'checkout_email_helptext',
         'presale_has_ended_text',
         'voucher_explanation_text',
-        'checkout_success_text',
         'banner_text',
         'banner_text_bottom',
         'show_dates_on_frontpage',
@@ -607,18 +573,11 @@ class EventSettingsSerializer(SettingsSerializer):
         'presale_start_show_date',
         'locales',
         'locale',
-        'region',
         'last_order_modification_date',
-        'allow_modifications_after_checkin',
         'show_quota_left',
         'waiting_list_enabled',
         'waiting_list_hours',
         'waiting_list_auto',
-        'waiting_list_names_asked',
-        'waiting_list_names_required',
-        'waiting_list_phones_asked',
-        'waiting_list_phones_required',
-        'waiting_list_phones_explanation_text',
         'max_items_per_order',
         'reservation_time',
         'contact_mail',
@@ -628,9 +587,7 @@ class EventSettingsSerializer(SettingsSerializer):
         'redirect_to_checkout_directly',
         'frontpage_subevent_ordering',
         'event_list_type',
-        'event_list_available_only',
         'frontpage_text',
-        'event_info_text',
         'attendee_names_asked',
         'attendee_names_required',
         'attendee_emails_asked',
@@ -639,12 +596,8 @@ class EventSettingsSerializer(SettingsSerializer):
         'attendee_addresses_required',
         'attendee_company_asked',
         'attendee_company_required',
-        'attendee_data_explanation_text',
         'confirm_texts',
         'order_email_asked_twice',
-        'order_phone_asked',
-        'order_phone_required',
-        'checkout_phone_helptext',
         'payment_term_mode',
         'payment_term_days',
         'payment_term_weekdays',
@@ -653,7 +606,6 @@ class EventSettingsSerializer(SettingsSerializer):
         'payment_term_expire_automatically',
         'payment_term_accept_late',
         'payment_explanation',
-        'payment_pending_hidden',
         'ticket_download',
         'ticket_download_date',
         'ticket_download_addons',
@@ -664,7 +616,6 @@ class EventSettingsSerializer(SettingsSerializer):
         'mail_from',
         'mail_from_name',
         'mail_attach_ical',
-        'mail_attach_tickets',
         'invoice_address_asked',
         'invoice_address_required',
         'invoice_address_vatid',
@@ -696,7 +647,6 @@ class EventSettingsSerializer(SettingsSerializer):
         'invoice_additional_text',
         'invoice_footer_text',
         'invoice_eu_currencies',
-        'invoice_logo_image',
         'cancel_allow_user',
         'cancel_allow_user_until',
         'cancel_allow_user_paid',
@@ -706,48 +656,54 @@ class EventSettingsSerializer(SettingsSerializer):
         'cancel_allow_user_paid_keep_percentage',
         'cancel_allow_user_paid_adjust_fees',
         'cancel_allow_user_paid_adjust_fees_explanation',
-        'cancel_allow_user_paid_adjust_fees_step',
         'cancel_allow_user_paid_refund_as_giftcard',
         'cancel_allow_user_paid_require_approval',
         'change_allow_user_variation',
         'change_allow_user_until',
         'change_allow_user_price',
-        'primary_color',
-        'theme_color_success',
-        'theme_color_danger',
-        'theme_color_background',
-        'theme_round_borders',
-        'primary_font',
-        'logo_image',
-        'logo_image_large',
-        'logo_show_title',
-        'og_image',
     ]
 
     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', {})
+            if callable(kwargs):
+                kwargs = kwargs()
+            kwargs.setdefault('required', False)
+            kwargs.setdefault('allow_null', True)
+            form_kwargs = DEFAULTS[fname].get('form_kwargs', {})
+            if callable(form_kwargs):
+                form_kwargs = 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_event_settings(self.event, settings_dict)
+        validate_settings(self.event, settings_dict)
         return data
 
-    def get_new_filename(self, name: str) -> str:
-        nonce = get_random_string(length=8)
-        fname = '%s/%s/%s.%s.%s' % (
-            self.event.organizer.slug, self.event.slug, name.split('/')[-1], nonce, name.split('.')[-1]
-        )
-        # TODO: make sure pub is always correct
-        return 'pub/' + fname
-
 
 class DeviceEventSettingsSerializer(EventSettingsSerializer):
     default_fields = [

src/pretix/api/serializers/exporters.py

@@ -1,127 +0,0 @@
-from django import forms
-from django.http import QueryDict
-from rest_framework import serializers
-
-
-class FormFieldWrapperField(serializers.Field):
-    def __init__(self, *args, **kwargs):
-        self.form_field = kwargs.pop('form_field')
-        super().__init__(*args, **kwargs)
-
-    def to_representation(self, value):
-        return self.form_field.widget.format_value(value)
-
-    def to_internal_value(self, data):
-        d = self.form_field.widget.value_from_datadict({'name': data}, {}, 'name')
-        d = self.form_field.clean(d)
-        return d
-
-
-simple_mappings = (
-    (forms.DateField, serializers.DateField, ()),
-    (forms.TimeField, serializers.TimeField, ()),
-    (forms.SplitDateTimeField, serializers.DateTimeField, ()),
-    (forms.DateTimeField, serializers.DateTimeField, ()),
-    (forms.DecimalField, serializers.DecimalField, ('max_digits', 'decimal_places', 'min_value', 'max_value')),
-    (forms.FloatField, serializers.FloatField, ()),
-    (forms.IntegerField, serializers.IntegerField, ()),
-    (forms.EmailField, serializers.EmailField, ()),
-    (forms.UUIDField, serializers.UUIDField, ()),
-    (forms.URLField, serializers.URLField, ()),
-    (forms.NullBooleanField, serializers.NullBooleanField, ()),
-    (forms.BooleanField, serializers.BooleanField, ()),
-)
-
-
-class SerializerDescriptionField(serializers.Field):
-    def to_representation(self, value):
-        fields = []
-        for k, v in value.fields.items():
-            d = {
-                'name': k,
-                'required': v.required,
-            }
-            if isinstance(v, serializers.ChoiceField):
-                d['choices'] = list(v.choices.keys())
-            fields.append(d)
-
-        return fields
-
-
-class ExporterSerializer(serializers.Serializer):
-    identifier = serializers.CharField()
-    verbose_name = serializers.CharField()
-    input_parameters = SerializerDescriptionField(source='_serializer')
-
-
-class PrimaryKeyRelatedField(serializers.PrimaryKeyRelatedField):
-    def to_representation(self, value):
-        if isinstance(value, int):
-            return value
-        return super().to_representation(value)
-
-
-class JobRunSerializer(serializers.Serializer):
-    def __init__(self, *args, **kwargs):
-        ex = kwargs.pop('exporter')
-        events = kwargs.pop('events', None)
-        super().__init__(*args, **kwargs)
-        if events is not None:
-            self.fields["events"] = serializers.SlugRelatedField(
-                queryset=events,
-                required=True,
-                allow_empty=False,
-                slug_field='slug',
-                many=True
-            )
-        for k, v in ex.export_form_fields.items():
-            for m_from, m_to, m_kwargs in simple_mappings:
-                if isinstance(v, m_from):
-                    self.fields[k] = m_to(
-                        required=v.required,
-                        allow_null=not v.required,
-                        validators=v.validators,
-                        **{kwarg: getattr(v, kwargs, None) for kwarg in m_kwargs}
-                    )
-                    break
-
-            if isinstance(v, forms.ModelMultipleChoiceField):
-                self.fields[k] = PrimaryKeyRelatedField(
-                    queryset=v.queryset,
-                    required=v.required,
-                    allow_empty=not v.required,
-                    validators=v.validators,
-                    many=True
-                )
-            elif isinstance(v, forms.ModelChoiceField):
-                self.fields[k] = PrimaryKeyRelatedField(
-                    queryset=v.queryset,
-                    required=v.required,
-                    allow_null=not v.required,
-                    validators=v.validators,
-                )
-            elif isinstance(v, forms.MultipleChoiceField):
-                self.fields[k] = serializers.MultipleChoiceField(
-                    choices=v.choices,
-                    required=v.required,
-                    allow_empty=not v.required,
-                    validators=v.validators,
-                )
-            elif isinstance(v, forms.ChoiceField):
-                self.fields[k] = serializers.ChoiceField(
-                    choices=v.choices,
-                    required=v.required,
-                    allow_null=not v.required,
-                    validators=v.validators,
-                )
-            else:
-                self.fields[k] = FormFieldWrapperField(form_field=v, required=v.required, allow_null=not v.required)
-
-    def to_internal_value(self, data):
-        if isinstance(data, QueryDict):
-            data = data.copy()
-        for k, v in self.fields.items():
-            if isinstance(v, serializers.ManyRelatedField) and k not in data:
-                data[k] = []
-        data = super().to_internal_value(data)
-        return data

src/pretix/api/serializers/fields.py

@@ -1,6 +1,5 @@
 from collections import OrderedDict
 
-from django.core.exceptions import ValidationError
 from rest_framework import serializers
 
 
@@ -28,50 +27,3 @@ class ListMultipleChoiceField(serializers.MultipleChoiceField):
         ]
 
         return remove_duplicates_from_list(representation_data)
-
-
-class UploadedFileField(serializers.Field):
-    default_error_messages = {
-        'required': 'No file was submitted.',
-        'not_found': 'The submitted file ID was not found.',
-        'invalid_type': 'The submitted file has a file type that is not allowed in this field.',
-        'size': 'The submitted file is too large to be used in this field.',
-    }
-
-    def __init__(self, *args, **kwargs):
-        self.allowed_types = kwargs.pop('allowed_types', None)
-        self.max_size = kwargs.pop('max_size', None)
-        super().__init__(*args, **kwargs)
-
-    def to_internal_value(self, data):
-        from pretix.base.models import CachedFile
-
-        request = self.context.get('request', None)
-        try:
-            cf = CachedFile.objects.get(
-                session_key=f'api-upload-{str(type(request.user or request.auth))}-{(request.user or request.auth).pk}',
-                file__isnull=False,
-                pk=data[len("file:"):],
-            )
-        except (ValidationError, IndexError):  # invalid uuid
-            self.fail('not_found')
-        except CachedFile.DoesNotExist:
-            self.fail('not_found')
-
-        if self.allowed_types and cf.type not in self.allowed_types:
-            self.fail('invalid_type')
-        if self.max_size and cf.file.size > self.max_size:
-            self.fail('size')
-
-        return cf.file
-
-    def to_representation(self, value):
-        if not value:
-            return None
-
-        try:
-            url = value.url
-        except AttributeError:
-            return None
-        request = self.context['request']
-        return request.build_absolute_uri(url)

src/pretix/api/serializers/item.py

@@ -7,7 +7,6 @@ from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from pretix.api.serializers.event import MetaDataField
-from pretix.api.serializers.fields import UploadedFileField
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.base.models import (
     Item, ItemAddOn, ItemBundle, ItemCategory, ItemMetaValue, ItemVariation,
@@ -114,9 +113,6 @@ class ItemSerializer(I18nAwareModelSerializer):
     variations = InlineItemVariationSerializer(many=True, required=False)
     tax_rate = ItemTaxRateField(source='*', read_only=True)
     meta_data = MetaDataField(required=False, source='*')
-    picture = UploadedFileField(required=False, allow_null=True, allowed_types=(
-        'image/png', 'image/jpeg', 'image/gif'
-    ), max_size=10 * 1024 * 1024)
 
     class Meta:
         model = Item
@@ -127,7 +123,7 @@ class ItemSerializer(I18nAwareModelSerializer):
                   'min_per_order', 'max_per_order', 'checkin_attention', 'has_variations', 'variations',
                   'addons', 'bundles', 'original_price', 'require_approval', 'generate_tickets',
                   'show_quota_left', 'hidden_if_available', 'allow_waitinglist', 'issue_giftcard', 'meta_data')
-        read_only_fields = ('has_variations',)
+        read_only_fields = ('has_variations', 'picture')
 
     def validate(self, data):
         data = super().validate(data)
@@ -281,9 +277,7 @@ class QuestionSerializer(I18nAwareModelSerializer):
         model = Question
         fields = ('id', 'question', 'type', 'required', 'items', 'options', 'position',
                   'ask_during_checkin', 'identifier', 'dependency_question', 'dependency_values',
-                  'hidden', 'dependency_value', 'print_on_invoice', 'help_text', 'valid_number_min',
-                  'valid_number_max', 'valid_date_min', 'valid_date_max', 'valid_datetime_min', 'valid_datetime_max'
-                  )
+                  'hidden', 'dependency_value', 'print_on_invoice', 'help_text')
 
     def validate_identifier(self, value):
         Question._clean_identifier(self.context['event'], value, self.instance)

src/pretix/api/serializers/order.py

@@ -3,7 +3,6 @@ from collections import Counter, defaultdict
 from decimal import Decimal
 
 import pycountry
-from django.core.files import File
 from django.db.models import F, Q
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy
@@ -13,23 +12,18 @@ from rest_framework.exceptions import ValidationError
 from rest_framework.relations import SlugRelatedField
 from rest_framework.reverse import reverse
 
-from pretix.api.serializers.event import SubEventSerializer
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
-from pretix.api.serializers.item import (
-    InlineItemVariationSerializer, ItemSerializer,
-)
 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 (
-    CachedFile, Checkin, Invoice, InvoiceAddress, InvoiceLine, Item,
-    ItemVariation, Order, OrderPosition, Question, QuestionAnswer, Seat,
-    SubEvent, TaxRule, Voucher,
+    Checkin, Invoice, InvoiceAddress, InvoiceLine, Item, ItemVariation, Order,
+    OrderPosition, Question, QuestionAnswer, Seat, SubEvent, TaxRule, Voucher,
 )
 from pretix.base.models.orders import (
     CartPosition, OrderFee, OrderPayment, OrderRefund, RevokedTicketSecret,
 )
-from pretix.base.pdf import get_images, get_variables
+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
@@ -49,14 +43,6 @@ class CompatibleCountryField(serializers.Field):
             return instance.country_old
 
 
-class CountryField(serializers.Field):
-    def to_internal_value(self, data):
-        return {self.field_name: Country(data)}
-
-    def to_representation(self, src):
-        return str(src) if src else None
-
-
 class InvoiceAddressSerializer(I18nAwareModelSerializer):
     country = CompatibleCountryField(source='*')
     name = serializers.CharField(required=False)
@@ -108,9 +94,12 @@ class AnswerQuestionIdentifierField(serializers.Field):
 
 class AnswerQuestionOptionsIdentifierField(serializers.Field):
     def to_representation(self, instance: QuestionAnswer):
-        if isinstance(instance, WrappedModel) or instance.pk:
-            return [o.identifier for o in instance.options.all()]
-        return []
+        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):
@@ -123,102 +112,12 @@ class InlineSeatSerializer(I18nAwareModelSerializer):
 class AnswerSerializer(I18nAwareModelSerializer):
     question_identifier = AnswerQuestionIdentifierField(source='*', read_only=True)
     option_identifiers = AnswerQuestionOptionsIdentifierField(source='*', read_only=True)
-
-    def to_representation(self, instance):
-        r = super().to_representation(instance)
-        if r['answer'].startswith('file://') and instance.orderposition:
-            r['answer'] = reverse('api-v1:orderposition-answer', kwargs={
-                'organizer': instance.orderposition.order.event.organizer.slug,
-                'event': instance.orderposition.order.event.slug,
-                'pk': instance.orderposition.pk,
-                'question': instance.question_id,
-            }, request=self.context['request'])
-        return r
+    options = AnswerQuestionOptionsField(source='*', read_only=True)
 
     class Meta:
         model = QuestionAnswer
         fields = ('question', 'answer', 'question_identifier', 'options', 'option_identifiers')
 
-    def validate_question(self, q):
-        if q.event != self.context['event']:
-            raise ValidationError(
-                'The specified question does not belong to this event.'
-            )
-        return q
-
-    def _handle_file_upload(self, data):
-        try:
-            ao = self.context["request"].user or self.context["request"].auth
-            cf = CachedFile.objects.get(
-                session_key=f'api-upload-{str(type(ao))}-{ao.pk}',
-                file__isnull=False,
-                pk=data['answer'][len("file:"):],
-            )
-        except (ValidationError, IndexError):  # invalid uuid
-            raise ValidationError('The submitted file ID "{fid}" was not found.'.format(fid=data))
-        except CachedFile.DoesNotExist:
-            raise ValidationError('The submitted file ID "{fid}" was not found.'.format(fid=data))
-
-        allowed_types = (
-            'image/png', 'image/jpeg', 'image/gif', 'application/pdf'
-        )
-        if cf.type not in allowed_types:
-            raise ValidationError('The submitted file "{fid}" has a file type that is not allowed in this field.'.format(fid=data))
-        if cf.file.size > 10 * 1024 * 1024:
-            raise ValidationError('The submitted file "{fid}" is too large to be used in this field.'.format(fid=data))
-
-        data['options'] = []
-        data['answer'] = cf.file
-        return data
-
-    def validate(self, data):
-        if data.get('question').type == Question.TYPE_FILE:
-            return self._handle_file_upload(data)
-        elif data.get('question').type in (Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE):
-            if not data.get('options'):
-                raise ValidationError(
-                    'You need to specify options if the question is of a choice type.'
-                )
-            if data.get('question').type == Question.TYPE_CHOICE and len(data.get('options')) > 1:
-                raise ValidationError(
-                    'You can specify at most one option for this question.'
-                )
-            for o in data.get('options'):
-                if o.question_id != data.get('question').pk:
-                    raise ValidationError(
-                        'The specified option does not belong to this question.'
-                    )
-
-            data['answer'] = ", ".join([str(o) for o in data.get('options')])
-
-        else:
-            if data.get('options'):
-                raise ValidationError(
-                    'You should not specify options if the question is not of a choice type.'
-                )
-
-            if data.get('question').type == Question.TYPE_BOOLEAN:
-                if data.get('answer') in ['true', 'True', '1', 'TRUE']:
-                    data['answer'] = 'True'
-                elif data.get('answer') in ['false', 'False', '0', 'FALSE']:
-                    data['answer'] = 'False'
-                else:
-                    raise ValidationError(
-                        'Please specify "true" or "false" for boolean questions.'
-                    )
-            elif data.get('question').type == Question.TYPE_NUMBER:
-                serializers.DecimalField(
-                    max_digits=50,
-                    decimal_places=25
-                ).to_internal_value(data.get('answer'))
-            elif data.get('question').type == Question.TYPE_DATE:
-                data['answer'] = serializers.DateField().to_internal_value(data.get('answer'))
-            elif data.get('question').type == Question.TYPE_TIME:
-                data['answer'] = serializers.TimeField().to_internal_value(data.get('answer'))
-            elif data.get('question').type == Question.TYPE_DATETIME:
-                data['answer'] = serializers.DateTimeField().to_internal_value(data.get('answer'))
-        return data
-
 
 class CheckinSerializer(I18nAwareModelSerializer):
     class Meta:
@@ -281,16 +180,13 @@ class PdfDataSerializer(serializers.Field):
         res = {}
 
         ev = instance.subevent or instance.order.event
-        with language(instance.order.locale, instance.order.event.settings.region):
+        with language(instance.order.locale):
             # This needs to have some extra performance improvements to avoid creating hundreds of queries when
             # we serialize a list.
 
             if 'vars' not in self.context:
                 self.context['vars'] = get_variables(self.context['request'].event)
 
-            if 'vars_images' not in self.context:
-                self.context['vars_images'] = get_images(self.context['request'].event)
-
             for k, f in self.context['vars'].items():
                 res[k] = f['evaluate'](instance, instance.order, ev)
 
@@ -305,39 +201,17 @@ class PdfDataSerializer(serializers.Field):
             for k, v in instance.item._cached_meta_data.items():
                 res['itemmeta:' + k] = v
 
-            res['images'] = {}
-
-            for k, f in self.context['vars_images'].items():
-                if 'etag' in f:
-                    has_image = etag = f['etag'](instance, instance.order, ev)
-                else:
-                    has_image = f['etag'](instance, instance.order, ev)
-                    etag = None
-                if has_image:
-                    url = reverse('api-v1:orderposition-pdf_image', kwargs={
-                        'organizer': instance.order.event.organizer.slug,
-                        'event': instance.order.event.slug,
-                        'pk': instance.pk,
-                        'key': k,
-                    }, request=self.context['request'])
-                    if etag:
-                        url += f'#etag={etag}'
-                    res['images'][k] = url
-                else:
-                    res['images'][k] = None
-
-            return res
+        return res
 
 
 class OrderPositionSerializer(I18nAwareModelSerializer):
-    checkins = CheckinSerializer(many=True, read_only=True)
+    checkins = CheckinSerializer(many=True)
     answers = AnswerSerializer(many=True)
-    downloads = PositionDownloadsField(source='*', read_only=True)
+    downloads = PositionDownloadsField(source='*')
     order = serializers.SlugRelatedField(slug_field='code', read_only=True)
-    pdf_data = PdfDataSerializer(source='*', read_only=True)
+    pdf_data = PdfDataSerializer(source='*')
     seat = InlineSeatSerializer(read_only=True)
     country = CompatibleCountryField(source='*')
-    attendee_name = serializers.CharField(required=False)
 
     class Meta:
         model = OrderPosition
@@ -345,99 +219,11 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
                   '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')
-        read_only_fields = (
-            'id', 'order', 'positionid', 'item', 'variation', 'price', 'voucher', 'tax_rate', 'tax_value', 'secret',
-            'addon_to', 'subevent', 'checkins', 'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data',
-            'seat', 'canceled'
-        )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        request = self.context.get('request')
-        if not request or not self.context['request'].query_params.get('pdf_data', 'false') == 'true' or 'can_view_orders' not in request.eventpermset:
-            self.fields.pop('pdf_data', None)
-
-    def validate(self, data):
-        if data.get('attendee_name') and data.get('attendee_name_parts'):
-            raise ValidationError(
-                {'attendee_name': ['Do not specify attendee_name if you specified attendee_name_parts.']}
-            )
-        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').code):
-                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
-
-    def update(self, instance, validated_data):
-        # Even though all fields that shouldn't be edited are marked as read_only in the serializer
-        # (hopefully), we'll be extra careful here and be explicit about the model fields we update.
-        update_fields = [
-            'attendee_name_parts', 'company', 'street', 'zipcode', 'city', 'country',
-            'state', 'attendee_email',
-        ]
-        answers_data = validated_data.pop('answers', None)
-
-        name = validated_data.pop('attendee_name', '')
-        if name and not validated_data.get('attendee_name_parts'):
-            validated_data['attendee_name_parts'] = {
-                '_legacy': name
-            }
-
-        for attr, value in validated_data.items():
-            if attr in update_fields:
-                setattr(instance, attr, value)
-
-        instance.save(update_fields=update_fields)
-
-        if answers_data is not None:
-            qs_seen = set()
-            answercache = {
-                a.question_id: a for a in instance.answers.all()
-            }
-            for answ_data in answers_data:
-                options = answ_data.pop('options', [])
-                if answ_data['question'].pk in qs_seen:
-                    raise ValidationError(f'Question {answ_data["question"]} was sent twice.')
-                if answ_data['question'].pk in answercache:
-                    a = answercache[answ_data['question'].pk]
-                    if isinstance(answ_data['answer'], File):
-                        a.file.save(answ_data['answer'].name, answ_data['answer'], save=False)
-                        a.answer = 'file://' + a.file.name
-                    else:
-                        for attr, value in answ_data.items():
-                            setattr(a, attr, value)
-                    a.save()
-                else:
-                    if isinstance(answ_data['answer'], File):
-                        an = answ_data.pop('answer')
-                        a = instance.answers.create(**answ_data, answer='')
-                        a.file.save(an.name, an, save=False)
-                        a.answer = 'file://' + a.file.name
-                        a.save()
-                    else:
-                        a = instance.answers.create(**answ_data)
-                a.options.set(options)
-                qs_seen.add(a.question_id)
-            for qid, a in answercache.items():
-                if qid not in qs_seen:
-                    a.delete()
-
-        return instance
+        if 'request' in self.context and not self.context['request'].query_params.get('pdf_data', 'false') == 'true':
+            self.fields.pop('pdf_data')
 
 
 class RequireAttentionField(serializers.Field):
@@ -489,18 +275,6 @@ class CheckinListOrderPositionSerializer(OrderPositionSerializer):
                   'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat', 'require_attention',
                   'order__status')
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        if 'subevent' in self.context['request'].query_params.getlist('expand'):
-            self.fields['subevent'] = SubEventSerializer(read_only=True)
-
-        if 'item' in self.context['request'].query_params.getlist('expand'):
-            self.fields['item'] = ItemSerializer(read_only=True)
-
-        if 'variation' in self.context['request'].query_params.getlist('expand'):
-            self.fields['variation'] = InlineItemVariationSerializer(read_only=True)
-
 
 class OrderPaymentTypeField(serializers.Field):
     # TODO: Remove after pretix 2.2
@@ -562,7 +336,7 @@ class OrderRefundSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = OrderRefund
-        fields = ('local_id', 'state', 'source', 'amount', 'payment', 'created', 'execution_date', 'comment', 'provider')
+        fields = ('local_id', 'state', 'source', 'amount', 'payment', 'created', 'execution_date', 'provider')
 
 
 class OrderURLField(serializers.URLField):
@@ -587,7 +361,7 @@ class OrderSerializer(I18nAwareModelSerializer):
     class Meta:
         model = Order
         fields = (
-            'code', 'status', 'testmode', 'secret', 'email', 'phone', 'locale', 'datetime', 'expires', 'payment_date',
+            'code', 'status', 'testmode', 'secret', 'email', 'locale', 'datetime', 'expires', 'payment_date',
             'payment_provider', 'fees', 'total', 'comment', 'invoice_address', 'positions', 'downloads',
             'checkin_attention', 'last_modified', 'payments', 'refunds', 'require_approval', 'sales_channel',
             'url'
@@ -601,7 +375,7 @@ class OrderSerializer(I18nAwareModelSerializer):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if not self.context['request'].query_params.get('pdf_data', 'false') == 'true':
-            self.fields['positions'].child.fields.pop('pdf_data', None)
+            self.fields['positions'].child.fields.pop('pdf_data')
 
         for exclude_field in self.context['request'].query_params.getlist('exclude'):
             p = exclude_field.split('.')
@@ -619,7 +393,7 @@ class OrderSerializer(I18nAwareModelSerializer):
     def update(self, instance, validated_data):
         # Even though all fields that shouldn't be edited are marked as read_only in the serializer
         # (hopefully), we'll be extra careful here and be explicit about the model fields we update.
-        update_fields = ['comment', 'checkin_attention', 'email', 'locale', 'phone']
+        update_fields = ['comment', 'checkin_attention', 'email', 'locale']
 
         if 'invoice_address' in validated_data:
             iadata = validated_data.pop('invoice_address')
@@ -651,17 +425,7 @@ class OrderSerializer(I18nAwareModelSerializer):
         return instance
 
 
-class AnswerQuestionOptionsField(serializers.Field):
-    def to_representation(self, instance: QuestionAnswer):
-        return [o.pk for o in instance.options.all()]
-
-
-class SimulatedAnswerSerializer(AnswerSerializer):
-    options = AnswerQuestionOptionsField(read_only=True, source='*')
-
-
 class SimulatedOrderPositionSerializer(OrderPositionSerializer):
-    answers = SimulatedAnswerSerializer(many=True)
     addon_to = serializers.SlugRelatedField(read_only=True, slug_field='positionid')
 
 
@@ -688,8 +452,62 @@ class PriceCalcSerializer(serializers.Serializer):
             del self.fields['subevent']
 
 
-class AnswerCreateSerializer(AnswerSerializer):
-    pass
+class AnswerCreateSerializer(I18nAwareModelSerializer):
+
+    class Meta:
+        model = QuestionAnswer
+        fields = ('question', 'answer', 'options')
+
+    def validate_question(self, q):
+        if q.event != self.context['event']:
+            raise ValidationError(
+                'The specified question does not belong to this event.'
+            )
+        return q
+
+    def validate(self, data):
+        if data.get('question').type == Question.TYPE_FILE:
+            raise ValidationError(
+                'File uploads are currently not supported via the API.'
+            )
+        elif data.get('question').type in (Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE):
+            if not data.get('options'):
+                raise ValidationError(
+                    'You need to specify options if the question is of a choice type.'
+                )
+            if data.get('question').type == Question.TYPE_CHOICE and len(data.get('options')) > 1:
+                raise ValidationError(
+                    'You can specify at most one option for this question.'
+                )
+            data['answer'] = ", ".join([str(o) for o in data.get('options')])
+
+        else:
+            if data.get('options'):
+                raise ValidationError(
+                    'You should not specify options if the question is not of a choice type.'
+                )
+
+            if data.get('question').type == Question.TYPE_BOOLEAN:
+                if data.get('answer') in ['true', 'True', '1', 'TRUE']:
+                    data['answer'] = 'True'
+                elif data.get('answer') in ['false', 'False', '0', 'FALSE']:
+                    data['answer'] = 'False'
+                else:
+                    raise ValidationError(
+                        'Please specify "true" or "false" for boolean questions.'
+                    )
+            elif data.get('question').type == Question.TYPE_NUMBER:
+                serializers.DecimalField(
+                    max_digits=50,
+                    decimal_places=25
+                ).to_internal_value(data.get('answer'))
+            elif data.get('question').type == Question.TYPE_DATE:
+                data['answer'] = serializers.DateField().to_internal_value(data.get('answer'))
+            elif data.get('question').type == Question.TYPE_TIME:
+                data['answer'] = serializers.TimeField().to_internal_value(data.get('answer'))
+            elif data.get('question').type == Question.TYPE_DATETIME:
+                data['answer'] = serializers.DateTimeField().to_internal_value(data.get('answer'))
+        return data
 
 
 class OrderFeeCreateSerializer(I18nAwareModelSerializer):
@@ -864,7 +682,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
     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_email = serializers.BooleanField(default=False, required=False)
+    send_mail = serializers.BooleanField(default=False, required=False)
     simulate = serializers.BooleanField(default=False, required=False)
 
     def __init__(self, *args, **kwargs):
@@ -873,9 +691,9 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = Order
-        fields = ('code', 'status', 'testmode', 'email', 'phone', 'locale', 'payment_provider', 'fees', 'comment', 'sales_channel',
+        fields = ('code', 'status', 'testmode', 'email', 'locale', 'payment_provider', 'fees', 'comment', 'sales_channel',
                   'invoice_address', 'positions', 'checkin_attention', 'payment_info', 'payment_date', 'consume_carts',
-                  'force', 'send_email', 'simulate')
+                  'force', 'send_mail', 'simulate')
 
     def validate_payment_provider(self, pp):
         if pp is None:
@@ -968,7 +786,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         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_email', False)
+        self._send_mail = validated_data.pop('send_mail', False)
 
         if 'invoice_address' in validated_data:
             iadata = validated_data.pop('invoice_address')
@@ -1226,16 +1044,8 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                     pos.save()
                     for answ_data in answers_data:
                         options = answ_data.pop('options', [])
-
-                        if isinstance(answ_data['answer'], File):
-                            an = answ_data.pop('answer')
-                            answ = pos.answers.create(**answ_data, answer='')
-                            answ.file.save(an.name, an, save=False)
-                            answ.answer = 'file://' + answ.file.name
-                            answ.save()
-                        else:
-                            answ = pos.answers.create(**answ_data)
-                            answ.options.add(*options)
+                        answ = pos.answers.create(**answ_data)
+                        answ.options.add(*options)
                 pos_map[pos.positionid] = pos
 
             if not simulate:
@@ -1347,24 +1157,17 @@ class InlineInvoiceLineSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = InvoiceLine
-        fields = ('position', 'description', 'item', 'variation', 'attendee_name', 'event_date_from',
-                  'event_date_to', 'gross_value', 'tax_value', 'tax_rate', 'tax_name')
+        fields = ('position', 'description', 'gross_value', 'tax_value', 'tax_rate', 'tax_name')
 
 
 class InvoiceSerializer(I18nAwareModelSerializer):
     order = serializers.SlugRelatedField(slug_field='code', read_only=True)
-    refers = serializers.SlugRelatedField(slug_field='full_invoice_no', read_only=True)
+    refers = serializers.SlugRelatedField(slug_field='invoice_no', read_only=True)
     lines = InlineInvoiceLineSerializer(many=True)
-    invoice_to_country = CountryField()
-    invoice_from_country = CountryField()
 
     class Meta:
         model = Invoice
-        fields = ('order', 'number', 'is_cancellation', 'invoice_from', 'invoice_from_name', 'invoice_from_zipcode',
-                  'invoice_from_city', 'invoice_from_country', 'invoice_from_tax_id', 'invoice_from_vat_id',
-                  'invoice_to', 'invoice_to_company', 'invoice_to_name', 'invoice_to_street', 'invoice_to_zipcode',
-                  'invoice_to_city', 'invoice_to_state', 'invoice_to_country', 'invoice_to_vat_id', 'invoice_to_beneficiary',
-                  'custom_field', 'date', 'refers', 'locale',
+        fields = ('order', 'number', 'is_cancellation', 'invoice_from', 'invoice_to', 'date', 'refers', 'locale',
                   'introductory_text', 'additional_text', 'payment_provider_text', 'footer_text', 'lines',
                   'foreign_currency_display', 'foreign_currency_rate', 'foreign_currency_rate_date',
                   'internal_reference')
@@ -1391,7 +1194,7 @@ class OrderRefundCreateSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = OrderRefund
-        fields = ('state', 'source', 'amount', 'payment', 'execution_date', 'provider', 'info', 'comment')
+        fields = ('state', 'source', 'amount', 'payment', 'execution_date', 'provider', 'info')
 
     def create(self, validated_data):
         pid = validated_data.pop('payment', None)

src/pretix/api/serializers/organizer.py

@@ -1,28 +1,21 @@
-import logging
 from decimal import Decimal
 
 from django.db.models import Q
-from django.utils.crypto import get_random_string
-from django.utils.translation import gettext_lazy as _
+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.api.serializers.settings import SettingsSerializer
 from pretix.base.auth import get_auth_backends
-from pretix.base.i18n import get_language_without_region
 from pretix.base.models import (
-    Device, GiftCard, GiftCardTransaction, Organizer, SeatingPlan, Team,
-    TeamAPIToken, TeamInvite, User,
+    Device, GiftCard, Organizer, SeatingPlan, Team, TeamAPIToken, TeamInvite,
+    User,
 )
 from pretix.base.models.seating import SeatingPlanLayoutValidator
 from pretix.base.services.mail import SendMailException, mail
-from pretix.base.settings import validate_organizer_settings
 from pretix.helpers.urls import build_absolute_uri
 
-logger = logging.getLogger(__name__)
-
 
 class OrganizerSerializer(I18nAwareModelSerializer):
     class Meta:
@@ -66,21 +59,6 @@ class GiftCardSerializer(I18nAwareModelSerializer):
         fields = ('id', 'secret', 'issuance', 'value', 'currency', 'testmode', 'expires', 'conditions')
 
 
-class OrderEventSlugField(serializers.RelatedField):
-
-    def to_representation(self, obj):
-        return obj.event.slug
-
-
-class GiftCardTransactionSerializer(I18nAwareModelSerializer):
-    order = serializers.SlugRelatedField(slug_field='code', read_only=True)
-    event = OrderEventSlugField(source='order', read_only=True)
-
-    class Meta:
-        model = GiftCardTransaction
-        fields = ('id', 'datetime', 'value', 'event', 'order', 'text')
-
-
 class EventSlugField(serializers.SlugRelatedField):
     def get_queryset(self):
         return self.context['organizer'].events.all()
@@ -95,7 +73,7 @@ class TeamSerializer(serializers.ModelSerializer):
             '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', 'can_checkin_orders'
+            'can_change_vouchers'
         )
 
     def validate(self, data):
@@ -150,7 +128,7 @@ class TeamInviteSerializer(serializers.ModelSerializer):
                     })
                 },
                 event=None,
-                locale=get_language_without_region()  # TODO: expose?
+                locale=get_language()  # TODO: expose?
             )
         except SendMailException:
             pass  # Already logged
@@ -209,47 +187,3 @@ class TeamMemberSerializer(serializers.ModelSerializer):
         fields = (
             'id', 'email', 'fullname', 'require_2fa'
         )
-
-
-class OrganizerSettingsSerializer(SettingsSerializer):
-    default_fields = [
-        'contact_mail',
-        'imprint_url',
-        'organizer_info_text',
-        'event_list_type',
-        'event_list_availability',
-        'organizer_homepage_text',
-        'organizer_link_back',
-        'organizer_logo_image_large',
-        'giftcard_length',
-        'giftcard_expiry_years',
-        'locales',
-        'region',
-        'event_team_provisioning',
-        'primary_color',
-        'theme_color_success',
-        'theme_color_danger',
-        'theme_color_background',
-        'theme_round_borders',
-        'primary_font',
-        'organizer_logo_image'
-    ]
-
-    def __init__(self, *args, **kwargs):
-        self.organizer = kwargs.pop('organizer')
-        super().__init__(*args, **kwargs)
-
-    def validate(self, data):
-        data = super().validate(data)
-        settings_dict = self.instance.freeze()
-        settings_dict.update(data)
-        validate_organizer_settings(self.organizer, settings_dict)
-        return data
-
-    def get_new_filename(self, name: str) -> str:
-        nonce = get_random_string(length=8)
-        fname = '%s/%s.%s.%s' % (
-            self.organizer.slug, name.split('/')[-1], nonce, name.split('.')[-1]
-        )
-        # TODO: make sure pub is always correct
-        return 'pub/' + fname

src/pretix/api/serializers/settings.py

@@ -1,77 +0,0 @@
-import logging
-
-from django.core.files import File
-from django.core.files.storage import default_storage
-from django.db.models.fields.files import FieldFile
-from hierarkey.proxy import HierarkeyProxy
-from rest_framework import serializers
-from rest_framework.exceptions import ValidationError
-
-from pretix.api.serializers.fields import UploadedFileField
-from pretix.base.settings import DEFAULTS
-
-logger = logging.getLogger(__name__)
-
-
-class SettingsSerializer(serializers.Serializer):
-    default_fields = []
-
-    def __init__(self, *args, **kwargs):
-        self.changed_data = []
-        super().__init__(*args, **kwargs)
-        for fname in self.default_fields:
-            kwargs = DEFAULTS[fname].get('serializer_kwargs', {})
-            if callable(kwargs):
-                kwargs = kwargs()
-            kwargs.setdefault('required', False)
-            kwargs.setdefault('allow_null', True)
-            form_kwargs = DEFAULTS[fname].get('form_kwargs', {})
-            if callable(form_kwargs):
-                form_kwargs = 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')
-            f.parent = self
-            self.fields[fname] = f
-
-    def update(self, instance: HierarkeyProxy, validated_data):
-        for attr, value in validated_data.items():
-            if isinstance(value, FieldFile):
-                # Delete old file
-                fname = instance.get(attr, as_type=File)
-                if fname:
-                    try:
-                        default_storage.delete(fname.name)
-                    except OSError:  # pragma: no cover
-                        logger.error('Deleting file %s failed.' % fname.name)
-
-                # Create new file
-                newname = default_storage.save(self.get_new_filename(value.name), value)
-                instance.set(attr, File(file=value, name=newname))
-                self.changed_data.append(attr)
-            elif isinstance(self.fields[attr], UploadedFileField):
-                if value is None:
-                    fname = instance.get(attr, as_type=File)
-                    if fname:
-                        try:
-                            default_storage.delete(fname.name)
-                        except OSError:  # pragma: no cover
-                            logger.error('Deleting file %s failed.' % fname.name)
-                    instance.delete(attr)
-                else:
-                    # file is unchanged
-                    continue
-            elif value is None:
-                instance.delete(attr)
-                self.changed_data.append(attr)
-            elif instance.get(attr, as_type=type(value)) != value:
-                instance.set(attr, value)
-                self.changed_data.append(attr)
-        return instance
-
-    def get_new_filename(self, name: str) -> str:
-        raise NotImplementedError()

src/pretix/api/serializers/waitinglist.py

@@ -8,7 +8,7 @@ class WaitingListSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = WaitingListEntry
-        fields = ('id', 'created', 'name', 'name_parts', 'email', 'phone', 'voucher', 'item', 'variation', 'locale', 'subevent', 'priority')
+        fields = ('id', 'created', 'email', 'voucher', 'item', 'variation', 'locale', 'subevent', 'priority')
         read_only_fields = ('id', 'created', 'voucher')
 
     def validate(self, data):
@@ -32,11 +32,4 @@ class WaitingListSerializer(I18nAwareModelSerializer):
             if availability[0] == 100:
                 raise ValidationError("This product is currently available.")
 
-        if data.get('name') and data.get('name_parts'):
-            raise ValidationError(
-                {'name': ['Do not specify name if you specified name_parts.']}
-            )
-        if data.get('name_parts') and '_scheme' not in data.get('name_parts'):
-            data['name_parts']['_scheme'] = event.settings.name_scheme
-
         return data

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, exporters, item, oauth, order, organizer, upload,
-    user, version, voucher, waitinglist, webhooks,
+    checkin, device, event, item, oauth, order, organizer, user, version,
+    voucher, waitinglist, webhooks,
 )
 
 router = routers.DefaultRouter()
@@ -22,7 +22,6 @@ orga_router.register(r'seatingplans', organizer.SeatingPlanViewSet)
 orga_router.register(r'giftcards', organizer.GiftCardViewSet)
 orga_router.register(r'teams', organizer.TeamViewSet)
 orga_router.register(r'devices', organizer.DeviceViewSet)
-orga_router.register(r'exporters', exporters.OrganizerExportersViewSet, basename='exporters')
 
 team_router = routers.DefaultRouter()
 team_router.register(r'members', organizer.TeamMemberViewSet)
@@ -45,7 +44,6 @@ event_router.register(r'taxrules', event.TaxRuleViewSet)
 event_router.register(r'waitinglistentries', waitinglist.WaitingListViewSet)
 event_router.register(r'checkinlists', checkin.CheckinListViewSet)
 event_router.register(r'cartpositions', cart.CartPositionViewSet)
-event_router.register(r'exporters', exporters.EventExportersViewSet, basename='exporters')
 
 checkinlist_router = routers.DefaultRouter()
 checkinlist_router.register(r'positions', checkin.CheckinListPositionViewSet, basename='checkinlistpos')
@@ -62,9 +60,6 @@ order_router = routers.DefaultRouter()
 order_router.register(r'payments', order.PaymentViewSet)
 order_router.register(r'refunds', order.RefundViewSet)
 
-giftcard_router = routers.DefaultRouter()
-giftcard_router.register(r'transactions', organizer.GiftCardTransactionViewSet)
-
 # Force import of all plugins to give them a chance to register URLs with the router
 for app in apps.get_app_configs():
     if hasattr(app, 'PretixPluginMeta'):
@@ -74,9 +69,6 @@ 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>[^/]+)/settings/$', organizer.OrganizerSettingsView.as_view(),
-        name="organizer.settings"),
-    url(r'^organizers/(?P<organizer>[^/]+)/giftcards/(?P<giftcard>[^/]+)/', include(giftcard_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)),
@@ -95,7 +87,6 @@ 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"^device/eventselection$", device.EventSelectionView.as_view(), name="device.eventselection"),
-    url(r"^upload$", upload.UploadView.as_view(), name="upload"),
     url(r"^me$", user.MeView.as_view(), name="user.me"),
     url(r"^version$", version.VersionView.as_view(), name="version"),
 ]

src/pretix/api/views/checkin.py

@@ -22,17 +22,16 @@ from pretix.api.views import RichOrderingFilter
 from pretix.api.views.order import OrderPositionFilter
 from pretix.base.i18n import language
 from pretix.base.models import (
-    CachedFile, Checkin, CheckinList, Event, Order, OrderPosition, Question,
+    Checkin, CheckinList, Event, Order, OrderPosition,
 )
 from pretix.base.services.checkin import (
-    CheckInError, RequiredQuestionsError, SQLLogic, perform_checkin,
+    CheckInError, RequiredQuestionsError, perform_checkin,
 )
 from pretix.helpers.database import FixedOrderBy
 
 with scopes_disabled():
     class CheckinListFilter(FilterSet):
         subevent_match = django_filters.NumberFilter(method='subevent_match_qs')
-        ends_after = django_filters.rest_framework.IsoDateTimeFilter(method='ends_after_qs')
 
         class Meta:
             model = CheckinList
@@ -43,35 +42,19 @@ with scopes_disabled():
                 Q(subevent_id=value) | Q(subevent_id__isnull=True)
             )
 
-        def ends_after_qs(self, queryset, name, value):
-            expr = (
-                Q(subevent__isnull=True) |
-                Q(
-                    Q(Q(subevent__date_to__isnull=True) & Q(subevent__date_from__gte=value))
-                    | Q(Q(subevent__date_to__isnull=False) & Q(subevent__date_to__gte=value))
-                )
-            )
-            return queryset.filter(expr)
-
 
 class CheckinListViewSet(viewsets.ModelViewSet):
     serializer_class = CheckinListSerializer
     queryset = CheckinList.objects.none()
     filter_backends = (DjangoFilterBackend,)
     filterset_class = CheckinListFilter
-    permission = ('can_view_orders', 'can_checkin_orders',)
+    permission = 'can_view_orders'
     write_permission = 'can_change_event_settings'
 
     def get_queryset(self):
         qs = self.request.event.checkin_lists.prefetch_related(
             'limit_products',
         )
-
-        if 'subevent' in self.request.query_params.getlist('expand'):
-            qs = qs.prefetch_related(
-                'subevent', 'subevent__event', 'subevent__subeventitem_set', 'subevent__subeventitemvariation_set',
-                'subevent__seat_category_mappings', 'subevent__meta_values'
-            )
         return qs
 
     def perform_create(self, serializer):
@@ -172,37 +155,15 @@ class CheckinListViewSet(viewsets.ModelViewSet):
 
 with scopes_disabled():
     class CheckinOrderPositionFilter(OrderPositionFilter):
-        check_rules = django_filters.rest_framework.BooleanFilter(method='check_rules_qs')
-        # check_rules is currently undocumented on purpose, let's get a feel for the performance impact first
-
-        def __init__(self, *args, **kwargs):
-            self.checkinlist = kwargs.pop('checkinlist')
-            super().__init__(*args, **kwargs)
 
         def has_checkin_qs(self, queryset, name, value):
             return queryset.filter(last_checked_in__isnull=not value)
 
-        def check_rules_qs(self, queryset, name, value):
-            if not self.checkinlist.rules:
-                return queryset
-            return queryset.filter(SQLLogic(self.checkinlist).apply(self.checkinlist.rules))
-
-
-class ExtendedBackend(DjangoFilterBackend):
-    def get_filterset_kwargs(self, request, queryset, view):
-        kwargs = super().get_filterset_kwargs(request, queryset, view)
-
-        # merge filterset kwargs provided by view class
-        if hasattr(view, 'get_filterset_kwargs'):
-            kwargs.update(view.get_filterset_kwargs())
-
-        return kwargs
-
 
 class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = CheckinListOrderPositionSerializer
     queryset = OrderPosition.all.none()
-    filter_backends = (ExtendedBackend, RichOrderingFilter)
+    filter_backends = (DjangoFilterBackend, RichOrderingFilter)
     ordering = ('attendee_name_cached', 'positionid')
     ordering_fields = (
         'order__code', 'order__datetime', 'positionid', 'attendee_name',
@@ -226,13 +187,8 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
     }
 
     filterset_class = CheckinOrderPositionFilter
-    permission = ('can_view_orders', 'can_checkin_orders')
-    write_permission = ('can_change_orders', 'can_checkin_orders')
-
-    def get_filterset_kwargs(self):
-        return {
-            'checkinlist': self.checkinlist,
-        }
+    permission = 'can_view_orders'
+    write_permission = 'can_change_orders'
 
     @cached_property
     def checkinlist(self):
@@ -253,7 +209,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
             order__event=self.request.event,
         ).annotate(
             last_checked_in=Subquery(cqs)
-        ).prefetch_related('order__event', 'order__event__organizer')
+        )
         if self.checkinlist.subevent:
             qs = qs.filter(
                 subevent=self.checkinlist.subevent
@@ -299,22 +255,6 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
         if not self.checkinlist.all_products and not ignore_products:
             qs = qs.filter(item__in=self.checkinlist.limit_products.values_list('id', flat=True))
 
-        if 'subevent' in self.request.query_params.getlist('expand'):
-            qs = qs.prefetch_related(
-                'subevent', 'subevent__event', 'subevent__subeventitem_set', 'subevent__subeventitemvariation_set',
-                'subevent__seat_category_mappings', 'subevent__meta_values'
-            )
-
-        if 'item' in self.request.query_params.getlist('expand'):
-            qs = qs.prefetch_related('item', 'item__addons', 'item__bundles', 'item__meta_values', 'item__variations').select_related('item__tax_rule')
-
-        if 'variation' in self.request.query_params.getlist('expand'):
-            qs = qs.prefetch_related('variation')
-
-        if 'pk' not in self.request.resolver_match.kwargs and 'can_view_orders' not in self.request.eventpermset \
-                and len(self.request.query_params.get('search', '')) < 3:
-            qs = qs.none()
-
         return qs
 
     @action(detail=False, methods=['POST'], url_name='redeem', url_path='(?P<pk>.*)/redeem')
@@ -362,10 +302,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
             for q in op.item.questions.filter(ask_during_checkin=True):
                 if str(q.pk) in aws:
                     try:
-                        if q.type == Question.TYPE_FILE:
-                            given_answers[q] = self._handle_file_upload(aws[str(q.pk)])
-                        else:
-                            given_answers[q] = q.clean_answer(aws[str(q.pk)])
+                        given_answers[q] = q.clean_answer(aws[str(q.pk)])
                     except ValidationError:
                         pass
 
@@ -415,25 +352,3 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                 'require_attention': op.item.checkin_attention or op.order.checkin_attention,
                 'position': CheckinListOrderPositionSerializer(op, context=self.get_serializer_context()).data
             }, status=201)
-
-    def _handle_file_upload(self, data):
-        try:
-            cf = CachedFile.objects.get(
-                session_key=f'api-upload-{str(type(self.request.user or self.request.auth))}-{(self.request.user or self.request.auth).pk}',
-                file__isnull=False,
-                pk=data[len("file:"):],
-            )
-        except (ValidationError, IndexError):  # invalid uuid
-            raise ValidationError('The submitted file ID "{fid}" was not found.'.format(fid=data))
-        except CachedFile.DoesNotExist:
-            raise ValidationError('The submitted file ID "{fid}" was not found.'.format(fid=data))
-
-        allowed_types = (
-            'image/png', 'image/jpeg', 'image/gif', 'application/pdf'
-        )
-        if cf.type not in allowed_types:
-            raise ValidationError('The submitted file "{fid}" has a file type that is not allowed in this field.'.format(fid=data))
-        if cf.file.size > 10 * 1024 * 1024:
-            raise ValidationError('The submitted file "{fid}" is too large to be used in this field.'.format(fid=data))
-
-        return cf.file

src/pretix/api/views/device.py

@@ -53,8 +53,8 @@ class DeviceSerializer(serializers.ModelSerializer):
 
 
 class InitializeView(APIView):
-    authentication_classes = ()
-    permission_classes = ()
+    authentication_classes = tuple()
+    permission_classes = tuple()
 
     def post(self, request, format=None):
         serializer = InitializationRequestSerializer(data=request.data)
@@ -131,7 +131,7 @@ class EventSelectionView(APIView):
 
     @property
     def base_event_qs(self):
-        qs = self.request.auth.get_events_with_any_permission().annotate(
+        qs = self.request.auth.organizer.events.annotate(
             first_date=Coalesce('date_admission', 'date_from'),
             last_date=Coalesce('date_to', 'date_from'),
         ).filter(
@@ -154,7 +154,6 @@ class EventSelectionView(APIView):
         ).filter(
             event__organizer=self.request.auth.organizer,
             event__live=True,
-            event__in=self.request.auth.get_events_with_any_permission(),
             active=True,
         ).select_related('event').order_by('first_date')
         if self.request.auth.gate:

src/pretix/api/views/event.py

@@ -18,9 +18,7 @@ from pretix.base.models import (
     CartPosition, Device, Event, TaxRule, TeamAPIToken,
 )
 from pretix.base.models.event import SubEvent
-from pretix.base.settings import SETTINGS_AFFECTING_CSS
 from pretix.helpers.dicts import merge_dicts
-from pretix.presale.style import regenerate_css
 from pretix.presale.views.organizer import filter_qs_by_attr
 
 with scopes_disabled():
@@ -28,7 +26,6 @@ with scopes_disabled():
         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')
-        sales_channel = django_filters.rest_framework.CharFilter(method='sales_channel_qs')
 
         class Meta:
             model = Event
@@ -70,9 +67,6 @@ with scopes_disabled():
             else:
                 return queryset.exclude(expr)
 
-        def sales_channel_qs(self, queryset, name, value):
-            return queryset.filter(sales_channels__contains=value)
-
 
 class EventViewSet(viewsets.ModelViewSet):
     serializer_class = EventSerializer
@@ -259,7 +253,7 @@ class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
         qs = filter_qs_by_attr(qs, self.request)
 
         return qs.prefetch_related(
-            'subeventitem_set', 'subeventitemvariation_set', 'seat_category_mappings', 'meta_values'
+            'subeventitem_set', 'subeventitemvariation_set', 'seat_category_mappings'
         )
 
     def list(self, request, **kwargs):
@@ -365,13 +359,9 @@ class EventSettingsView(views.APIView):
 
     def get(self, request, *args, **kwargs):
         if isinstance(request.auth, Device):
-            s = DeviceEventSettingsSerializer(instance=request.event.settings, event=request.event, context={
-                'request': request
-            })
+            s = DeviceEventSettingsSerializer(instance=request.event.settings, event=request.event)
         elif 'can_change_event_settings' in request.eventpermset:
-            s = EventSettingsSerializer(instance=request.event.settings, event=request.event, context={
-                'request': request
-            })
+            s = EventSettingsSerializer(instance=request.event.settings, event=request.event)
         else:
             raise PermissionDenied()
         if 'explain' in request.GET:
@@ -386,7 +376,7 @@ class EventSettingsView(views.APIView):
 
     def patch(self, request, *wargs, **kwargs):
         s = EventSettingsSerializer(instance=request.event.settings, data=request.data, partial=True,
-                                    event=request.event, context={'request': request})
+                                    event=request.event)
         s.is_valid(raise_exception=True)
         with transaction.atomic():
             s.save()
@@ -395,10 +385,5 @@ class EventSettingsView(views.APIView):
                     k: v for k, v in s.validated_data.items()
                 }
             )
-        if any(p in s.changed_data for p in SETTINGS_AFFECTING_CSS):
-            regenerate_css.apply_async(args=(request.event.pk,))
-        s = EventSettingsSerializer(
-            instance=request.event.settings, event=request.event, context={
-                'request': request
-            })
+        s = EventSettingsSerializer(instance=request.event.settings, event=request.event)
         return Response(s.data)

src/pretix/api/views/exporters.py

@@ -1,154 +0,0 @@
-from datetime import timedelta
-
-from celery.result import AsyncResult
-from django.conf import settings
-from django.http import Http404
-from django.shortcuts import get_object_or_404
-from django.utils.functional import cached_property
-from django.utils.timezone import now
-from rest_framework import status, viewsets
-from rest_framework.decorators import action
-from rest_framework.response import Response
-from rest_framework.reverse import reverse
-
-from pretix.api.serializers.exporters import (
-    ExporterSerializer, JobRunSerializer,
-)
-from pretix.base.models import CachedFile, Device, TeamAPIToken
-from pretix.base.services.export import export, multiexport
-from pretix.base.signals import (
-    register_data_exporters, register_multievent_data_exporters,
-)
-from pretix.helpers.http import ChunkBasedFileResponse
-
-
-class ExportersMixin:
-    def list(self, request, *args, **kwargs):
-        res = ExporterSerializer(self.exporters, many=True)
-        return Response({
-            "count": len(self.exporters),
-            "next": None,
-            "previous": None,
-            "results": res.data
-        })
-
-    def get_object(self):
-        instances = [e for e in self.exporters if e.identifier == self.kwargs.get('pk')]
-        if not instances:
-            raise Http404()
-        return instances[0]
-
-    def retrieve(self, request, *args, **kwargs):
-        instance = self.get_object()
-        serializer = ExporterSerializer(instance)
-        return Response(serializer.data)
-
-    @action(detail=True, methods=['GET'], url_name='download', url_path='download/(?P<asyncid>[^/]+)/(?P<cfid>[^/]+)')
-    def download(self, *args, **kwargs):
-        cf = get_object_or_404(CachedFile, id=kwargs['cfid'])
-        if cf.file:
-            resp = ChunkBasedFileResponse(cf.file.file, content_type=cf.type)
-            resp['Content-Disposition'] = 'attachment; filename="{}"'.format(cf.filename)
-            return resp
-        elif not settings.HAS_CELERY:
-            return Response(
-                {'status': 'failed', 'message': 'Unknown file ID or export failed'},
-                status=status.HTTP_410_GONE
-            )
-
-        res = AsyncResult(kwargs['asyncid'])
-        if res.failed():
-            if isinstance(res.info, dict) and res.info['exc_type'] == 'ExportError':
-                msg = res.info['exc_message']
-            else:
-                msg = 'Internal error'
-            return Response(
-                {'status': 'failed', 'message': msg},
-                status=status.HTTP_410_GONE
-            )
-
-        return Response(
-            {
-                'status': 'running' if res.state in ('PROGRESS', 'STARTED', 'SUCCESS') else 'waiting',
-                'percentage': res.result.get('value', None) if res.result else None,
-            },
-            status=status.HTTP_409_CONFLICT
-        )
-
-    @action(detail=True, methods=['POST'])
-    def run(self, *args, **kwargs):
-        instance = self.get_object()
-        serializer = JobRunSerializer(exporter=instance, data=self.request.data, **self.get_serializer_kwargs())
-        serializer.is_valid(raise_exception=True)
-
-        cf = CachedFile(web_download=False)
-        cf.date = now()
-        cf.expires = now() + timedelta(hours=24)
-        cf.save()
-        d = serializer.data
-        for k, v in d.items():
-            if isinstance(v, set):
-                d[k] = list(v)
-        async_result = self.do_export(cf, instance, d)
-
-        url_kwargs = {
-            'asyncid': str(async_result.id),
-            'cfid': str(cf.id),
-        }
-        url_kwargs.update(self.kwargs)
-        return Response({
-            'download': reverse('api-v1:exporters-download', kwargs=url_kwargs, request=self.request)
-        }, status=status.HTTP_202_ACCEPTED)
-
-
-class EventExportersViewSet(ExportersMixin, viewsets.ViewSet):
-    permission = 'can_view_orders'
-
-    def get_serializer_kwargs(self):
-        return {}
-
-    @cached_property
-    def exporters(self):
-        exporters = []
-        responses = register_data_exporters.send(self.request.event)
-        for ex in sorted([response(self.request.event) for r, response in responses], key=lambda ex: str(ex.verbose_name)):
-            ex._serializer = JobRunSerializer(exporter=ex)
-            exporters.append(ex)
-        return exporters
-
-    def do_export(self, cf, instance, data):
-        return export.apply_async(args=(self.request.event.id, str(cf.id), instance.identifier, data))
-
-
-class OrganizerExportersViewSet(ExportersMixin, viewsets.ViewSet):
-    permission = None
-
-    @cached_property
-    def exporters(self):
-        exporters = []
-        events = (self.request.auth or self.request.user).get_events_with_permission('can_view_orders', request=self.request).filter(
-            organizer=self.request.organizer
-        )
-        responses = register_multievent_data_exporters.send(self.request.organizer)
-        for ex in sorted([response(events) for r, response in responses if response], key=lambda ex: str(ex.verbose_name)):
-            ex._serializer = JobRunSerializer(exporter=ex, events=events)
-            exporters.append(ex)
-        return exporters
-
-    def get_serializer_kwargs(self):
-        return {
-            'events': self.request.auth.get_events_with_permission('can_view_orders', request=self.request).filter(
-                organizer=self.request.organizer
-            )
-        }
-
-    def do_export(self, cf, instance, data):
-        return multiexport.apply_async(kwargs={
-            'organizer': self.request.organizer.id,
-            'user': self.request.user.id if self.request.user.is_authenticated else None,
-            'token': self.request.auth.pk if isinstance(self.request.auth, TeamAPIToken) else None,
-            'device': self.request.auth.pk if isinstance(self.request.auth, Device) else None,
-            'fileid': str(cf.id),
-            'provider': instance.identifier,
-            'form_data': data
-        })

src/pretix/api/views/item.py

@@ -49,9 +49,7 @@ class ItemViewSet(ConditionalListView, viewsets.ModelViewSet):
     write_permission = 'can_change_items'
 
     def get_queryset(self):
-        return self.request.event.items.select_related('tax_rule').prefetch_related(
-            'variations', 'addons', 'bundles', 'meta_values'
-        ).all()
+        return self.request.event.items.select_related('tax_rule').prefetch_related('variations', 'addons', 'bundles').all()
 
     def perform_create(self, serializer):
         serializer.save(event=self.request.event)

src/pretix/api/views/order.py

@@ -1,6 +1,4 @@
 import datetime
-import mimetypes
-import os
 from decimal import Decimal
 
 import django_filters
@@ -14,7 +12,6 @@ from django.utils.timezone import make_aware, now
 from django.utils.translation import gettext as _
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
 from django_scopes import scopes_disabled
-from PIL import Image
 from rest_framework import mixins, serializers, status, viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import (
@@ -36,11 +33,10 @@ from pretix.base.i18n import language
 from pretix.base.models import (
     CachedCombinedTicket, CachedTicket, Device, Event, Invoice, InvoiceAddress,
     Order, OrderFee, OrderPayment, OrderPosition, OrderRefund, Quota, SubEvent,
-    TaxRule, TeamAPIToken, generate_secret,
+    TeamAPIToken, generate_secret,
 )
-from pretix.base.models.orders import QuestionAnswer, RevokedTicketSecret
+from pretix.base.models.orders import RevokedTicketSecret
 from pretix.base.payment import PaymentException
-from pretix.base.pdf import get_images
 from pretix.base.secrets import assign_ticket_secret
 from pretix.base.services import tickets
 from pretix.base.services.invoices import (
@@ -69,7 +65,6 @@ with scopes_disabled():
         modified_since = django_filters.IsoDateTimeFilter(field_name='last_modified', lookup_expr='gte')
         created_since = django_filters.IsoDateTimeFilter(field_name='datetime', lookup_expr='gte')
         subevent_after = django_filters.IsoDateTimeFilter(method='subevent_after_qs')
-        subevent_before = django_filters.IsoDateTimeFilter(method='subevent_before_qs')
         search = django_filters.CharFilter(method='search_qs')
 
         class Meta:
@@ -89,19 +84,6 @@ with scopes_disabled():
             ).filter(has_se_after=True)
             return qs
 
-        def subevent_before_qs(self, qs, name, value):
-            qs = qs.annotate(
-                has_se_before=Exists(
-                    OrderPosition.all.filter(
-                        subevent_id__in=SubEvent.objects.filter(
-                            Q(date_from__lt=value), event=OuterRef(OuterRef('event_id'))
-                        ).values_list('id'),
-                        order_id=OuterRef('pk'),
-                    )
-                )
-            ).filter(has_se_before=True)
-            return qs
-
         def search_qs(self, qs, name, value):
             u = value
             if "-" in value:
@@ -562,15 +544,10 @@ class OrderViewSet(viewsets.ModelViewSet):
             )
 
     def create(self, request, *args, **kwargs):
-        if 'send_mail' in request.data and 'send_email' not in request.data:
-            request.data['send_email'] = request.data['send_mail']
         serializer = OrderCreateSerializer(data=request.data, context=self.get_serializer_context())
         serializer.is_valid(raise_exception=True)
         with transaction.atomic():
-            try:
-                self.perform_create(serializer)
-            except TaxRule.SaleNotAllowed:
-                raise ValidationError(_('One of the selected products is not available in the selected country.'))
+            self.perform_create(serializer)
             send_mail = serializer._send_mail
             order = serializer.instance
             if not order.pk:
@@ -586,7 +563,7 @@ class OrderViewSet(viewsets.ModelViewSet):
                 auth=request.auth,
             )
 
-        with language(order.locale, self.request.event.settings.region):
+        with language(order.locale):
             order_placed.send(self.request.event, order=order)
             if order.status == Order.STATUS_PAID:
                 order_paid.send(self.request.event, order=order)
@@ -678,17 +655,6 @@ class OrderViewSet(viewsets.ModelViewSet):
                     }
                 )
 
-            if 'phone' in self.request.data and serializer.instance.phone != self.request.data.get('phone'):
-                serializer.instance.log_action(
-                    'pretix.event.order.phone.changed',
-                    user=self.request.user,
-                    auth=self.request.auth,
-                    data={
-                        'old_phone': serializer.instance.phone,
-                        'new_phone': self.request.data.get('phone'),
-                    }
-                )
-
             if 'locale' in self.request.data and serializer.instance.locale != self.request.data.get('locale'):
                 serializer.instance.log_action(
                     'pretix.event.order.locale.changed',
@@ -767,7 +733,7 @@ with scopes_disabled():
             }
 
 
-class OrderPositionViewSet(mixins.DestroyModelMixin, mixins.UpdateModelMixin, viewsets.ReadOnlyModelViewSet):
+class OrderPositionViewSet(mixins.DestroyModelMixin, viewsets.ReadOnlyModelViewSet):
     serializer_class = OrderPositionSerializer
     queryset = OrderPosition.all.none()
     filter_backends = (DjangoFilterBackend, OrderingFilter)
@@ -787,11 +753,6 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, mixins.UpdateModelMixin, vi
         },
     }
 
-    def get_serializer_context(self):
-        ctx = super().get_serializer_context()
-        ctx['event'] = self.request.event
-        return ctx
-
     def get_queryset(self):
         if self.request.query_params.get('include_canceled_positions', 'false') == 'true':
             qs = OrderPosition.all
@@ -906,7 +867,7 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, mixins.UpdateModelMixin, vi
 
         price = get_price(**kwargs)
         tr = kwargs.get('tax_rule', kwargs.get('item').tax_rule)
-        with language(data.get('locale') or self.request.event.settings.locale, self.request.event.settings.region):
+        with language(data.get('locale') or self.request.event.settings.locale):
             return Response({
                 'gross': price.gross,
                 'gross_formatted': money_filter(price.gross, self.request.event.currency, hide_currency=True),
@@ -917,62 +878,6 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, mixins.UpdateModelMixin, vi
                 'tax_rule': tr.pk if tr else None,
             })
 
-    @action(detail=True, url_name='answer', url_path=r'answer/(?P<question>\d+)')
-    def answer(self, request, **kwargs):
-        pos = self.get_object()
-        answer = get_object_or_404(
-            QuestionAnswer,
-            orderposition=self.get_object(),
-            question_id=kwargs.get('question')
-        )
-        if not answer.file:
-            raise NotFound()
-
-        ftype, ignored = mimetypes.guess_type(answer.file.name)
-        resp = FileResponse(answer.file, content_type=ftype or 'application/binary')
-        resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}-{}"'.format(
-            self.request.event.slug.upper(),
-            pos.order.code,
-            pos.positionid,
-            os.path.basename(answer.file.name).split('.', 1)[1]
-        )
-        return resp
-
-    @action(detail=True, url_name='pdf_image', url_path=r'pdf_image/(?P<key>[^/]+)')
-    def pdf_image(self, request, key, **kwargs):
-        pos = self.get_object()
-
-        image_vars = get_images(request.event)
-        if key not in image_vars:
-            raise NotFound('Unknown key')
-
-        image_file = image_vars[key]['evaluate'](pos, pos.order, pos.subevent or self.request.event)
-        if image_file is None:
-            raise NotFound('No image available')
-
-        if getattr(image_file, 'name', ''):
-            ftype, ignored = mimetypes.guess_type(image_file.name)
-            extension = os.path.basename(image_file.name).split('.')[-1]
-        else:
-            img = Image.open(image_file)
-            ftype = Image.MIME[img.format]
-            extensions = {
-                'GIF': 'gif', 'TIFF': 'tif', 'BMP': 'bmp', 'JPEG': 'jpg', 'PNG': 'png'
-            }
-            extension = extensions.get(img.format, 'bin')
-            if hasattr(image_file, 'seek'):
-                image_file.seek(0)
-
-        resp = FileResponse(image_file, content_type=ftype or 'application/binary')
-        resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}-{}.{}"'.format(
-            self.request.event.slug.upper(),
-            pos.order.code,
-            pos.positionid,
-            key,
-            extension,
-        )
-        return resp
-
     @action(detail=True, url_name='download', url_path='download/(?P<output>[^/]+)')
     def download(self, request, output, **kwargs):
         provider = self._get_output_provider(output)
@@ -1016,44 +921,6 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, mixins.UpdateModelMixin, vi
         except Quota.QuotaExceededException as e:
             raise ValidationError(str(e))
 
-    def update(self, request, *args, **kwargs):
-        partial = kwargs.get('partial', False)
-        if not partial:
-            return Response(
-                {"detail": "Method \"PUT\" not allowed."},
-                status=status.HTTP_405_METHOD_NOT_ALLOWED,
-            )
-        return super().update(request, *args, **kwargs)
-
-    def perform_update(self, serializer):
-        with transaction.atomic():
-            old_data = self.get_serializer_class()(instance=serializer.instance, context=self.get_serializer_context()).data
-            serializer.save()
-            new_data = serializer.data
-
-            if old_data != new_data:
-                log_data = self.request.data
-                if 'answers' in log_data:
-                    for a in new_data['answers']:
-                        log_data[f'question_{a["question"]}'] = a["answer"]
-                    log_data.pop('answers', None)
-                serializer.instance.order.log_action(
-                    'pretix.event.order.modified',
-                    user=self.request.user,
-                    auth=self.request.auth,
-                    data={
-                        'data': [
-                            dict(
-                                position=serializer.instance.pk,
-                                **log_data
-                            )
-                        ]
-                    }
-                )
-
-        tickets.invalidate_cache.apply_async(kwargs={'event': serializer.instance.order.event.pk, 'order': serializer.instance.order.pk})
-        order_modified.send(sender=serializer.instance.order.event, order=serializer.instance.order)
-
 
 class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
     serializer_class = OrderPaymentSerializer
@@ -1065,7 +932,6 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
     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)
-        ctx['event'] = self.request.event
         return ctx
 
     def get_queryset(self):
@@ -1073,7 +939,6 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
         return order.payments.all()
 
     def create(self, request, *args, **kwargs):
-        send_mail = request.data.get('send_email', True)
         serializer = OrderPaymentCreateSerializer(data=request.data, context=self.get_serializer_context())
         serializer.is_valid(raise_exception=True)
         with transaction.atomic():
@@ -1089,8 +954,7 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
                         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),
-                        send_mail=send_mail,
+                        force=request.data.get('force', False)
                     )
                 except Quota.QuotaExceededException:
                     pass

src/pretix/api/views/organizer.py

@@ -6,9 +6,7 @@ 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, mixins, serializers, status, views, viewsets,
-)
+from rest_framework import filters, mixins, serializers, status, viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import MethodNotAllowed, PermissionDenied
 from rest_framework.mixins import CreateModelMixin, DestroyModelMixin
@@ -17,18 +15,15 @@ from rest_framework.viewsets import GenericViewSet
 
 from pretix.api.models import OAuthAccessToken
 from pretix.api.serializers.organizer import (
-    DeviceSerializer, GiftCardSerializer, GiftCardTransactionSerializer,
-    OrganizerSerializer, OrganizerSettingsSerializer, SeatingPlanSerializer,
-    TeamAPITokenSerializer, TeamInviteSerializer, TeamMemberSerializer,
-    TeamSerializer,
+    DeviceSerializer, GiftCardSerializer, OrganizerSerializer,
+    SeatingPlanSerializer, TeamAPITokenSerializer, TeamInviteSerializer,
+    TeamMemberSerializer, TeamSerializer,
 )
 from pretix.base.models import (
-    Device, GiftCard, GiftCardTransaction, Organizer, SeatingPlan, Team,
-    TeamAPIToken, TeamInvite, User,
+    Device, GiftCard, Organizer, SeatingPlan, Team, TeamAPIToken, TeamInvite,
+    User,
 )
-from pretix.base.settings import SETTINGS_AFFECTING_CSS
 from pretix.helpers.dicts import merge_dicts
-from pretix.presale.style import regenerate_organizer_css
 
 
 class OrganizerViewSet(viewsets.ReadOnlyModelViewSet):
@@ -196,24 +191,6 @@ class GiftCardViewSet(viewsets.ModelViewSet):
         raise MethodNotAllowed("Gift cards cannot be deleted.")
 
 
-class GiftCardTransactionViewSet(viewsets.ReadOnlyModelViewSet):
-    serializer_class = GiftCardTransactionSerializer
-    queryset = GiftCardTransaction.objects.none()
-    permission = 'can_manage_gift_cards'
-    write_permission = 'can_manage_gift_cards'
-
-    @cached_property
-    def giftcard(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 get_object_or_404(qs, pk=self.kwargs.get('giftcard'))
-
-    def get_queryset(self):
-        return self.giftcard.transactions.select_related('order', 'order__event')
-
-
 class TeamViewSet(viewsets.ModelViewSet):
     serializer_class = TeamSerializer
     queryset = Team.objects.none()
@@ -419,43 +396,3 @@ class DeviceViewSet(mixins.CreateModelMixin,
             data=self.request.data
         )
         return inst
-
-
-class OrganizerSettingsView(views.APIView):
-    permission = 'can_change_organizer_settings'
-
-    def get(self, request, *args, **kwargs):
-        s = OrganizerSettingsSerializer(instance=request.organizer.settings, organizer=request.organizer, context={
-            'request': request
-        })
-        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 = OrganizerSettingsSerializer(
-            instance=request.organizer.settings, data=request.data, partial=True,
-            organizer=request.organizer, context={
-                'request': request
-            }
-        )
-        s.is_valid(raise_exception=True)
-        with transaction.atomic():
-            s.save()
-            self.request.organizer.log_action(
-                'pretix.organizer.settings', user=self.request.user, auth=self.request.auth, data={
-                    k: v for k, v in s.validated_data.items()
-                }
-            )
-        if any(p in s.changed_data for p in SETTINGS_AFFECTING_CSS):
-            regenerate_organizer_css.apply_async(args=(request.organizer.pk,))
-        s = OrganizerSettingsSerializer(instance=request.organizer.settings, organizer=request.organizer, context={
-            'request': request
-        })
-        return Response(s.data)

src/pretix/api/views/upload.py

@@ -1,55 +0,0 @@
-import datetime
-
-from django.utils.timezone import now
-from oauth2_provider.contrib.rest_framework import OAuth2Authentication
-from rest_framework.authentication import SessionAuthentication
-from rest_framework.exceptions import ValidationError
-from rest_framework.parsers import FileUploadParser
-from rest_framework.response import Response
-from rest_framework.views import APIView
-
-from pretix.api.auth.device import DeviceTokenAuthentication
-from pretix.api.auth.permission import AnyAuthenticatedClientPermission
-from pretix.api.auth.token import TeamTokenAuthentication
-from pretix.base.models import CachedFile
-
-ALLOWED_TYPES = {
-    'image/gif': {'.gif'},
-    'image/jpeg': {'.jpg', '.jpeg'},
-    'image/png': {'.png'},
-    'application/pdf': {'.pdf'},
-}
-
-
-class UploadView(APIView):
-    authentication_classes = (
-        SessionAuthentication, OAuth2Authentication, DeviceTokenAuthentication, TeamTokenAuthentication
-    )
-    parser_classes = [FileUploadParser]
-    permission_classes = [AnyAuthenticatedClientPermission]
-
-    def post(self, request):
-        if 'file' not in request.data:
-            raise ValidationError('No file has been submitted.')
-        file_obj = request.data['file']
-        content_type = file_obj.content_type.split(";")[0]  # ignore e.g. "; charset=…"
-        if content_type not in ALLOWED_TYPES:
-            raise ValidationError('Content type "{type}" is not allowed'.format(type=content_type))
-        if not any(file_obj.name.endswith(ext) for ext in ALLOWED_TYPES[content_type]):
-            raise ValidationError('File name "{name}" has an invalid extension for type "{type}"'.format(
-                name=file_obj.name,
-                type=content_type
-            ))
-        cf = CachedFile.objects.create(
-            expires=now() + datetime.timedelta(days=1),
-            date=now(),
-            web_download=False,
-            filename=file_obj.name,
-            type=content_type,
-            session_key=f'api-upload-{str(type(request.user or request.auth))}-{(request.user or request.auth).pk}'
-        )
-        cf.file.save(file_obj.name, file_obj)
-        cf.save()
-        return Response({
-            'id': f'file:{cf.pk}'
-        }, status=201)

src/pretix/api/views/version.py

@@ -6,7 +6,6 @@ from rest_framework.views import APIView
 
 from pretix import __version__
 from pretix.api.auth.device import DeviceTokenAuthentication
-from pretix.api.auth.permission import AnyAuthenticatedClientPermission
 from pretix.api.auth.token import TeamTokenAuthentication
 
 
@@ -49,7 +48,6 @@ class VersionView(APIView):
     authentication_classes = (
         SessionAuthentication, OAuth2Authentication, DeviceTokenAuthentication, TeamTokenAuthentication
     )
-    permission_classes = [AnyAuthenticatedClientPermission]
 
     def get(self, request, format=None):
         return Response({