Release 1.7.2

.gitattributes

@@ -1,17 +1,13 @@
-src/pretix/static/fontawesome/* linguist-vendored
-src/pretix/static/lightbox/* linguist-vendored
-src/pretix/static/typeahead/* linguist-vendored
-src/pretix/static/moment/* linguist-vendored
-src/pretix/static/datetimepicker/* linguist-vendored
-src/pretix/static/colorpicker/* linguist-vendored
-src/pretix/static/fileupload/* linguist-vendored
-src/pretix/static/vuejs/* linguist-vendored
-src/pretix/static/select2/* linguist-vendored
-src/pretix/static/charts/* linguist-vendored
-src/pretix/static/rrule/* linguist-vendored
-src/pretix/static/iframeresizer/* linguist-vendored
-src/pretix/static/pdfjs/* linguist-vendored
-src/pretix/static/fabric/* linguist-vendored
+src/static/fontawesome/* linguist-vendored
+src/static/lightbox/* linguist-vendored
+src/static/typeahead/* linguist-vendored
+src/static/moment/* linguist-vendored
+src/static/datetimepicker/* linguist-vendored
+src/static/colorpicker/* linguist-vendored
+src/static/fileupload/* linguist-vendored
+src/static/charts/* linguist-vendored
+src/pretix/plugins/ticketoutputpdf/static/pretixplugins/ticketoutputpdf/fabric.* linguist-vendored
+src/pretix/plugins/ticketoutputpdf/static/pretixplugins/ticketoutputpdf/pdf.* linguist-vendored
 
 # Denote all files that are truly binary and should not be modified.
 *.eot binary

.gitlab-ci.yml

@@ -8,8 +8,6 @@ tests:
         - XDG_CACHE_HOME=/cache bash .travis.sh tests
     tags:
         - python3
-    except:
-        - pypi
 pypi:
     stage: release
     script:
@@ -19,16 +17,12 @@ pypi:
         - pip install -U pip wheel setuptools
         - XDG_CACHE_HOME=/cache pip3 install -Ur src/requirements.txt -r src/requirements/dev.txt -r src/requirements/py34.txt
         - cd src
-        - python setup.py sdist
-        - pip install dist/pretix-*.tar.gz
-        - python -m pretix migrate
-        - python -m pretix check
         - python setup.py sdist upload
         - python setup.py bdist_wheel upload
     tags:
         - python3
     only:
-        - pypi
+        - release
     artifacts:
         paths:
             - src/dist/

.travis.sh

@@ -25,27 +25,19 @@ if [ "$1" == "doctests" ]; then
 	cd doc
 	make doctest
 fi
-if [ "$1" == "spelling" ]; then
-	XDG_CACHE_HOME=/cache pip3 install -Ur doc/requirements.txt
-	cd doc
-	make spelling
-	if [ -s _build/spelling/output.txt ]; then
-		exit 1
-	fi
-fi
 if [ "$1" == "tests" ]; then
 	pip3 install -r src/requirements.txt -Ur src/requirements/dev.txt -r src/requirements/py34.txt
 	cd src
 	python manage.py check
 	make all compress
-	py.test --reruns 5 tests
+	py.test --rerun 5 tests
 fi
 if [ "$1" == "tests-cov" ]; then
 	pip3 install -r src/requirements.txt -Ur src/requirements/dev.txt -r src/requirements/py34.txt
 	cd src
 	python manage.py check
 	make all compress
-	coverage run -m py.test --reruns 5 tests && codecov
+	coverage run -m py.test --rerun 5 tests && codecov
 fi
 if [ "$1" == "plugins" ]; then
 	pip3 install -r src/requirements.txt -Ur src/requirements/dev.txt -r src/requirements/py34.txt
@@ -58,7 +50,7 @@ if [ "$1" == "plugins" ]; then
     cd pretix-cartshare
     python setup.py develop
     make
-	py.test --reruns 5 tests
+	py.test --rerun 5 tests
     popd
 
 fi

.travis.yml

@@ -12,37 +12,29 @@ services:
   - postgresql
 matrix:
   include:
-    - python: 3.6
+    - python: 3.4
+      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_sqlite.cfg
+    - python: 3.5
       env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_sqlite.cfg
     - python: 3.6
-      env: JOB=tests-cov
+      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_sqlite.cfg
+    - python: 3.4
+      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_mysql.cfg
+    - python: 3.5
+      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_mysql.cfg
+    - python: 3.6
+      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_mysql.cfg
+    - python: 3.4
+      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
+    - python: 3.5
+      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
+    - python: 3.6
+      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
     - python: 3.6
       env: JOB=style
-    - python: 3.4
-      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_sqlite.cfg
-    - python: 3.5
-      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_sqlite.cfg
-    - python: 3.4
-      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_mysql.cfg
-    - python: 3.5
-      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_mysql.cfg
-    - python: 3.6
-      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_mysql.cfg
-    - python: 3.4
-      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
-    - python: 3.5
-      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
-    - python: 3.6
-      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
     - python: 3.6
       env: JOB=plugins
     - python: 3.6
-      env: JOB=spelling
+      env: JOB=tests-cov
 addons:
   postgresql: "9.4"
-  apt:
-      packages:
-          - enchant
-branches:
-  except:
-  - /^weblate-.*/

CODE_OF_CONDUCT.md

@@ -1,5 +0,0 @@
-Code of Conduct
-===============
-
-We have a [Code of Conduct](https://docs.pretix.eu/en/latest/development/contribution/codeofconduct.html)
-in place that applies to all project contributions, including issues, pull requests, etc.

README.rst

@@ -40,14 +40,6 @@ Contributing
 If you want to contribute to pretix, please read the `developer documentation`_
 in our documentation. If you have any further questions, please do not hesitate to ask!
 
-.. image:: https://translate.pretix.eu/widgets/pretix/-/pretix/multi-blue.svg
-   :target: https://translate.pretix.eu/engage/pretix/
-
-Code of Conduct
----------------
-We have a `Code of Conduct`_ in place that applies to all project contributions,
-including issues, pull requests, etc.
-
 License
 -------
 The code in this repository is published under the terms of the Apache License. 
@@ -58,6 +50,5 @@ AUTHORS file for a list of all the awesome folks who contributed to this project
 
 .. _installation guide: https://docs.pretix.eu/en/latest/admin/installation/index.html
 .. _developer documentation: https://docs.pretix.eu/en/latest/development/index.html
-.. _Code of Conduct: https://docs.pretix.eu/en/latest/development/contribution/codeofconduct.html
 .. _pretix.eu: https://pretix.eu
 .. _blog: https://pretix.eu/about/en/blog/

deployment/docker/pretix.bash

@@ -2,7 +2,6 @@
 cd /pretix/src
 export DJANGO_SETTINGS_MODULE=production_settings
 export DATA_DIR=/data/
-export HOME=/pretix
 NUM_WORKERS=10
 
 if [ ! -d /data/logs ]; then

deployment/docker/supervisord.conf

@@ -23,7 +23,6 @@ autostart=true
 autorestart=true
 priority=5
 user=pretixuser
-environment=HOME=/pretix
 
 [program:pretixtask]
 command=/usr/local/bin/pretix taskworker

doc/Makefile

@@ -175,9 +175,3 @@ pseudoxml:
 	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
 	@echo
 	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
-
-spelling:
-	$(SPHINXBUILD) -b spelling $(ALLSPHINXOPTS) $(BUILDDIR)/spelling
-	@echo
-	@echo "Spelling check finished, look at the results in " \
-		  "$(BUILDDIR)/spelling/output.txt."

doc/admin/config.rst

@@ -2,8 +2,6 @@
 
 .. _`config`:
 
-.. spelling:: Galera
-
 Configuration file
 ==================
 
@@ -12,7 +10,7 @@ at the following locations. It will try to read the file from the specified path
 the following order. The file that is found *last* will override the settings from
 the files found before.
 
-1. ``PRETIX_CONFIG_FILE`` environment variable
+1. ``PREFIX_CONFIG_FILE`` environment variable
 2. ``/etc/pretix/pretix.cfg``
 3. ``~/.pretix.cfg``
 4. ``pretix.cfg`` in the current working directory
@@ -47,7 +45,7 @@ Example::
 
 ``datadir``
     The local path to a data directory that will be used for storing user uploads and similar
-    data. Defaults to the value of the environment variable ``DATA_DIR`` or ``data``.
+    data. Defaults to thea value of the environment variable ``DATA_DIR`` or ``data``.
 
 ``plugins_default``
     A comma-separated list of plugins that are enabled by default for all new events.
@@ -70,10 +68,6 @@ Example::
     that are used to print tax amounts in the customer currency on invoices for some currencies. Set to ``off`` to
     disable this feature. Defaults to ``on``.
 
-``audit_comments``
-    Enables or disables nagging staff users for leaving comments on their sessions for auditability.
-    Defaults to ``off``.
-
 
 Locale settings
 ---------------
@@ -292,4 +286,4 @@ various places like order codes, secrets in the ticket QR codes, etc. Example::
     voucher_code=16
 
 .. _Python documentation: https://docs.python.org/3/library/configparser.html?highlight=configparser#supported-ini-file-structure
-.. _Celery documentation: http://docs.celeryproject.org/en/latest/userguide/configuration.html
+.. _Celery documentation: http://docs.celeryproject.org/en/latest/configuration.html

doc/admin/installation/docker_smallscale.rst

@@ -162,7 +162,7 @@ named ``/etc/systemd/system/pretix.service`` with the following content::
         -v /etc/pretix:/etc/pretix \
         -v /var/run/redis:/var/run/redis \
         -v /var/run/mysqld:/var/run/mysqld \
-        pretix/standalone:stable all
+        pretix/standalone all
     ExecStop=/usr/bin/docker stop %n
 
     [Install]
@@ -239,8 +239,6 @@ Restarting the service can take a few seconds, especially if the update requires
 Replace ``stable`` above with a specific version number like ``1.0`` or with ``latest`` for the development
 version, if you want to.
 
-.. _`docker_plugininstall`:
-
 Install a plugin
 ----------------
 
@@ -268,8 +266,8 @@ to re-build your custom image after you pulled ``pretix/standalone`` if you want
 .. _pretix.eu: https://pretix.eu/
 .. _MySQL: https://dev.mysql.com/doc/refman/5.7/en/linux-installation-apt-repo.html
 .. _PostgreSQL: https://www.digitalocean.com/community/tutorials/how-to-install-and-use-postgresql-9-4-on-debian-8
-.. _redis: https://blog.programster.org/debian-8-install-redis-server/
+.. _redis: http://blog.programster.org/debian-8-install-redis-server/
 .. _ufw: https://en.wikipedia.org/wiki/Uncomplicated_Firewall
-.. _redis website: https://redis.io/topics/security
+.. _redis website: http://redis.io/topics/security
 .. _redis in docker: https://hub.docker.com/r/_/redis/
 .. _strong encryption settings: https://mozilla.github.io/server-side-tls/ssl-config-generator/

doc/admin/installation/general.rst

@@ -1,7 +1,5 @@
 .. highlight:: ini
 
-.. spelling:: SQL
-
 General remarks
 ===============
 

doc/admin/installation/manual_smallscale.rst

@@ -177,7 +177,7 @@ For background tasks we need a second service ``/etc/systemd/system/pretix-worke
     [Install]
     WantedBy=multi-user.target
 
-You can now run the following commands to enable and start the services::
+You can now run the following comamnds to enable and start the services::
 
     # systemctl daemon-reload
     # systemctl enable pretix-web pretix-worker
@@ -213,7 +213,7 @@ The following snippet is an example on how to configure a nginx proxy for pretix
         ssl_certificate /path/to/cert.chain.pem;
         ssl_certificate_key /path/to/key.pem;
 
-        add_header Referrer-Policy same-origin;
+        add_header Referrer-Options same-origin;
         add_header X-Content-Type-Options nosniff;
 
         location / {
@@ -276,8 +276,6 @@ To upgrade to a new pretix release, pull the latest code changes and run the fol
     # systemctl restart pretix-web pretix-worker
 
 
-.. _`manual_plugininstall`:
-
 Install a plugin
 ----------------
 
@@ -298,6 +296,6 @@ example::
 .. _pretix.eu: https://pretix.eu/
 .. _MySQL: https://dev.mysql.com/doc/refman/5.7/en/linux-installation-apt-repo.html
 .. _PostgreSQL: https://www.digitalocean.com/community/tutorials/how-to-install-and-use-postgresql-9-4-on-debian-8
-.. _redis: https://blog.programster.org/debian-8-install-redis-server/
+.. _redis: http://blog.programster.org/debian-8-install-redis-server/
 .. _ufw: https://en.wikipedia.org/wiki/Uncomplicated_Firewall
 .. _strong encryption settings: https://mozilla.github.io/server-side-tls/ssl-config-generator/

doc/api/fundamentals.rst

@@ -44,25 +44,6 @@ like the following:
           adding OAuth2 support in the future for user-level authentication. If you want
           to use session authentication, be sure to comply with Django's `CSRF policies`_.
 
-Permissions
------------
-
-The API follows pretix team based permissions model. Each organizer can have several teams
-each with it's own set of permissions. Each team can have any number of API keys attached.
-
-To access a given endpoint the team the API key belongs to needs to have the corresponding
-permission for the organizer/event being accessed.
-
-Possible permissions are:
-
-* Can create events
-* Can change event settings
-* Can change product settings
-* Can view orders
-* Can change orders
-* Can view vouchers
-* Can change vouchers
-
 Compatibility
 -------------
 

doc/api/resources/categories.rst

@@ -22,10 +22,6 @@ 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.
-
 
 Endpoints
 ---------
@@ -48,7 +44,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "count": 1,
@@ -94,7 +90,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "id": 1,
@@ -110,118 +106,3 @@ Endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/categories/
-
-   Creates a new category
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/categories/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content: application/json
-
-      {
-        "name": {"en": "Tickets"},
-        "description": {"en": "Tickets are what you need to get in."},
-        "position": 1,
-        "is_addon": false
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "name": {"en": "Tickets"},
-        "description": {"en": "Tickets are what you need to get in."},
-        "position": 1,
-        "is_addon": false
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event to create a category for
-   :param event: The ``slug`` field of the event to create a category for
-   :statuscode 201: no error
-   :statuscode 400: The category could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/categories/(id)/
-
-   Update a category. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
-   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
-   want to change.
-
-   You can change all fields of the resource except the ``id`` field.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/categories/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "is_addon": true
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "name": {"en": "Tickets"},
-        "description": {"en": "Tickets are what you need to get in."},
-        "position": 1,
-        "is_addon": true
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the category to modify
-   :statuscode 200: no error
-   :statuscode 400: The category could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/category/(id)/
-
-   Delete a category.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/categories/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the category to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.

doc/api/resources/checkinlists.rst

@@ -1,622 +0,0 @@
-Check-in lists
-==============
-
-Resource description
---------------------
-
-You can create check-in lists that you can use e.g. at the entrance of your event to track who is coming and if they
-actually bought a ticket.
-
-You can create multiple check-in lists to separate multiple parts of your event, for example if you have separate
-entries for multiple ticket types. Different check-in lists are completely independent: If a ticket shows up on two
-lists, it is valid once on every list. This might be useful if you run a festival with festival passes that allow
-access to every or multiple performances as well as tickets only valid for single performances.
-
-The check-in list resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the check-in list
-name                                  string                     The internal name of the check-in list
-all_products                          boolean                    If ``true``, the check-in lists contains tickets of all products in this event. The ``limit_products`` field is ignored in this case.
-limit_products                        list of integers           List of item IDs to include in this list.
-subevent                              integer                    ID of the date inside an event series this list belongs to (or ``null``).
-position_count                        integer                    Number of tickets that match this list (read-only).
-checkin_count                         integer                    Number of check-ins performed on this list (read-only).
-include_pending                       boolean                    If ``true``, the check-in list also contains tickets from orders in pending state.
-===================================== ========================== =======================================================
-
-.. 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.
-
-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.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/checkinlists/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "count": 1,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id": 1,
-            "name": "Default list",
-            "checkin_count": 123,
-            "position_count": 456,
-            "all_products": true,
-            "limit_products": [],
-            "include_pending": false,
-            "subevent": null
-          }
-        ]
-      }
-
-   :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
-   :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)/events/(event)/checkinlists/(id)/
-
-   Returns information on one check-in list, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/checkinlists/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "name": "Default list",
-        "checkin_count": 123,
-        "position_count": 456,
-        "all_products": true,
-        "limit_products": [],
-        "include_pending": false,
-        "subevent": null
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param id: The ``id`` field of the check-in list 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)/events/(event)/checkinlists/(id)/status/
-
-   Returns detailed status information on a check-in list, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/checkinlists/1/status/ 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
-
-      {
-        "checkin_count": 17,
-        "position_count": 42,
-        "event": {
-          "name": "Demo Converence",
-        },
-        "items": [
-          {
-            "name": "T-Shirt",
-            "id": 1,
-            "checkin_count": 1,
-            "admission": False,
-            "position_count": 1,
-            "variations": [
-              {
-                "value": "Red",
-                "id": 1,
-                "checkin_count": 1,
-                "position_count": 12
-              },
-              {
-                "value": "Blue",
-                "id": 2,
-                "checkin_count": 4,
-                "position_count": 8
-              }
-            ]
-          },
-          {
-            "name": "Ticket",
-            "id": 2,
-            "checkin_count": 15,
-            "admission": True,
-            "position_count": 22,
-            "variations": []
-          }
-        ]
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param id: The ``id`` field of the check-in list to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/checkinlists/
-
-   Creates a new check-in list.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/checkinlists/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content: application/json
-
-      {
-        "name": "VIP entry",
-        "all_products": false,
-        "limit_products": [1, 2],
-        "subevent": null
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 2,
-        "name": "VIP entry",
-        "checkin_count": 0,
-        "position_count": 0,
-        "all_products": false,
-        "limit_products": [1, 2],
-        "include_pending": false,
-        "subevent": null
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event/item to create a list for
-   :param event: The ``slug`` field of the event to create a list for
-   :statuscode 201: no error
-   :statuscode 400: The list could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/checkinlists/(id)/
-
-   Update a check-in list. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
-   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
-   want to change.
-
-   You can change all fields of the resource except the ``id`` field and the ``checkin_count`` and ``position_count``
-   fields.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/checkinlists/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "name": "Backstage",
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 2,
-        "name": "Backstage",
-        "checkin_count": 23,
-        "position_count": 42,
-        "all_products": false,
-        "limit_products": [1, 2],
-        "include_pending": false,
-        "subevent": null
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the list to modify
-   :statuscode 200: no error
-   :statuscode 400: The list could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/checkinlist/(id)/
-
-   Delete a check-in list. Note that this also deletes the information on all check-ins performed via this list.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/checkinlist/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the check-in list to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.
-
-
-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.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/checkinlists/(list)/positions/
-
-   Returns a list of all order positions within a given event. The result is the same as
-   the :ref:`order-position-resource`, with one important difference: the ``checkins`` value will only include
-   check-ins for the selected list.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/checkinlists/1/positions/ 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": 23442,
-            "order": "ABC12",
-            "positionid": 1,
-            "item": 1345,
-            "variation": null,
-            "price": "23.00",
-            "attendee_name": "Peter",
-            "attendee_email": null,
-            "voucher": null,
-            "tax_rate": "0.00",
-            "tax_rule": null,
-            "tax_value": "0.00",
-            "secret": "z3fsn8jyufm5kpk768q69gkbyr5f4h6w",
-            "addon_to": null,
-            "subevent": null,
-            "checkins": [
-              {
-                "list": 1,
-                "datetime": "2017-12-25T12:45:23Z"
-              }
-            ],
-            "answers": [
-              {
-                "question": 12,
-                "answer": "Foo",
-                "options": []
-              }
-            ],
-            "downloads": [
-              {
-                "output": "pdf",
-                "url": "https://pretix.eu/api/v1/organizers/bigevents/events/sampleconf/orderpositions/23442/download/pdf/"
-              }
-            ]
-          }
-        ]
-      }
-
-   :query integer page: The page number in case of a multi-page result set, default is 1
-   :query string ordering: Manually set the ordering of results. Valid fields to be used are ``order__code``,
-                           ``order__datetime``, ``positionid``, ``attendee_name``, ``last_checked_in`` and ``order__email``. Default:
-                           ``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 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.
-   :query integer variation__in: Only return positions with one of the purchased item variation matching the given
-                                 comma-separated IDs.
-   :query string attendee_name: Only return positions with the given value in the attendee_name field. Also, add-on
-                                products positions are shown if they refer to an attendee with the given name.
-   :query string secret: Only return positions with the given ticket secret.
-   :query string order__status: Only return positions with the given order status.
-   :query string order__status__in: Only return positions with one the given comma-separated order status.
-   :query boolean has_checkin: If set to ``true`` or ``false``, only return positions that have or have not been
-                               checked in already.
-   :query integer subevent: Only return positions of the sub-event with the given ID
-   :query integer subevent__in: Only return positions of one of the sub-events with the given comma-separated IDs
-   :query integer addon_to: Only return positions that are add-ons to the position with the given ID.
-   :query integer addon_to__in: Only return positions that are add-ons to one of the positions with the given
-                                      comma-separated IDs.
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param list: The ID of the check-in list to look for
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-   :statuscode 404: The requested check-in list does not exist.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/checkinlists/(list)/positions/(id)/
-
-   Returns information on one order position, identified by its internal ID.
-   The result format is the same as the :ref:`order-position-resource`, with one important difference: the
-   ``checkins`` value will only include check-ins for the selected list.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/checkinlists/1/positions/23442/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 23442,
-        "order": "ABC12",
-        "positionid": 1,
-        "item": 1345,
-        "variation": null,
-        "price": "23.00",
-        "attendee_name": "Peter",
-        "attendee_email": null,
-        "voucher": null,
-        "tax_rate": "0.00",
-        "tax_rule": null,
-        "tax_value": "0.00",
-        "secret": "z3fsn8jyufm5kpk768q69gkbyr5f4h6w",
-        "addon_to": null,
-        "subevent": null,
-        "checkins": [
-          {
-            "list": 1,
-            "datetime": "2017-12-25T12:45:23Z"
-          }
-        ],
-        "answers": [
-          {
-            "question": 12,
-            "answer": "Foo",
-            "options": []
-          }
-        ],
-        "downloads": [
-          {
-            "output": "pdf",
-            "url": "https://pretix.eu/api/v1/organizers/bigevents/events/sampleconf/orderpositions/23442/download/pdf/"
-          }
-        ]
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param list: The ID of the check-in list to look for
-   :param id: The ``id`` field of the order position to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-   :statuscode 404: The requested order position or check-in list does not exist.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/checkinlists/(list)/positions/(id)/redeem/
-
-   Tries to redeem an order position, identified by its internal ID, i.e. checks the attendee in. This endpoint
-   accepts a number of optional requests in the body.
-
-   :<json boolean questions_supported: When this parameter is set to ``true``, handling of questions is supported. If
-                                       you do not implement question handling in your user interface, you **must**
-                                       set this to ``false``. In that case, questions will just be ignored. Defaults
-                                       to ``true``.
-   :<json datetime datetime: Specifies the datetime of the check-in. If not supplied, the current time will be used.
-   :<json boolean force: Specifies that the check-in should succeed regardless of previous check-ins or required
-                         questions that have not been filled. Defaults to ``false``.
-   :<json boolean ignore_unpaid: Specifies that the check-in should succeed even if the order is in pending state.
-                                 Defaults to ``false``.
-   :<json string nonce: You can set this parameter to a unique random value to identify this check-in. If you're sending
-                        this request twice with the same nonce, the second request will also succeed but will always
-                        create only one check-in object even when the previous request was successful as well. This
-                        allows for a certain level of idempotency and enables you to re-try after a connection failure.
-   :<json object answers: If questions are supported/required, you may/must supply a mapping of question IDs to their
-                          respective answers. The answers should always be strings. In case of (multiple-)choice-type
-                          answers, the string should contain the (comma-separated) IDs of the selected options.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/checkinlists/1/positions/234/redeem/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-      {
-        "force": false,
-        "ignore_unpaid": false,
-        "nonce": "Pvrk50vUzQd0DhdpNRL4I4OcXsvg70uA",
-        "datetime": null,
-        "questions_supported": true,
-        "answers": {
-          "4": "XS"
-        }
-      }
-
-   **Example successful response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "status": "ok"
-      }
-
-   **Example response with required questions**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 400 Bad Request
-      Content-Type: text/json
-
-      {
-        "status": "incomplete"
-        "questions": [
-          {
-            "id": 1,
-            "question": {"en": "T-Shirt size"},
-            "type": "C",
-            "required": false,
-            "items": [1, 2],
-            "position": 1,
-            "identifier": "WY3TP9SL",
-            "ask_during_checkin": true,
-            "options": [
-              {
-                "id": 1,
-                "identifier": "LVETRWVU",
-                "position": 0,
-                "answer": {"en": "S"}
-              },
-              {
-                "id": 2,
-                "identifier": "DFEMJWMJ",
-                "position": 1,
-                "answer": {"en": "M"}
-              },
-              {
-                "id": 3,
-                "identifier": "W9AH7RDE",
-                "position": 2,
-                "answer": {"en": "L"}
-              }
-            ]
-          }
-        ]
-      }
-
-   **Example error response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Content-Type: text/json
-
-      {
-        "status": "error",
-        "reason": "unpaid",
-      }
-
-   Possible error reasons:
-
-   * ``unpaid`` - Ticket is not paid for or has been refunded
-   * ``already_redeemed`` - Ticket already has been redeemed
-   * ``product`` - Tickets with this product may not be scanned at this device
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param list: The ID of the check-in list to look for
-   :param id: The ``id`` field of the order position to fetch
-   :statuscode 201: no error
-   :statuscode 400: Invalid or incomplete request, see above
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-   :statuscode 404: The requested order position or check-in list does not exist.

doc/api/resources/events.rst

@@ -25,22 +25,14 @@ presale_start                         datetime                   The date at whi
 presale_end                           datetime                   The date at which the ticket shop closes (or ``null``)
 location                              multi-lingual string       The event location (or ``null``)
 has_subevents                         boolean                    ``True`` if the event series feature is active for this
-                                                                 event. Cannot change after event is created.
+                                                                 event
 meta_data                             dict                       Values set for organizer-specific meta data parameters.
-plugins                               list                       A list of package names of the enabled plugins for this
-                                                                 event.
 ===================================== ========================== =======================================================
 
-
 .. 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.
-
 Endpoints
 ---------
 
@@ -48,8 +40,6 @@ Endpoints
 
    Returns a list of all events within a given organizer the authenticated user/token has access to.
 
-   Permission required: "Can change event settings"
-
    **Example request**:
 
    .. sourcecode:: http
@@ -64,7 +54,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "count": 1,
@@ -84,13 +74,7 @@ Endpoints
             "presale_end": null,
             "location": null,
             "has_subevents": false,
-            "meta_data": {},
-            "plugins": [
-              "pretix.plugins.banktransfer"
-              "pretix.plugins.stripe"
-              "pretix.plugins.paypal"
-              "pretix.plugins.ticketoutputpdf"
-            ]
+            "meta_data": {}
           }
         ]
       }
@@ -105,8 +89,6 @@ Endpoints
 
    Returns information on one event, identified by its slug.
 
-   Permission required: "Can change event settings"
-
    **Example request**:
 
    .. sourcecode:: http
@@ -121,7 +103,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "name": {"en": "Sample Conference"},
@@ -136,13 +118,7 @@ Endpoints
         "presale_end": null,
         "location": null,
         "has_subevents": false,
-        "meta_data": {},
-        "plugins": [
-          "pretix.plugins.banktransfer"
-          "pretix.plugins.stripe"
-          "pretix.plugins.paypal"
-          "pretix.plugins.ticketoutputpdf"
-        ]
+        "meta_data": {}
       }
 
    :param organizer: The ``slug`` field of the organizer to fetch
@@ -150,242 +126,3 @@ Endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view it.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/
-
-   Creates a new event
-
-   Please note that events cannot be created as 'live' using this endpoint. Quotas and payment must be added to the
-   event before sales can go live.
-
-   Permission required: "Can create events"
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content: application/json
-
-      {
-        "name": {"en": "Sample Conference"},
-        "slug": "sampleconf",
-        "live": false,
-        "currency": "EUR",
-        "date_from": "2017-12-27T10:00:00Z",
-        "date_to": null,
-        "date_admission": null,
-        "is_public": false,
-        "presale_start": null,
-        "presale_end": null,
-        "location": null,
-        "has_subevents": false,
-        "meta_data": {},
-        "plugins": [
-          "pretix.plugins.stripe",
-          "pretix.plugins.paypal"
-        ]
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "name": {"en": "Sample Conference"},
-        "slug": "sampleconf",
-        "live": false,
-        "currency": "EUR",
-        "date_from": "2017-12-27T10:00:00Z",
-        "date_to": null,
-        "date_admission": null,
-        "is_public": false,
-        "presale_start": null,
-        "presale_end": null,
-        "location": null,
-        "has_subevents": false,
-        "meta_data": {},
-        "plugins": [
-          "pretix.plugins.stripe",
-          "pretix.plugins.paypal"
-        ]
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event to create.
-   :statuscode 201: no error
-   :statuscode 400: The event could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.
-
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/clone/
-
-   Creates a new event with properties as set in the request body. The properties that are copied are: 'is_public',
-   settings, plugin settings, items, variations, add-ons, quotas, categories, tax rules, questions.
-
-   If the 'plugins' and/or 'is_public' fields are present in the post body this will determine their value. Otherwise
-   their value will be copied from the existing event.
-
-   Please note that you can only copy from events under the same organizer.
-
-   Permission required: "Can create events"
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/clone/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content: application/json
-
-      {
-        "name": {"en": "Sample Conference"},
-        "slug": "sampleconf",
-        "live": false,
-        "currency": "EUR",
-        "date_from": "2017-12-27T10:00:00Z",
-        "date_to": null,
-        "date_admission": null,
-        "is_public": false,
-        "presale_start": null,
-        "presale_end": null,
-        "location": null,
-        "has_subevents": false,
-        "meta_data": {},
-        "plugins": [
-          "pretix.plugins.stripe",
-          "pretix.plugins.paypal"
-        ]
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "name": {"en": "Sample Conference"},
-        "slug": "sampleconf",
-        "live": false,
-        "currency": "EUR",
-        "date_from": "2017-12-27T10:00:00Z",
-        "date_to": null,
-        "date_admission": null,
-        "is_public": false,
-        "presale_start": null,
-        "presale_end": null,
-        "location": null,
-        "has_subevents": false,
-        "meta_data": {},
-        "plugins": [
-          "pretix.plugins.stripe",
-          "pretix.plugins.paypal"
-        ]
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event to create.
-   :param event: The ``slug`` field of the event to copy settings and items from.
-   :statuscode 201: no error
-   :statuscode 400: The event could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.
-
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/
-
-   Updates an event
-
-   Permission required: "Can change event settings"
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content: application/json
-
-      {
-        "plugins": [
-          "pretix.plugins.banktransfer",
-          "pretix.plugins.stripe",
-          "pretix.plugins.paypal",
-          "pretix.plugins.pretixdroid"
-        ]
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "name": {"en": "Sample Conference"},
-        "slug": "sampleconf",
-        "live": false,
-        "currency": "EUR",
-        "date_from": "2017-12-27T10:00:00Z",
-        "date_to": null,
-        "date_admission": null,
-        "is_public": false,
-        "presale_start": null,
-        "presale_end": null,
-        "location": null,
-        "has_subevents": false,
-        "meta_data": {},
-        "plugins": [
-          "pretix.plugins.banktransfer",
-          "pretix.plugins.stripe",
-          "pretix.plugins.paypal",
-          "pretix.plugins.pretixdroid"
-        ]
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event to update
-   :param event: The ``slug`` field of the event to update
-   :statuscode 201: no error
-   :statuscode 400: The event could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
-
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/items/(id)/
-
-   Delete an event. Note that events with orders cannot be deleted to ensure data integrity.
-
-   Permission required: "Can change event settings"
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.

doc/api/resources/index.rst

@@ -10,13 +10,9 @@ Resources and endpoints
    taxrules
    categories
    items
-   item_variations
-   item_add-ons
    questions
-   question_options
    quotas
    orders
    invoices
    vouchers
-   checkinlists
    waitinglist

doc/api/resources/invoices.rst

@@ -41,7 +41,6 @@ foreign_currency_rate                 decimal (string)           If ``foreign_cu
                                                                  invoicing time, it is stored here.
 foreign_currency_rate_date            date                       If ``foreign_currency_rate`` is set, this signifies the
                                                                  date at which the currency rate was obtained.
-internal_reference                    string                     Customer's reference to be printed on the invoice.
 ===================================== ========================== =======================================================
 
 
@@ -58,11 +57,6 @@ internal_reference                    string                     Customer's refe
    ``foreign_currency_rate_date`` have been added.
 
 
-.. versionchanged:: 1.9
-
-   The attribute ``internal_reference`` has been added.
-
-
 Endpoints
 ---------
 
@@ -84,7 +78,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "count": 1,
@@ -101,7 +95,6 @@ Endpoints
             "refers": null,
             "locale": "en",
             "introductory_text": "thank you for your purchase of the following items:",
-            "internal_reference": "",
             "additional_text": "We are looking forward to see you on our conference!",
             "payment_provider_text": "Please transfer the money to our account ABC…",
             "footer_text": "Big Events LLC - Registration No. 123456 - VAT ID: EU0987654321",
@@ -125,7 +118,7 @@ Endpoints
    :query boolean is_cancellation: If set to ``true`` or ``false``, only invoices with this value for the field
                                    ``is_cancellation`` will be returned.
    :query string order: If set, only invoices belonging to the order with the given order code will be returned.
-   :query string refers: If set, only invoices referring to the given invoice will be returned.
+   :query string refers: If set, only invoices refering to the given invoice will be returned.
    :query string locale: If set, only invoices with the given locale will be returned.
    :query string ordering: Manually set the ordering of results. Valid fields to be used are ``date`` and
                            ``nr`` (equals to ``number``). Default: ``nr``
@@ -153,7 +146,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "number": "SAMPLECONF-00001",
@@ -165,7 +158,6 @@ Endpoints
         "refers": null,
         "locale": "en",
         "introductory_text": "thank you for your purchase of the following items:",
-        "internal_reference": "",
         "additional_text": "We are looking forward to see you on our conference!",
         "payment_provider_text": "Please transfer the money to our account ABC…",
         "footer_text": "Big Events LLC - Registration No. 123456 - VAT ID: EU0987654321",
@@ -221,61 +213,5 @@ Endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-   :statuscode 409: The file is not yet ready and will now be prepared. Retry the request after waiting for a few
+   :statuscode 409: The file is not yet ready and will now be prepared. Retry the request after waiting vor a few
                     seconds.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/invoices/(invoice_no)/reissue/
-
-   Cancels the invoice and creates a new one.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/invoices/00001/reissue/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-      Content-Type: application/pdf
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param invoice_no: The ``invoice_no`` field of the invoice to reissue
-   :statuscode 200: no error
-   :statuscode 400: The invoice has already been canceled
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/invoices/(invoice_no)/regenerate/
-
-   Re-generates the invoice from order data.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/invoices/00001/regenerate/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-      Content-Type: application/pdf
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param invoice_no: The ``invoice_no`` field of the invoice to regenerate
-   :statuscode 200: no error
-   :statuscode 400: The invoice has already been canceled
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.

doc/api/resources/item_add-ons.rst

@@ -1,246 +0,0 @@
-Item add-ons
-============
-
-Resource description
---------------------
-
-With add-ons, you can specify products that can be bought as an addition to this specific product. For example, if you
-host a conference with a base conference ticket and a number of workshops, you could define the workshops as add-ons to
-the conference ticket. With this configuration, the workshops cannot be bought on their own but only in combination with
-a conference ticket. You can here specify categories of products that can be used as add-ons to this product. You can
-also specify the minimum and maximum number of add-ons of the given category that can or need to be chosen. The user can
-buy every add-on from the category at most once. If an add-on product has multiple variations, only one of them can be
-bought.
-The add-ons resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the add-on
-addon_category                        integer                    Internal ID of the item category the add-on can be
-                                                                 chosen from.
-min_count                             integer                    The minimal number of add-ons that need to be chosen.
-max_count                             integer                    The maximal number of add-ons that can be chosen.
-position                              integer                    An integer, used for sorting
-price_included                        boolean                    Adding this add-on to the item is free
-===================================== ========================== =======================================================
-
-.. versionchanged:: 1.12
-
-   This resource has been added.
-
-Endpoints
----------
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/items/(item)/addons/
-
-   Returns a list of all add-ons for a given item.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/items/11/addons/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "count": 2,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id": 3,
-            "addon_category": 1,
-            "min_count": 0,
-            "max_count": 10,
-            "position": 0,
-            "price_included": true
-          },
-          {
-            "id": 4,
-            "addon_category": 2,
-            "min_count": 0,
-            "max_count": 10,
-            "position": 1,
-            "price_included": true
-          }
-        ]
-      }
-
-   :query integer page: The page number in case of a multi-page result set, default is 1
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param item: The ``id`` field of the item to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/item does not exist **or** you have no permission to view this resource.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/items/(item)/addons/(id)/
-
-   Returns information on one add-on, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/items/1/addons/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 3,
-        "addon_category": 1,
-        "min_count": 0,
-        "max_count": 10,
-        "position": 1,
-        "price_included": true
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param item: The ``id`` field of the item to fetch
-   :param id: The ``id`` field of the add-on to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/organizers/bigevents/events/sampleconf/items/1/addons/
-
-   Creates a new add-on
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/(organizer)/events/(event)/items/(item)/addons/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content: application/json
-
-      {
-        "addon_category": 1,
-        "min_count": 0,
-        "max_count": 10,
-        "position": 1,
-        "price_included": true
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 3,
-        "addon_category": 1,
-        "min_count": 0,
-        "max_count": 10,
-        "position": 1,
-        "price_included": true
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event/item to create a add-on for
-   :param event: The ``slug`` field of the event to create a add-on for
-   :param item: The ``id`` field of the item to create a add-on for
-   :statuscode 201: no error
-   :statuscode 400: The add-on could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/items/(item)/addon/(id)/
-
-   Update an add-on. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
-   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
-   want to change.
-
-   You can change all fields of the resource except the ``id`` field.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/items/1/addons/3/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "min_count": 0,
-        "max_count": 10,
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 3,
-        "addon_category": 1,
-        "min_count": 0,
-        "max_count": 10,
-        "position": 1,
-        "price_included": true
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param item: The ``id`` field of the item to modify
-   :param id: The ``id`` field of the add-on to modify
-   :statuscode 200: no error
-   :statuscode 400: The add-on could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/items/(id)/addons/(id)/
-
-   Delete an add-on.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/items/1/addons/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the item to modify
-   :param id: The ``id`` field of the add-on to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.

doc/api/resources/item_variations.rst

@@ -1,258 +0,0 @@
-Item variations
-===============
-
-Resource description
---------------------
-
-Variations of items can be use for products (items) that are available in different sizes, colors or other variations
-of the same product.
-The variations resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the variation
-default_price                         money (string)             The price set directly for this variation or ``null``
-price                                 money (string)             The price used for this variation. This is either the
-                                                                 same as ``default_price`` if that value is set or equal
-                                                                 to the item's ``default_price`` (read-only).
-active                                boolean                    If ``False``, this variation will not be sold or shown.
-description                           multi-lingual string       A public description of the variation. May contain
-                                                                 Markdown syntax or can be ``null``.
-position                              integer                    An integer, used for sorting
-===================================== ========================== =======================================================
-
-.. versionchanged:: 1.12
-
-   This resource has been added.
-
-Endpoints
----------
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/items/(item)/variations/
-
-   Returns a list of all variations for a given item.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/items/11/variations/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "count": 2,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id": 1,
-            "value": {
-              "en": "S"
-            },
-            "active": true,
-            "description": {
-              "en": "Test2"
-            },
-            "position": 0,
-            "default_price": "223.00",
-            "price": 223.0
-          },
-          {
-            "id": 3,
-            "value": {
-              "en": "L"
-            },
-            "active": true,
-            "description": {},
-            "position": 1,
-            "default_price": null,
-            "price": 15.0
-          }
-        ]
-      }
-
-   :query integer page: The page number in case of a multi-page result set, default is 1
-   :query boolean active: If set to ``true`` or ``false``, only items with this value for the field ``active`` will be
-                          returned.
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param item: The ``id`` field of the item to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/item does not exist **or** you have no permission to view this resource.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/items/(item)/variations/(id)/
-
-   Returns information on one variation, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/items/1/variations/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 3,
-        "value": {
-              "en": "Student"
-        },
-        "default_price": "10.00",
-        "price": "10.00",
-        "active": true,
-        "description": null,
-        "position": 0
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param item: The ``id`` field of the item to fetch
-   :param id: The ``id`` field of the variation to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/items/(item)/variations/
-
-   Creates a new variation
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/items/1/variations/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content: application/json
-
-      {
-        "value": {"en": "Student"},
-        "default_price": "10.00",
-        "active": true,
-        "description": null,
-        "position": 0
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "value": {"en": "Student"},
-        "default_price": "10.00",
-        "price": "10.00",
-        "active": true,
-        "description": null,
-        "position": 0
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event/item to create a variation for
-   :param event: The ``slug`` field of the event to create a variation for
-   :param item: The ``id`` field of the item to create a variation for
-   :statuscode 201: no error
-   :statuscode 400: The variation could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/items/(item)/variations/(id)/
-
-   Update a variation. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
-   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
-   want to change.
-
-   You can change all fields of the resource except the ``id`` and the ``price`` field.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/items/1/variations/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "active": false,
-        "position": 1
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "value": {"en": "Student"},
-        "default_price": "10.00",
-        "price": "10.00",
-        "active": false,
-        "description": null,
-        "position": 1
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the item to modify
-   :param id: The ``id`` field of the variation to modify
-   :statuscode 200: no error
-   :statuscode 400: The variation could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/items/(id)/variations/(id)/
-
-   Delete a variation.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/items/1/variations/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the item to modify
-   :param id: The ``id`` field of the variation to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.

doc/api/resources/items.rst

@@ -33,7 +33,6 @@ admission                             boolean                    ``True`` for it
                                                                  (such as add-ons or merchandise).
 position                              integer                    An integer, used for sorting
 picture                               string                     A product picture to be displayed in the shop
-                                                                 (read-only).
 available_from                        datetime                   The first date time at which this item can be bought
                                                                  (or ``null``).
 available_until                       datetime                   The last date time at which this item can be bought
@@ -54,10 +53,10 @@ max_per_order                         integer                    This product ca
 checkin_attention                     boolean                    If ``True``, the check-in app should show a warning
                                                                  that this ticket requires special attention if such
                                                                  a product is being scanned.
-has_variations                        boolean                    Shows whether or not this item has variations.
+has_variations                        boolean                    Shows whether or not this item has variations
+                                                                 (read-only).
 variations                            list of objects            A list with one object for each variation of this item.
-                                                                 Can be empty. Only writable during creation,
-                                                                 use separate endpoint to modify this later.
+                                                                 Can be empty.
 ├ id                                  integer                    Internal ID of the variation
 ├ default_price                       money (string)             The price set directly for this variation or ``null``
 ├ price                               money (string)             The price used for this variation. This is either the
@@ -67,15 +66,12 @@ variations                            list of objects            A list with one
 ├ description                         multi-lingual string       A public description of the variation. May contain
                                                                  Markdown syntax or can be ``null``.
 └ position                            integer                    An integer, used for sorting
-addons                                list of objects            Definition of add-ons that can be chosen for this item.
-                                                                 Only writable during creation,
-                                                                 use separate endpoint to modify this later.
+addons                                list of objects            Definition of add-ons that can be chosen for this item
 ├ addon_category                      integer                    Internal ID of the item category the add-on can be
                                                                  chosen from.
 ├ min_count                           integer                    The minimal number of add-ons that need to be chosen.
-├ max_count                           integer                    The maximal number of add-ons that can be chosen.
+├ max_count                           integer                    The maxima number of add-ons that can be chosen.
 └ position                            integer                    An integer, used for sorting
-└ price_included                      boolean                    Adding this add-on to the item is free
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.7
@@ -83,20 +79,6 @@ addons                                list of objects            Definition of a
    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``.
-
-Notes
------
-Please note that an item either always has variations or never has. Once created with variations the item can never
-change to an item without and vice versa. To create an item with variations ensure that you POST an item with at least
-one variation.
-
-Also note that ``variations`` and ``addons`` are only supported on ``POST``. To update/delete variations and add-ons please
-use the dedicated nested endpoints. By design this endpoint does not support ``PATCH`` and ``PUT`` with nested
-``variations`` and/or ``addons``.
 
 Endpoints
 ---------
@@ -119,7 +101,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "count": 1,
@@ -206,7 +188,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "id": 1,
@@ -257,226 +239,3 @@ Endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/items/
-
-   Creates a new item
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/items/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content: application/json
-
-      {
-        "id": 1,
-        "name": {"en": "Standard ticket"},
-        "default_price": "23.00",
-        "category": null,
-        "active": true,
-        "description": null,
-        "free_price": false,
-        "tax_rate": "0.00",
-        "tax_rule": 1,
-        "admission": false,
-        "position": 0,
-        "picture": null,
-        "available_from": null,
-        "available_until": null,
-        "require_voucher": false,
-        "hide_without_voucher": false,
-        "allow_cancel": true,
-        "min_per_order": null,
-        "max_per_order": null,
-        "checkin_attention": false,
-        "variations": [
-          {
-             "value": {"en": "Student"},
-             "default_price": "10.00",
-             "price": "10.00",
-             "active": true,
-             "description": null,
-             "position": 0
-          },
-          {
-             "value": {"en": "Regular"},
-             "default_price": null,
-             "price": "23.00",
-             "active": true,
-             "description": null,
-             "position": 1
-          }
-        ],
-        "addons": []
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "name": {"en": "Standard ticket"},
-        "default_price": "23.00",
-        "category": null,
-        "active": true,
-        "description": null,
-        "free_price": false,
-        "tax_rate": "0.00",
-        "tax_rule": 1,
-        "admission": false,
-        "position": 0,
-        "picture": null,
-        "available_from": null,
-        "available_until": null,
-        "require_voucher": false,
-        "hide_without_voucher": false,
-        "allow_cancel": true,
-        "min_per_order": null,
-        "max_per_order": null,
-        "checkin_attention": false,
-        "has_variations": true,
-        "variations": [
-          {
-             "value": {"en": "Student"},
-             "default_price": "10.00",
-             "price": "10.00",
-             "active": true,
-             "description": null,
-             "position": 0
-          },
-          {
-             "value": {"en": "Regular"},
-             "default_price": null,
-             "price": "23.00",
-             "active": true,
-             "description": null,
-             "position": 1
-          }
-        ],
-        "addons": []
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event to create an item for
-   :param event: The ``slug`` field of the event to create an item for
-   :statuscode 201: no error
-   :statuscode 400: The item could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/items/(id)/
-
-   Update an item. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
-   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
-   want to change.
-
-   You can change all fields of the resource except the ``has_variations``, ``variations`` and the ``addon`` field. If
-   you need to update/delete variations or add-ons please use the nested dedicated endpoints.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/items/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "name": {"en": "Ticket"},
-        "default_price": "25.00"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "name": {"en": "Ticket"},
-        "default_price": "25.00",
-        "category": null,
-        "active": true,
-        "description": null,
-        "free_price": false,
-        "tax_rate": "0.00",
-        "tax_rule": 1,
-        "admission": false,
-        "position": 0,
-        "picture": null,
-        "available_from": null,
-        "available_until": null,
-        "require_voucher": false,
-        "hide_without_voucher": false,
-        "allow_cancel": true,
-        "min_per_order": null,
-        "max_per_order": null,
-        "checkin_attention": false,
-        "has_variations": true,
-        "variations": [
-          {
-             "value": {"en": "Student"},
-             "default_price": "10.00",
-             "price": "10.00",
-             "active": true,
-             "description": null,
-             "position": 0
-          },
-          {
-             "value": {"en": "Regular"},
-             "default_price": null,
-             "price": "23.00",
-             "active": true,
-             "description": null,
-             "position": 1
-          }
-        ],
-        "addons": []
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the item to modify
-   :statuscode 200: no error
-   :statuscode 400: The item could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/items/(id)/
-
-   Delete an item.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/items/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the item to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.
-

doc/api/resources/orders.rst

@@ -1,5 +1,3 @@
-.. spelling:: checkins
-
 Orders
 ======
 
@@ -26,13 +24,14 @@ email                                 string                     The customer em
 locale                                string                     The locale used for communication with this customer
 datetime                              datetime                   Time of order creation
 expires                               datetime                   The order will expire, if it is still pending by this time
-payment_date                          date                       Date of payment receipt
+payment_date                          date                       Date of payment receival
 payment_provider                      string                     Payment provider used for this order
+payment_fee                           money (string)             Payment fee included in this order's total
+payment_fee_tax_rate                  decimal (string)           Tax rate applied to the payment fee
+payment_fee_tax_value                 money (string)             Tax value included in the payment fee
+payment_fee_tax_rule                  integer                    The ID of the used tax rule (or ``null``)
 total                                 money (string)             Total value of this order
 comment                               string                     Internal comment on this order
-checkin_attention                     boolean                    If ``True``, the check-in app should show a warning
-                                                                 that this ticket requires special attention if a ticket
-                                                                 of this order is scanned.
 invoice_address                       object                     Invoice address information (can be ``null``)
 ├ last_modified                       datetime                   Last modification date of the address
 ├ company                             string                     Customer company name
@@ -44,7 +43,6 @@ invoice_address                       object                     Invoice address
 ├ zipcode                             string                     Customer ZIP code
 ├ city                                string                     Customer city
 ├ country                             string                     Customer country
-├ internal_reference                  string                     Customer's internal reference to be printed on the invoice
 ├ vat_id                              string                     Customer VAT ID
 └ vat_id_validated                    string                     ``True``, if the VAT ID has been validated against the
                                                                  EU VAT service and validation was successful. This only
@@ -80,23 +78,8 @@ downloads                             list of objects            List of ticket
 
    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.
+   deprecated in favour 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.
-
-.. _order-position-resource:
 
 Order position resource
 -----------------------
@@ -106,7 +89,7 @@ Order position resource
 ===================================== ========================== =======================================================
 Field                                 Type                       Description
 ===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the order position
+id                                    integer                    Internal ID of the order positon
 code                                  string                     Order code of the order the position belongs to
 positionid                            integer                    Number of the position within the order
 item                                  integer                    ID of the purchased item
@@ -122,7 +105,6 @@ secret                                string                     Secret code pri
 addon_to                              integer                    Internal ID of the position this position is an add-on for (or ``null``)
 subevent                              integer                    ID of the date inside an event series this position belongs to (or ``null``).
 checkins                              list of objects            List of check-ins with this ticket
-├ list                                integer                    Internal ID of the check-in list
 └ datetime                            datetime                   Time of check-in
 downloads                             list of objects            List of ticket download options
 ├ output                              string                     Ticket output provider (e.g. ``pdf``, ``passbook``)
@@ -130,31 +112,17 @@ downloads                             list of objects            List of ticket
 answers                               list of objects            Answers to user-defined questions
 ├ question                            integer                    Internal ID of the answered question
 ├ 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
+└ options                             list of integers           Internal IDs of selected option(s)s (only for choice types)
 ===================================== ========================== =======================================================
 
 .. 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.
-
 
 Order endpoints
 ---------------
 
-.. versionchanged:: 1.15
-
-   Filtering for emails or order codes is now case-insensitive.
-
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orders/
 
    Returns a list of all orders within a given event.
@@ -173,7 +141,7 @@ Order endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "count": 1,
@@ -193,7 +161,6 @@ Order endpoints
             "fees": [],
             "total": "23.00",
             "comment": "",
-            "checkin_attention": false,
             "invoice_address": {
                 "last_modified": "2017-12-01T10:00:00Z",
                 "is_business": True,
@@ -203,7 +170,6 @@ Order endpoints
                 "zipcode": "12345",
                 "city": "Testington",
                 "country": "Testikistan",
-                "internal_reference": "",
                 "vat_id": "EU123456789",
                 "vat_id_validated": False
             },
@@ -226,16 +192,13 @@ Order endpoints
                 "subevent": null,
                 "checkins": [
                   {
-                    "list": 44,
                     "datetime": "2017-12-25T12:45:23Z"
                   }
                 ],
                 "answers": [
                   {
                     "question": 12,
-                    "question_identifier": "WY3TP9SL",
                     "answer": "Foo",
-                    "option_idenfiters": [],
                     "options": []
                   }
                 ],
@@ -288,7 +251,7 @@ Order endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "code": "ABC12",
@@ -303,7 +266,6 @@ Order endpoints
         "fees": [],
         "total": "23.00",
         "comment": "",
-        "checkin_attention": false,
         "invoice_address": {
             "last_modified": "2017-12-01T10:00:00Z",
             "company": "Sample company",
@@ -313,7 +275,6 @@ Order endpoints
             "zipcode": "12345",
             "city": "Testington",
             "country": "Testikistan",
-            "internal_reference": "",
             "vat_id": "EU123456789",
             "vat_id_validated": False
         },
@@ -336,16 +297,13 @@ Order endpoints
             "subevent": null,
             "checkins": [
               {
-                "list": 44,
                 "datetime": "2017-12-25T12:45:23Z"
               }
             ],
             "answers": [
               {
                 "question": 12,
-                "question_identifier": "WY3TP9SL",
                 "answer": "Foo",
-                "option_idenfiters": [],
                 "options": []
               }
             ],
@@ -371,13 +329,12 @@ Order endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-   :statuscode 404: The requested order does not exist.
 
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/download/(output)/
 
    Download tickets for an order, identified by its order code. Depending on the chosen output, the response might
    be a ZIP file, PDF file or something else. The order details response contains a list of output options for this
-   particular order.
+   partictular order.
 
    Tickets can be only downloaded if the order is paid and if ticket downloads are active. Note that in some cases the
    ticket file might not yet have been created. In that case, you will receive a status code :http:statuscode:`409` and
@@ -408,218 +365,15 @@ Order endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource
-                    **or** downloads are not available for this order at this time. The response content will
+                    **or** downlodas are not available for this order at this time. The response content will
                     contain more details.
-   :statuscode 404: The requested order or output provider does not exist.
-   :statuscode 409: The file is not yet ready and will now be prepared. Retry the request after waiting for a few
+   :statuscode 409: The file is not yet ready and will now be prepared. Retry the request after waiting vor a few
                           seconds.
 
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/mark_paid/
-
-   Marks a pending or expired order as successfully paid.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/mark_paid/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "code": "ABC12",
-        "status": "p",
-        ...
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param code: The ``code`` field of the order to modify
-   :statuscode 200: no error
-   :statuscode 400: The order cannot be marked as paid, either because the current order status does not allow it or because no quota is left to perform the operation.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-   :statuscode 404: The requested order does not exist.
-   :statuscode 409: The server was unable to acquire a lock and could not process your request. You can try again after a short waiting period.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/mark_canceled/
-
-   Marks a pending order as canceled.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/mark_canceled/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: text/json
-
-      {
-          "send_email": true
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "code": "ABC12",
-        "status": "c",
-        ...
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param code: The ``code`` field of the order to modify
-   :statuscode 200: no error
-   :statuscode 400: The order cannot be marked as canceled since the current order status does not allow it.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-   :statuscode 404: The requested order does not exist.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/mark_pending/
-
-   Marks a paid order as unpaid.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/mark_pending/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "code": "ABC12",
-        "status": "n",
-        ...
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param code: The ``code`` field of the order to modify
-   :statuscode 200: no error
-   :statuscode 400: The order cannot be marked as unpaid since the current order status does not allow it.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-   :statuscode 404: The requested order does not exist.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/mark_expired/
-
-   Marks a unpaid order as expired.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/mark_expired/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "code": "ABC12",
-        "status": "e",
-        ...
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param code: The ``code`` field of the order to modify
-   :statuscode 200: no error
-   :statuscode 400: The order cannot be marked as expired since the current order status does not allow it.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-   :statuscode 404: The requested order does not exist.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/extend/
-
-   Extends the payment deadline of a pending order. If the order is already expired and quota is still
-   available, its state will be changed to pending.
-
-   The only required parameter of this operation is ``expires``, which should contain a date in the future.
-   Note that only a date is expected, not a datetime, since pretix will always set the deadline to the end of the
-   day in the event's timezone.
-
-   You can pass the optional parameter ``force``. If it is set to ``true``, the operation will be performed even if
-   it leads to an overbooked quota because the order was expired and the tickets have been sold again.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/extend/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: text/json
-
-      {
-          "expires": "2017-10-28",
-          "force": false
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "code": "ABC12",
-        "status": "n",
-        "expires": "2017-10-28T23:59:59Z",
-        ...
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param code: The ``code`` field of the order to modify
-   :statuscode 200: no error
-   :statuscode 400: The order cannot be extended since the current order status does not allow it or no quota is available or the submitted date is invalid.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-   :statuscode 404: The requested order does not exist.
-
 
 Order 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.
-
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/
 
    Returns a list of all order positions within a given event.
@@ -638,7 +392,7 @@ Order position endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "count": 1,
@@ -663,16 +417,13 @@ Order position endpoints
             "subevent": null,
             "checkins": [
               {
-                "list": 44,
                 "datetime": "2017-12-25T12:45:23Z"
               }
             ],
             "answers": [
               {
                 "question": 12,
-                "question_identifier": "WY3TP9SL",
                 "answer": "Foo",
-                "option_idenfiters": [],
                 "options": []
               }
             ],
@@ -691,24 +442,16 @@ Order position endpoints
                            ``order__datetime``, ``positionid``, ``attendee_name``, and ``order__status``. Default:
                            ``order__datetime,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 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.
-   :query integer variation__in: Only return positions with one of the purchased item variation matching the given
-                                 comma-separated IDs.
    :query string attendee_name: Only return positions with the given value in the attendee_name field. Also, add-on
                                 products positions are shown if they refer to an attendee with the given name.
    :query string secret: Only return positions with the given ticket secret.
    :query string order__status: Only return positions with the given order status.
-   :query string order__status__in: Only return positions with one the given comma-separated order status.
-   :query boolean has_checkin: If set to ``true`` or ``false``, only return positions that have or have not been
+   :query bollean has_checkin: If set to ``true`` or ``false``, only return positions that have or have not been
                                checked in already.
    :query integer subevent: Only return positions of the sub-event with the given ID
-   :query integer subevent__in: Only return positions of one of the sub-events with the given comma-separated IDs
    :query integer addon_to: Only return positions that are add-ons to the position with the given ID.
-   :query integer addon_to__in: Only return positions that are add-ons to one of the positions with the given
-                                comma-separated IDs.
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
    :statuscode 200: no error
@@ -733,7 +476,7 @@ Order position endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "id": 23442,
@@ -753,16 +496,13 @@ Order position endpoints
         "subevent": null,
         "checkins": [
           {
-            "list": 44,
             "datetime": "2017-12-25T12:45:23Z"
           }
         ],
         "answers": [
           {
             "question": 12,
-            "question_identifier": "WY3TP9SL",
             "answer": "Foo",
-            "option_idenfiters": [],
             "options": []
           }
         ],
@@ -780,13 +520,12 @@ Order position endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-   :statuscode 404: The requested order position does not exist.
 
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/(id)/download/(output)/
 
    Download tickets for one order position, identified by its internal ID.
    Depending on the chosen output, the response might be a ZIP file, PDF file or something else. The order details
-   response contains a list of output options for this particular order position.
+   response contains a list of output options for this partictular order position.
 
    Tickets can be only downloaded if the order is paid and if ticket downloads are active. Also, depending on event
    configuration downloads might be only unavailable for add-on products or non-admission products.
@@ -818,8 +557,7 @@ Order position endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource
-                    **or** downloads are not available for this order position at this time. The response content will
+                    **or** downlodas are not available for this order position at this time. The response content will
                     contain more details.
-   :statuscode 404: The requested order position or download provider does not exist.
-   :statuscode 409: The file is not yet ready and will now be prepared. Retry the request after waiting for a few
+   :statuscode 409: The file is not yet ready and will now be prepared. Retry the request after waiting vor a few
                     seconds.

doc/api/resources/organizers.rst

@@ -41,7 +41,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "count": 1,
@@ -77,7 +77,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "name": "Big Events LLC",

doc/api/resources/question_options.rst

@@ -1,233 +0,0 @@
-Question options
-================
-
-Resource description
---------------------
-
-Questions of type "choice" or "multiple choice" can have different options attached.
-The options resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the option
-position                              integer                    An integer, used for sorting
-identifier                            string                     An arbitrary string that can be used for matching with
-                                                                 other sources.
-answer                                multi-lingual string       The displayed value of this option
-===================================== ========================== =======================================================
-
-.. versionchanged:: 1.12
-
-   This resource has been added.
-
-Endpoints
----------
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/questions/(question)/options/
-
-   Returns a list of all options for a given question.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/questions/11/options/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "count": 2,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id": 1,
-            "identifier": "LVETRWVU",
-            "position": 1,
-            "answer": {"en": "S"}
-          },
-          {
-            "id": 2,
-            "identifier": "DFEMJWMJ",
-            "position": 2,
-            "answer": {"en": "M"}
-          },
-          {
-            "id": 3,
-            "identifier": "W9AH7RDE",
-            "position": 3,
-            "answer": {"en": "L"}
-          }
-        ]
-      }
-
-   :query integer page: The page number in case of a multi-page result set, default is 1
-   :query boolean active: If set to ``true`` or ``false``, only questions with this value for the field ``active`` will be
-                          returned.
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param question: The ``id`` field of the question to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/question does not exist **or** you have no permission to view this resource.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/questions/(question)/options/(id)/
-
-   Returns information on one option, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/questions/1/options/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "identifier": "LVETRWVU",
-        "position": 1,
-        "answer": {"en": "S"}
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param question: The ``id`` field of the question to fetch
-   :param id: The ``id`` field of the option to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/questions/(question)/options/
-
-   Creates a new option
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/questions/1/options/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content: application/json
-
-      {
-        "identifier": "LVETRWVU",
-        "position": 1,
-        "answer": {"en": "S"}
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "identifier": "LVETRWVU",
-        "position": 1,
-        "answer": {"en": "S"}
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event/question to create a option for
-   :param event: The ``slug`` field of the event to create a option for
-   :param question: The ``id`` field of the question to create a option for
-   :statuscode 201: no error
-   :statuscode 400: The option could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/questions/(question)/options/(id)/
-
-   Update an option. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
-   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
-   want to change.
-
-   You can change all fields of the resource except the ``id`` field.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/questions/1/options/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "position": 3
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "identifier": "LVETRWVU",
-        "position": 1,
-        "answer": {"en": "S"}
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the question to modify
-   :param id: The ``id`` field of the option to modify
-   :statuscode 200: no error
-   :statuscode 400: The option could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/questions/(id)/options/(id)/
-
-   Delete an option.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/questions/1/options/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the question to modify
-   :param id: The ``id`` field of the option to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.

doc/api/resources/questions.rst

@@ -1,5 +1,3 @@
-.. spelling:: checkin
-
 Questions
 =========
 
@@ -25,45 +23,19 @@ type                                  string                     The expected ty
                                                                  * ``C`` – choice from a list
                                                                  * ``M`` – multiple choice from a list
                                                                  * ``F`` – file upload
-                                                                 * ``D`` – date
-                                                                 * ``H`` – time
-                                                                 * ``W`` – date and time
 required                              boolean                    If ``True``, the question needs to be filled out.
 position                              integer                    An integer, used for sorting
 items                                 list of integers           List of item IDs this question is assigned to.
-identifier                            string                     An arbitrary string that can be used for matching with
-                                                                 other sources.
-ask_during_checkin                    boolean                    If ``True``, this question will not be asked while
-                                                                 buying the ticket, but will show up when redeeming
-                                                                 the ticket instead.
 options                               list of objects            In case of question type ``C`` or ``M``, this lists the
-                                                                 available objects. Only writable during creation,
-                                                                 use separate endpoint to modify this later.
+                                                                 available objects.
 ├ id                                  integer                    Internal ID of the option
-├ position                            integer                    An integer, used for sorting
-├ identifier                          string                     An arbitrary string that can be used for matching with
-                                                                 other sources.
 └ answer                              multi-lingual string       The displayed value of this option
 ===================================== ========================== =======================================================
 
-.. 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.
 
 Endpoints
 ---------
 
-.. versionchanged:: 1.15
-
-   The questions endpoint has been extended by the filter queries ``ask_during_checkin``, ``requred``, and
-   ``identifier``.
-
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/questions/
 
    Returns a list of all questions within a given event.
@@ -82,7 +54,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "count": 1,
@@ -96,25 +68,17 @@ Endpoints
             "required": false,
             "items": [1, 2],
             "position": 1,
-            "identifier": "WY3TP9SL",
-            "ask_during_checkin": false,
             "options": [
               {
                 "id": 1,
-                "identifier": "LVETRWVU",
-                "position": 0,
                 "answer": {"en": "S"}
               },
               {
                 "id": 2,
-                "identifier": "DFEMJWMJ",
-                "position": 1,
                 "answer": {"en": "M"}
               },
               {
                 "id": 3,
-                "identifier": "W9AH7RDE",
-                "position": 2,
                 "answer": {"en": "L"}
               }
             ]
@@ -125,9 +89,6 @@ Endpoints
    :query integer page: The page number in case of a multi-page result set, default is 1
    :query string ordering: Manually set the ordering of results. Valid fields to be used are ``id`` and ``position``.
                            Default: ``position``
-   :query string identifier: Only return questions with the given identifier string
-   :query boolean ask_during_checkin: Only return questions that are or are not to be asked during check-in
-   :query boolean required: Only return questions that are or are not required to fill in
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
    :statuscode 200: no error
@@ -152,7 +113,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "id": 1,
@@ -161,25 +122,17 @@ Endpoints
         "required": false,
         "items": [1, 2],
         "position": 1,
-        "identifier": "WY3TP9SL",
-        "ask_during_checkin": false,
         "options": [
           {
             "id": 1,
-            "identifier": "LVETRWVU",
-            "position": 1,
             "answer": {"en": "S"}
           },
           {
             "id": 2,
-            "identifier": "DFEMJWMJ",
-            "position": 2,
             "answer": {"en": "M"}
           },
           {
             "id": 3,
-            "identifier": "W9AH7RDE",
-            "position": 3,
             "answer": {"en": "L"}
           }
         ]
@@ -191,179 +144,3 @@ Endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/questions/
-
-   Creates a new question
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/questions/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content: application/json
-
-      {
-        "question": {"en": "T-Shirt size"},
-        "type": "C",
-        "required": false,
-        "items": [1, 2],
-        "position": 1,
-        "ask_during_checkin": false,
-        "options": [
-          {
-            "answer": {"en": "S"}
-          },
-          {
-            "answer": {"en": "M"}
-          },
-          {
-            "answer": {"en": "L"}
-          }
-        ]
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-
-      {
-        "id": 1,
-        "question": {"en": "T-Shirt size"},
-        "type": "C",
-        "required": false,
-        "items": [1, 2],
-        "position": 1,
-        "identifier": "WY3TP9SL",
-        "ask_during_checkin": false,
-        "options": [
-          {
-            "id": 1,
-            "identifier": "LVETRWVU",
-            "position": 1,
-            "answer": {"en": "S"}
-          },
-          {
-            "id": 2,
-            "identifier": "DFEMJWMJ",
-            "position": 2,
-            "answer": {"en": "M"}
-          },
-          {
-            "id": 3,
-            "identifier": "W9AH7RDE",
-            "position": 3,
-            "answer": {"en": "L"}
-          }
-        ]
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event to create an item for
-   :param event: The ``slug`` field of the event to create an item for
-   :statuscode 201: no error
-   :statuscode 400: The item could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/questions/(id)/
-
-   Update a question. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
-   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
-   want to change.
-
-   You can change all fields of the resource except the ``options`` field. If
-   you need to update/delete options please use the nested dedicated endpoints.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/items/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "position": 2
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "question": {"en": "T-Shirt size"},
-        "type": "C",
-        "required": false,
-        "items": [1, 2],
-        "position": 2,
-        "identifier": "WY3TP9SL",
-        "ask_during_checkin": false,
-        "options": [
-          {
-            "id": 1,
-            "identifier": "LVETRWVU",
-            "position": 1,
-            "answer": {"en": "S"}
-          },
-          {
-            "id": 2,
-            "identifier": "DFEMJWMJ",
-            "position": 2,
-            "answer": {"en": "M"}
-          },
-          {
-            "id": 3,
-            "identifier": "W9AH7RDE",
-            "position": 3,
-            "answer": {"en": "L"}
-          }
-        ]
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the question to modify
-   :statuscode 200: no error
-   :statuscode 400: The item could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/questions/(id)/
-
-   Delete a question.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/items/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the item to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.

doc/api/resources/quotas.rst

@@ -4,7 +4,7 @@ Quotas
 Resource description
 --------------------
 
-Quotas define how many times an item can be sold.
+Questions define how many times an item can be sold.
 The quota resource contains the following public fields:
 
 .. rst-class:: rest-resource-table
@@ -20,10 +20,6 @@ variations                            list of integers           List of item va
 subevent                              integer                    ID of the date inside an event series this quota belongs to (or ``null``).
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 1.10
-
-   The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
-
 
 Endpoints
 ---------
@@ -46,7 +42,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "count": 1,
@@ -92,7 +88,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "id": 1,
@@ -110,131 +106,6 @@ Endpoints
    :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)/events/(event)/quotas/
-
-   Creates a new quota
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/quotas/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content: application/json
-
-      {
-        "name": "Ticket Quota",
-        "size": 200,
-        "items": [1, 2],
-        "variations": [1, 4, 5, 7],
-        "subevent": null
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "name": "Ticket Quota",
-        "size": 200,
-        "items": [1, 2],
-        "variations": [1, 4, 5, 7],
-        "subevent": null
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event/item to create a quota for
-   :param event: The ``slug`` field of the event to create a quota for
-   :statuscode 201: no error
-   :statuscode 400: The quota could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/quotas/(id)/
-
-   Update a quota. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
-   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
-   want to change.
-
-   You can change all fields of the resource except the ``id`` field.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/quotas/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "name": "New Ticket Quota",
-        "size": 100,
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 2,
-        "name": "New Ticket Quota",
-        "size": 100,
-        "items": [
-          1,
-          2
-        ],
-        "variations": [
-          1,
-          2
-        ],
-        "subevent": null
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the quota rule to modify
-   :statuscode 200: no error
-   :statuscode 400: The quota could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/quota/(id)/
-
-   Delete a quota. Note that if you delete a quota the items the quota acts on might no longer be available for sale.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/quotas/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the quotas to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.
-
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/quotas/(id)/availability/
 
    Returns availability information on one quota, identified by its ID.
@@ -253,7 +124,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "available": true,

doc/api/resources/subevents.rst

@@ -60,7 +60,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "count": 1,
@@ -114,7 +114,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "id": 1,

doc/api/resources/taxrules.rst

@@ -4,8 +4,7 @@ Tax rules
 Resource description
 --------------------
 
-Tax rules specify how tax should be calculated for specific products. Custom taxation rule sets are currently to
-available via the API.
+Tax rules specify how tax should be calculated for specific products.
 
 .. rst-class:: rest-resource-table
 
@@ -26,10 +25,6 @@ home_country                          string                     Merchant countr
 
    This resource has been added.
 
-.. versionchanged:: 1.9
-
-   The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
-
 
 Endpoints
 ---------
@@ -52,7 +47,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "count": 1,
@@ -95,7 +90,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "id": 1,
@@ -108,128 +103,7 @@ Endpoints
 
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
-   :param id: The ``id`` field of the tax rule to fetch
+   :param id: The ``slug`` field of the sub-event to fetch
    :statuscode 200: no error
    :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/rule does not exist **or** you have no permission to view it.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/taxrules/
-
-   Create a new tax rule.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/taxrules/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 166
-
-      {
-        "name": {"en": "VAT"},
-        "rate": "19.00",
-        "price_includes_tax": true,
-        "eu_reverse_charge": false,
-        "home_country": "DE"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "name": {"en": "VAT"},
-        "rate": "19.00",
-        "price_includes_tax": true,
-        "eu_reverse_charge": false,
-        "home_country": "DE"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to create a tax rule for
-   :param event: The ``slug`` field of the event to create a tax rule for
-   :statuscode 201: no error
-   :statuscode 400: The tax rule could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create tax rules.
-
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/taxrules/(id)/
-
-   Update a tax rule. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
-   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
-   want to change.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/taxrules/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 34
-
-      {
-        "rate": "20.00",
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: text/javascript
-
-      {
-        "id": 1,
-        "name": {"en": "VAT"},
-        "rate": "20.00",
-        "price_includes_tax": true,
-        "eu_reverse_charge": false,
-        "home_country": "DE"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the tax rule to modify
-   :statuscode 200: no error
-   :statuscode 400: The tax rule could not be modified due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/rule does not exist **or** you have no permission to change it.
-
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/taxrules/(id)/
-
-   Delete a tax rule. Note that tax rules can only be deleted if they are not in use for any products, settings
-   or orders. If you cannot delete a tax rule, this method will return a ``403`` status code and you can only
-   discontinue using it everywhere else.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/taxrules/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the tax rule to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/rule does not exist **or** you have no permission to change it **or** this tax rule cannot be deleted since it is currently in use.
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view it.

doc/api/resources/vouchers.rst

@@ -44,10 +44,6 @@ subevent                              integer                    ID of the date
 ===================================== ========================== =======================================================
 
 
-.. versionchanged:: 1.9
-
-   The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
-
 Endpoints
 ---------
 
@@ -69,7 +65,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "count": 1,
@@ -140,7 +136,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "id": 1,
@@ -166,151 +162,3 @@ Endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/vouchers/
-
-   Create a new voucher.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/vouchers/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 408
-
-      {
-        "code": "43K6LKM37FBVR2YG",
-        "max_usages": 1,
-        "valid_until": null,
-        "block_quota": false,
-        "allow_ignore_quota": false,
-        "price_mode": "set",
-        "value": "12.00",
-        "item": 1,
-        "variation": null,
-        "quota": null,
-        "tag": "testvoucher",
-        "comment": "",
-        "subevent": null
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "code": "43K6LKM37FBVR2YG",
-        "max_usages": 1,
-        "redeemed": 0,
-        "valid_until": null,
-        "block_quota": false,
-        "allow_ignore_quota": false,
-        "price_mode": "set",
-        "value": "12.00",
-        "item": 1,
-        "variation": null,
-        "quota": null,
-        "tag": "testvoucher",
-        "comment": "",
-        "subevent": null
-      }
-
-   :param organizer: The ``slug`` field of the organizer to create a voucher for
-   :param event: The ``slug`` field of the event to create a voucher for
-   :statuscode 201: no error
-   :statuscode 400: The voucher could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
-   :statuscode 409: The server was unable to acquire a lock and could not process your request. You can try again after a short waiting period.
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/vouchers/(id)/
-
-   Update a voucher. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
-   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
-   want to change.
-
-   You can change all fields of the resource except the ``id`` and ``redeemed`` fields.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/vouchers/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 408
-
-      {
-        "price_mode": "set",
-        "value": "24.00"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "code": "43K6LKM37FBVR2YG",
-        "max_usages": 1,
-        "redeemed": 0,
-        "valid_until": null,
-        "block_quota": false,
-        "allow_ignore_quota": false,
-        "price_mode": "set",
-        "value": "24.00",
-        "item": 1,
-        "variation": null,
-        "quota": null,
-        "tag": "testvoucher",
-        "comment": "",
-        "subevent": null
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the voucher to modify
-   :statuscode 200: no error
-   :statuscode 400: The voucher could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
-   :statuscode 409: The server was unable to acquire a lock and could not process your request. You can try again after a short waiting period.
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/vouchers/(id)/
-
-   Delete a voucher. Note that you cannot delete a voucher if it already has been redeemed.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/vouchers/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the voucher to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.

doc/api/resources/waitinglist.rst

@@ -27,12 +27,6 @@ subevent                              integer                    ID of the date
 ===================================== ========================== =======================================================
 
 
-.. versionchanged:: 1.15
-
-   The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added as well as a method to send out
-   vouchers.
-
-
 Endpoints
 ---------
 
@@ -54,7 +48,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "count": 1,
@@ -108,7 +102,7 @@ Endpoints
 
       HTTP/1.1 200 OK
       Vary: Accept
-      Content-Type: application/json
+      Content-Type: text/javascript
 
       {
         "id": 1,
@@ -127,161 +121,3 @@ Endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/waitinglistentries/
-
-   Create a new entry.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/waitinglistentries/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 408
-
-      {
-        "email": "waiting@example.org",
-        "item": 3,
-        "variation": null,
-        "locale": "de",
-        "subevent": null
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "created": "2017-12-01T10:00:00Z",
-        "email": "waiting@example.org",
-        "voucher": null,
-        "item": 3,
-        "variation": null,
-        "locale": "de",
-        "subevent": null
-      }
-
-   :param organizer: The ``slug`` field of the organizer to create an entry for
-   :param event: The ``slug`` field of the event to create an entry for
-   :statuscode 201: no error
-   :statuscode 400: The voucher could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this
-                    resource **or** entries cannot be created for this item at this time.
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/waitinglistentries/(id)/
-
-   Update an entry. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
-   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
-   want to change.
-
-   You can change all fields of the resource except the ``id``, ``voucher`` and ``created`` fields. You can only change
-   an entry as long as no ``voucher`` is set.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/waitinglistentries/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 408
-
-      {
-        "item": 4
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "created": "2017-12-01T10:00:00Z",
-        "email": "waiting@example.org",
-        "voucher": null,
-        "item": 4,
-        "variation": null,
-        "locale": "de",
-        "subevent": null
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the entry to modify
-   :statuscode 200: no error
-   :statuscode 400: The entry could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this
-                    resource **or** entries cannot be created for this item at this time **or** this entry already
-                    has a voucher assigned
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/waitinglistentries/(id)/send_voucher/
-
-   Manually sends a voucher to someone on the waiting list
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/waitinglistentries/1/send_voucher/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 0
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the entry to modify
-   :statuscode 204: no error
-   :statuscode 400: The voucher could not be sent out, see body for details (e.g. voucher has already been sent or
-                    item is not available).
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to do this
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/waitinglistentries/(id)/
-
-   Delete an entry. Note that you cannot delete an entry once it is assigned a voucher.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/waitinglistentries/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the entry to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this
-                    resource **or** this entry already has a voucher assigned.

doc/checkin_filter.py

@@ -1,11 +0,0 @@
-from enchant.tokenize import get_tokenizer, Filter, unit_tokenize
-
-class CheckinFilter(Filter):
-    """ If a word looks like checkin_count, it refers to a so-called variable in
-    the code, and is treated as being spelled right."""
-
-    def _split(self, word):
-        if word[:8] == "checkin_":
-            return unit_tokenize(word[8:])
-
-        return unit_tokenize(word)

doc/conf.py

@@ -31,13 +31,6 @@ import django
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pretix.testutils.settings")
 django.setup()
 
-
-try:
-    import enchant
-    HAS_PYENCHANT = True
-except:
-    HAS_PYENCHANT = False
-
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -53,8 +46,6 @@ extensions = [
     'sphinxcontrib.httpdomain',
     'sphinxcontrib.images',
 ]
-if HAS_PYENCHANT:
-    extensions.append('sphinxcontrib.spelling')
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -299,26 +290,3 @@ texinfo_documents = [
 images_config = {
     'default_image_width': '250px'
 }
-
-linkcheck_ignore = [
-    r'http://localhost.*', r'.*yourdomain.*', r'https://en.wikipedia.org', 'https://pretix.eu/',
-]
-
-# -- Options for Spelling output ------------------------------------------
-if HAS_PYENCHANT:
-    # String specifying the language, as understood by PyEnchant and enchant.
-    # Defaults to en_US for US English.
-    spelling_lang = 'en_US'
-
-    # String specifying a file containing a list of words known to be spelled
-    # correctly but that do not appear in the language dictionary selected by
-    # spelling_lang. The file should contain one word per line.
-    spelling_word_list_filename='spelling_wordlist.txt'
-
-    # Boolean controlling whether suggestions for misspelled words are printed.
-    # Defaults to False.
-    spelling_show_suggestions=True
-
-    # List of filter classes to be added to the tokenizer that produces words to be checked.
-    from checkin_filter import CheckinFilter
-    spelling_filters=[CheckinFilter]

doc/development/api/customview.rst

@@ -25,7 +25,7 @@ If you want to add a custom view to the control area of an event, just register
             views.admin_view, name='backend'),
     ]
 
-It is required that your URL parameters are called ``organizer`` and ``event``. If you want to
+It is required that your URL paramaters are called ``organizer`` and ``event``. If you want to
 install a view on organizer level, you can leave out the ``event``.
 
 You can then implement the view as you would normally do. Our middleware will automatically
@@ -60,85 +60,7 @@ your views::
     def admin_view(request, organizer, event):
         ...
 
-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::
-
-
-    from django.core.urlresolvers import resolve, reverse
-    from django.dispatch import receiver
-    from django.utils.translation import ugettext_lazy as _
-    from pretix.control.signals import nav_event
-
-
-    @receiver(nav_event, dispatch_uid='friends_tickets_nav')
-    def navbar_info(sender, request, **kwargs):
-        url = resolve(request.path_info)
-        if not request.user.has_event_permission(request.organizer, request.event, 'can_change_vouchers'):
-            return []
-        return [{
-            'label': _('My plugin view'),
-            'icon': 'heart',
-            'url': reverse('plugins:myplugin:index', kwargs={
-                'event': request.event.slug,
-                'organizer': request.organizer.slug,
-            }),
-            'active': url.namespace == 'plugins:myplugin' and url.url_name == 'review',
-        }]
-
-
-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::
-
-    @receiver(nav_event_settings, dispatch_uid='friends_tickets_nav_settings')
-    def navbar_settings(sender, request, **kwargs):
-        url = resolve(request.path_info)
-        return [{
-            'label': _('My settings'),
-            'url': reverse('plugins:myplugin:settings', kwargs={
-                'event': request.event.slug,
-                'organizer': request.organizer.slug,
-            }),
-            'active': url.namespace == 'plugins:myplugin' and url.url_name == 'settings',
-        }]
-
-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::
-
-    class MySettingsView(EventSettingsViewMixin, EventSettingsFormView):
-        model = Event
-        permission = 'can_change_settings'
-        form_class = MySettingsForm
-        template_name = 'my_plugin/settings.html'
-
-        def get_success_url(self, **kwargs):
-            return reverse('plugins:myplugin:settings', kwargs={
-                'organizer': self.request.event.organizer.slug,
-                'event': self.request.event.slug,
-            })
-
-With this template::
-
-    {% extends "pretixcontrol/event/settings_base.html" %}
-    {% load i18n %}
-    {% load bootstrap3 %}
-    {% block title %} {% trans "Friends Tickets Settings" %} {% endblock %}
-    {% block inside %}
-        <form action="" method="post" class="form-horizontal">
-            {% csrf_token %}
-            <fieldset>
-                <legend>{% trans "Friends Tickets Settings" %}</legend>
-                {% bootstrap_form form layout="horizontal" %}
-            </fieldset>
-            <div class="form-group submit-group">
-                <button type="submit" class="btn btn-primary btn-save">
-                    {% trans "Save" %}
-                </button>
-            </div>
-        </form>
-    {% endblock %}
+Similarly, there is ``organizer_permission_required`` and ``OrganizerPermissionRequiredMixin``.
 
 Frontend views
 --------------

doc/development/api/exporter.rst

@@ -21,10 +21,10 @@ that we'll provide in this plugin::
 
     from django.dispatch import receiver
 
-    from pretix.base.signals import register_data_exporters
+    from pretix.base.signals import register_data_exporter
 
 
-    @receiver(register_data_exporters, dispatch_uid="exporter_myexporter")
+    @receiver(register_data_exporter, dispatch_uid="exporter_myexporter")
     def register_data_exporter(sender, **kwargs):
         from .exporter import MyExporter
         return MyExporter

doc/development/api/general.rst

@@ -11,8 +11,7 @@ Core
 ----
 
 .. automodule:: pretix.base.signals
-   :members: periodic_task, event_live_issues, event_copy_data, email_filter, register_notification_types,
-      item_copy_data
+   :members: periodic_task, event_live_issues, event_copy_data
 
 Order events
 """"""""""""
@@ -20,13 +19,13 @@ Order events
 There are multiple signals that will be sent out in the ordering cycle:
 
 .. automodule:: pretix.base.signals
-   :members: validate_cart, order_fee_calculation, order_paid, order_placed, order_fee_type_name, allow_ticket_download
+   :members: validate_cart, order_paid, order_placed
 
 Frontend
 --------
 
 .. automodule:: pretix.presale.signals
-   :members: html_head, html_footer, footer_links, front_page_top, front_page_bottom, fee_calculation_for_cart, contact_form_fields, question_form_fields, checkout_confirm_messages, checkout_confirm_page_content
+   :members: html_head, html_footer, footer_links, front_page_top, front_page_bottom, contact_form_fields, question_form_fields, checkout_confirm_messages
 
 
 .. automodule:: pretix.presale.signals
@@ -48,17 +47,11 @@ Backend
 -------
 
 .. automodule:: pretix.control.signals
-   :members: nav_event, html_head, quota_detail_html, nav_topbar, nav_global, nav_organizer, nav_event_settings, order_info, event_settings_widget
+   :members: nav_event, html_head, quota_detail_html, nav_topbar, nav_global, nav_organizer
 
 
 .. automodule:: pretix.base.signals
-   :members: logentry_display, logentry_object_link, requiredaction_display
-
-Vouchers
-""""""""
-
-.. automodule:: pretix.control.signals
-   :members: item_forms
+   :members: logentry_display, requiredaction_display
 
 Vouchers
 """"""""
@@ -71,9 +64,3 @@ Dashboards
 
 .. automodule:: pretix.control.signals
    :members: event_dashboard_widgets, user_dashboard_widgets
-
-Ticket designs
-""""""""""""""
-
-.. automodule:: pretix.base.signals
-   :members: layout_text_variables

doc/development/api/index.rst

@@ -11,7 +11,5 @@ Contents:
    ticketoutput
    payment
    invoice
-   shredder
    customview
    general
-   quality

doc/development/api/invoice.rst

@@ -13,7 +13,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
+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.invoice.BaseInvoiceRenderer``
 that we'll provide in this plugin::
 

doc/development/api/payment.rst

@@ -102,10 +102,6 @@ The provider class
 
    .. automethod:: order_control_refund_perform
 
-   .. automethod:: is_implicit
-
-   .. automethod:: shred_payment_info
-
 
 Additional views
 ----------------

doc/development/api/plugins.rst

@@ -114,19 +114,6 @@ method to make your receivers available::
         def ready(self):
             from . import signals  # NOQA
 
-You can optionally specify code that is executed when your plugin is activated for an event
-in the ``installed`` method::
-
-    class PaypalApp(AppConfig):
-        …
-
-        def installed(self, event):
-            pass  # Your code here
-
-
-Note that ``installed`` will *not* be called if the plugin in indirectly activated for an event
-because the event is created with settings copied from another event.
-
 Views
 -----
 
@@ -142,5 +129,5 @@ your Django app label.
 .. _Django app: https://docs.djangoproject.com/en/1.7/ref/applications/
 .. _signal dispatcher: https://docs.djangoproject.com/en/1.7/topics/signals/
 .. _namespace packages: http://legacy.python.org/dev/peps/pep-0420/
-.. _entry point: https://setuptools.readthedocs.io/en/latest/pkg_resources.html#locating-plugins
+.. _entry point: https://pythonhosted.org/setuptools/setuptools.html#dynamic-discovery-of-services-and-plugins
 .. _cookiecutter: https://cookiecutter.readthedocs.io/en/latest/

doc/development/api/quality.rst

@@ -1,125 +0,0 @@
-.. highlight:: python
-   :linenothreshold: 5
-
-.. _`pluginquality`:
-
-Plugin quality checklist
-========================
-
-If you want to write a high-quality pretix plugin, this is a list of things you should check before
-you publish it. This is also a list of things that we check, if we consider installing an externally
-developed plugin on our hosted infrastructure.
-
-A. Meta
--------
-
-#. The plugin is clearly licensed under an appropriate license.
-
-#. The plugin has an unambiguous name, description, and author metadata.
-
-#. The plugin has a clear versioning scheme and the latest version of the plugin is kept compatible to the latest
-   stable version of pretix.
-
-#. The plugin is properly packaged using standard Python packaging tools.
-
-#. The plugin correctly declares its external dependencies.
-
-#. A contact address is provided in case of security issues.
-
-B. Isolation
-------------
-
-#. If any signal receivers use the `dispatch_uid`_ feature, the UIDs are prefixed by the plugin's name and do not
-   clash with other plugins.
-
-#. If any templates or static files are shipped, they are located in subdirectories with the name of the plugin and do
-   not clash with other plugins or core files.
-
-#. Any keys stored to the settings store are prefixed with the plugin's name and do not clash with other plugins or
-   core.
-
-#. Any keys stored to the user session are prefixed with the plugin's name and do not clash with other plugins or
-   core.
-
-#. Any registered URLs are unlikely to clash with other plugins or future core URLs.
-
-C. Security
------------
-
-#. All important actions are logged to the :ref:`shared log storage <logging>` and a signal receiver is registered to
-   provide a human-readable representation of the log entry.
-
-#. All views require appropriate permissions and use the ``event_urls`` mechanism if appropriate.
-   :ref:`Read more <customview>`
-
-#. Any session data for customers is stored in the cart session system if appropriate.
-
-#. If the plugin is a payment provider:
-
-  #. No credit card numbers may be stored within pretix.
-
-  #. A notification/webhook system is implemented to notify pretix of any refunds.
-
-  #. If such a webhook system is implemented, contents of incoming webhooks are either verified using a cryptographic
-     signature or are not being trusted and all data is fetched from an API instead.
-
-D. Privacy
-----------
-
-#. No personal data is stored that is not required for the plugin's functionality.
-
-#. For any personal data that is saved to the database, an appropriate :ref:`data shredder <shredder>` is provided
-   that offers the data for download and then removes it from the database (including log entries).
-
-E. Internationalization
------------------------
-
-#. All user-facing strings in templates, Python code, and templates are wrapped in `gettext calls`_.
-
-#. No languages, time zones, date formats, or time formats are hardcoded.
-
-#. Installing the plugin automatically compiles ``.po`` files to ``.mo`` files. This is fulfilled automatically if
-   you use the ``setup.py`` file form our plugin cookiecutter.
-
-F. Functionality
-----------------
-
-#. If the plugin adds any database models or relationships from the settings storage to database models, it registers
-   a receiver to the :py:attr:`pretix.base.signals.event_copy_data` or :py:attr:`pretix.base.signals.item_copy_data`
-   signals.
-
-#. If the plugin is a payment provider:
-
-    #. A webhook-like system is implemented if payment confirmations are not sent instantly.
-
-    #. Refunds are implemented, if possible.
-
-    #. In case of overpayment or external refunds, a "required action" is created to notify the event organizer.
-
-#. If the plugin adds steps to the checkout process, it has been tested in combination with the pretix widget.
-
-G. Code quality
----------------
-
-#. `isort`_ and `flake8`_ are used to ensure consistent code styling.
-
-#. Unit tests are provided for important pieces of business logic.
-
-#. Functional tests are provided for important interface parts.
-
-#. Tests are provided to check that permission checks are working.
-
-#. Continuous Integration is set up to check that tests are passing and styling is consistent.
-
-H. Specific to pretix.eu
-------------------------
-
-#. pretix.eu integrates the data stored by this plugin with its data report features.
-
-#. pretix.eu integrates this plugin in its generated privacy statements, if necessary.
-
-
-.. _isort: https://www.google.de/search?q=isort&oq=isort&aqs=chrome..69i57j0j69i59j69i60l2j69i59.599j0j4&sourceid=chrome&ie=UTF-8
-.. _flake8: http://flake8.pycqa.org/en/latest/
-.. _gettext calls: https://docs.djangoproject.com/en/2.0/topics/i18n/translation/
-.. _dispatch_uid: https://docs.djangoproject.com/en/2.0/topics/signals/#django.dispatch.Signal.connect

doc/development/api/shredder.rst

@@ -1,94 +0,0 @@
-.. highlight:: python
-   :linenothreshold: 5
-
-.. _`shredder`:
-
-Writing a data shredder
-=======================
-
-If your plugin adds the ability to store personal data within pretix, you should also implement a "data shredder"
-to anonymize or pseudonymize the data later.
-
-Shredder registration
----------------------
-
-The data shredder API does not make a lot of usage from signals, however, it
-does use a signal to get a list of all available data shredders. Your plugin
-should listen for this signal and return the subclass of ``pretix.base.shredder.BaseDataShredder``
-that we'll provide in this plugin:
-
-.. sourcecode:: python
-
-    from django.dispatch import receiver
-
-    from pretix.base.signals import register_data_shredders
-
-
-    @receiver(register_data_shredders, dispatch_uid="custom_data_shredders")
-    def register_shredder(sender, **kwargs):
-        return [
-            PluginDataShredder,
-        ]
-
-The shredder class
-------------------
-
-.. class:: pretix.base.shredder.BaseDataShredder
-
-   The central object of each invoice renderer is the subclass of ``BaseInvoiceRenderer``.
-
-   .. py:attribute:: BaseInvoiceRenderer.event
-
-      The default constructor sets this property to the event we are currently
-      working for.
-
-   .. autoattribute:: identifier
-
-      This is an abstract attribute, you **must** override this!
-
-   .. autoattribute:: verbose_name
-
-      This is an abstract attribute, you **must** override this!
-
-   .. autoattribute:: description
-
-      This is an abstract attribute, you **must** override this!
-
-   .. automethod:: generate_files
-
-   .. automethod:: shred_data
-
-Example
--------
-
-For example, the core data shredder responsible for removing invoice address information including their history
-looks like this:
-
-.. sourcecode:: python
-
-    class InvoiceAddressShredder(BaseDataShredder):
-        verbose_name = _('Invoice addresses')
-        identifier = 'invoice_addresses'
-        description = _('This will remove all invoice addresses from orders, '
-                        'as well as logged changes to them.')
-
-        def generate_files(self) -> List[Tuple[str, str, str]]:
-            yield 'invoice-addresses.json', 'application/json', json.dumps({
-                ia.order.code: InvoiceAdddressSerializer(ia).data
-                for ia in InvoiceAddress.objects.filter(order__event=self.event)
-            }, indent=4)
-
-        @transaction.atomic
-        def shred_data(self):
-            InvoiceAddress.objects.filter(order__event=self.event).delete()
-
-            for le in self.event.logentry_set.filter(action_type="pretix.event.order.modified"):
-                d = le.parsed_data
-                if 'invoice_data' in d and not isinstance(d['invoice_data'], bool):
-                    for field in d['invoice_data']:
-                        if d['invoice_data'][field]:
-                            d['invoice_data'][field] = '█'
-                    le.data = json.dumps(d)
-                    le.shredded = True
-                    le.save(update_fields=['data', 'shredded'])
-

doc/development/concepts.rst

@@ -59,7 +59,7 @@ If an item is assigned to multiple quotas, it can only be bought if *all of them
 If multiple items are assigned to the same quota, the quota will be counted as sold out as soon as the
 *sum* of the two items exceeds the quota limit.
 
-The availability of a quota is currently calculated by subtracting the following numbers from the quota
+The availability of a quota is currently calculated by substracting the following numbers from the quota
 limit:
 
 * The number of orders placed for an item that are either already paid or within their granted payment period

doc/development/contribution/codeofconduct.rst

@@ -77,6 +77,6 @@ Attribution
 -----------
 
 This Code of Conduct is adapted from the `Contributor Covenant`_, version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/
+available at http://contributor-covenant.org/version/1/4/
 
-.. _Contributor Covenant: https://www.contributor-covenant.org
+.. _Contributor Covenant: http://contributor-covenant.org

doc/development/contribution/style.rst

@@ -24,7 +24,7 @@ Coding style and quality
   ``Fix #123 -- Problems with order creation`` or ``Refs #123 -- Fix this part of that bug``.
 
 
-.. _PEP 8: https://legacy.python.org/dev/peps/pep-0008/
+.. _PEP 8: http://legacy.python.org/dev/peps/pep-0008/
 .. _flake8: https://pypi.python.org/pypi/flake8
 .. _Django Coding Style: https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/coding-style/
 .. _translation: https://docs.djangoproject.com/en/1.11/topics/i18n/translation/

doc/development/implementation/index.rst

@@ -16,5 +16,4 @@ Contents:
    settings
    background
    email
-   permissions
    logging

doc/development/implementation/logging.rst

@@ -1,11 +1,9 @@
-Logging and notifications
-=========================
+Logging
+=======
 
 As pretix is handling monetary transactions, we are very careful to make it possible to review all changes
 in the system that lead to the current state.
 
-.. _`logging`:
-
 Logging changes
 ---------------
 
@@ -21,7 +19,7 @@ To actually log an action, you can just call the ``log_action`` method on your o
    order.log_action('pretix.event.order.canceled', user=user, data={})
 
 The positional ``action`` argument should represent the type of action and should be globally unique, we
-recommend to prefix it with your package name, e.g. ``paypal.payment.rejected``. The ``user`` argument is
+recomment do prefix it with your packagename, e.g. ``paypal.payment.rejected``. The ``user`` argument is
 optional and may contain the user who performed the action. The optional ``data`` argument can contain
 additional information about this action.
 
@@ -83,61 +81,6 @@ implementation could look like::
         if logentry.action_type in plains:
             return plains[logentry.action_type]
 
-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::
-
-    @receiver(register_notification_types)
-    def register_my_notification_types(sender, **kwargs):
-        return [MyNotificationType(sender)]
-
-Note that this event is different than other events send out by pretix: ``sender`` may be an event or ``None``. The
-latter case is required to let the user define global notification preferences for all events.
-
-You also need to implement a custom class that specifies how notifications should be handled for your notification type.
-You should subclass the base ``NotificationType`` class and implement all its members:
-
-.. autoclass:: pretix.base.notifications.NotificationType
-   :members: action_type, verbose_name, required_permission, build_notification
-
-A simple implementation could look like this::
-
-    class MyNotificationType(NotificationType):
-        required_permission = "can_view_orders"
-        action_type = "pretix.event.order.paid"
-        verbose_name = _("Order has been paid")
-
-        def build_notification(self, logentry: LogEntry):
-            order = logentry.content_object
-
-            order_url = build_absolute_uri(
-                'control:event.order',
-                kwargs={
-                    'organizer': logentry.event.organizer.slug,
-                    'event': logentry.event.slug,
-                    'code': order.code
-                }
-            )
-
-            n = Notification(
-                event=logentry.event,
-                title=_('Order {code} has been marked as paid').format(code=order.code),
-                url=order_url
-            )
-            n.add_attribute(_('Order code'), order.code)
-            n.add_action(_('View order details'), order_url)
-            return n
-
-As you can see, the relevant code is in the ``build_notification`` method that is supposed to create a ``Notification``
-method that has a title, description, URL, attributes, and actions. The full definition of ``Notification`` is the
-following:
-
-.. autoclass:: pretix.base.notifications.Notification
-   :members: add_action, add_attribute
-
 
 Logging technical information
 -----------------------------

doc/development/implementation/models.rst

@@ -1,8 +1,6 @@
 .. highlight:: python
    :linenothreshold: 5
 
-.. spelling:: answ contrib
-
 Data model
 ==========
 
@@ -23,7 +21,7 @@ Organizers and events
    :members:
 
 .. autoclass:: pretix.base.models.Event
-   :members: get_date_from_display, get_time_from_display, get_date_to_display, get_date_range_display, presale_has_ended, presale_is_running, cache, lock, get_plugins, get_mail_backend, payment_term_last, get_payment_providers, get_invoice_renderers, active_subevents, invoice_renderer, settings
+   :members: get_date_from_display, get_time_from_display, get_date_to_display, get_date_range_display, presale_has_ended, presale_is_running, get_cache, lock, get_plugins, get_mail_backend, payment_term_last, get_payment_providers, get_invoice_renderers, active_subevents, invoice_renderer, settings
 
 .. autoclass:: pretix.base.models.SubEvent
    :members: get_date_from_display, get_time_from_display, get_date_to_display, get_date_range_display, presale_has_ended, presale_is_running
@@ -31,9 +29,6 @@ Organizers and events
 .. autoclass:: pretix.base.models.Team
    :members:
 
-.. autoclass:: pretix.base.models.TeamAPIToken
-   :members:
-
 .. autoclass:: pretix.base.models.RequiredAction
    :members:
 

doc/development/implementation/permissions.rst

@@ -1,194 +0,0 @@
-Permissions
-===========
-
-pretix uses a fine-grained permission system to control who is allowed to control what parts of the system.
-The central concept here is the concept of *Teams*. You can read more on `configuring teams and permissions <user-teams>`_
-and the :class:`pretix.base.models.Team` model in the respective parts of the documentation. The basic digest is:
-An organizer account can have any number of teams, and any number of users can be part of a team. A team can be
-assigned a set of permissions and connected to some or all of the events of the organizer.
-
-A second way to access pretix is via the REST API, which allows authentication via tokens that are bound to a team,
-but not to a user. You can read more at :class:`pretix.base.models.TeamAPIToken`. This page will show you how to
-work with permissions in plugins and within the pretix code base.
-
-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::
-
-    from pretix.control.permissions import (
-        OrganizerPermissionRequiredMixin, organizer_permission_required
-    )
-
-
-    class MyOrgaView(OrganizerPermissionRequiredMixin, View):
-        permission = 'can_change_organizer_settings'
-        # Only users with the permission ``can_change_organizer_settings`` on
-        # this organizer can access this
-
-
-    class MyOtherOrgaView(OrganizerPermissionRequiredMixin, View):
-        permission = None
-        # Only users with *any* permission on this organizer can access this
-
-
-    @organizer_permission_required('can_change_organizer_settings')
-    def my_orga_view(request, organizer, **kwargs):
-        # Only users with the permission ``can_change_organizer_settings`` on
-        # this organizer can access this
-
-
-    @organizer_permission_required()
-    def my_other_orga_view(request, organizer, **kwargs):
-        # Only users with *any* permission on this organizer can access this
-
-
-Of course, the same is available on event level::
-
-    from pretix.control.permissions import (
-        EventPermissionRequiredMixin, event_permission_required
-    )
-
-
-    class MyEventView(EventPermissionRequiredMixin, View):
-        permission = 'can_change_event_settings'
-        # Only users with the permission ``can_change_event_settings`` on
-        # this event can access this
-
-
-    class MyOtherEventView(EventPermissionRequiredMixin, View):
-        permission = None
-        # Only users with *any* permission on this event can access this
-
-
-    @event_permission_required('can_change_event_settings')
-    def my_event_view(request, organizer, **kwargs):
-        # Only users with the permission ``can_change_event_settings`` on
-        # this event can access this
-
-
-    @event_permission_required()
-    def my_other_event_view(request, organizer, **kwargs):
-        # 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)::
-
-    from pretix.control.permissions import (
-        AdministratorPermissionRequiredMixin, administrator_permission_required
-    )
-
-
-    class MyGlobalView(AdministratorPermissionRequiredMixin, View):
-        # ...
-
-
-    @administrator_permission_required
-    def my_global_view(request, organizer, **kwargs):
-        # ...
-
-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::
-
-    from pretix.control.permissions import (
-        StaffMemberRequiredMixin, staff_member_required
-    )
-
-
-    class MyGlobalView(StaffMemberRequiredMixin, View):
-        # ...
-
-
-    @staff_member_required
-    def my_global_view(request, organizer, **kwargs):
-        # ...
-
-
-
-Requiring permissions in the REST API
--------------------------------------
-
-When creating your own ``viewset`` using Django REST framework, you just need to set the ``permission`` attribute
-and pretix will check it automatically for you::
-
-    class MyModelViewSet(viewsets.ReadOnlyModelViewSet):
-        permission = 'can_view_orders'
-
-Checking permission in code
----------------------------
-
-If you need to work with permissions manually, there are a couple of useful helper methods on the :class:`pretix.base.models.Event`,
-:class:`pretix.base.models.User` and :class:`pretix.base.models.TeamAPIToken` classes. Here's a quick overview.
-
-Return all users that are in any team that is connected to this event::
-
-    >>> event.get_users_with_any_permission()
-    <QuerySet: …>
-
-Return all users that are in a team with a specific permission for this event::
-
-    >>> event.get_users_with_permission('can_change_event_settings')
-    <QuerySet: …>
-
-Determine if a user has a certain permission for a specific event::
-
-    >>> user.has_event_permission(organizer, event, 'can_change_event_settings', request=request)
-    True
-
-Determine if a user has any permission for a specific event::
-
-    >>> user.has_event_permission(organizer, event, request=request)
-    True
-
-In the two previous commands, the ``request`` argument is optional, but required to support staff sessions (see below).
-
-The same method exists for organizer-level permissions::
-
-    >>> user.has_organizer_permission(organizer, 'can_change_event_settings', request=request)
-    True
-
-Sometimes, it might be more useful to get the set of permissions at once::
-
-    >>> user.get_event_permission_set(organizer, event)
-    {'can_change_event_settings', 'can_view_orders', 'can_change_orders'}
-
-    >>> user.get_organizer_permission_set(organizer, event)
-    {'can_change_organizer_settings', 'can_create_events'}
-
-Within a view on the ``/control`` subpath, the results of these two methods are already available in the
-``request.eventpermset`` and ``request.orgapermset`` properties. This makes it convenient to query them in templates::
-
-    {% if "can_change_orders" in request.eventpermset %}
-        …
-    {% endif %}
-
-You can also do the reverse to get any events a user has access to::
-
-    >>> user.get_events_with_permission('can_change_event_settings', request=request)
-    <QuerySet: …>
-
-    >>> user.get_events_with_any_permission(request=request)
-    <QuerySet: …>
-
-Most of these methods work identically on :class:`pretix.base.models.TeamAPIToken`.
-
-Staff sessions
---------------
-
-.. versionchanged:: 1.14
-
-   In 1.14, the ``User.is_superuser`` attribute has been deprecated and statically set to return ``False``. Staff
-   sessions have been newly introduced.
-
-System administrators of a pretix instance are identified by the ``is_staff`` attribute on the user model. By default,
-the regular permission rules apply for users with ``is_staff = True``. The only difference is that such users can
-temporarily turn on "staff mode" via a button in the user interface that grants them **all permissions** as long as
-staff mode is active. You can check if a user is in staff mode using their session key:
-
-    >>> user.has_active_staff_session(request.session.session_key)
-    False
-
-Staff mode has a hard time limit and during staff mode, a middleware will log all requests made by that user. Later,
-the user is able to also save a message to comment on what they did in their administrative session. This feature is
-intended to help compliance with data protection rules as imposed e.g. by GDPR.

doc/development/implementation/settings.rst

@@ -35,7 +35,7 @@ Forms
 -----
 
 Hierarkey also provides a base class for forms that allow the modification of settings. pretix contains a
-subclass that also adds support for internationalized fields:
+subclass that also adds suport for internationalized fields:
 
 .. autoclass:: pretix.base.forms.SettingsForm
 
@@ -65,4 +65,4 @@ Plugins can add custom hardcoded defaults in the following way::
 Make sure that you include this code in a module that is imported at app loading time.
 
 .. _django-hierarkey: https://github.com/raphaelm/django-hierarkey
-.. _documentation: https://django-hierarkey.readthedocs.io/en/latest/
+.. _documentation: https://django-hierarkey.readthedocs.io/en/latest/

doc/development/implementation/urlconfig.rst

@@ -67,7 +67,7 @@ available as ``plugins:sendmail:send``.
 Generating a URL for the frontend is a complicated task, because you need to know whether the event's
 organizer uses a custom URL or not and then generate the URL with a different domain and different
 arguments based on this information. pretix provides some helpers to make this easier. The first helper
-is a python method that emulates a behavior similar to ``reverse``:
+is a python method that emulates a behaviour similar to ``reverse``:
 
 .. autofunction:: pretix.multidomain.urlreverse.eventreverse
 
@@ -82,5 +82,5 @@ Implementation details
 ----------------------
 
 There are some other caveats when using a design like this, e.g. you have to care about cookie domains
-and referrer verification yourself. If you want to see how we built this, look into the ``pretix/multidomain/``
+and referer verification yourself. If you want to see how we built this, look into the ``pretix/multidomain/``
 sub-tree.

doc/development/index.rst

@@ -8,6 +8,5 @@ Developer documentation
    setup
    contribution/index
    implementation/index
-   translation/index
    api/index
    structure

doc/development/setup.rst

@@ -20,6 +20,7 @@ Your should install the following on your system:
 
 * Python 3.4 or newer
 * ``pip`` for Python 3 (Debian package: ``python3-pip``)
+* ``pyvenv`` for Python 3 (Debian package: ``python3-venv``)
 * ``python-dev`` for Python 3 (Debian package: ``python3-dev``)
 * ``libffi`` (Debian package: ``libffi-dev``)
 * ``libssl`` (Debian package: ``libssl-dev``)
@@ -36,7 +37,7 @@ Please execute ``python -V`` or ``python3 -V`` to make sure you have Python 3.4
 execute ``pip3 -V`` to check. Then use Python's internal tools to create a virtual
 environment and activate it for your current session::
 
-    python3 -m venv env
+    pyvenv env
     source env/bin/activate
 
 You should now see a ``(env)`` prepended to your shell prompt. You have to do this
@@ -86,7 +87,7 @@ and head to http://localhost:8000/
 
 As we did not implement an overall front page yet, you need to go directly to
 http://localhost:8000/control/ for the admin view or, if you imported the test
-data as suggested above, to the event page at http://localhost:8000/bigevents/2019/
+data as suggested above, to the event page at http://localhost:8000/bigevents/2018/
 
 .. note:: If you want the development server to listen on a different interface or
           port (for example because you develop on `pretixdroid`_), you can check
@@ -106,7 +107,7 @@ Execute the following commands to check for code style errors::
     isort -c -rc .
     python manage.py check
 
-Execute the following command to run pretix' test suite (might take a couple of minutes)::
+Execute the following command to run pretix' test suite (might take a coumple of minutes)::
 
     py.test
 
@@ -115,21 +116,14 @@ Execute the following command to run pretix' test suite (might take a couple of
           ``NUM`` being the number of threads you want to use.
 
 It is a good idea to put this command into your git hook ``.git/hooks/pre-commit``,
-for example, to check for any errors in any staged files when committing::
+for example::
 
-    #!/bin/bash
+    #!/bin/sh
     cd $GIT_DIR/../src
-    export GIT_WORK_TREE=../
-    export GIT_DIR=../.git
-    source ../env/bin/activate  # Adjust to however you activate your virtual environment
-    for file in $(git diff --cached --name-only | grep -E '\.py$')
-    do
-      git show ":$file" | flake8 - --stdin-display-name="$file" || exit 1 # we only want to lint the staged changes, not any un-staged changes
-      git show ":$file" | isort -df --check-only - | grep ERROR && exit 1 || true
-    done
+    flake8 . || exit 1
+    isort -q -rc -c . || exit 1
 
-
-This keeps you from accidentally creating commits violating the style guide.
+This keeps you from accidentally creating commits violating the sdtyle guide.
 
 Working with mails
 ^^^^^^^^^^^^^^^^^^
@@ -152,10 +146,6 @@ and update the ``*.po`` files accordingly::
 
     make localegen
 
-However, most of the time you don't need to care about this. Just create your pull request
-with functionality and English strings only, and we'll push the new translation strings
-to our translation platform after the merge.
-
 To actually see pretix in your language, you have to compile the ``*.po`` files to their
 optimized binary ``*.mo`` counterparts::
 

doc/development/translation/index.rst

@@ -1,88 +0,0 @@
-Translating pretix
-==================
-
-pretix has been designed for multi-language capabilities from its start. Organizers can enter their event information
-in multiple languages at the same time. However, the software interface of pretix also needs to be translated for
-this to be useful.
-
-Since we (the developers of pretix) only speak a very limited number of languages, we need help from the community
-to achieve this goal. To make translating pretix easy not only for software developers, we set up a translation
-platform at `translate.pretix.eu`_.
-
-Official and inofficial languages
----------------------------------
-
-In the pretix project, there are three types of languages:
-
-Official languages
-    are translated and maintained by the core team behind pretix or as part of long-term partnerships. We are
-    committed to keeping these translations up-to-date with new features or changes in pretix and try to offer
-    support in this language.
-
-Inofficial languages
-    are contributed and maintained by the Community. We ship them with pretix so you can use them, but we can not
-    guarantee that new or changed features in pretix will be translated in time.
-
-Incubating languages
-    are currently in the process of being translated. They can not yet be selected in pretix by end users on
-    production installations and are only available in development mode for testing.
-
-Please contact translate@pretix.eu if you think an incubated language should be promoted to an inofficial one or if
-you are interested in a partnership to make your language official.
-
-The current translation status of various languages is:
-
-.. image:: https://translate.pretix.eu/widgets/pretix/-/multi-blue.svg
-   :target: https://translate.pretix.eu/engage/pretix/?utm_source=widget
-
-
-Using our translation platform
-------------------------------
-
-If you visit `translate.pretix.eu`_ for the first time, it admittedly looks pretty bare.
-
-.. image:: img/weblate1.png
-   :class: screenshot
-
-It gets better if you create an account, which you will need to contribute translations. Click on "Register" in the
-top-right corner to get started:
-
-.. image:: img/weblate2.png
-   :class: screenshot
-
-You can either create an account or choose to log in with your GitHub account, whichever you like more.
-After creating and activating your account, we recommend that you change your profile and select which languages you
-can translate to and which languages you understand. You can find your profile settings by clicking on your name in
-the top-right corner.
-
-.. image:: img/weblate3.png
-   :class: screenshot
-
-Going back to the dashboard by clicking on the logo in the top-left corner, you can select between different lists
-of translation projects. You can either filter by projects that already have a translation in your language, or you
-go to the `pretix project page`_ where you can select specific components.
-
-.. note::
-
-   If you want to translate pretix to a new language that is not yet listed here, you are very welcome to do so!
-   While you technically can add the language to the portal yourself, we ask you to drop us a short mail to
-   translate@pretix.eu so we can add it to all components at once and also make it selectable in pretix itself.
-
-.. image:: img/weblate4.png
-   :class: screenshot
-
-Once you selected a component of a language, you can start going through strings to translate. You can start of by
-clicking the "Strings needing action" line in this view:
-
-.. image:: img/weblate5.png
-   :class: screenshot
-
-In the translate view, you can input your translation for a given source string. If you're unsure about your
-translation, you can also just "Suggest" it or mark it as "Needs editing". If you have no idea, just "Skip". If you
-scroll down, there is also a "Comments" section to discuss any questions with fellow translators or us developers.
-
-.. image:: img/weblate6.png
-   :class: screenshot
-
-.. _translate.pretix.eu: https://translate.pretix.eu
-.. _pretix project page: https://translate.pretix.eu/projects/pretix/

doc/plugins/list.rst

@@ -1,10 +1,56 @@
-.. spelling::
-   Analytics
-
 List of plugins
 ===============
 
-A detailed list of plugins that are available for pretix can be found on the
-`project website`_.
+The following plugins are shipped with pretix and are supported in the same
+ways that pretix itself is:
 
-.. _project website: https://pretix.eu/about/en/plugins
+* Bank transfer
+* PayPal
+* Stripe
+* Check-in lists
+* pretixdroid
+* Report exporter
+* Send out emails
+* Statistics
+* PDF ticket output
+
+The following plugins are not shipped with pretix but are maintained by the
+same team. We update them regularly to make them compatible with the latest
+pretix releases:
+
+* `SEPA direct debit`_
+* `Wirecard payment`_
+* `Pages`_
+* `Passbook/Wallet ticket output`_
+* `Cartshare`_
+* `Fontpack Free fonts`_
+* `Mailing list subscription`_
+
+The following closed-source plugins are available to customers of the hosted pretix.eu platform.
+Please get in touch with the pretix team if you want to have them for your self-hosted
+pretix installation:
+
+* Campaign tracking
+* Integration with Google Analytics and Facebook Pixel
+* Integration with Slack
+* Integration with MailChimp
+
+The following plugins are from independent third-party authors, so we can make
+no statements about their functionality, security, stability or compatibility:
+
+* `esPass ticket output`_
+* `IcePay integration`_
+* `Average price chart`_
+* `Pay in cash upon arrival`_
+
+.. _SEPA direct debit: https://github.com/pretix/pretix-sepadebit
+.. _Passbook/Wallet ticket output: https://github.com/pretix/pretix-passbook
+.. _Cartshare: https://github.com/pretix/pretix-cartshare
+.. _Pages: https://github.com/pretix/pretix-pages
+.. _esPass ticket output: https://github.com/esPass/pretix-espass
+.. _IcePay integration: https://github.com/chotee/pretix-icepay
+.. _Fontpack Free fonts: https://github.com/pretix/pretix-fontpack-free
+.. _Wirecard payment: https://github.com/pretix/pretix-wirecard
+.. _Mailing list subscription: https://github.com/pretix/pretix-newsletter-ml
+.. _Average price chart: https://github.com/rixx/pretix-avgchart
+.. _Pay in cash upon arrival: https://github.com/pc-coholic/pretix-cashpayment

doc/plugins/pretixdroid.rst

@@ -4,21 +4,10 @@ pretixdroid HTTP API
 The pretixdroid plugin provides a HTTP API that the `pretixdroid Android app`_
 uses to communicate with the pretix server.
 
-.. warning:: This API is **DEPRECATED** and will probably go away soon. It is used **only** to serve the pretixdroid
-             Android app. There are no backwards compatibility guarantees on this API. We will not add features that
-             are not required for the  Android App. There is a general-purpose :ref:`rest-api` that provides all
-             features that you need to check in.
-
-.. versionchanged:: 1.12
-
-   Support for check-in-time questions has been added. The new API features are fully backwards-compatible and
-   negotiated live, so clients which do not need this feature can ignore the change. For this reason, the API version
-   has not been increased and is still set to 3.
-
-.. versionchanged:: 1.13
-
-   Support for checking in unpaid tickets has been added.
-
+.. warning:: This API is intended **only** to serve the pretixdroid Android app. There are no backwards compatibility
+             guarantees on this API. We will not add features that are not required for the Android App. There is a
+             general-purpose :ref:`rest-api` that not yet provides all features that this API provides, but will do
+             so in the future.
 
 .. http:post:: /pretixdroid/api/(organizer)/(event)/redeem/
 
@@ -33,33 +22,18 @@ uses to communicate with the pretix server.
       Accept: application/json, text/javascript
       Content-Type: application/x-www-form-urlencoded
 
-      secret=az9u4mymhqktrbupmwkvv6xmgds5dk3&questions_supported=true
+      secret=az9u4mymhqktrbupmwkvv6xmgds5dk3
 
-   You **must** set the parameter secret.
+   You can optionally include the additional parameter ``datetime`` in the body containing an ISO8601-encoded
+   datetime of the entry attempt. If you don't, the current date and time will be used.
 
-   You **must** set the parameter ``questions_supported`` to ``true`` **if** you support asking questions
-   back to the app operator. You **must not** set it if you do not support this feature. In that case, questions
-   will just be ignored.
-
-   You **may** set the additional parameter ``datetime`` in the body containing an ISO8601-encoded
-   datetime of the entry attempt. If you don"t, the current date and time will be used.
-
-   You **may** set the additional parameter ``force`` to indicate that the request should be logged
+   You can optionally include the additional parameter ``force`` to indicate that the request should be logged
    regardless of previous check-ins for the same ticket. This might be useful if you made the entry decision offline.
-   Questions will also always be ignored in this case (i.e. supplied answers will be saved, but no error will be
-   thrown if they are missing or invalid).
 
-   You **may** set the additional parameter ``nonce`` with a globally unique random value to identify this
+   You can optionally include the additional parameter ``nonce`` with a globally unique random value to identify this
    check-in. This is meant to be used to prevent duplicate check-ins when you are just retrying after a connection
    failure.
 
-   You **may** set the additional parameter ``ignore_unpaid`` to indicate that the check-in should be performed even
-   if the order is in pending state.
-
-   If questions are supported and required, you will receive a dictionary ``questions`` containing details on the
-   particular questions to ask. To answer them, just re-send your redemption request with additional parameters of
-   the form ``answer_<question>=<answer>``, e.g. ``answer_12=24``.
-
    **Example successful response**:
 
    .. sourcecode:: http
@@ -69,68 +43,10 @@ uses to communicate with the pretix server.
 
       {
         "status": "ok"
-        "version": 3,
-        "data": {
-          "secret": "az9u4mymhqktrbupmwkvv6xmgds5dk3",
-          "order": "ABCDE",
-          "item": "Standard ticket",
-          "item_id": 1,
-          "variation": null,
-          "variation_id": null,
-          "attendee_name": "Peter Higgs",
-          "attention": false,
-          "redeemed": true,
-          "checkin_allowed": true,
-          "paid": true
-        }
+        "version": 2
       }
 
-   **Example response with required questions**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Content-Type: text/json
-
-      {
-        "status": "incomplete"
-        "version": 3
-        "data": {
-          "secret": "az9u4mymhqktrbupmwkvv6xmgds5dk3",
-          "order": "ABCDE",
-          "item": "Standard ticket",
-          "item_id": 1,
-          "variation": null,
-          "variation_id": null,
-          "attendee_name": "Peter Higgs",
-          "attention": false,
-          "redeemed": true,
-          "checkin_allowed": true,
-          "paid": true
-        },
-        "questions": [
-          {
-            "id": 12,
-            "type": "C",
-            "question": "Choose a shirt size",
-            "required": true,
-            "position": 2,
-            "items": [1],
-            "options": [
-              {
-                "id": 24,
-                "answer": "M"
-              },
-              {
-                "id": 25,
-                "answer": "L"
-              }
-            ]
-          }
-        ]
-      }
-
-   **Example error response with data**:
+   **Example error response**:
 
    .. sourcecode:: http
 
@@ -140,40 +56,13 @@ uses to communicate with the pretix server.
       {
         "status": "error",
         "reason": "already_redeemed",
-        "version": 3,
-        "data": {
-          "secret": "az9u4mymhqktrbupmwkvv6xmgds5dk3",
-          "order": "ABCDE",
-          "item": "Standard ticket",
-          "item_id": 1,
-          "variation": null,
-          "variation_id": null,
-          "attendee_name": "Peter Higgs",
-          "attention": false,
-          "redeemed": true,
-          "checkin_allowed": true,
-          "paid": true
-        }
-      }
-
-   **Example error response without data**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Content-Type: text/json
-
-      {
-        "status": "error",
-        "reason": "unkown_ticket",
-        "version": 3
+        "version": 2
       }
 
    Possible error reasons:
 
    * ``unpaid`` - Ticket is not paid for or has been refunded
    * ``already_redeemed`` - Ticket already has been redeemed
-   * ``product`` - Tickets with this product may not be scanned at this device
    * ``unknown_ticket`` - Secret does not match a ticket in the database
 
    :query key: Secret API key
@@ -211,12 +100,11 @@ uses to communicate with the pretix server.
             "attendee_name": "Peter Higgs",
             "redeemed": false,
             "attention": false,
-            "checkin_allowed": true,
             "paid": true
           },
           ...
         ],
-        "version": 3
+        "version": 2
       }
 
    :query query: Search query
@@ -245,7 +133,6 @@ uses to communicate with the pretix server.
       Content-Type: text/json
 
       {
-        "version": 3,
         "results": [
           {
             "secret": "az9u4mymhqktrbupmwkvv6xmgds5dk3",
@@ -255,31 +142,11 @@ uses to communicate with the pretix server.
             "attendee_name": "Peter Higgs",
             "redeemed": false,
             "attention": false,
-            "checkin_allowed": true,
             "paid": true
           },
           ...
         ],
-        "questions": [
-          {
-            "id": 12,
-            "type": "C",
-            "question": "Choose a shirt size",
-            "required": true,
-            "position": 2,
-            "items": [1],
-            "options": [
-              {
-                "id": 24,
-                "answer": "M"
-              },
-              {
-                "id": 25,
-                "answer": "L"
-              }
-            ]
-          }
-        ]
+        "version": 2
       }
 
    :query key: Secret API key
@@ -290,7 +157,7 @@ uses to communicate with the pretix server.
 .. http:get:: /pretixdroid/api/(organizer)/(event)/status/
 
    Returns status information, such as the total number of tickets and the
-   number of performed check-ins.
+   number of performed checkins.
 
    **Example request**:
 
@@ -310,7 +177,7 @@ uses to communicate with the pretix server.
       {
         "checkins": 17,
         "total": 42,
-        "version": 3,
+        "version": 2,
         "event": {
           "name": "Demo Converence",
           "slug": "democon",

doc/requirements.txt

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

doc/spelling_wordlist.txt

@@ -1,131 +0,0 @@
-addon
-addons
-anonymize
-api
-auditability
-auth
-autobuild
-backend
-backends
-banktransfer
-boolean
-booleans
-cancelled
-casted
-checkbox
-checksum
-config
-contenttypes
-contextmanager
-cookiecutter
-cron
-cronjob
-cryptographic
-debian
-deduplication
-discoverable
-django
-dockerfile
-durations
-eu
-filename
-filesystem
-fontawesome
-frontend
-frontpage
-gettext
-gunicorn
-hardcoded
-hostname
-idempotency
-inofficial
-invalidations
-iterable
-Jimdo
-libsass
-linters
-memcached
-metadata
-middleware
-mixin
-mixins
-multi
-multidomain
-namespace
-namespaced
-namespaces
-namespacing
-natively
-nginx
-NotificationType
-ons
-optimizations
-overpayment
-param
-percental
-positionid
-pre
-prepend
-prepended
-prepending
-preprocessor
-presale
-pretix
-pretixdroid
-pretixpresale
-prometheus
-proxied
-proxying
-pseudonymize
-queryset
-redemptions
-redis
-refactored
-regex
-renderer
-renderers
-reportlab
-screenshot
-selectable
-serializers
-serializers
-sexualized
-startup
-stdout
-stylesheet
-subdirectories
-subdirectory
-subdomain
-subdomains
-subevent
-subevents
-submodule
-subpath
-systemd
-testutils
-timestamp
-tuples
-un
-unconfigured
-unix
-unprefixed
-untrusted
-username
-url
-versa
-versioning
-viewset
-viewsets
-webhook
-webhooks
-webserver
-webservice
-workflow
-zipcode
-Datetime
-Embeddable
-Hierarkey
-OAuth
-SSL
-Uptime
-Yay

doc/user/events/create.rst

@@ -1,5 +1,3 @@
-.. _event_create:
-
 Creating an event
 =================
 
@@ -28,15 +26,15 @@ is useful if you have a large number of events that are very similar to each oth
 (i.e. users should be able to buy tickets for multiple events at the same time). Those single events can differ in
 available products, quotas, prices and some meta information, but most settings need to be the same for all of them.
 We recommend to use this feature only if you really know that you need it and if you really run a lot of events, not if
-you run e.g. a yearly conference. You can read more on this feature :ref:`here <subevents>`.
+you run e.g. a yearly conference.
 
-Once you set these values, you can proceed to the next step:
+Once you set these values, you can procede to the next step:
 
 .. thumbnail:: ../../screens/event/create_step2.png
    :align: center
    :class: screenshot
 
-In this step, you will be asked more detailed questions about your event. In particular, you can fill in the
+In this step, you will be asked more detailled questions about your event. In particular, you can fill in the
 following fields:
 
 Name

doc/user/events/display.rst

@@ -1,42 +0,0 @@
-Display settings
-================
-
-The settings at "Settings" → "Display" allow you to customize the appearance of your ticket shop.
-
-.. thumbnail:: ../../screens/event/settings_display.png
-   :align: center
-   :class: screenshot
-
-The upper part of the page contains settings that you always need to set specifically for your event. Those are
-currently:
-
-Logo image
-    This logo will be shown as a banner above your shop. If you set it, the event name and date will no longer be
-    displayed by the shop, so we suggest to include them in the image yourself. The maximal height of the image is
-    120 pixels and if you want to use the full width, make your image 1140 pixels wide. If the user's screen is
-    smaller, the logo will be scaled down automatically, so it should still be legible at smaller sizes.
-
-Frontpage text
-    This text will be shown on the front page of your ticket shop, above the list of products. You can use it to explain
-    your product types, give more information on the event or for other general notices.
-    You can use :ref:`Markdown syntax <markdown-guide>` in this field.
-
-Show variations of a product expanded by default
-    If this is not checked, a product with variations will be shown as one row in the show by default and will expand
-    into multiple rows once it is clicked on. With this box checked, the variations will be shown as multiple rows
-    right from the beginning.
-
-
-The lower part of the page contains settings that you can **either** set on organizer-level for all your events **or**
-override for this single event individually. Those are:
-
-Primary color
-    This color will be used for links, buttons, and other design elements throughout your shop and emails sent to your
-    customers. We suggest not choosing something to light, since text in that color should be readable on a white
-    background and white text should be readable on a background of this color.
-
-Font
-    Choose one of multiple fonts to use for your web shop.
-
-.. note:: Both the color and font settings can take a few seconds up to a few minutes before they become active on your
-          shop.

doc/user/events/email.rst

@@ -1,154 +0,0 @@
-E-mail settings
-===============
-
-The settings at "Settings" → "E-mail" allow you to customize the emails that pretix sends to the participants of your
-event.
-
-.. thumbnail:: ../../screens/event/settings_email.png
-   :align: center
-   :class: screenshot
-
-The page is separated into three parts: "E-mail settings", "E-mail content" and "SMTP settings". We will explain all
-of them in detail on this page.
-
-E-mail settings
----------------
-
-The upper part of the page contains settings that are relevant for the generation of all e-mails alike. Those are
-currently:
-
-Subject prefix
-    This text will be prepended to the subject of all e-mails that are related to your event. For example, if you
-    set this to "dc2018" all subjects will be formatted like "[dc2018] Your payment was successful".
-
-Sender address
-    All e-mails will be sent with this address in the "From" field. If you use an email address at a custom domain,
-    we strongly recommend to use the SMTP settings below as well, otherwise your e-mails might be detected as spam
-    due to the `Sender Policy Framework`_ and similar mechanisms.
-
-Signature
-    This text will be appended to all e-mails in form of a signature. This might be useful e.g. to add your contact
-    details or any legal information that needs to be included with the e-mails.
-
-E-mail content
---------------
-
-The middle part of the page allows you to customize the exact texts of all e-mails sent by the system automatically.
-You can click on the different boxes to expand them and see the texts.
-
-Within the texts, you can use placeholders that will later by replaced by values depending on the event or order. Below
-every text box is a list of supported placeholders, but currently the following are defined (not every placeholder
-is valid in every text):
-
-============================== ===============================================================================
-Placeholder                    Description
-============================== ===============================================================================
-event                          The event name
-total                          The order's total value
-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
-invoice_name                   The name field of the invoice address
-invoice_company                The company field of the invoice address
-expire_date                    The order's expiration date
-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
-============================== ===============================================================================
-
-The different e-mails are explained in the following:
-
-Placed Order
-    This e-mail is sent out to every order directly after the order has been received, except if the order total
-    is zero (see below). It should specify that/how the order is to be paid.
-
-Paid Order
-    This e-mail is sent out as soon as the payment for an order has been received and should give the customer
-    more information on how to proceed, e.g. by downloading their ticket.
-
-Free Order
-    This e-mail is sent out instead of "Placed Order" and "Paid Order" if the order total is zero. It therefore should
-    tell the same information, except asking the customer for completing their payment.
-
-Resend link
-    Sent by admin
-        This e-mail will be sent out if you click the "Resend link" next to the e-mail address field on the order detail
-        page. It should include the link to the order and can be sent to users e.g. if they lost their original e-mails.
-
-    Requested by user
-        Customers can also request a link to all orders they created using their e-mail address themselves by filling
-        out a form on the website. In this case, they will receive an e-mail containing a list of all orders they created
-        with the respective links.
-
-Order changed
-    This e-mail is sent out if you change the content of the order and choose to notify the user about it.
-
-Payment reminder
-    This e-mail is sent out a certain number of days before the order's expiry date. You can specify the number of days
-    before the expiry date that this should happen and the e-mail will only ever be sent if you do specify such a
-    number. The text should ask the customer to complete the payment, tell the options on how to do so and the
-    consequences if no payment is received (ticket gone, depending on your other settings). You should also include
-    a way to contact you in case of questions.
-
-Waiting list notification
-    If you enable the waiting list feature, this is the mail that will be sent out if a ticket is assigned to a person on
-    the waiting list. It should include the voucher that needs to be redeemed to get the free spot and tell how long
-    that voucher is valid and where to redeem it.
-
-Order canceled
-    This e-mail is sent to a customer if their order has been canceled.
-
-
-Order custom mail
-    You can use pretix' admin interface to directly send an e-mail with a custom text to the customer of a specific
-    order. In this case, this will be the default text and might save you time by not having to re-type all of it every
-    time.
-
-Reminder to download tickets
-    If you want, you can configure an email that will be send out a number of days before your event to remind
-    attendees to download their tickets. The e-mail should include a link to the ticket download. This e-mail will only
-    ever be sent if you specify a number of days.
-
-SMTP settings
--------------
-
-If you want to send your e-mails via your own e-mail address, we strongly recommend to use SMTP for this purpose.
-SMTP is a protocol that is used by e-mail clients to communicate with e-mail servers. Using SMTP, pretix can talk to
-your e-mail service provider the same way that e.g. the e-mail app on your phone can.
-
-Your e-mail provider will most likely have a document that tells you the settings for the various fields to fill in
-here (hostname, port, username, password, encryption).
-
-With the checkbox "Use custom SMTP server" you can turn using your SMTP server on or off completely. With the
-button "Save and test custom SMTP connection", you can test if the connection and authentication to your SMTP server
-succeeds, even before turning that checkbox on.
-
-Spam issues
------------
-
-If you use an email address of your own domain as a sender address and do not use a custom SMTP server, it is very
-likely that at least some of your emails will go to the spam folders of their recipients. We **strongly recommend**
-to use your organization's SMTP server in this case, making your email really come from your organization. If you don't
-want that or cannot do that, you should add the pretix application server to your SPF record.
-
-If you are using our hosted service at pretix.eu, you can add the following to your SPF record::
-
-   include:_spf.pretix.eu
-
-A complete record could look like this::
-
-   v=spf1 a mx include:_spf.pretix.eu ~all
-
-Make sure to read up on the `SPF specification`_. If you want to authenticate your emails with DKIM, set up a DNS TXT
-record for the subdomain ``pretix._domainkey`` with the following contents::
-
-   v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXrDk6lwOWX00e2MbiiJac6huI+gnzLf9N4G1FnBv3PXq8fz3i2q1szH72OF5mAlKm3zXO4cl/uxx+lfidS1ERbX6Bn9BRstBTQUKWC4JFj8Yk9+fwT7LWehDURazLdTzfsIjJFudLLvxtOKSaOCtMhbPX05DIhziaqVCBqgz/NQIDAQAB
-
-Then, please contact support@pretix.eu and we will enable DKIM for your domain on our mail servers.
-
-
-.. _Sender Policy Framework: https://en.wikipedia.org/wiki/Sender_Policy_Framework
-.. _SPF specification: http://www.openspf.org/SPF_Record_Syntax

doc/user/events/invoicing.rst

@@ -1,96 +0,0 @@
-Invoice settings
-================
-
-.. spelling:: Inv
-
-The settings at "Settings" → "Invoice" allow you to specify if and how pretix should generate invoices for your orders.
-
-.. thumbnail:: ../../screens/event/settings_invoice.png
-   :align: center
-   :class: screenshot
-
-In particular, you can configure the following things:
-
-Ask for invoice address
-    If this checkbox is enabled, customers will be able to enter an invoice address during checkout. If you only enable
-    this box, the invoice address will be optional to fill in.
-
-Require invoice address
-    If this checkbox is enabled, entering an invoice address will be obligatory for all customers and it will not be
-    able to create an order without entering an address.
-
-Require customer name
-    If this checkbox is enabled, the street, city, and country fields of the invoice address will still be optional but
-    the name field will be obligatory.
-
-Generate invoices
-    This field controls whether pretix should generate an invoice for an order. You have the following options:
-
-    No
-        pretix will never generate an invoice. If you want to issue invoices, you need to do it yourself based on the
-        collected address data.
-
-    Manually in admin panel
-        pretix will not create invoices automatically, but the order detail view will show a button that allows you to
-        manually generate one for specific orders.
-
-    Automatically on user request
-        pretix will not create invoices on its own, but both the panel as well as the customer view of the order will
-        show a button that instantly generates an invoice for the specified order.
-
-    Automatically for all created orders
-        pretix will automatically create an invoice every time an order is placed.
-
-    Automatically on payment
-        pretix will automatically create an invoice for an order, as soon as the payment for the order is received.
-
-    pretix will never generate invoices for free orders, even though it might ask for the invoice address.
-
-Attach invoices to emails
-    If enabled, invoices will be attached to order confirmation e-mails if the "Generate invoices" setting is set to
-    "Automatically for all created orders" or to the payment confirmation e-mails if it is set to "Automatically on
-    payment".
-
-Ask for VAT ID
-    If enabled, the invoice address form will not only ask for a postal address, but also for a VAT ID. The VAT ID will
-    always be an optional field.
-
-Generate invoices with consecutive numbers
-    If enabled, invoices will be created with numerical invoice numbers in the order of their creation, i.e.
-    PREFIX-00001, PREFIX-00002, and so on. If disabled, invoice numbers will instead be generated from the order code,
-    i.e. PREFIX-YHASD-1. When in doubt, keep this option enabled since it might be legally required in your country,
-    but disabling it has the advantage that your customers can not estimate the number of tickets sold by looking at
-    the invoice numbers.
-
-Invoice number prefix
-    This is the prefix that will be prepended to all your invoice numbers. For example, if you set this to "Inv", your
-    invoices will be numbered Inv00001, Inv00002, etc. If you leave this field empty, your event slug will be used,
-    followed by a dash, e.g. DEMOCON-00001.
-
-    Within one organizer account, events with the same number prefix will share their number range. For example, if you
-    set this to "Inv" for all of your events, there will be only one invoice numbered Inv00007 across all your events
-    and the numbers will have gaps within one event.
-
-Show free products on invoices
-    If enabled, products that do not cost anything will still show up on invoices. Note that the order needs to contain
-    at least one non-free product in order to generate an invoice.
-
-Show attendee names on invoices
-    If enabled, the attendee name will be printed on the invoice for admission tickets.
-
-Your address
-    This should be set to the address of the entity issuing the invoice (read: you) and will be printed inside
-    the header of the invoice.
-
-Introductory text
-    A free custom text that will be printed above the list of products on the invoice.
-
-Additional text
-    A free custom text that will be printed below the list of products and the invoice total.
-
-Footer
-    A text that will be printed in the foot line of the invoice. This could contain your contact details or legal
-    information on the issuing entity, e.g. registration numbers, your VAT ID, etc.
-
-Logo image
-    A square image that will be printed in the invoice header, currently with a width of 2.5cm.

doc/user/events/plugins.rst

@@ -1,20 +0,0 @@
-Configuring plugins
-===================
-
-Plugins are optional parts of pretix that can be installed to extend the available functionality and that can be turned
-on or off completely for every event. For your event, a number of plugins might be active already, but you can unlock
-even more functionality by going to "Settings" → "Plugins" and enable more of them, if you need.
-
-.. thumbnail:: ../../screens/event/settings_plugins.png
-   :align: center
-   :class: screenshot
-
-For each plugin, you will find a short description as well as an Enable/Disable button. The pretix website has
-`an overview`_ of available plugins and more details of them. If you are on the pretix.eu hosted service, look for
-the "pretix Hosted" badge in the plugin list to learn which ones are supported there.
-
-If you are running pretix on your own server, refer to the installation manual of your installation type to learn
-how to install additional plugins (:ref:`manual <manual_plugininstall>` or :ref:`Docker <docker_plugininstall>`).
-
-.. _an overview: https://pretix.eu/about/en/plugins
-

doc/user/events/settings.rst

@@ -1,14 +0,0 @@
-Configuring an event
-====================
-
-.. toctree::
-   :maxdepth: 2
-
-   subevents
-   ../payments/index
-   plugins
-   display
-   tickets
-   email
-   taxes
-   invoicing

doc/user/events/subevents.rst

@@ -1,111 +0,0 @@
-.. _subevents:
-
-Event series
-============
-
-During creation of a new event, you can choose that you want to create this event as an event series.
-By event series, we mean a group of events that are similar in their structure and that you want to
-sell within a single shop. An event series consists of **dates**. Each date represents one "event"
-within the series.
-
-For example, we think good examples to use the event series feature are:
-
-* A theater or theater group that shows the same play on five evenings.
-
-* A band on tour that hosts the same show in different locations.
-
-* A workshop that is given multiple times in different locations or at different times.
-
-We **don't** think that the feature is well-suited for events like the following:
-
-* Event series distributed over a large timescale like annual conferences. We suggest using multiple events in this
-  case. You can avoid having to configure everything twice since you can copy settings from an existing event during
-  creation of the new event.
-
-* Multiple parts of a conference or festival (e.g. different days) if a significant number of attendees will visit
-  more than one of them. We suggest just using different products in this case.
-
-When using an event series, the single dates of the series are using the same settings in most places. They can
-**only** differ in the following aspects:
-
-* They can have different date, time, and location parameters.
-
-* They can use different text on the shop front page.
-
-* They can have different prices for the various products.
-
-* They always have distinct quotas, which allows you to assign different amounts of tickets or to enable or disable
-  some products completely.
-
-* They can have different rules for check-in.
-
-Therefore, if your events are likely to need more different settings, this is probably not the feature for you. The
-benefits of using event series, on the other hand, are:
-
-* You only need to set most settings once, as the multiple dates live in the same shop.
-
-* Your customers can build mixed orders, i.e. they can order tickets for multiple dates at once.
-
-
-Creating and modifying dates in the series
-------------------------------------------
-
-Click on "Dates" in the left navigation menu of your event. This page shows you the list of currently existing event
-dates and allows you to create, edit, clone and delete them.
-
-If "Dates" is missing from the navigation menu, you have insufficient permission or your event has not been set up as
-an event series and you need to create a new event.
-
-.. thumbnail:: ../../screens/event/subevent_list.png
-   :align: center
-   :class: screenshot
-
-If you click on one of them or create a new one, you will see the following form:
-
-.. thumbnail:: ../../screens/event/subevent_create.png
-   :align: center
-   :class: screenshot
-
-Here, you can make changes to the following fields, most of which are optional:
-
-Name
-  This is the public name of your date. It should be descriptive enough to tell the user which date to select in
-  a calendar.
-
-Active
-  This date will only show up for customers if you check this box. In this sense, it corresponds to the "live" setting
-  of events.
-
-
-Event start time
-  The date and time that this date starts at.
-
-Event end time
-  The date and time this date ends at.
-
-Location
-  This is the location of your date in a human-readable format. We will show this on the ticket shop frontpage, but
-  it might also be used e.g. in Wallet tickets.
-
-Admission time
-  The admission date and time to show on the ticket shop page or on the tickets.
-
-Frontpage text
-  A text to show on the front page of the ticket shop for this date.
-
-Start of presale
-  If you set this, no ticket will be sold before the time you set. If you set this on event series level as well,
-  both dates must be in the past for the tickets to be available.
-
-End of presale
-  If you set this, no ticket will be sold after the time you set. If you set this on event series level as well,
-  both dates must be in the future for the tickets to be available.
-
-Quotas
-  As for all events, no tickets will be available unless there is a quota created for them that specifies the number
-  of tickets available. You can create multiple quotas that are assigned to this date directly from this interface.
-
-Item prices
-  This is a table of all products configured for your shop. If you want, you can enter a new price for each one of them
-  in the right column to make them cheaper or more expensive for this date. If you leave a field empty, the price will
-  follow the product's default price.

doc/user/events/taxes.rst

@@ -1,7 +1,5 @@
-.. _taxes:
-
-Configuring taxes
-=================
+Tax rules
+=========
 
 In most countries, you will be required to pay some form of sales tax for your event tickets. If you don't know about
 the exact rules, you should consult a professional tax consultant right now.
@@ -18,7 +16,7 @@ your event, go to the respective section in your event's settings:
    :class: screenshot
 
 On this page, you can create, edit and delete your tax rules. Clicking on the name of a tax rule will take you to its
-detailed settings:
+detailled settings:
 
 .. thumbnail:: ../../screens/event/tax_detail.png
    :align: center
@@ -100,16 +98,6 @@ taxes" at the end of the page.
           errors of usually up to one cent from the intended price. This is unavoidable due to the
           flexible nature in which prices are being calculated.
 
-Custom tax rules
-----------------
-
-If you have very special requirements for the conditions in which VAT will or will not be charged, you can use the
-"Custom tax rules" section instead of the options listed above. Here, you can create a set of rules consisting of
-conditions (i.e. a country or a type of customer) and actions (i.e. do or do not charge VAT).
-
-The rules will then be checked from top to bottom and the first matching rule will be used to decide if VAT will be
-charged to the user.
-
 Taxation of payment fees
 ------------------------
 

doc/user/events/tickets.rst

@@ -1,30 +0,0 @@
-Ticket settings
-===============
-
-At "Settings" → "Tickets", you can configure the ticket download options that will be presented to your customers:
-
-.. thumbnail:: ../../screens/event/settings_tickets.png
-   :align: center
-   :class: screenshot
-
-The top of this page shows a short list of options relevant for all download formats:
-
-Use feature
-  This can be used to completely enable or disable ticket downloads all over your ticket shop.
-
-Download date
-  If you set a date here, no ticket download will be offered before this date. If no date is set, tickets can be
-  downloaded immediately after the payment for an order has been received.
-
-Offer to download tickets separately for add-on products
-  By default, tickets can not be downloaded for order positions which are only an add-on to other order positions. If
-  you enable this, this behavior will be changed and add-on products will get their own tickets as well. If disabled,
-  you can still print a list of chosen add-ons e.g. on the PDF tickets.
-
-Generate tickets for non-admission products
-  By default, tickets will only be generated for products that are marked as admission products. Enable this option to
-  generate tickets for all products instead.
-
-Below these settings, the detail settings for the various ticket file formats are offered. They differ from format to
-format and only share the common "Enable" setting that can be used to turn them on. By default, pretix ships with
-a PDF output plugin that you can configure through a visual design editor.

doc/user/events/widget.rst

@@ -1,149 +0,0 @@
-Embeddable Widget
-=================
-
-If you want to show your ticket shop on your event website or blog, you can use our JavaScript widget. This way,
-users will not need to leave your site to buy their ticket in most cases. The widget will still open a new tab
-for the checkout if the user is on a mobile device.
-
-To obtain the correct HTML code for embedding your event into your website, we recommend that you go to the "Widget"
-tab of your event's settings. You can specify some optional settings there (for example the language of the widget)
-and then click "Generate widget code".
-
-.. thumbnail:: ../../screens/event/widget_form.png
-   :align: center
-   :class: screenshot
-
-You will obtain two code snippets that look *roughly* like the following. The first should be embedded into the
-``<head>`` part of your website, if possible. If this inconvenient, you can put it in the ``<body>`` part as well::
-
-    <link rel="stylesheet" type="text/css" href="https://pretix.eu/demo/democon/widget/v1.css">
-    <script type="text/javascript" src="https://pretix.eu/widget/v1.en.js" async></script>
-
-The second snippet should be embedded at the position where the widget should show up::
-
-    <pretix-widget event="https://pretix.eu/demo/democon/"></pretix-widget>
-    <noscript>
-       <div class="pretix-widget">
-            <div class="pretix-widget-info-message">
-                JavaScript is disabled in your browser. To access our ticket shop without JavaScript,
-                please <a target="_blank" href="https://pretix.eu/demo/democon/">click here</a>.
-            </div>
-        </div>
-    </noscript>
-
-.. note::
-
-    You can of course embed multiple widgets of multiple events on your page. In this case, please add the first
-    snippet only *once* and the second snippets once *for each event*.
-
-.. note::
-
-    Some website builders like Jimdo have trouble with our custom HTML tag. In that case, you can use
-    ``<div class="pretix-widget-compat" …></div>`` instead of ``<pretix-widget …></pretix-widget>`` starting with
-    pretix 1.14.
-
-Example
--------
-
-Your embedded widget could look like the following:
-
-.. raw:: html
-
-    <link rel="stylesheet" type="text/css" href="https://pretix.eu/demo/democon/widget/v1.css">
-    <script type="text/javascript" src="https://pretix.eu/widget/v1.en.js" async></script>
-    <pretix-widget event="https://pretix.eu/demo/democon/"></pretix-widget>
-    <noscript>
-       <div class="pretix-widget">
-            <div class="pretix-widget-info-message">
-                JavaScript is disabled in your browser. To access our ticket shop without javascript, please <a target="_blank" href="https://pretix.eu/demo/democon/">click here</a>.
-            </div>
-        </div>
-    </noscript>
-
-
-Styling
--------
-
-If you want, you can customize the appearance of the widget to fit your website with CSS. If you inspect the rendered
-HTML of the widget with your browser's developer tools, you will see that nearly every element has a custom class
-and all classes are prefixed with ``pretix-widget``. You can override the styles as much as you want to and if
-you want to go all custom, you don't even need to use the stylesheet provided by us at all.
-
-SSL
----
-
-Since buying a ticket normally involves entering sensitive data, we strongly suggest that you use SSL/HTTPS for the page
-that includes the widget. Initiatives like `Let's Encrypt`_ allow you to obtain a SSL certificate free of charge.
-
-All data transferred to pretix will be made over SSL, even if using the widget on a non-SSL site. However, without
-using SSL for your site, a man-in-the-middle attacker could potentially alter the widget in dangerous ways. Moreover,
-using SSL is becoming standard practice and your customers might want expect see the secure lock icon in their browser
-granted to SSL-enabled web pages.
-
-By default, the checkout process will open in a new tab in your customer's browsers if you don't use SSL for your
-website. If you confident to have a good reason for not using SSL, you can override this behavior with the
-``skip-ssl-check`` attribute::
-
-   <pretix-widget event="https://pretix.eu/demo/democon/" skip-ssl-check></pretix-widget>
-
-Pre-selecting a voucher
------------------------
-
-You can pre-select a voucher for the widget with the ``voucher`` attribute::
-
-   <pretix-widget event="https://pretix.eu/demo/democon/" voucher="ABCDE123456"></pretix-widget>
-
-This way, the widget will only show products that can be bought with the voucher and prices according to the
-voucher's settings.
-
-.. raw:: html
-
-    <pretix-widget event="https://pretix.eu/demo/democon/" voucher="ABCDE123456"></pretix-widget>
-    <noscript>
-       <div class="pretix-widget">
-            <div class="pretix-widget-info-message">
-                JavaScript is disabled in your browser. To access our ticket shop without javascript, please <a target="_blank" href="https://pretix.eu/demo/democon/">click here</a>.
-            </div>
-        </div>
-    </noscript>
-
-pretix Button
--------------
-
-Instead of a product list, you can also display just a single button. When pressed, the button will add a number of
-products associated with the button to the cart and will immediately proceed to checkout if the operation succeeded.
-You can try out this behavior here:
-
-.. raw:: html
-
-    <pretix-button event="https://pretix.eu/demo/democon/" items="item_6424=1">Buy ticket!</pretix-button>
-    <noscript>
-       <div class="pretix-widget">
-            <div class="pretix-widget-info-message">
-                JavaScript is disabled in your browser. To access our ticket shop without javascript, please <a target="_blank" href="https://pretix.eu/demo/democon/">click here</a>.
-            </div>
-        </div>
-    </noscript>
-    <br><br>
-
-You can embed the pretix Button just like the pretix Widget. Just like above, first embed the CSS and JavaScript
-resources. Then, instead of the ``pretix-widget`` tag, use the ``pretix-button`` tag::
-
-    <pretix-button event="https://pretix.eu/demo/democon/" items="item_6424=1">
-        Buy ticket!
-    </pretix-button>
-
-As you can see, the ``pretix-button`` element takes an additional ``items`` attribute that specifies the items that
-should be added to the cart. The syntax of this attribute is ``item_ITEMID=1,item_ITEMID=2,variation_ITEMID_VARID=4``
-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.
-
-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.
-
-.. versionchanged:: 1.13
-
-   The pretix Button has been added in version 1.13.
-
-.. _Let's Encrypt: https://letsencrypt.org/

doc/user/faq.rst

@@ -1,75 +0,0 @@
-FAQ and Troubleshooting
-=======================
-
-How can I test my shop before taking it live?
----------------------------------------------
-
-There are multiple ways to do this.
-
-First, you could just create some orders in your real shop and cancel/refund them later. If you don't want to process
-real payments for the tests, you can either use a "manual" payment method like bank transfer and just mark the orders
-as paid with the button in the backend, or if you want to use e.g. Stripe, you can configure pretix to use your keys
-for the Stripe test system and use their test credit cars. Read our :ref:`Stripe documentation <stripe>` for more
-information.
-
-Second, you could create a separate event, just for testing. In the last step of the :ref:`event creation process <event_create>`,
-you can specify that you want to copy all settings from your real event, so you don't have to do all of it twice.
-
-We are planning to add a dedicated test mode in a later version of pretix.
-
-If you are using the hosted service at pretix.eu and want to get rid of the test orders completely, contact us at
-support@pretix.eu and we can remove them for you. Please note that we only are able to do that *before* you have
-received any real orders (i.e. taken the shop public). We won't charge any fees for test orders or test events.
-
-How do I delete an event?
--------------------------
-
-You can find the event deletion button at the bottom of the event settings page. Note however, that it is not possible
-to delete an event once any order or invoice has been created, as those likely contain information on financial
-transactions which legally may not be tampered with and needs to be kept on record for multiple years in most
-countries. In this case, you can just disable the shop by clicking the first square on your event
-dashboard.
-
-If you are using the hosted service at pretix.eu and want to get rid of an event that you only used for testing, contact
-us at support@pretix.eu and we can remove it for you.
-
-Why doesn't my product show up in the ticket shop?
---------------------------------------------------
-
-If you created a product and it doesn't show up, please follow the following steps to find out why:
-
-1. Check if the product's "active" checkbox is enabled.
-2. Check if the product is in a category that has the "Products in this category are add-on products" checkbox enabled.
-   If this is the case, the product won't show up on the shop front page, but only in the first step of checkout when
-   a product in the cart allows to add add-on products from this category.
-3. Check if the product's "Available from" or "Available until" settings restrict it to a date range.
-4. Check if the product's checkbox "This product will only be shown if a voucher matching the product is redeemed." is
-   enabled. If this is the case, the product will only be shown if the customer redeems a voucher that *directly* matches
-   to this product. It will not be shown if the voucher only is configured to match a quota that contains the product.
-5. Check that a quota exists that contains this product. If your product has variations, check that at least one
-   variation is contained in a quota. If your event is an event series, make sure that the product is contained in a
-   quota that is assigned to the series date that you access the shop for.
-6. If the sale period has not started yet or is already over, check the "Show items outside presale period" setting of
-   your event.
-
-How can I revert a check-in?
-----------------------------
-
-Neither our apps nor our web interface can currently undo the check-in of a tickets. We know that this is
-inconvenient for some of you, but we have a good reason for it:
-
-Our Desktop and Android apps both support an asynchronous mode in which they can scan tickets while staying
-independent of their internet connection. When scanning with multiple devices, it can of course happen that two
-devices scan the same ticket without knowing of the other scan. As soon as one of the devices regains connectivity, it
-will upload its activity and the server marks the ticket as checked in -- regardless of the order in which the two
-scans were made and uploaded (which could be two different orders).
-
-If we'd provide a "check out" feature, it would not only be used to fix an accidental scan, but scan at entry and
-exit to count the current number of people inside etc. In this case, the order of operations matters very much for them
-to make sense and provide useful results. This makes implementing an asynchronous mode much more complicated.
-
-In this trade off, we chose offline-capabilities over the check out feature. We plan on solving this problem in the
-future, but we're not there yet.
-
-If you're just *testing* the check-in capabilities and want to clean out everything for the real process, you can just
-delete and re-create the check-in list.

doc/user/index.rst

@@ -9,7 +9,5 @@ wanting to use pretix to sell tickets.
 
    organizers/index
    events/create
-   events/settings
-   events/widget
-   faq
-   markdown
+   events/taxes
+   payments/index

doc/user/markdown.rst

@@ -1,166 +0,0 @@
-.. _markdown-guide:
-
-Markdown Guide
-==============
-
-What is markdown?
------------------
-
-In many places of your shop, like frontpage texts, product descriptions and email texts, you can use
-`Markdown`_ to create links, bold text, and other formatted content. Markdown is a good middle-ground
-since it is way easier to learn than languages like HTML but allows all basic formatting options required
-for text in those places.
-
-Formatting rules
-----------------
-
-Simple text formatting
-""""""""""""""""""""""
-
-To set a text in italics, you can put it in asterisks or underscores. For example,
-
-.. code-block:: markdown
-
-    Please *really* pay your _ticket_.
-
-will become:
-
-    Please *really* pay your *ticket*.
-
-If you set double asterisks or underscores, the text will be printed in bold. For example,
-
-.. code-block:: markdown
-
-    This is **important**.
-
-will become:
-
-    This is **important**.
-
-You can also display, for example:
-
-.. code-block:: markdown
-
-    Input this `exactly like this`.
-
-You will get:
-
-    Input this ``exactly like this``.
-
-Links
-"""""
-
-You can create a link by just pasting it in, e.g.
-
-.. code-block:: markdown
-
-    Check this on https://en.wikipedia.org
-
-will become:
-
-    Check this on https://en.wikipedia.org
-
-However, if you want to control the text of the link, you can put the text of the link in ``[]`` brackets and the
-link target in ``()`` parentheses, like this:
-
-.. code-block:: markdown
-
-    Check this on [Wikipedia](https://en.wikipedia.org).
-
-This will yield:
-
-    Check this on `Wikipedia`_
-
-All links created with pretix Markdown syntax will open in a new tab.
-
-Lists
-"""""
-
-You can create un-numbered lists by prepending the lines with asterisks.
-
-.. code-block:: markdown
-
-    * First item
-    * Second item with a text that is too long to
-      fit in a line
-    * Third item
-
-will become:
-
-    * First item
-    * Second item with a text that is too long to
-      fit in a line
-    * Third item
-
-You can also use numbers as list items
-
-.. code-block:: markdown
-
-    1.  Red
-    2.  Green
-    3.  Blue
-
-to get
-
-    1.  Red
-    2.  Green
-    3.  Blue
-
-Headlines
-"""""""""
-
-To create a headline, prepend it with ``#`` for the main headline, ``##`` for a headline of the second level,
-and so on. For example:
-
-.. code-block:: markdown
-
-    # Headline 1
-    ## Headline 2
-    ### Headline 3
-    #### Headline 4
-    ##### Headline 5
-    ###### Headline 6
-
-We do not recommend using headlines of the first level, as pretix will already set the name of your event as a level-1
-headline of the page and HTML pages should have only one headline on the first level.
-
-You can also use
-
-.. code-block:: markdown
-
-    *****
-
-to create a horizontal line, like the following:
-
-.. raw:: html
-
-    <hr>
-
-Using HTML
-----------
-
-You can also directly embed HTML code, if you want, although we recommend
-using Markdown, as it enables e.g. people using text-based email clients
-to get a better plain text representation of your text. Note however, that for
-security reasons you can only use the following HTML elements::
-
-    a, abbr, acronym, b, br, code, div, em, h1, h2,
-    h3, h4, h5, h6, hr, i, li, ol, p, pre, span, strong,
-    table, tbody, td, thead, tr, ul
-
-Additionally, only the following attributes are allowed on them::
-
-    <a href="…" title="…">
-    <abbr title="…">
-    <acronym title="…">
-    <table width="…">
-    <td width="…" align="…">
-    <div class="…">
-    <p class="…">
-    <span class="…">
-
-All other elements and attributes will be stripped during parsing.
-
-
-.. _Markdown: https://en.wikipedia.org/wiki/Markdown
-.. _Wikipedia: https://en.wikipedia.org

doc/user/organizers/account.rst

@@ -1,43 +0,0 @@
-Organizer account
-=================
-
-The basis of all your operations within pretix is your organizer account. It represents an entity that is running
-events, for example a company, yourself or any other institution.
-Every event belongs to one organizer account and events within the same organizer account are assumed to belong together
-in some sense, whereas events in different organizer accounts are completely isolated.
-
-If you want to use the hosted pretix service, you can create an organizer account on our `Get started`_ page. Otherwise,
-ask your pretix administrator for access to an organizer account.
-
-You can find out all organizer accounts you have access to by going to your global dashboard (click on the pretix logo
-in the top-left corner) and then select "Organizers" from the navigation bar on the left side. Then, choose one of the
-organizer accounts presented, if there are multiple of them:
-
-.. thumbnail:: ../../screens/organizer/list.png
-   :align: center
-   :class: screenshot
-
-This overview shows you all event that belong to the organizer and you have access to:
-
-.. thumbnail:: ../../screens/organizer/event_list.png
-   :align: center
-   :class: screenshot
-
-With the "Edit" button at the top, next to the organizer account name, you can modify properties of the organizer
-account such as its name and display settings for the public profile page of the organizer account:
-
-.. thumbnail:: ../../screens/organizer/edit.png
-   :align: center
-   :class: screenshot
-
-.. tip::
-
-   The profile page will be shown as ``https://pretix.eu/slug/`` where ``slug`` is to be replaced by the short form of
-   the organizer name that you entered during account creation and ``pretix.eu`` is to be replaced by your
-   installation's domain name if you are not using our hosted service.
-
-   Instead, you can also use a custom domain for the profile page and your events, for example
-   ``https://tickets.example.com/`` if ``example.com`` is a domain that you own.  Head to :ref:`custom_domain` to learn
-   more.
-
-.. _Get started: https://pretix.eu/about/en/setup

doc/user/organizers/domain.rst

@@ -1,54 +0,0 @@
-.. _custom_domain:
-
-Using a custom domain
-=====================
-
-By default, event shops built with pretix are accessible at ``https://<domain>/<organizer>/<event>/``, where
-``<domain>`` is ``pretix.eu`` if you are using our hosted service and ``<organizer>`` and ``<event>`` are the short
-form versions of your organizer account name and event name, respectively.
-
-However, you are also able to use a custom domain for your ticket shops! If you work for "Awesome Party Corporation"
-and your website is ``awesomepartycorp.com``, you might want to sell your tickets at ``tickets.awesomepartycorp.com``
-and with pretix, you can do this. On this page, you find out the necessary steps to take.
-
-With the pretix.eu hosted service
----------------------------------
-
-Step 1: DNS Configuration
-#########################
-
-Go to the website of the provider you registered your domain name with. Look for the "DNS" settings page in their
-interface. Unfortunately, we can't tell you exactly how that is named and how it looks, since it is different for every
-domain provider.
-
-Use this interface to add a new subdomain record, e.g. ``tickets`` of the type ``CNAME`` (might also be called "alias").
-The value of the record should be ``www.pretix.eu``.
-
-Step 2: Wait for the DNS entry to propagate
-###########################################
-
-Submit your changes and wait a bit, it can regularly take up to three hours for DNS changes to propagate to the caches
-of all DNS servers. You can try checking by accessing your new subdomain, ``http://tickets.awesomepartycorp.com``.
-If DNS was changed successfully, you should see a SSL certificate error. If you ignore the error and access the page
-anyways, you should get a pretix-themed error page with the headline "Unknown domain".
-
-Step 3: Tell us
-###############
-
-Write an email to support@pretix.eu, naming your new domain and your organizer account. We will then generate a SSL
-certificate for you (for free!) and configure the domain.
-
-
-With a custom pretix installation
----------------------------------
-
-If you installed pretix on a server yourself, you can also use separate domains for separate organizers.
-First of all, configure your webserver or reverse proxy to pass requests to the new domain to pretix as well.
-Then, go to the organizer account in pretix and click the "Edit" button. Enter the new domain in the "Custom Domain"
-field, then you're done!
-
-.. thumbnail:: ../../screens/organizer/edit_sysadmin.png
-   :align: center
-   :class: screenshot
-
-Note that this field only shows up if you are logged in as a system administrator of your pretix installation.

doc/user/organizers/index.rst

@@ -1,9 +1,112 @@
 Organizer accounts and teams
 ============================
 
-.. toctree::
-   :maxdepth: 2
+Organizer account
+-----------------
 
-   account
-   teams
-   domain
+The basis of all your operations within pretix is your organizer account. It represents an entity that is running
+events, for example a company, yourself or any other institution.
+Every event belongs to one organizer account and events within the same organizer account are assumed to belong together
+in some sense, whereas events in different organizer accounts are completely isolated.
+
+If you want to use the hosted pretix service, you can create an organizer account on our `Get started`_ page. Otherwise,
+ask your pretix administrator for access to an organizer account.
+
+You can find out all organizer accounts you have access to by going to your global dashboard (click on the pretix logo
+in the top-left corner) and then select "Organizers" from the navigation bar on the left side. Then, choose one of the
+organizer accounts presented, if there are multiple of them:
+
+.. thumbnail:: ../../screens/organizer/list.png
+   :align: center
+   :class: screenshot
+
+This overview shows you all event that belong to the organizer and you have access to:
+
+.. thumbnail:: ../../screens/organizer/event_list.png
+   :align: center
+   :class: screenshot
+
+With the "Edit" button at the top, next to the organizer account name, you can modify properties of the organizer
+account such as its name and display settings for the public profile page of the organizer account:
+
+.. thumbnail:: ../../screens/organizer/edit.png
+   :align: center
+   :class: screenshot
+
+.. tip::
+
+   The profile page will be shown as ``https://pretix.eu/slug/`` where ``slug`` is to be replaced by the short form of
+   the organizer name that you entered during account creation and ``pretix.eu`` is to be replaced by your
+   installation's domain name if you are not using our hosted service.
+
+   Instead, you can also use a custom domain for the profile page and your events, for example
+   ``https://tickets.example.com/`` if ``example.com`` is a domain that you own. In this case, please contact the pretix
+   hosted support or your system administrator to set up the custom domain.
+
+Teams
+-----
+
+We don't expect you to work on your events all by yourself and therefore, pretix comes with ways to invite your fellow
+team members to access your pretix organizer account. To manage teams, click on the "Teams" link on your organizer
+settings page (see above how to find it). This shows you a list of teams that should contain at least one team already:
+
+.. thumbnail:: ../../screens/organizer/team_list.png
+   :align: center
+   :class: screenshot
+
+If you click on a team name, you get to a page that shows you the current members of the team:
+
+.. thumbnail:: ../../screens/organizer/team_detail.png
+   :align: center
+   :class: screenshot
+
+You see that there is a list of pretix user accounts (i.e. email addresses), who are part of the team. To add a user to
+the team, just enter their email address in the text box next to the "Add" button. If the user already has an account
+in the pretix system they will instantly get access to the team. Otherwise, they will be sent an email with an invitation
+link that can be used to create an account. This account will then instantly have access to the team. Users can be part
+of as many teams as you want.
+
+In the section below, you can also create access tokens for our :ref:`rest-api`. You can read more on this topic in the
+section :ref:`rest-auth` of the API documentation.
+
+Next to the team name, you again see a button called "Edit" that allows you to modify the permissions of the team.
+Permissions separate into two areas:
+
+* **Organizer permissions** allow actions on the level of an organizer account, in particular:
+
+   * Can create events – To create a new event under this organizer account, users need to have this permission
+
+   * Can change teams and permissions – This permission is required to perform the kind of action you are doing right now.
+     Anyone with this permission can assign arbitrary other permissions to themselves, so this is the most powerful
+     permission there is to give.
+
+   * Can change organizer settings – This permission is required to perform changes to the settings of the organizer
+     account, e.g. its name or display settings.
+
+* **Event permissions** allow actions on the level of an event. You can give the team access to all events of the
+  organizer (including future ones that are not yet created) or just a selected set of events. The specific permissions to choose from are:
+
+   * Can change event settings – This permission gives access to most areas of the control panel that are not controlled
+     by one of the other event permissions, especially those that are related to setting up and configuring the event.
+
+   * Can change product settings – This permission allows to create and modify products and objects that are closely
+     related to products, such as product categories, quotas, and questions.
+
+   * Can view orders – This permission allows viewing the list of orders and allindividual order details, but not
+     changing anything about it. This also includes the various exports offered.
+
+   * Can change orders – This permission allows all actions that involve changing an order, such as changing the products
+     in an order, marking an order as paid or refunden, importing banking data, etc. This only works properly if the
+     same users also have the "Can view orders" permission.
+
+   * Can view vouchers – This permission allows viewing the list of vouchers including the voucher codes themselves and
+     their redemption status.
+
+   * 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.
+
+.. thumbnail:: ../../screens/organizer/team_edit.png
+   :align: center
+   :class: screenshot
+
+.. _Get started: https://pretix.eu/about/en/setup

doc/user/organizers/teams.rst

@@ -1,67 +0,0 @@
-.. _user-teams:
-
-Teams
-=====
-
-We don't expect you to work on your events all by yourself and therefore, pretix comes with ways to invite your fellow
-team members to access your pretix organizer account. To manage teams, click on the "Teams" link on your organizer
-settings page (see above how to find it). This shows you a list of teams that should contain at least one team already:
-
-.. thumbnail:: ../../screens/organizer/team_list.png
-   :align: center
-   :class: screenshot
-
-If you click on a team name, you get to a page that shows you the current members of the team:
-
-.. thumbnail:: ../../screens/organizer/team_detail.png
-   :align: center
-   :class: screenshot
-
-You see that there is a list of pretix user accounts (i.e. email addresses), who are part of the team. To add a user to
-the team, just enter their email address in the text box next to the "Add" button. If the user already has an account
-in the pretix system they will instantly get access to the team. Otherwise, they will be sent an email with an invitation
-link that can be used to create an account. This account will then instantly have access to the team. Users can be part
-of as many teams as you want.
-
-In the section below, you can also create access tokens for our :ref:`rest-api`. You can read more on this topic in the
-section :ref:`rest-auth` of the API documentation.
-
-Next to the team name, you again see a button called "Edit" that allows you to modify the permissions of the team.
-Permissions separate into two areas:
-
-* **Organizer permissions** allow actions on the level of an organizer account, in particular:
-
-   * Can create events – To create a new event under this organizer account, users need to have this permission
-
-   * Can change teams and permissions – This permission is required to perform the kind of action you are doing right now.
-     Anyone with this permission can assign arbitrary other permissions to themselves, so this is the most powerful
-     permission there is to give.
-
-   * Can change organizer settings – This permission is required to perform changes to the settings of the organizer
-     account, e.g. its name or display settings.
-
-* **Event permissions** allow actions on the level of an event. You can give the team access to all events of the
-  organizer (including future ones that are not yet created) or just a selected set of events. The specific permissions to choose from are:
-
-   * Can change event settings – This permission gives access to most areas of the control panel that are not controlled
-     by one of the other event permissions, especially those that are related to setting up and configuring the event.
-
-   * Can change product settings – This permission allows to create and modify products and objects that are closely
-     related to products, such as product categories, quotas, and questions.
-
-   * Can view orders – This permission allows viewing the list of orders and all individual order details, but not
-     changing anything about it. This also includes the various exports offered.
-
-   * Can change orders – This permission allows all actions that involve changing an order, such as changing the products
-     in an order, marking an order as paid or refunded, importing banking data, etc. This only works properly if the
-     same users also have the "Can view orders" permission.
-
-   * Can view vouchers – This permission allows viewing the list of vouchers including the voucher codes themselves and
-     their redemption status.
-
-   * 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.
-
-.. thumbnail:: ../../screens/organizer/team_edit.png
-   :align: center
-   :class: screenshot

doc/user/payments/banktransfer.rst

@@ -30,9 +30,3 @@ many orders could be processed correctly and how many could not. You can then go
 transfers from your bank statement that are not yet matched to an order. Using the input field and the buttons on the
 left of each transaction, you can manually enter an order code to match it to or just discard it from the list, e.g.
 if the transaction is not related to the event at all.
-
-
-.. tip:: If you aren't afraid of getting a bit more technical and your bank supports the HBCI/FinTS protocol (as most
-         German banks do), you can use `pretix-banktool`_ to fully automate this process.
-
-.. _pretix-banktool: https://github.com/pretix/pretix-banktool

doc/user/payments/fees.rst

@@ -1,5 +1,3 @@
-.. _payment-fees:
-
 Payment method fees
 ===================
 
@@ -20,9 +18,6 @@ might also decide to go for option one to make it easier for customers who don't
              legislation might already be in place or become relevant from January 2018 the latest. This is not
              legal advice. If in doubt, consult a lawyer or refrain from charging payment fees.
 
-If you go for the first option (as you should in the EU), you can just leave the payment fee fields in pretix' settings
-empty.
-
 If you go for the second option, you can configure pretix to charge the payment method fees to your user. You can
 define both an absolute fee as well as a percental fee based on the order total. If you do so, there are two
 different ways in which pretix can calculate the fee. Normally, it is fine to just go with the default setting, but
@@ -60,4 +55,4 @@ same 5 %, such that for a ticket with a list price of 100 € you will get your
     ===================================================== =============
 
     Due to the various rounding steps performed by pretix and by the payment provider, the end total on
-    your bank account might still vary by one cent.
+    your bank account might stil vary by one cent.

doc/user/payments/index.rst

@@ -1,10 +1,9 @@
-Payment settings
-================
+Accepting payments
+==================
 
 .. toctree::
    :maxdepth: 2
 
-   settings
    overview
    fees
    paypal

doc/user/payments/overview.rst

@@ -2,15 +2,33 @@ Payment method overview
 =======================
 
 pretix allows you to accept payments using a variety of payment methods to fit the needs of very different events.
-This page gives you a short overview over them and links to more detailed descriptions in some cases.
+This page gives you a short overview over them and links to more detailled descriptions in some cases.
 
 Payment methods are built as pretix plugins. For this reason, you might first need to enable a certain plugin at
-"Settings" → "Plugins" in your event settings. Then, you can configure them in detail at "Settings" → "Payment".
+"Settings" → "Plugins" in your event settings. Then, you can configure them in detail at "Settings" -> "Payment".
 
 If you host pretix on your own server, you might need to install a plugin first for some of the payment methods listed
 on this page as well as for additional ones.
 
-To get an overview of the officially supported payment methods and their pros and cons, head to the `pretix website`_.
-On these pages, you get more information on how to configure :ref:`stripe`, :ref:`paypal`, and :ref:`banktransfer`.
+:ref:`stripe`
+    Stripe is a US-based company that offers you an easy way to accept credit card payments from all over the world.
+    To accept payments with Stripe, you need to have a Stripe merchant account that is easy to create. Click on the link
+    above to get more details about the Stripe integration into pretix.
+
+:ref:`paypal`
+    If you want to accept online payments via PayPal, you can do so using pretix. You will need a PayPal merchant
+    account and it is a little bit complicated to obtain the required technical details, but we've got you covered.
+    Click on the link above to learn more.
+
+:ref:`banktransfer`
+    Classical IBAN wire transfers are a common payment method in central Europe that has the large benefit that it
+    often does not cause any additional fees. However, it requires you to invest some more effort as you need to
+    check your bank account for incoming payments regularly. We provide some tools to make this easier for you.
+
+SEPA debit
+    In some Europen countries, a very popular online payment method is SEPA direct debit. If you want to offer this
+    option in your pretix ticket shop, we provide a convenient plugin that allows users to enter their SEPA bank
+    account details and issue a SEPA mandate. You will then need to regularly download a SEPA XML file from pretix
+    and upload it to your bank's interface to actually perform the debits.
+
 
-.. _pretix website: https://pretix.eu/about/en/features/payment

doc/user/payments/paypal.rst

@@ -12,12 +12,6 @@ If you look into pretix' settings, you are required to fill in two keys:
 
 Unfortunately, it is not straightforward how to get those keys from PayPal's website. In order to do so, you
 need to go to `developer.paypal.com`_ to link the account to your pretix event.
-
-.. warning::
-
-   Unfortunately, PayPal tries to confuse you by having multiple APIs with different keys. You really need to
-   go to https://developer.paypal.com for the API we use, not to your normal account settings!
-
 Click on "Log In" in the top-right corner and log in with your PayPal account.
 
 .. image:: img/paypal2.png
@@ -52,8 +46,8 @@ webhooks. To create one, scroll a bit down and click "Add Webhook".
 .. image:: img/paypal7.png
    :class: screenshot
 
-Then, enter the webhook URL that you find on the pretix settings page. If you use pretix Hosted, this is always ``https://pretix.eu/_paypal/webhook/``.
-Tick the box "All events" and save.
+Then, enter the webhook URL that you find on the pretix settings page. It should look similar to the one in the
+screenshot but contain your event name. Tick the box "All events" and save.
 
 .. image:: img/paypal8.png
    :class: screenshot

doc/user/payments/settings.rst

@@ -1,65 +0,0 @@
-General settings
-================
-
-At "Settings" → "Payment", you can configure every aspect related to the payments you want to accept. The upper part
-of the page shows a number of general settings that affect all payment methods:
-
-.. thumbnail:: ../../screens/event/settings_payment.png
-   :align: center
-   :class: screenshot
-
-In particular, these are:
-
-Payment term in days
-  If a order has been created, it is supposed to be paid within this number of days. Of course, some payment methods
-  (like credit card) succeed immediately in most cases, but others don't (like bank transfer) and even credit card
-  payments might fail and you might want to give the customer a chance to try another credit card before losing their
-  ticket. Therefore, we recommend setting a few days here. If you are accepting bank transfers, we wouldn't recommend
-  less than 10 days.
-
-Last date of payments
-  There is probably no use for payments received after your event, so you can set a date that the payment deadline of
-  a new order will never exceed. This has precedence over the number of days configured above, so if I create an order
-  two days before the configured last date of payments, my payment term will only be two days, not ten. If you have
-  payment methods that always require some time (like bank transfer), you will later be able to selectively disable them
-  once the event comes closer.
-
-Only end payment terms on weekdays
-  If you check this box, the payment term calculated by the number of days configured above will never end on a Saturday
-  or a Sunday. If it technically would do so, the term is extended to the next Monday. Note that this currently does not
-  take into account national or bank holidays in your country.
-
-Automatically expire unpaid orders
-  If you check this box, orders will automatically go into "expired" state if the payment term is over and no payment
-  has been received. This means that the tickets will no longer be reserved for the customer and someone else can buy
-  them from the shop again. If you do not check this box, tickets do not become available again automatically, but you
-  can mark orders as expired manually.
-
-Accept late payments
-  If you check this box, incoming payments will accepted even if the order is in "expired" state -- as long as there
-  still is sufficient quota available and the last date of payments is not yet over. We recommend to check this in most
-  cases.
-
-Tax rule for payment fees
-  If you pass on the payment method fees to your customers, you will most likely also need to pay sales tax on those
-  fees. Here, you can configure the tax rate. Read :ref:`taxes` for more information.
-
-Below, you can configure the details of the various payment methods. You can find information on their different settings
-on the next pages of this documentation, but there are a few things most of them have in common:
-
-Enable payment method
-  Check this box to allow customers to use this method. At least one method needs to be active to process non-free orders.
-
-Additional fee (absolute and percentage), Calculate the fee from the total value including the fee
-  These fields allow you to pass fees on to your customers instead of paying them yourselves. Read :ref:`payment-fees`
-  for documentation on how this behaves.
-
-Available until
-  This allows you to set a date at which this payment method will automatically become disabled. This is useful if you
-  want people to be able to pay by card on the day before your event, but not by bank transfer, because it would not
-  arrive in time.
-
-Text on invoices
-  If you are using pretix' invoicing feature, this is a text that will be printed on every invoice for an order that
-  uses this payment method. You could use this to tell the accounting department of the invoice receiver that the payment
-  has already been received online or that it should be performed via bank transfer.

doc/user/payments/stripe.rst

@@ -3,10 +3,6 @@
 Stripe
 ======
 
-.. note:: If you use the Hosted version of pretix at pretix.eu, you do not need to copy API keys and create webhooks
-          any more. Instead, you can just click "Connect with Stripe" in pretix and everything will connect
-          automatically.
-
 To integrate Stripe with pretix, you first need to have an active Stripe merchant account. If you do not already have a
 Stripe account, you can create one on `stripe.com`_. Then, click on "API" in the left navigation of the Stripe
 Dashboard. As you can see in the following screenshot, you will be presented with two sets of API keys, one for test