Fix #575 -- Do not extend card expiry on failed card operations

.github/workflows/docs.yml

@@ -1,42 +0,0 @@
-name: Documentation
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - 'src/pretix/locale/**'
-      - 'src/pretix/static/**'
-      - 'src/tests/**'
-  pull_request:
-    branches: [ master ]
-    paths-ignore:
-      - 'src/pretix/locale/**'
-      - 'src/pretix/static/**'
-      - 'src/tests/**'
-
-jobs:
-  spelling:
-    name: Spellcheck
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.8
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - name: Install system packages
-        run: sudo apt install enchant hunspell aspell-en
-      - name: Install Dependencies
-        run: pip3 install --no-use-pep517 -Ur doc/requirements.txt
-      - name: Spellcheck docs
-        run: make spelling
-        working-directory: ./doc
-      - name:
-        run: '[ ! -s _build/spelling/output.txt ]'
-        working-directory: ./doc

.github/workflows/strings.yml

@@ -1,62 +0,0 @@
-name: Strings
-
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'doc/**'
-      - 'src/pretix/locale/**'
-  pull_request:
-    branches: [ master ]
-    paths:
-      - 'doc/**'
-      - 'src/pretix/locale/**'
-
-jobs:
-  compile:
-    runs-on: ubuntu-latest
-    name: Check gettext syntax
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.8
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - name: Install system packages
-        run: sudo apt install gettext
-      - name: Install Dependencies
-        run: pip3 install --no-use-pep517 -Ur src/requirements.txt
-      - name: Compile messages
-        run: python manage.py compilemessages
-        working-directory: ./src
-      - name: Compile jsi18n
-        run: python manage.py compilejsi18n
-        working-directory: ./src
-  spelling:
-    runs-on: ubuntu-latest
-    name: Spellcheck
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.8
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - name: Install system packages
-        run: sudo apt install enchant hunspell hunspell-de-de aspell-en aspell-de
-      - name: Install Dependencies
-        run: pip3 install --no-use-pep517 -Ur src/requirements/dev.txt
-      - name: Spellcheck translations
-        run: potypo
-        working-directory: ./src

.github/workflows/style.yml

@@ -1,55 +0,0 @@
-name: Code Style
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - 'src/pretix/locale/**'
-      - 'src/pretix/static/**'
-  pull_request:
-    branches: [ master ]
-    paths-ignore:
-      - 'src/pretix/locale/**'
-      - 'src/pretix/static/**'
-
-jobs:
-  isort:
-    name: isort
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.8
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - name: Install Dependencies
-        run: pip3 install --no-use-pep517 -Ur src/requirements/dev.txt
-      - name: Run isort
-        run: isort -c -rc -df .
-        working-directory: ./src
-  flake:
-    name: flake8
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.8
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - name: Install Dependencies
-        run: pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt
-      - name: Run flake8
-        run: flake8 .
-        working-directory: ./src

.github/workflows/tests.yml

@@ -1,75 +0,0 @@
-name: Tests
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - 'doc/**'
-      - 'src/pretix/locale/**'
-  pull_request:
-    branches: [ master ]
-    paths-ignore:
-      - 'doc/**'
-      - 'src/pretix/locale/**'
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    name: Tests
-    strategy:
-      matrix:
-        python-version: [3.6, 3.7, 3.8]
-        database: [sqlite, postgres, mysql]
-        exclude:
-          - database: mysql
-            python-version: 3.7
-          - database: sqlite
-            python-version: 3.7
-          - database: mysql
-            python-version: 3.6
-          - database: sqlite
-            python-version: 3.6
-    steps:
-      - uses: actions/checkout@v2
-      - uses: getong/mariadb-action@v1.1
-        with:
-          mariadb version: '10.4'
-          mysql database: 'pretix'
-          mysql root password: ''
-        if: matrix.database == 'mysql'
-      - uses: harmon758/postgresql-action@v1
-        with:
-          postgresql version: '11'
-          postgresql db: 'pretix'
-          postgresql user: 'postgres'
-          postgresql password: 'postgres'
-        if: matrix.database == 'postgres'
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
-        with:
-          python-version: ${{ matrix.python-version }}
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - name: Install system dependencies
-        run: sudo apt install gettext mysql-client
-      - name: Install Python dependencies
-        run: pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt mysqlclient psycopg2-binary
-      - name: Run checks
-        run: python manage.py check
-        working-directory: ./src
-      - name: Compile
-        working-directory: ./src
-        run: make all compress
-      - name: Run tests
-        working-directory: ./src
-        run: PRETIX_CONFIG_FILE=tests/travis_${{ matrix.database }}.cfg py.test -n 3 -p no:sugar --cov=./ --cov-report=xml --reruns 3 tests --maxfail=100
-      - name: Upload coverage
-        uses: codecov/codecov-action@v1
-        with:
-          file: src/coverage.xml
-          fail_ci_if_error: true
-        if: matrix.database == 'postgres' && matrix.python-version == '3.8'

.gitlab-ci.yml

@@ -5,11 +5,7 @@ tests:
         - virtualenv env
         - source env/bin/activate
         - pip install -U pip wheel setuptools
-        - XDG_CACHE_HOME=/cache pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt
-        - cd src
-        - python manage.py check
-        - make all compress
-        - py.test --reruns 3 -n 3 tests
+        - XDG_CACHE_HOME=/cache bash .travis.sh tests
     tags:
         - python3
     except:

.travis.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+set -e
+set -x
+
+echo "Executing job $1"
+
+if [ "$PRETIX_CONFIG_FILE" == "tests/travis_mysql.cfg" ]; then
+    mysql -u root -e 'CREATE DATABASE pretix DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;'
+    pip3 install -Ur src/requirements/mysql.txt
+fi
+
+if [ "$PRETIX_CONFIG_FILE" == "tests/travis_postgres.cfg" ]; then
+    psql -c 'create database travis_ci_test;' -U postgres
+fi
+
+if [ "$1" == "style" ]; then
+	XDG_CACHE_HOME=/cache pip3 install --no-use-pep517 -Ur src/requirements.txt -r src/requirements/dev.txt
+	cd src
+    flake8 .
+    isort -c -rc -df .
+fi
+if [ "$1" == "doctests" ]; then
+	XDG_CACHE_HOME=/cache pip3 install --no-use-pep517 -Ur doc/requirements.txt
+	cd doc
+	make doctest
+fi
+if [ "$1" == "doc-spelling" ]; then
+	XDG_CACHE_HOME=/cache pip3 install --no-use-pep517 -Ur doc/requirements.txt
+	cd doc
+	make spelling
+	if [ -s _build/spelling/output.txt ]; then
+		exit 1
+	fi
+fi
+if [ "$1" == "translation-spelling" ]; then
+	XDG_CACHE_HOME=/cache pip3 install --no-use-pep517 -Ur src/requirements/dev.txt
+	cd src
+	potypo
+fi
+if [ "$1" == "tests" ]; then
+	pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt
+	cd src
+	python manage.py check
+	make all compress
+	py.test --reruns 5 -n 3 tests
+fi
+if [ "$1" == "tests-cov" ]; then
+	pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt
+	cd src
+	python manage.py check
+	make all compress
+	coverage run -m py.test --reruns 5 tests && codecov
+fi
+if [ "$1" == "plugins" ]; then
+	pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt
+	cd src
+	python setup.py develop
+	make all compress
+
+	pushd ~
+    git clone --depth 1 https://github.com/pretix/pretix-cartshare.git
+    cd pretix-cartshare
+    python setup.py develop
+    make
+	py.test --reruns 5 tests
+    popd
+
+fi

.travis.yml

@@ -0,0 +1,45 @@
+language: python
+dist: xenial
+sudo: false
+install:
+  - pip install -U pip wheel setuptools
+script:
+  - bash .travis.sh $JOB
+cache:
+  directories:
+    - $HOME/.cache/pip
+services:
+  - mysql
+  - postgresql
+matrix:
+  include:
+    - python: 3.7
+      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_sqlite.cfg
+    - python: 3.7
+      env: JOB=tests-cov PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
+    - python: 3.7
+      env: JOB=style
+    - python: 3.7
+      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_mysql.cfg
+    - python: 3.7
+      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
+    - python: 3.5
+      env: JOB=tests PRETIX_CONFIG_FILE=tests/travis_postgres.cfg
+    - python: 3.7
+      env: JOB=doc-spelling
+    - python: 3.7
+      env: JOB=translation-spelling
+addons:
+  postgresql: "9.4"
+  mariadb: '10.3'
+  apt:
+      packages:
+          - enchant
+          - myspell-de-de
+          - aspell-en
+          - sqlite3
+  sources:
+    - travis-ci/sqlite3
+branches:
+  except:
+  - /^weblate-.*/

README.rst

@@ -4,10 +4,11 @@ pretix
 .. image:: https://img.shields.io/pypi/v/pretix.svg
    :target: https://pypi.python.org/pypi/pretix
 
-.. image:: https://github.com/pretix/pretix/workflows/Documentation/badge.svg
+.. image:: https://readthedocs.org/projects/pretix/badge/?version=latest
    :target: https://docs.pretix.eu/en/latest/
 
-.. image:: https://github.com/pretix/pretix/workflows/Tests/badge.svg
+.. image:: https://travis-ci.org/pretix/pretix.svg?branch=master
+   :target: https://travis-ci.org/pretix/pretix
 
 .. image:: https://codecov.io/gh/pretix/pretix/branch/master/graph/badge.svg
    :target: https://codecov.io/gh/pretix/pretix

doc/admin/config.rst

@@ -92,7 +92,7 @@ Example::
 
 ``trust_x_forwarded_proto``
     Specifies whether the ``X-Forwarded-Proto`` header can be trusted. Only set to ``on`` if you have a reverse
-    proxy that actively removes and re-adds the header to make sure the correct value is set.
+    proxy that actively removes and re-adds the header to make sure the correct client IP is the first value.
     Defaults to ``off``.
 
 

doc/admin/installation/docker_smallscale.rst

@@ -182,7 +182,7 @@ named ``/etc/systemd/system/pretix.service`` with the following content::
         -v /var/pretix-data:/data \
         -v /etc/pretix:/etc/pretix \
         -v /var/run/redis:/var/run/redis \
-        --sysctl net.core.somaxconn=4096 \
+        --sysctl net.core.somaxconn=4096
         pretix/standalone:stable all
     ExecStop=/usr/bin/docker stop %n
 

doc/admin/installation/manual_smallscale.rst

@@ -12,7 +12,7 @@ solution with many things readily set-up, look at :ref:`dockersmallscale`.
              get it right. If you're not feeling comfortable managing a Linux server, check out our hosting and service
              offers at `pretix.eu`_.
 
-We tested this guide on the Linux distribution **Debian 10.0** but it should work very similar on other
+We tested this guide on the Linux distribution **Debian 8.0** but it should work very similar on other
 modern distributions, especially on all systemd-based ones.
 
 Requirements
@@ -133,7 +133,7 @@ command if you're running MySQL::
 
     (venv)$ pip3 install "pretix[postgres]" gunicorn
 
-Note that you need Python 3.6 or newer. You can find out your Python version using ``python -V``.
+Note that you need Python 3.5 or newer. You can find out your Python version using ``python -V``.
 
 We also need to create a data directory::
 

doc/api/resources/checkinlists.rst

@@ -30,9 +30,6 @@ position_count                        integer                    Number of ticke
 checkin_count                         integer                    Number of check-ins performed on this list (read-only).
 include_pending                       boolean                    If ``true``, the check-in list also contains tickets from orders in pending state.
 auto_checkin_sales_channels           list of strings            All items on the check-in list will be automatically marked as checked-in when purchased through any of the listed sales channels.
-allow_multiple_entries                boolean                    If ``true``, subsequent scans of a ticket on this list should not show a warning but instead be stored as an additional check-in.
-allow_entry_after_exit                boolean                    If ``true``, subsequent scans of a ticket on this list are valid if the last scan of the ticket was an exit scan.
-rules                                 object                     Custom check-in logic. The contents of this field are currently not considered a stable API and modifications through the API are highly discouraged.
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.10
@@ -51,11 +48,6 @@ rules                                 object                     Custom check-in
 
     The ``auto_checkin_sales_channels`` field has been added.
 
-.. versionchanged:: 3.9
-
-    The ``subevent`` attribute may now be ``null`` inside event series. The ``allow_multiple_entries``,
-    ``allow_entry_after_exit``, and ``rules`` attributes have been added.
-
 Endpoints
 ---------
 
@@ -97,9 +89,6 @@ Endpoints
             "limit_products": [],
             "include_pending": false,
             "subevent": null,
-            "allow_multiple_entries": false,
-            "allow_entry_after_exit": true,
-            "rules": {},
             "auto_checkin_sales_channels": [
               "pretixpos"
             ]
@@ -144,9 +133,6 @@ Endpoints
         "limit_products": [],
         "include_pending": false,
         "subevent": null,
-        "allow_multiple_entries": false,
-        "allow_entry_after_exit": true,
-        "rules": {},
         "auto_checkin_sales_channels": [
           "pretixpos"
         ]
@@ -243,8 +229,6 @@ Endpoints
         "all_products": false,
         "limit_products": [1, 2],
         "subevent": null,
-        "allow_multiple_entries": false,
-        "allow_entry_after_exit": true,
         "auto_checkin_sales_channels": [
           "pretixpos"
         ]
@@ -267,8 +251,6 @@ Endpoints
         "limit_products": [1, 2],
         "include_pending": false,
         "subevent": null,
-        "allow_multiple_entries": false,
-        "allow_entry_after_exit": true,
         "auto_checkin_sales_channels": [
           "pretixpos"
         ]
@@ -321,8 +303,6 @@ Endpoints
         "limit_products": [1, 2],
         "include_pending": false,
         "subevent": null,
-        "allow_multiple_entries": false,
-        "allow_entry_after_exit": true,
         "auto_checkin_sales_channels": [
           "pretixpos"
         ]
@@ -716,7 +696,6 @@ Order position endpoints
      ``canceled_supported`` to ``true``, otherwise these orders return ``unpaid``.
    * ``already_redeemed`` - Ticket already has been redeemed
    * ``product`` - Tickets with this product may not be scanned at this device
-   * ``rules`` - Check-in prevented by a user-defined rule
 
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch

doc/api/resources/giftcards.rst

@@ -18,8 +18,6 @@ secret                                string                     Gift card code
 value                                 money (string)             Current gift card value
 currency                              string                     Currency of the value (can not be modified later)
 testmode                              boolean                    Whether this is a test gift card
-expires                               datetime                   Expiry date (or ``null``)
-conditions                            string                     Special terms and conditions for this card (or ``null``)
 ===================================== ========================== =======================================================
 
 Endpoints
@@ -55,8 +53,6 @@ Endpoints
             "secret": "HLBYVELFRC77NCQY",
             "currency": "EUR",
             "testmode": false,
-            "expires": null,
-            "conditions": null,
             "value": "13.37"
           }
         ]
@@ -96,8 +92,6 @@ Endpoints
         "secret": "HLBYVELFRC77NCQY",
         "currency": "EUR",
         "testmode": false,
-        "expires": null,
-        "conditions": null,
         "value": "13.37"
       }
 
@@ -140,8 +134,6 @@ Endpoints
         "secret": "HLBYVELFRC77NCQY",
         "testmode": false,
         "currency": "EUR",
-        "expires": null,
-        "conditions": null,
         "value": "13.37"
       }
 
@@ -188,8 +180,6 @@ Endpoints
         "secret": "HLBYVELFRC77NCQY",
         "testmode": false,
         "currency": "EUR",
-        "expires": null,
-        "conditions": null,
         "value": "14.00"
       }
 
@@ -232,8 +222,6 @@ Endpoints
         "secret": "HLBYVELFRC77NCQY",
         "currency": "EUR",
         "testmode": false,
-        "expires": null,
-        "conditions": null,
         "value": "15.37"
       }
 

doc/api/resources/orders.rst

@@ -151,10 +151,6 @@ last_modified                         datetime                   Last modificati
 
    The ``order.fees.canceled`` attribute has been added.
 
-.. versionchanged:: 3.8
-
-   The ``reactivate`` operation has been added.
-
 
 .. _order-position-resource:
 
@@ -177,13 +173,6 @@ price                                 money (string)             Price of this p
 attendee_name                         string                     Specified attendee name for this position (or ``null``)
 attendee_name_parts                   object of strings          Decomposition of attendee name (i.e. given name, family name)
 attendee_email                        string                     Specified attendee email address for this position (or ``null``)
-company                               string                     Attendee company name (or ``null``)
-street                                string                     Attendee street (or ``null``)
-zipcode                               string                     Attendee ZIP code (or ``null``)
-city                                  string                     Attendee city (or ``null``)
-country                               string                     Attendee country code (or ``null``)
-state                                 string                     Attendee state (ISO 3166-2 code). Only supported in
-                                                                 AU, BR, CA, CN, MY, MX, and US, otherwise ``null``.
 voucher                               integer                    Internal ID of the voucher used for this position (or ``null``)
 tax_rate                              decimal (string)           VAT rate applied for this position
 tax_value                             money (string)             VAT included in this position
@@ -195,7 +184,6 @@ pseudonymization_id                   string                     A random ID, e.
 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
-├ type                                string                     Type of scan (defaults to ``entry``)
 └ auto_checked_in                     boolean                    Indicates if this check-in been performed automatically by the system
 downloads                             list of objects            List of ticket download options
 ├ output                              string                     Ticket output provider (e.g. ``pdf``, ``passbook``)
@@ -248,14 +236,6 @@ pdf_data                              object                     Data object req
 
   The attribute ``canceled`` has been added.
 
-.. versionchanged:: 3.8
-
-  The attributes ``company``, ``street``, ``zipcode``, ``city``, ``country``, and ``state`` have been added.
-
-.. versionchanged:: 3.9
-
-  The ``checkin.type`` attribute has been added.
-
 .. _order-payment-resource:
 
 Order payment resource
@@ -400,12 +380,6 @@ List of all orders
                   "full_name": "Peter",
                 },
                 "attendee_email": null,
-                "company": "Sample company",
-                "street": "Test street 12",
-                "zipcode": "12345",
-                "city": "Testington",
-                "country": "DE",
-                "state": null,
                 "voucher": null,
                 "tax_rate": "0.00",
                 "tax_value": "0.00",
@@ -418,7 +392,6 @@ List of all orders
                 "checkins": [
                   {
                     "list": 44,
-                    "type": "entry",
                     "datetime": "2017-12-25T12:45:23Z",
                     "auto_checked_in": false
                   }
@@ -563,12 +536,6 @@ Fetching individual orders
               "full_name": "Peter",
             },
             "attendee_email": null,
-            "company": "Sample company",
-            "street": "Test street 12",
-            "zipcode": "12345",
-            "city": "Testington",
-            "country": "DE",
-            "state": null,
             "voucher": null,
             "tax_rate": "0.00",
             "tax_rule": null,
@@ -581,7 +548,6 @@ Fetching individual orders
             "checkins": [
               {
                 "list": 44,
-                "type": "entry",
                 "datetime": "2017-12-25T12:45:23Z",
                 "auto_checked_in": false
               }
@@ -850,9 +816,9 @@ Creating orders
    * ``consume_carts`` (optional) – A list of cart IDs. All cart positions with these IDs will be deleted if the
      order creation is successful. Any quotas or seats that become free by this operation will be credited to your order
      creation.
-   * ``email`` (optional)
+   * ``email``
    * ``locale``
-   * ``sales_channel`` (optional)
+   * ``sales_channel``
    * ``payment_provider`` (optional) – The identifier of the payment provider set for this order. This needs to be an
      existing payment provider. You should use ``"free"`` for free orders, and we strongly advise to use ``"manual"``
      for all orders you create as paid. This field is optional when the order status is ``"n"`` or the order total is
@@ -885,21 +851,15 @@ Creating orders
 
       * ``positionid`` (optional, see below)
       * ``item``
-      * ``variation`` (optional)
+      * ``variation``
       * ``price`` (optional, if set to ``null`` or missing the price will be computed from the given product)
       * ``seat`` (The ``seat_guid`` attribute of a seat. Required when the specified ``item`` requires a seat, otherwise must be ``null``.)
-      * ``attendee_name`` **or** ``attendee_name_parts`` (optional)
+      * ``attendee_name`` **or** ``attendee_name_parts``
       * ``voucher`` (optional, the ``code`` attribute of a valid voucher)
-      * ``attendee_email`` (optional)
-      * ``company`` (optional)
-      * ``street`` (optional)
-      * ``zipcode`` (optional)
-      * ``city`` (optional)
-      * ``country`` (optional)
-      * ``state`` (optional)
+      * ``attendee_email``
       * ``secret`` (optional)
       * ``addon_to`` (optional, see below)
-      * ``subevent`` (optional)
+      * ``subevent``
       * ``answers``
 
         * ``question``
@@ -1097,42 +1057,6 @@ Order state operations
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
    :statuscode 404: The requested order does not exist.
 
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/reactivate/
-
-   Reactivates a canceled order. This will set the order to pending or paid state. Only possible if all products are
-   still available.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/reactivate/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "code": "ABC12",
-        "status": "n",
-        ...
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param code: The ``code`` field of the order to modify
-   :statuscode 200: no error
-   :statuscode 400: The order cannot be reactivated
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-   :statuscode 404: The requested order does not exist.
-
 .. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/mark_pending/
 
    Marks a paid order as unpaid.
@@ -1478,7 +1402,6 @@ List of all order positions
             "checkins": [
               {
                 "list": 44,
-                "type": "entry",
                 "datetime": "2017-12-25T12:45:23Z",
                 "auto_checked_in": false
               }
@@ -1584,7 +1507,6 @@ Fetching individual positions
         "checkins": [
           {
             "list": 44,
-            "type": "entry",
             "datetime": "2017-12-25T12:45:23Z",
             "auto_checked_in": false
           }

doc/api/webhooks.rst

@@ -70,9 +70,6 @@ and ``checkin_list``.
              only include the minimum amount of data necessary for you to fetch the changed objects from our
              :ref:`rest-api` in an authenticated way.
 
-.. warning:: In very rare cases, you could receive the same webhook notification twice. We try to avoid it, but we
-             prefer it over missing a notification.
-
 If you want to further prevent others from accessing your webhook URL, you can also use `Basic authentication`_ and
 supply the URL to us in the format of ``https://username:password@domain.com/path/``.
 We recommend that you use HTTPS for your webhook URL and might require it in the future. If HTTPS is used, we require

doc/development/api/customview.rst

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

doc/development/api/general.rst

@@ -20,7 +20,7 @@ Order events
 There are multiple signals that will be sent out in the ordering cycle:
 
 .. automodule:: pretix.base.signals
-   :members: validate_cart, validate_cart_addons, validate_order, order_fee_calculation, order_paid, order_placed, order_canceled, order_reactivated, order_expired, order_modified, order_changed, order_approved, order_denied, order_fee_type_name, allow_ticket_download, order_split, order_gracefully_delete, invoice_line_text
+   :members: validate_cart, validate_cart_addons, validate_order, order_fee_calculation, order_paid, order_placed, order_canceled, order_expired, order_modified, order_changed, order_approved, order_denied, order_fee_type_name, allow_ticket_download, order_split, order_gracefully_delete, invoice_line_text
 
 Check-ins
 """""""""
@@ -33,11 +33,11 @@ Frontend
 --------
 
 .. automodule:: pretix.presale.signals
-   :members: html_head, html_footer, footer_link, front_page_top, front_page_bottom, front_page_bottom_widget, fee_calculation_for_cart, contact_form_fields, question_form_fields, checkout_confirm_messages, checkout_confirm_page_content, checkout_all_optional, html_page_header, sass_preamble, sass_postamble, render_seating_plan, checkout_flow_steps, position_info, position_info_top, item_description
+   :members: html_head, html_footer, footer_link, front_page_top, front_page_bottom, front_page_bottom_widget, fee_calculation_for_cart, contact_form_fields, question_form_fields, checkout_confirm_messages, checkout_confirm_page_content, checkout_all_optional, html_page_header, sass_preamble, sass_postamble, render_seating_plan, checkout_flow_steps, position_info, item_description
 
 
 .. automodule:: pretix.presale.signals
-   :members: order_info, order_info_top, order_meta_from_request
+   :members: order_info, order_meta_from_request
 
 Request flow
 """"""""""""

doc/development/api/plugins.rst

@@ -61,7 +61,7 @@ A working example would be::
         from pretix.base.plugins import PluginConfig
     except ImportError:
         raise RuntimeError("Please use pretix 2.7 or above to run this plugin!")
-    from django.utils.translation import gettext_lazy as _
+    from django.utils.translation import ugettext_lazy as _
 
 
     class PaypalApp(PluginConfig):

doc/development/api/ticketoutput.rst

@@ -72,10 +72,6 @@ The output class
 
    .. autoattribute:: download_button_icon
 
-   .. autoattribute:: multi_download_button_text
-
-   .. autoattribute:: long_download_button_text
-
    .. autoattribute:: preview_allowed
 
    .. autoattribute:: javascript_required

doc/development/contribution/style.rst

@@ -18,7 +18,7 @@ Coding style and quality
 * We expect all new code to come with proper tests. When writing new tests, please write them using `pytest-style`_
   test functions and raw ``assert`` statements. Use `fixtures`_ to prevent repetitive code. Some old parts of pretix'
   test suite are in the style of Python's unit test module. If you extend those files, you might continue in this style,
-  but please use ``pytest`` style for any new test files.
+  but please use pytest style for any new test files.
 
 * Please keep the first line of your commit messages short. When referencing an issue, please phrase it like
   ``Fix #123 -- Problems with order creation`` or ``Refs #123 -- Fix this part of that bug``.

doc/development/implementation/logging.rst

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

doc/plugins/digital.rst

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

doc/plugins/index.rst

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

doc/user/events/guides/timeslots.rst

@@ -1,94 +0,0 @@
-.. _timeslots:
-
-Use case: Time slots
-====================
-
-A more advanced use case of pretix is using pretix for time-slot-based access to an area with a limited visitor
-capacity, such as a museum or other attraction. This guide will show you the quickest way to set up such an event
-with pretix.
-
-First of all, when creating your event, you need to select that your event represents an "event series":
-
-
-.. thumbnail:: ../../../screens/event/create_step1.png
-   :align: center
-   :class: screenshot
-
-You can click :ref:`here <subevents>` for a more general description of event series with pretix, but everything you
-need to know is in this chapter as well.
-
-General event setup
--------------------
-
-Before you go further, set up your products that you want to sell for each time slot, such as different types of entry.
-
-Creating slots
---------------
-
-To create the time slots, you need to create a number of "dates" in the event series. Select "Dates" in the navigation
-menu on the left side and click "Create many new dates". Then, first enter the pattern of your opening days. In the
-example, the museum is open week Tuesday to Sunday. We recommend to create the slots for a few weeks at a time, but not
-e.g. for a full year, since it will be more complicated to change things later.
-
-.. thumbnail:: ../../../screens/event/timeslots_create.png
-   :align: center
-   :class: screenshot
-
-Then, scroll to the times section and create your time slots. You can do any interval you like. If you have different
-opening times on different week days, you will need to go through the creation process multiple times.
-
-.. thumbnail:: ../../../screens/event/timeslots_create_2.png
-   :align: center
-   :class: screenshot
-
-Scroll further down and create one or multiple quotas that define how many people can book a ticket for that time slot.
-In this example, 50 people in total are allowed to enter within every slot:
-
-.. thumbnail:: ../../../screens/event/timeslots_create_3.png
-   :align: center
-   :class: screenshot
-
-Do **not** create a check-in list at this point. We will deal with this further below in the guide.
-Now, press "Save" to create your slots.
-
-.. warning:: If you create a lot of time slots at once, the server might need a few minutes to create them all in our
-             system. If you receive an error page because it took too long, please do not try again immediately but wait
-             for a few minutes. Most likely, the slots will be created successfully even though you saw an error.
-
-Event settings
---------------
-
-We recommend that you navigate to "Settings" > "General" > "Display" and set the settings "Default overview style"
-to "Week calendar":
-
-.. thumbnail:: ../../../screens/event/timeslots_settings_1.png
-   :align: center
-   :class: screenshot
-
-Now, your ticket shop should give users a nice weekly overview over all time slots and their availability:
-
-.. thumbnail:: ../../../screens/event/timeslots_presale.png
-   :align: center
-   :class: screenshot
-
-Check-in
---------
-
-If you want to scan people at the entrance of your event and only admit them at their designated time, we recommend
-the following setup: Go to "Check-in" in the main navigation on the left and create a new check-in list. Give it a name
-and do *not* choose a specific data. We will use one check-in list for all dates. Then, go to the "Advanced" tab at
-the top and set up two restrictions to make sure people can only get in during the time slot they registered for.
-You can create the rules exactly like shown in the following screenshot:
-
-.. thumbnail:: ../../../screens/event/timeslots_checkinlists.png
-   :align: center
-   :class: screenshot
-
-If you want, you can enter a tolerance of e.g. "10" if you want to be a little bit more relaxed and admit people up to
-10 minutes before or after their time slot.
-
-Now, download our `Android or Desktop app`_ and register it to your account. The app will ask you to select one the
-time slots, but it does not matter, you can select any one of them and then select your newly created check-in list.
-That's it, you're good to go!
-
-.. _Android or Desktop app: https://pretix.eu/about/en/scan

doc/user/events/structureguide.rst

@@ -344,13 +344,3 @@ In addition to your normal conference quota, you need to create an unlimited quo
 Then, head to the **Bundled products** tab of the "conference ticket" and add the "conference food" as a bundled product with a **designated price** of € 150.
 
 Once a customer tries to buy the € 450 conference ticket, a sub-product will be added and the price will automatically be split into the two components, leading to a correct computation of taxes.
-
-You can find more use cases in these specialized guides:
-
-More use cases
---------------
-
-.. toctree::
-   :maxdepth: 1
-
-   guides/timeslots

doc/user/events/widget.rst

@@ -136,15 +136,10 @@ If you want to include all your public events, you can just reference your organ
 
    <pretix-widget event="https://pretix.eu/demo/"></pretix-widget>
 
-There is an optional ``style`` parameter that let's you choose between a monthly calendar view, a week view and a list
-view. If you do not set it, the choice will be taken from your organizer settings::
+There is an optional ``style`` parameter that let's you choose between a calendar view and a list view. If you do not set it, the choice will be taken from your organizer settings::
 
    <pretix-widget event="https://pretix.eu/demo/series/" style="list"></pretix-widget>
    <pretix-widget event="https://pretix.eu/demo/series/" style="calendar"></pretix-widget>
-   <pretix-widget event="https://pretix.eu/demo/series/" style="week"></pretix-widget>
-
-If you have more than 100 events, the system might refuse to show a list view and always show a calendar for performance
-reasons instead.
 
 You can see an example here:
 

doc/user/faq.rst

@@ -58,6 +58,28 @@ method without creating a new order. If payment deadlines were dependent on the
 forth could either allow someone to extend their deadline forever, or render someones order invalid by moving the date
 back in the past.
 
+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.
+
 Why does pretix not support any 1D (linear) bar codes?
 ------------------------------------------------------
 

doc/user/organizers/domain.rst

@@ -14,23 +14,30 @@ and with pretix, you can do this. On this page, you find out the necessary steps
 With the pretix.eu hosted service
 ---------------------------------
 
-Go to "Organizers" in the backend and select your organizer account. Then, go to "Settings" and "Custom Domain".
-
-This page will show you instructions on how to set up your own domain. Basically, it works like this:
+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 the one shown on the "Custom Domain" page in pretix' backend.
+The value of the record should be ``www.pretix.eu``.
+
+Step 2: Wait for the DNS entry to propagate
+###########################################
 
 Submit your changes and wait a bit, it can regularly take up to three hours for DNS changes to propagate to the caches
 of all DNS servers. You can try checking by accessing your new subdomain, ``http://tickets.awesomepartycorp.com``.
 If DNS was changed successfully, you should see a SSL certificate error. If you ignore the error and access the page
 anyways, you should get a pretix-themed error page with the headline "Unknown domain".
 
-Now, tell us about your domain on the "Custom Domain" page to get started.
+Step 3: Tell us
+###############
+
+Write an email to support@pretix.eu, naming your new domain and your organizer account. We will then generate a SSL
+certificate for you (for free!) and configure the domain.
+
 
 With a custom pretix installation
 ---------------------------------

doc/user/payments/settings.rst

@@ -1,8 +1,8 @@
 General settings
 ================
 
-At "Settings" → "Payment", you can configure every aspect related to the payments you want to accept. The "Deadline"
-and "Advanced" tabs of the page show a number of general settings that affect all payment methods:
+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

src/pretix/__init__.py

@@ -1 +1 @@
-__version__ = "3.9.0"
+__version__ = "3.7.0.dev0"

src/pretix/api/models.py

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

src/pretix/api/serializers/cart.py

@@ -2,7 +2,7 @@ from datetime import timedelta
 
 from django.utils.crypto import get_random_string
 from django.utils.timezone import now
-from django.utils.translation import gettext_lazy
+from django.utils.translation import ugettext_lazy
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
@@ -56,7 +56,7 @@ class CartPositionCreateSerializer(I18nAwareModelSerializer):
                           else validated_data.get('item').quotas.filter(subevent=validated_data.get('subevent')))
             if len(new_quotas) == 0:
                 raise ValidationError(
-                    gettext_lazy('The product "{}" is not assigned to a quota.').format(
+                    ugettext_lazy('The product "{}" is not assigned to a quota.').format(
                         str(validated_data.get('item'))
                     )
                 )
@@ -64,8 +64,8 @@ class CartPositionCreateSerializer(I18nAwareModelSerializer):
                 avail = quota.availability()
                 if avail[0] != Quota.AVAILABILITY_OK or (avail[1] is not None and avail[1] < 1):
                     raise ValidationError(
-                        gettext_lazy('There is not enough quota available on quota "{}" to perform '
-                                     'the operation.').format(
+                        ugettext_lazy('There is not enough quota available on quota "{}" to perform '
+                                      'the operation.').format(
                             quota.name
                         )
                     )
@@ -88,7 +88,7 @@ class CartPositionCreateSerializer(I18nAwareModelSerializer):
                 else:
                     validated_data['seat'] = seat
                     if not seat.is_available(sales_channel=validated_data.get('sales_channel', 'web')):
-                        raise ValidationError(gettext_lazy('The selected seat "{seat}" is not available.').format(seat=seat.name))
+                        raise ValidationError(ugettext_lazy('The selected seat "{seat}" is not available.').format(seat=seat.name))
             elif seated:
                 raise ValidationError('The specified product requires to choose a seat.')
 

src/pretix/api/serializers/checkin.py

@@ -1,4 +1,4 @@
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext as _
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
@@ -14,8 +14,7 @@ class CheckinListSerializer(I18nAwareModelSerializer):
     class Meta:
         model = CheckinList
         fields = ('id', 'name', 'all_products', 'limit_products', 'subevent', 'checkin_count', 'position_count',
-                  'include_pending', 'auto_checkin_sales_channels', 'allow_multiple_entries', 'allow_entry_after_exit',
-                  'rules')
+                  'include_pending', 'auto_checkin_sales_channels')
 
     def validate(self, data):
         data = super().validate(data)
@@ -29,7 +28,9 @@ class CheckinListSerializer(I18nAwareModelSerializer):
                 raise ValidationError(_('One or more items do not belong to this event.'))
 
         if event.has_subevents:
-            if full_data.get('subevent') and event != full_data.get('subevent').event:
+            if not full_data.get('subevent'):
+                raise ValidationError(_('Subevent cannot be null for event series.'))
+            if event != full_data.get('subevent').event:
                 raise ValidationError(_('The subevent does not belong to this event.'))
         else:
             if full_data.get('subevent'):

src/pretix/api/serializers/event.py

@@ -2,7 +2,7 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.utils.functional import cached_property
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext as _
 from django_countries.serializers import CountryFieldMixin
 from hierarkey.proxy import HierarkeyProxy
 from pytz import common_timezones
@@ -532,9 +532,6 @@ class EventSettingsSerializer(serializers.Serializer):
         'checkout_email_helptext',
         'presale_has_ended_text',
         'voucher_explanation_text',
-        'banner_text',
-        'banner_text_bottom',
-        'show_dates_on_frontpage',
         'show_date_to',
         'show_times',
         'show_items_outside_presale_period',
@@ -555,16 +552,11 @@ class EventSettingsSerializer(serializers.Serializer):
         'meta_noindex',
         'redirect_to_checkout_directly',
         'frontpage_subevent_ordering',
-        'event_list_type',
         'frontpage_text',
         'attendee_names_asked',
         'attendee_names_required',
         'attendee_emails_asked',
         'attendee_emails_required',
-        'attendee_addresses_asked',
-        'attendee_addresses_required',
-        'attendee_company_asked',
-        'attendee_company_required',
         'confirm_text',
         'order_email_asked_twice',
         'payment_term_days',
@@ -618,10 +610,6 @@ class EventSettingsSerializer(serializers.Serializer):
         'cancel_allow_user_paid_keep',
         'cancel_allow_user_paid_keep_fees',
         'cancel_allow_user_paid_keep_percentage',
-        'cancel_allow_user_paid_adjust_fees',
-        'cancel_allow_user_paid_adjust_fees_explanation',
-        'cancel_allow_user_paid_refund_as_giftcard',
-        'cancel_allow_user_paid_require_approval',
     ]
 
     def __init__(self, *args, **kwargs):

src/pretix/api/serializers/fields.py

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

src/pretix/api/serializers/item.py

@@ -3,7 +3,7 @@ from decimal import Decimal
 from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.utils.functional import cached_property
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 from rest_framework import serializers
 
 from pretix.api.serializers.event import MetaDataField
@@ -287,8 +287,8 @@ class QuestionSerializer(I18nAwareModelSerializer):
         if value:
             if value.type not in (Question.TYPE_CHOICE, Question.TYPE_BOOLEAN, Question.TYPE_CHOICE_MULTIPLE):
                 raise ValidationError('Question dependencies can only be set to boolean or choice questions.')
-            if value == self.instance:
-                raise ValidationError('A question cannot depend on itself.')
+        if value == self.instance:
+            raise ValidationError('A question cannot depend on itself.')
         return value
 
     def validate(self, data):

src/pretix/api/serializers/order.py

@@ -5,7 +5,7 @@ from decimal import Decimal
 import pycountry
 from django.db.models import F, Q
 from django.utils.timezone import now
-from django.utils.translation import gettext_lazy
+from django.utils.translation import ugettext_lazy
 from django_countries.fields import Country
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
@@ -39,7 +39,7 @@ class CompatibleCountryField(serializers.Field):
     def to_representation(self, instance: InvoiceAddress):
         if instance.country:
             return str(instance.country)
-        elif hasattr(instance, 'country_old'):
+        else:
             return instance.country_old
 
 
@@ -122,7 +122,7 @@ class AnswerSerializer(I18nAwareModelSerializer):
 class CheckinSerializer(I18nAwareModelSerializer):
     class Meta:
         model = Checkin
-        fields = ('datetime', 'list', 'auto_checked_in', 'type')
+        fields = ('datetime', 'list', 'auto_checked_in')
 
 
 class OrderDownloadsField(serializers.Field):
@@ -211,12 +211,10 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
     order = serializers.SlugRelatedField(slug_field='code', read_only=True)
     pdf_data = PdfDataSerializer(source='*')
     seat = InlineSeatSerializer(read_only=True)
-    country = CompatibleCountryField(source='*')
 
     class Meta:
         model = OrderPosition
         fields = ('id', 'order', 'positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
-                  'company', 'street', 'zipcode', 'city', 'country', 'state',
                   'attendee_email', 'voucher', 'tax_rate', 'tax_value', 'secret', 'addon_to', 'subevent', 'checkins',
                   'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat', 'canceled')
 
@@ -518,22 +516,12 @@ class OrderPositionCreateSerializer(I18nAwareModelSerializer):
                                      max_digits=10)
     voucher = serializers.SlugRelatedField(slug_field='code', queryset=Voucher.objects.none(),
                                            required=False, allow_null=True)
-    country = CompatibleCountryField(source='*')
 
     class Meta:
         model = OrderPosition
         fields = ('positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts', 'attendee_email',
-                  'company', 'street', 'zipcode', 'city', 'country', 'state',
                   'secret', 'addon_to', 'subevent', 'answers', 'seat', 'voucher')
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        for k, v in self.fields.items():
-            if k in ('company', 'street', 'zipcode', 'city', 'country', 'state'):
-                v.required = False
-                v.allow_blank = True
-                v.allow_null = True
-
     def validate_secret(self, secret):
         if secret and OrderPosition.all.filter(order__event=self.context['event'], secret=secret).exists():
             raise ValidationError(
@@ -588,24 +576,6 @@ class OrderPositionCreateSerializer(I18nAwareModelSerializer):
             )
         if data.get('attendee_name_parts') and '_scheme' not in data.get('attendee_name_parts'):
             data['attendee_name_parts']['_scheme'] = self.context['request'].event.settings.name_scheme
-
-        if data.get('country'):
-            if not pycountry.countries.get(alpha_2=data.get('country')):
-                raise ValidationError(
-                    {'country': ['Invalid country code.']}
-                )
-
-        if data.get('state'):
-            cc = str(data.get('country') or self.instance.country or '')
-            if cc not in COUNTRIES_WITH_STATE_IN_ADDRESS:
-                raise ValidationError(
-                    {'state': ['States are not supported in country "{}".'.format(cc)]}
-                )
-            if not pycountry.subdivisions.get(code=cc + '-' + data.get('state')):
-                raise ValidationError(
-                    {'state': ['"{}" is not a known subdivision of the country "{}".'.format(data.get('state'), cc)]}
-                )
-
         return data
 
 
@@ -751,7 +721,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                 sales_channel = get_all_sales_channels()[self.initial_data['sales_channel']]
 
                 if testmode and not sales_channel.testmode_supported:
-                    raise ValidationError('This sales channel does not provide support for test mode.')
+                    raise ValidationError('This sales channel does not provide support for testmode.')
             except KeyError:
                 # We do not need to raise a ValidationError here, since there is another check to validate the
                 # sales_channel
@@ -892,7 +862,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                     else:
                         pos_data['seat'] = seat
                         if (seat not in free_seats and not seat.is_available(sales_channel=validated_data.get('sales_channel', 'web'))) or seat in seats_seen:
-                            errs[i]['seat'] = [gettext_lazy('The selected seat "{seat}" is not available.').format(seat=seat.name)]
+                            errs[i]['seat'] = [ugettext_lazy('The selected seat "{seat}" is not available.').format(seat=seat.name)]
                         seats_seen.add(seat)
                 elif seated:
                     errs[i]['seat'] = ['The specified product requires to choose a seat.']
@@ -907,7 +877,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                                   if pos_data.get('variation')
                                   else pos_data.get('item').quotas.filter(subevent=pos_data.get('subevent')))
                     if len(new_quotas) == 0:
-                        errs[i]['item'] = [gettext_lazy('The product "{}" is not assigned to a quota.').format(
+                        errs[i]['item'] = [ugettext_lazy('The product "{}" is not assigned to a quota.').format(
                             str(pos_data.get('item'))
                         )]
                     else:
@@ -919,7 +889,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                                 quota_avail_cache[quota][1] -= 1
                                 if quota_avail_cache[quota][1] < 0:
                                     errs[i]['item'] = [
-                                        gettext_lazy('There is not enough quota available on quota "{}" to perform the operation.').format(
+                                        ugettext_lazy('There is not enough quota available on quota "{}" to perform the operation.').format(
                                             quota.name
                                         )
                                     ]

src/pretix/api/serializers/organizer.py

@@ -1,7 +1,7 @@
 from decimal import Decimal
 
 from django.db.models import Q
-from django.utils.translation import get_language, gettext_lazy as _
+from django.utils.translation import get_language, ugettext_lazy as _
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
@@ -55,7 +55,7 @@ class GiftCardSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = GiftCard
-        fields = ('id', 'secret', 'issuance', 'value', 'currency', 'testmode', 'expires', 'conditions')
+        fields = ('id', 'secret', 'issuance', 'value', 'currency', 'testmode')
 
 
 class EventSlugField(serializers.SlugRelatedField):

src/pretix/api/views/__init__.py

@@ -41,8 +41,8 @@ class ConditionalListView:
             return super().list(request, **kwargs)
 
         lmd = request.event.logentry_set.filter(
-            content_type__model=self.get_queryset().model._meta.model_name,
-            content_type__app_label=self.get_queryset().model._meta.app_label,
+            content_type__model=self.queryset.model._meta.model_name,
+            content_type__app_label=self.queryset.model._meta.app_label,
         ).aggregate(
             m=Max('datetime')
         )['m']

src/pretix/api/views/checkin.py

@@ -88,9 +88,8 @@ class CheckinListViewSet(viewsets.ModelViewSet):
         pqs = OrderPosition.objects.filter(
             order__event=clist.event,
             order__status__in=[Order.STATUS_PAID] + ([Order.STATUS_PENDING] if clist.include_pending else []),
+            subevent=clist.subevent,
         )
-        if clist.subevent:
-            pqs = pqs.filter(subevent=clist.subevent)
         if not clist.all_products:
             pqs = pqs.filter(item__in=clist.limit_products.values_list('id', flat=True))
             cqs = cqs.filter(position__item__in=clist.limit_products.values_list('id', flat=True))
@@ -202,13 +201,10 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
 
         qs = OrderPosition.objects.filter(
             order__event=self.request.event,
+            subevent=self.checkinlist.subevent
         ).annotate(
             last_checked_in=Subquery(cqs)
         )
-        if self.checkinlist.subevent:
-            qs = qs.filter(
-                subevent=self.checkinlist.subevent
-            )
 
         if self.request.query_params.get('ignore_status', 'false') != 'true' and not ignore_status:
             qs = qs.filter(
@@ -255,9 +251,6 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
     @action(detail=True, methods=['POST'])
     def redeem(self, *args, **kwargs):
         force = bool(self.request.data.get('force', False))
-        type = self.request.data.get('type', None) or Checkin.TYPE_ENTRY
-        if type not in dict(Checkin.CHECKIN_TYPES):
-            raise ValidationError("Invalid check-in type.")
         ignore_unpaid = bool(self.request.data.get('ignore_unpaid', False))
         nonce = self.request.data.get('nonce')
         op = self.get_object(ignore_status=True)
@@ -290,7 +283,6 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                 canceled_supported=self.request.data.get('canceled_supported', False),
                 user=self.request.user,
                 auth=self.request.auth,
-                type=type,
             )
         except RequiredQuestionsError as e:
             return Response({

src/pretix/api/views/item.py

@@ -20,7 +20,6 @@ from pretix.base.models import (
     CartPosition, Item, ItemAddOn, ItemBundle, ItemCategory, ItemVariation,
     Question, QuestionOption, Quota,
 )
-from pretix.base.services.quotas import QuotaAvailability
 from pretix.helpers.dicts import merge_dicts
 
 with scopes_disabled():
@@ -534,17 +533,14 @@ class QuotaViewSet(ConditionalListView, viewsets.ModelViewSet):
     def availability(self, request, *args, **kwargs):
         quota = self.get_object()
 
-        qa = QuotaAvailability()
-        qa.queue(quota)
-        qa.compute()
-        avail = qa.results[quota]
+        avail = quota.availability()
 
         data = {
-            'paid_orders': qa.count_paid_orders[quota],
-            'pending_orders': qa.count_pending_orders[quota],
-            'blocking_vouchers': qa.count_vouchers[quota],
-            'cart_positions': qa.count_cart[quota],
-            'waiting_list': qa.count_pending_orders[quota],
+            'paid_orders': quota.count_paid_orders(),
+            'pending_orders': quota.count_pending_orders(),
+            'blocking_vouchers': quota.count_blocking_vouchers(),
+            'cart_positions': quota.count_in_cart(),
+            'waiting_list': quota.count_waiting_list_pending(),
             'available_number': avail[1],
             'available': avail[0] == Quota.AVAILABILITY_OK,
             'total_size': quota.size,

src/pretix/api/views/oauth.py

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

src/pretix/api/views/order.py

@@ -9,7 +9,7 @@ from django.db.models.functions import Coalesce, Concat
 from django.http import FileResponse, HttpResponse
 from django.shortcuts import get_object_or_404
 from django.utils.timezone import make_aware, now
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext as _
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
 from django_scopes import scopes_disabled
 from rest_framework import mixins, serializers, status, viewsets
@@ -44,7 +44,7 @@ from pretix.base.services.mail import SendMailException
 from pretix.base.services.orders import (
     OrderChangeManager, OrderError, _order_placed_email,
     _order_placed_email_attendee, approve_order, cancel_order, deny_order,
-    extend_order, mark_order_expired, mark_order_refunded, reactivate_order,
+    extend_order, mark_order_expired, mark_order_refunded,
 )
 from pretix.base.services.pricing import get_price
 from pretix.base.services.tickets import generate
@@ -261,29 +261,6 @@ class OrderViewSet(viewsets.ModelViewSet):
             )
         return self.retrieve(request, [], **kwargs)
 
-    @action(detail=True, methods=['POST'])
-    def reactivate(self, request, **kwargs):
-
-        order = self.get_object()
-        if order.status != Order.STATUS_CANCELED:
-            return Response(
-                {'detail': 'The order is not allowed to be reactivated.'},
-                status=status.HTTP_400_BAD_REQUEST
-            )
-
-        try:
-            reactivate_order(
-                order,
-                user=request.user if request.user.is_authenticated else None,
-                auth=request.auth if isinstance(request.auth, (Device, TeamAPIToken, OAuthAccessToken)) else None,
-            )
-        except OrderError as e:
-            return Response(
-                {'detail': str(e)},
-                status=status.HTTP_400_BAD_REQUEST
-            )
-        return self.retrieve(request, [], **kwargs)
-
     @action(detail=True, methods=['POST'])
     def approve(self, request, **kwargs):
         send_mail = request.data.get('send_email', True)

src/pretix/api/views/organizer.py

@@ -58,7 +58,7 @@ class SeatingPlanViewSet(viewsets.ModelViewSet):
     write_permission = 'can_change_organizer_settings'
 
     def get_queryset(self):
-        return self.request.organizer.seating_plans.order_by('name')
+        return self.request.organizer.seating_plans.all()
 
     def get_serializer_context(self):
         ctx = super().get_serializer_context()
@@ -195,7 +195,7 @@ class TeamViewSet(viewsets.ModelViewSet):
     write_permission = 'can_change_teams'
 
     def get_queryset(self):
-        return self.request.organizer.teams.order_by('pk')
+        return self.request.organizer.teams.all()
 
     def get_serializer_context(self):
         ctx = super().get_serializer_context()
@@ -268,7 +268,7 @@ class TeamInviteViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnlyMo
         return get_object_or_404(self.request.organizer.teams, pk=self.kwargs.get('team'))
 
     def get_queryset(self):
-        return self.team.invites.order_by('email')
+        return self.team.invites.all()
 
     def get_serializer_context(self):
         ctx = super().get_serializer_context()
@@ -305,7 +305,7 @@ class TeamAPITokenViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnly
         return get_object_or_404(self.request.organizer.teams, pk=self.kwargs.get('team'))
 
     def get_queryset(self):
-        return self.team.tokens.order_by('name')
+        return self.team.tokens.all()
 
     def get_serializer_context(self):
         ctx = super().get_serializer_context()

src/pretix/api/webhooks.py

@@ -7,7 +7,7 @@ import requests
 from celery.exceptions import MaxRetriesExceededError
 from django.db.models import Exists, OuterRef, Q
 from django.dispatch import receiver
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 from django_scopes import scope, scopes_disabled
 from requests import RequestException
 
@@ -125,10 +125,6 @@ def register_default_webhook_events(sender, **kwargs):
             'pretix.event.order.canceled',
             _('Order canceled'),
         ),
-        ParametrizedOrderWebhookEvent(
-            'pretix.event.order.reactivated',
-            _('Order reactivated'),
-        ),
         ParametrizedOrderWebhookEvent(
             'pretix.event.order.expired',
             _('Order expired'),
@@ -168,9 +164,9 @@ def register_default_webhook_events(sender, **kwargs):
     )
 
 
-@app.task(base=TransactionAwareTask, acks_late=True)
+@app.task(base=TransactionAwareTask)
 def notify_webhooks(logentry_id: int):
-    logentry = LogEntry.all.select_related('event', 'event__organizer').get(id=logentry_id)
+    logentry = LogEntry.all.get(id=logentry_id)
 
     if not logentry.organizer:
         return  # We need to know the organizer
@@ -205,7 +201,7 @@ def notify_webhooks(logentry_id: int):
         send_webhook.apply_async(args=(logentry_id, notification_type.action_type, wh.pk))
 
 
-@app.task(base=ProfiledTask, bind=True, max_retries=9, acks_late=True)
+@app.task(base=ProfiledTask, bind=True, max_retries=9)
 def send_webhook(self, logentry_id: int, action_type: str, webhook_id: int):
     # 9 retries with 2**(2*x) timing is roughly 72 hours
     with scopes_disabled():

src/pretix/base/auth.py

@@ -85,16 +85,6 @@ class BaseAuthBackend:
         """
         return
 
-    def get_next_url(self, request):
-        """
-        This method will be called after a successful login to determine the next URL. Pretix in general uses the
-        ``'next'`` query parameter. However, external authentication methods could use custom attributes with hardcoded
-        names for security purposes. For example, OAuth uses ``'state'`` for keeping track of application state.
-        """
-        if "next" in request.GET:
-            return request.GET.get("next")
-        return None
-
 
 class NativeAuthBackend(BaseAuthBackend):
     identifier = 'native'

src/pretix/base/channels.py

@@ -2,7 +2,7 @@ import logging
 from collections import OrderedDict
 
 from django.dispatch import receiver
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 from pretix.base.signals import register_sales_channels
 

src/pretix/base/email.py

@@ -9,7 +9,7 @@ from django.core.mail.backends.smtp import EmailBackend
 from django.dispatch import receiver
 from django.template.loader import get_template
 from django.utils.timezone import now
-from django.utils.translation import get_language, gettext_lazy as _
+from django.utils.translation import get_language, ugettext_lazy as _
 from inlinestyler.utils import inline_css
 
 from pretix.base.i18n import LazyCurrencyNumber, LazyDate, LazyNumber

src/pretix/base/exporter.py

@@ -7,7 +7,7 @@ from typing import Tuple
 from defusedcsv import csv
 from django import forms
 from django.utils.formats import localize
-from django.utils.translation import gettext, gettext_lazy as _
+from django.utils.translation import ugettext, ugettext_lazy as _
 from openpyxl import Workbook
 from openpyxl.cell.cell import KNOWN_TYPES
 
@@ -180,9 +180,9 @@ class MultiSheetListExporter(ListExporter):
         ]
         for s, l in self.sheets:
             choices += [
-                (s + ':default', str(l) + ' – ' + gettext('CSV (with commas)')),
-                (s + ':excel', str(l) + ' – ' + gettext('CSV (Excel-style)')),
-                (s + ':semicolon', str(l) + ' – ' + gettext('CSV (with semicolons)')),
+                (s + ':default', str(l) + ' – ' + ugettext('CSV (with commas)')),
+                (s + ':excel', str(l) + ' – ' + ugettext('CSV (Excel-style)')),
+                (s + ':semicolon', str(l) + ' – ' + ugettext('CSV (with semicolons)')),
             ]
         ff = OrderedDict(
             [

src/pretix/base/exporters/answers.py

@@ -5,7 +5,7 @@ from zipfile import ZipFile
 
 from django import forms
 from django.dispatch import receiver
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 from pretix.base.models import QuestionAnswer
 

src/pretix/base/exporters/dekodi.py

@@ -6,7 +6,7 @@ import dateutil
 from django import forms
 from django.core.serializers.json import DjangoJSONEncoder
 from django.dispatch import receiver
-from django.utils.translation import gettext, gettext_lazy
+from django.utils.translation import ugettext, ugettext_lazy
 
 from pretix.base.i18n import language
 from pretix.base.models import Invoice, OrderPayment
@@ -79,7 +79,7 @@ class DekodiNREIExporter(BaseExporter):
                     payments.append({
                         'PTID': '5',
                         'PTN': 'Lastschrift',
-                        'PTNo4': gettext('Event ticket {event}-{code}').format(
+                        'PTNo4': ugettext('Event ticket {event}-{code}').format(
                             event=self.event.slug.upper(),
                             code=invoice.order.code
                         ),
@@ -199,19 +199,19 @@ class DekodiNREIExporter(BaseExporter):
             [
                 ('date_from',
                  forms.DateField(
-                     label=gettext_lazy('Start date'),
+                     label=ugettext_lazy('Start date'),
                      widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
                      required=False,
-                     help_text=gettext_lazy('Only include invoices issued on or after this date. Note that the invoice date does '
-                                            'not always correspond to the order or payment date.')
+                     help_text=ugettext_lazy('Only include invoices issued on or after this date. Note that the invoice date does '
+                                             'not always correspond to the order or payment date.')
                  )),
                 ('date_to',
                  forms.DateField(
-                     label=gettext_lazy('End date'),
+                     label=ugettext_lazy('End date'),
                      widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
                      required=False,
-                     help_text=gettext_lazy('Only include invoices issued on or before this date. Note that the invoice date '
-                                            'does not always correspond to the order or payment date.')
+                     help_text=ugettext_lazy('Only include invoices issued on or before this date. Note that the invoice date '
+                                             'does not always correspond to the order or payment date.')
                  )),
             ]
         )

src/pretix/base/exporters/invoices.py

@@ -7,7 +7,7 @@ import dateutil.parser
 from django import forms
 from django.db.models import Exists, OuterRef, Q
 from django.dispatch import receiver
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 from pretix.base.models import OrderPayment
 

src/pretix/base/exporters/mail.py

@@ -2,7 +2,7 @@ from collections import OrderedDict
 
 from django import forms
 from django.dispatch import receiver
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 from pretix.base.models import OrderPosition
 

src/pretix/base/exporters/orderlist.py

@@ -8,13 +8,12 @@ from django.db.models import (
 )
 from django.dispatch import receiver
 from django.utils.formats import date_format
-from django.utils.translation import gettext as _, gettext_lazy, pgettext
+from django.utils.translation import pgettext, ugettext as _, ugettext_lazy
 
 from pretix.base.models import (
-    GiftCard, InvoiceAddress, InvoiceLine, Order, OrderPosition, Question,
+    InvoiceAddress, InvoiceLine, Order, OrderPosition, Question,
 )
 from pretix.base.models.orders import OrderFee, OrderPayment, OrderRefund
-from pretix.base.services.quotas import QuotaAvailability
 from pretix.base.settings import PERSON_NAME_SCHEMES
 
 from ..exporter import ListExporter, MultiSheetListExporter
@@ -23,7 +22,7 @@ from ..signals import register_data_exporters
 
 class OrderListExporter(MultiSheetListExporter):
     identifier = 'orderlist'
-    verbose_name = gettext_lazy('Order data')
+    verbose_name = ugettext_lazy('Order data')
 
     @property
     def sheets(self):
@@ -306,12 +305,6 @@ class OrderListExporter(MultiSheetListExporter):
                 headers.append(_('Attendee name') + ': ' + str(label))
         headers += [
             _('Attendee email'),
-            _('Company'),
-            _('Address'),
-            _('ZIP code'),
-            _('City'),
-            _('Country'),
-            pgettext('address', 'State'),
             _('Voucher'),
             _('Pseudonymization ID'),
         ]
@@ -335,9 +328,7 @@ class OrderListExporter(MultiSheetListExporter):
         headers += [
             _('Address'), _('ZIP code'), _('City'), _('Country'), pgettext('address', 'State'), _('VAT ID'),
         ]
-        headers += [
-            _('Sales channel'), _('Order locale'),
-        ]
+        headers.append(_('Sales channel'))
 
         yield headers
 
@@ -373,12 +364,6 @@ class OrderListExporter(MultiSheetListExporter):
                     )
             row += [
                 op.attendee_email,
-                op.company or '',
-                op.street or '',
-                op.zipcode or '',
-                op.city or '',
-                op.country if op.country else '',
-                op.state or '',
                 op.voucher.code if op.voucher else '',
                 op.pseudonymization_id,
             ]
@@ -420,10 +405,7 @@ class OrderListExporter(MultiSheetListExporter):
                 ]
             except InvoiceAddress.DoesNotExist:
                 row += [''] * (8 + (len(name_scheme['fields']) if len(name_scheme['fields']) > 1 else 0))
-            row += [
-                order.sales_channel,
-                order.locale
-            ]
+            row.append(order.sales_channel)
             yield row
 
     def get_filename(self):
@@ -432,27 +414,16 @@ class OrderListExporter(MultiSheetListExporter):
 
 class PaymentListExporter(ListExporter):
     identifier = 'paymentlist'
-    verbose_name = gettext_lazy('Order payments and refunds')
+    verbose_name = ugettext_lazy('Order payments and refunds')
 
     @property
     def additional_form_fields(self):
         return OrderedDict(
             [
-                ('payment_states',
-                 forms.MultipleChoiceField(
-                     label=_('Payment states'),
-                     choices=OrderPayment.PAYMENT_STATES,
-                     initial=[OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED],
-                     required=False,
-                     widget=forms.CheckboxSelectMultiple,
-                 )),
-                ('refund_states',
-                 forms.MultipleChoiceField(
-                     label=_('Refund states'),
-                     choices=OrderRefund.REFUND_STATES,
-                     initial=[OrderRefund.REFUND_STATE_DONE, OrderRefund.REFUND_STATE_CREATED,
-                              OrderRefund.REFUND_STATE_TRANSIT],
-                     widget=forms.CheckboxSelectMultiple,
+                ('successful_only',
+                 forms.BooleanField(
+                     label=_('Only successful payments'),
+                     initial=True,
                      required=False
                  )),
             ]
@@ -468,13 +439,19 @@ class PaymentListExporter(ListExporter):
 
         payments = OrderPayment.objects.filter(
             order__event=self.event,
-            state__in=form_data.get('payment_states', [])
         ).order_by('created')
         refunds = OrderRefund.objects.filter(
-            order__event=self.event,
-            state__in=form_data.get('refund_states', [])
+            order__event=self.event
         ).order_by('created')
 
+        if form_data['successful_only']:
+            payments = payments.filter(
+                state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED),
+            )
+            refunds = refunds.filter(
+                state=OrderRefund.REFUND_STATE_DONE,
+            )
+
         objs = sorted(list(payments) + list(refunds), key=lambda o: o.created)
 
         headers = [
@@ -508,7 +485,7 @@ class PaymentListExporter(ListExporter):
 
 class QuotaListExporter(ListExporter):
     identifier = 'quotalist'
-    verbose_name = gettext_lazy('Quota availabilities')
+    verbose_name = ugettext_lazy('Quota availabilities')
 
     def iterate_list(self, form_data):
         headers = [
@@ -517,21 +494,16 @@ class QuotaListExporter(ListExporter):
         ]
         yield headers
 
-        quotas = list(self.event.quotas.all())
-        qa = QuotaAvailability(full_results=True)
-        qa.queue(*quotas)
-        qa.compute()
-
-        for quota in quotas:
-            avail = qa.results[quota]
+        for quota in self.event.quotas.all():
+            avail = quota.availability()
             row = [
                 quota.name,
                 _('Infinite') if quota.size is None else quota.size,
-                qa.count_paid_orders[quota],
-                qa.count_pending_orders[quota],
-                qa.count_vouchers[quota],
-                qa.count_cart[quota],
-                qa.count_waitinglist[quota],
+                quota.count_paid_orders(),
+                quota.count_pending_orders(),
+                quota.count_blocking_vouchers(),
+                quota.count_in_cart(),
+                quota.count_waiting_list_pending(),
                 _('Infinite') if avail[1] is None else avail[1]
             ]
             yield row
@@ -542,7 +514,7 @@ class QuotaListExporter(ListExporter):
 
 class InvoiceDataExporter(MultiSheetListExporter):
     identifier = 'invoicedata'
-    verbose_name = gettext_lazy('Invoice data')
+    verbose_name = ugettext_lazy('Invoice data')
 
     @property
     def sheets(self):
@@ -726,45 +698,6 @@ class InvoiceDataExporter(MultiSheetListExporter):
         return '{}_invoices'.format(self.event.slug)
 
 
-class GiftcardRedemptionListExporter(ListExporter):
-    identifier = 'giftcardredemptionlist'
-    verbose_name = gettext_lazy('Gift card redemptions')
-
-    def iterate_list(self, form_data):
-        tz = pytz.timezone(self.event.settings.timezone)
-
-        payments = OrderPayment.objects.filter(
-            order__event=self.event,
-            provider='giftcard'
-        ).order_by('created')
-        refunds = OrderRefund.objects.filter(
-            order__event=self.event,
-            provider='giftcard'
-        ).order_by('created')
-
-        objs = sorted(list(payments) + list(refunds), key=lambda o: (o.order.code, o.created))
-
-        headers = [
-            _('Order'), _('Payment ID'), _('Date'), _('Gift card code'), _('Amount'), _('Issuer')
-        ]
-        yield headers
-
-        for obj in objs:
-            gc = GiftCard.objects.get(pk=obj.info_data.get('gift_card'))
-            row = [
-                obj.order.code,
-                obj.full_id,
-                obj.created.astimezone(tz).date().strftime('%Y-%m-%d'),
-                gc.secret,
-                obj.amount * (-1 if isinstance(obj, OrderRefund) else 1),
-                gc.issuer
-            ]
-            yield row
-
-    def get_filename(self):
-        return '{}_giftcardredemptions'.format(self.event.slug)
-
-
 @receiver(register_data_exporters, dispatch_uid="exporter_orderlist")
 def register_orderlist_exporter(sender, **kwargs):
     return OrderListExporter
@@ -783,8 +716,3 @@ def register_quotalist_exporter(sender, **kwargs):
 @receiver(register_data_exporters, dispatch_uid="exporter_invoicedata")
 def register_invoicedata_exporter(sender, **kwargs):
     return InvoiceDataExporter
-
-
-@receiver(register_data_exporters, dispatch_uid="exporter_giftcardredemptionlist")
-def register_giftcardredemptionlist_exporter(sender, **kwargs):
-    return GiftcardRedemptionListExporter

src/pretix/base/forms/__init__.py

@@ -3,6 +3,7 @@ import logging
 import i18nfield.forms
 from django import forms
 from django.forms.models import ModelFormMetaclass
+from django.utils import six
 from django.utils.crypto import get_random_string
 from formtools.wizard.views import SessionWizardView
 from hierarkey.forms import HierarkeyForm
@@ -24,7 +25,7 @@ class BaseI18nModelForm(i18nfield.forms.BaseI18nModelForm):
         super().__init__(*args, **kwargs)
 
 
-class I18nModelForm(BaseI18nModelForm, metaclass=ModelFormMetaclass):
+class I18nModelForm(six.with_metaclass(ModelFormMetaclass, BaseI18nModelForm)):
     pass
 
 
@@ -48,9 +49,6 @@ class I18nInlineFormSet(i18nfield.forms.I18nInlineFormSet):
         super().__init__(*args, **kwargs)
 
 
-SECRET_REDACTED = '*****'
-
-
 class SettingsForm(i18nfield.forms.I18nFormMixin, HierarkeyForm):
     auto_fields = []
 
@@ -76,12 +74,6 @@ class SettingsForm(i18nfield.forms.I18nFormMixin, HierarkeyForm):
             if isinstance(f, (RelativeDateTimeField, RelativeDateField)):
                 f.set_event(self.obj)
 
-    def save(self):
-        for k, v in self.cleaned_data.items():
-            if isinstance(self.fields.get(k), SecretKeySettingsField) and self.cleaned_data.get(k) == SECRET_REDACTED:
-                self.cleaned_data[k] = self.initial[k]
-        return super().save()
-
     def get_new_filename(self, name: str) -> str:
         from pretix.base.models import Event
 
@@ -120,32 +112,3 @@ class SafeSessionWizardView(SessionWizardView):
             }
         )
         return context
-
-
-class SecretKeySettingsWidget(forms.TextInput):
-    def __init__(self, attrs=None):
-        if attrs is None:
-            attrs = {}
-        attrs.update({
-            'autocomplete': 'new-password'  # see https://bugs.chromium.org/p/chromium/issues/detail?id=370363#c7
-        })
-        super().__init__(attrs)
-
-    def get_context(self, name, value, attrs):
-        if value:
-            value = SECRET_REDACTED
-        return super().get_context(name, value, attrs)
-
-
-class SecretKeySettingsField(forms.CharField):
-    widget = SecretKeySettingsWidget
-
-    def has_changed(self, initial, data):
-        if data == SECRET_REDACTED:
-            return False
-        return super().has_changed(initial, data)
-
-    def run_validators(self, value):
-        if value == SECRET_REDACTED:
-            return
-        return super().run_validators(value)

src/pretix/base/forms/auth.py

@@ -3,10 +3,9 @@ from django.conf import settings
 from django.contrib.auth.password_validation import (
     password_validators_help_texts, validate_password,
 )
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 from pretix.base.models import User
-from pretix.helpers.dicts import move_to_end
 
 
 class LoginForm(forms.Form):
@@ -37,7 +36,7 @@ class LoginForm(forms.Form):
         if not settings.PRETIX_LONG_SESSIONS or backend.url:
             del self.fields['keep_logged_in']
         else:
-            move_to_end(self.fields, 'keep_logged_in')
+            self.fields.move_to_end('keep_logged_in')
 
     def clean(self):
         if all(k in self.cleaned_data for k, f in self.fields.items() if f.required):

src/pretix/base/forms/questions.py

@@ -18,7 +18,7 @@ from django.forms import Select
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import (
-    get_language, gettext_lazy as _, pgettext_lazy,
+    get_language, pgettext_lazy, ugettext_lazy as _,
 )
 from django_countries import countries
 from django_countries.fields import Country, CountryField
@@ -40,8 +40,7 @@ from pretix.base.settings import (
     PERSON_NAME_TITLE_GROUPS,
 )
 from pretix.base.templatetags.rich_text import rich_text
-from pretix.control.forms import ExtFileField, SplitDateTimeField
-from pretix.helpers.countries import CachedCountries
+from pretix.control.forms import SplitDateTimeField
 from pretix.helpers.escapejson import escapejson_attr
 from pretix.helpers.i18n import get_format_without_seconds
 from pretix.presale.signals import question_form_fields
@@ -205,21 +204,16 @@ def guess_country(event):
         valid_countries = countries.countries
         if '-' in locale:
             parts = locale.split('-')
-            # TODO: does this actually work?
             if parts[1].upper() in valid_countries:
                 country = Country(parts[1].upper())
             elif parts[0].upper() in valid_countries:
                 country = Country(parts[0].upper())
         else:
-            if locale.upper() in valid_countries:
+            if locale in valid_countries:
                 country = Country(locale.upper())
     return country
 
 
-class QuestionCheckboxSelectMultiple(forms.CheckboxSelectMultiple):
-    option_template_name = 'pretixbase/forms/widgets/checkbox_option_with_links.html'
-
-
 class BaseQuestionsForm(forms.Form):
     """
     This form class is responsible for asking order-related questions. This includes
@@ -247,7 +241,7 @@ class BaseQuestionsForm(forms.Form):
         if item.admission and event.settings.attendee_names_asked:
             self.fields['attendee_name_parts'] = NamePartsFormField(
                 max_length=255,
-                required=event.settings.attendee_names_required and not self.all_optional,
+                required=event.settings.attendee_names_required,
                 scheme=event.settings.name_scheme,
                 titles=event.settings.name_scheme_titles,
                 label=_('Attendee name'),
@@ -255,7 +249,7 @@ class BaseQuestionsForm(forms.Form):
             )
         if item.admission and event.settings.attendee_emails_asked:
             self.fields['attendee_email'] = forms.EmailField(
-                required=event.settings.attendee_emails_required and not self.all_optional,
+                required=event.settings.attendee_emails_required,
                 label=_('Attendee email'),
                 initial=(cartpos.attendee_email if cartpos else orderpos.attendee_email),
                 widget=forms.EmailInput(
@@ -264,75 +258,6 @@ class BaseQuestionsForm(forms.Form):
                     }
                 )
             )
-        if item.admission and event.settings.attendee_company_asked:
-            self.fields['company'] = forms.CharField(
-                required=event.settings.attendee_company_required and not self.all_optional,
-                label=_('Company'),
-                initial=(cartpos.company if cartpos else orderpos.company),
-            )
-
-        if item.admission and event.settings.attendee_addresses_asked:
-            self.fields['street'] = forms.CharField(
-                required=event.settings.attendee_addresses_required and not self.all_optional,
-                label=_('Address'),
-                widget=forms.Textarea(attrs={
-                    'rows': 2,
-                    'placeholder': _('Street and Number'),
-                    'autocomplete': 'street-address'
-                }),
-                initial=(cartpos.street if cartpos else orderpos.street),
-            )
-            self.fields['zipcode'] = forms.CharField(
-                required=event.settings.attendee_addresses_required and not self.all_optional,
-                label=_('ZIP code'),
-                initial=(cartpos.zipcode if cartpos else orderpos.zipcode),
-                widget=forms.TextInput(attrs={
-                    'autocomplete': 'postal-code',
-                }),
-            )
-            self.fields['city'] = forms.CharField(
-                required=event.settings.attendee_addresses_required and not self.all_optional,
-                label=_('City'),
-                initial=(cartpos.city if cartpos else orderpos.city),
-                widget=forms.TextInput(attrs={
-                    'autocomplete': 'address-level2',
-                }),
-            )
-            country = (cartpos.country if cartpos else orderpos.country) or guess_country(event)
-            self.fields['country'] = CountryField(
-                countries=CachedCountries
-            ).formfield(
-                required=event.settings.attendee_addresses_required and not self.all_optional,
-                label=_('Country'),
-                initial=country,
-                widget=forms.Select(attrs={
-                    'autocomplete': 'country',
-                }),
-            )
-            c = [('', pgettext_lazy('address', 'Select state'))]
-            fprefix = str(self.prefix) + '-' if self.prefix is not None and self.prefix != '-' else ''
-            cc = None
-            if fprefix + 'country' in self.data:
-                cc = str(self.data[fprefix + 'country'])
-            elif country:
-                cc = str(country)
-            if cc and cc in COUNTRIES_WITH_STATE_IN_ADDRESS:
-                types, form = COUNTRIES_WITH_STATE_IN_ADDRESS[cc]
-                statelist = [s for s in pycountry.subdivisions.get(country_code=cc) if s.type in types]
-                c += sorted([(s.code[3:], s.name) for s in statelist], key=lambda s: s[1])
-            elif fprefix + 'state' in self.data:
-                self.data = self.data.copy()
-                del self.data[fprefix + 'state']
-
-            self.fields['state'] = forms.ChoiceField(
-                label=pgettext_lazy('address', 'State'),
-                required=False,
-                choices=c,
-                widget=forms.Select(attrs={
-                    'autocomplete': 'address-level1',
-                }),
-            )
-            self.fields['state'].widget.is_required = True
 
         for q in questions:
             # Do we already have an answer? Provide it as the initial value
@@ -384,14 +309,12 @@ class BaseQuestionsForm(forms.Form):
                     initial=initial.answer if initial else None,
                 )
             elif q.type == Question.TYPE_COUNTRYCODE:
-                field = CountryField(
-                    countries=CachedCountries
-                ).formfield(
+                field = CountryField().formfield(
                     label=label, required=required,
                     help_text=help_text,
                     widget=forms.Select,
                     empty_label='',
-                    initial=initial.answer if initial else guess_country(event),
+                    initial=initial.answer if initial else None,
                 )
             elif q.type == Question.TYPE_CHOICE:
                 field = forms.ModelChoiceField(
@@ -409,21 +332,15 @@ class BaseQuestionsForm(forms.Form):
                     label=label, required=required,
                     help_text=help_text,
                     to_field_name='identifier',
-                    widget=QuestionCheckboxSelectMultiple,
+                    widget=forms.CheckboxSelectMultiple,
                     initial=initial.options.all() if initial else None,
                 )
             elif q.type == Question.TYPE_FILE:
-                field = ExtFileField(
+                field = forms.FileField(
                     label=label, required=required,
                     help_text=help_text,
                     initial=initial.file if initial else None,
                     widget=UploadedFileWidget(position=pos, event=event, answer=initial),
-                    ext_whitelist=(
-                        ".png", ".jpg", ".gif", ".jpeg", ".pdf", ".txt", ".docx", ".gif", ".svg",
-                        ".pptx", ".ppt", ".doc", ".xlsx", ".xls", ".jfif", ".heic", ".heif", ".pages",
-                        ".bmp", ".tif", ".tiff"
-                    ),
-                    max_size=10 * 1024 * 1024,
                 )
             elif q.type == Question.TYPE_DATE:
                 field = forms.DateField(
@@ -502,10 +419,6 @@ class BaseQuestionsForm(forms.Form):
     def clean(self):
         d = super().clean()
 
-        if d.get('city') and d.get('country') and str(d['country']) in COUNTRIES_WITH_STATE_IN_ADDRESS:
-            if not d.get('state'):
-                self.add_error('state', _('This field is required.'))
-
         question_cache = {f.question.pk: f.question for f in self.fields.values() if getattr(f, 'question', None)}
 
         def question_is_visible(parentid, qvals):
@@ -587,8 +500,6 @@ class BaseInvoiceAddressForm(forms.ModelForm):
         if not event.settings.invoice_address_vatid:
             del self.fields['vat_id']
 
-        self.fields['country'].choices = CachedCountries()
-
         c = [('', pgettext_lazy('address', 'Select state'))]
         fprefix = self.prefix + '-' if self.prefix else ''
         cc = None

src/pretix/base/forms/user.py

@@ -4,7 +4,7 @@ from django.contrib.auth.password_validation import (
     password_validators_help_texts, validate_password,
 )
 from django.db.models import Q
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 from pytz import common_timezones
 
 from pretix.base.models import User

src/pretix/base/forms/validators.py

@@ -2,7 +2,7 @@ import re
 
 from django.core.exceptions import ValidationError
 from django.core.validators import BaseValidator
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 from i18nfield.strings import LazyI18nString
 
 

src/pretix/base/forms/widgets.py

@@ -4,7 +4,7 @@ from django import forms
 from django.utils.formats import get_format
 from django.utils.functional import lazy
 from django.utils.timezone import now
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 
 class DatePickerWidget(forms.DateInput):

src/pretix/base/i18n.py

@@ -3,7 +3,7 @@ from contextlib import contextmanager
 from django.conf import settings
 from django.utils import translation
 from django.utils.formats import date_format, number_format
-from django.utils.translation import gettext
+from django.utils.translation import ugettext
 from i18nfield.fields import (  # noqa
     I18nCharField, I18nTextarea, I18nTextField, I18nTextInput,
 )
@@ -69,6 +69,6 @@ class LazyLocaleException(Exception):
 
     def __str__(self):
         if self.msgargs:
-            return gettext(self.msg) % self.msgargs
+            return ugettext(self.msg) % self.msgargs
         else:
-            return gettext(self.msg)
+            return ugettext(self.msg)

src/pretix/base/invoice.py

@@ -10,7 +10,7 @@ from django.contrib.staticfiles import finders
 from django.dispatch import receiver
 from django.utils.formats import date_format, localize
 from django.utils.translation import (
-    get_language, gettext, gettext_lazy, pgettext,
+    get_language, pgettext, ugettext, ugettext_lazy,
 )
 from PIL.Image import BICUBIC
 from reportlab.lib import pagesizes
@@ -264,8 +264,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
     invoice_to_top = 52 * mm
 
     def _draw_invoice_to(self, canvas):
-        p = Paragraph(bleach.clean(self.invoice.address_invoice_to, tags=[]).strip().replace('\n', '<br />\n'),
-                      style=self.stylesheet['Normal'])
+        p = Paragraph(self.invoice.address_invoice_to.strip().replace('\n', '<br />\n'), style=self.stylesheet['Normal'])
         p.wrapOn(canvas, self.invoice_to_width, self.invoice_to_height)
         p_size = p.wrap(self.invoice_to_width, self.invoice_to_height)
         p.drawOn(canvas, self.invoice_to_left, self.pagesize[1] - p_size[1] - self.invoice_to_top)
@@ -423,7 +422,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
             canvas.saveState()
             canvas.setFont('OpenSansBd', 30)
             canvas.setFillColorRGB(32, 0, 0)
-            canvas.drawRightString(self.pagesize[0] - 20 * mm, (297 - 100) * mm, gettext('TEST MODE'))
+            canvas.drawRightString(self.pagesize[0] - 20 * mm, (297 - 100) * mm, ugettext('TEST MODE'))
             canvas.restoreState()
 
     def _on_first_page(self, canvas: Canvas, doc):
@@ -672,7 +671,6 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
                     table
                 ]))
         elif self.invoice.foreign_currency_display and self.invoice.foreign_currency_rate:
-            foreign_total = round_decimal(total * self.invoice.foreign_currency_rate)
             story.append(Spacer(1, 5 * mm))
             story.append(Paragraph(
                 pgettext(
@@ -680,7 +678,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
                                '{date}, the invoice total corresponds to {total}.'
                 ).format(rate=localize(self.invoice.foreign_currency_rate),
                          date=date_format(self.invoice.foreign_currency_rate_date, "SHORT_DATE_FORMAT"),
-                         total=fmt(foreign_total)),
+                         total=fmt(total)),
                 self.stylesheet['Fineprint']
             ))
 
@@ -689,7 +687,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
 
 class Modern1Renderer(ClassicInvoiceRenderer):
     identifier = 'modern1'
-    verbose_name = gettext_lazy('Modern Invoice Renderer (pretix 2.7)')
+    verbose_name = ugettext_lazy('Modern Invoice Renderer (pretix 2.7)')
     bottom_margin = 16.9 * mm
     top_margin = 16.9 * mm
     right_margin = 20 * mm

src/pretix/base/middleware.py

@@ -15,9 +15,7 @@ from django.utils.translation.trans_real import (
 )
 
 from pretix.base.settings import GlobalSettingsObject
-from pretix.multidomain.urlreverse import (
-    get_event_domain, get_organizer_domain,
-)
+from pretix.multidomain.urlreverse import get_domain
 
 _supported = None
 
@@ -233,10 +231,7 @@ class SecurityMiddleware(MiddlewareMixin):
                 dynamicdomain += " " + settings.SITE_URL
 
         if hasattr(request, 'organizer') and request.organizer:
-            if hasattr(request, 'event') and request.event:
-                domain = get_event_domain(request.event, fallback=True)
-            else:
-                domain = get_organizer_domain(request.organizer)
+            domain = get_domain(request.organizer)
             if domain:
                 siteurlsplit = urlsplit(settings.SITE_URL)
                 if siteurlsplit.port and siteurlsplit.port not in (80, 443):

src/pretix/base/migrations/0001_squashed_0028_auto_20160816_1242.py

@@ -108,7 +108,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', i18nfield.fields.I18nCharField(max_length=200, verbose_name='Name')),
-                ('slug', models.CharField(max_length=50, db_index=True, help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$')], verbose_name='Slug')),
+                ('slug', models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$')], verbose_name='Slug')),
                 ('currency', models.CharField(default='EUR', max_length=10, verbose_name='Default currency')),
                 ('date_from', models.DateTimeField(verbose_name='Event start time')),
                 ('date_to', models.DateTimeField(blank=True, null=True, verbose_name='Event end time')),
@@ -274,7 +274,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=200, verbose_name='Name')),
-                ('slug', models.CharField(max_length=50, db_index=True, help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$')], verbose_name='Slug')),
+                ('slug', models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$')], verbose_name='Slug')),
             ],
             options={
                 'verbose_name': 'Organizer',

src/pretix/base/migrations/0002_auto_20160209_0940.py

@@ -65,7 +65,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', i18nfield.fields.I18nCharField(max_length=200, verbose_name='Name')),
-                ('slug', models.CharField(max_length=50, db_index=True, help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$')], verbose_name='Slug')),
+                ('slug', models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$')], verbose_name='Slug')),
                 ('currency', models.CharField(default='EUR', max_length=10, verbose_name='Default currency')),
                 ('date_from', models.DateTimeField(verbose_name='Event start time')),
                 ('date_to', models.DateTimeField(blank=True, null=True, verbose_name='Event end time')),
@@ -229,7 +229,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=200, verbose_name='Name')),
-                ('slug', models.CharField(max_length=50, db_index=True, help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$')], verbose_name='Slug')),
+                ('slug', models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$')], verbose_name='Slug')),
             ],
             options={
                 'ordering': ('name',),

src/pretix/base/migrations/0031_auto_20160816_0648_squashed_0048_auto_20161129_1330.py

@@ -182,12 +182,12 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='slug',
-            field=models.CharField(max_length=50, db_index=True, help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Slug'),
+            field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Slug'),
         ),
         migrations.AlterField(
             model_name='organizer',
             name='slug',
-            field=models.CharField(max_length=50, db_index=True, help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBanlistValidator()], verbose_name='Slug'),
+            field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBanlistValidator()], verbose_name='Slug'),
         ),
         migrations.AlterField(
             model_name='voucher',

src/pretix/base/migrations/0047_auto_20161126_1300.py

@@ -23,12 +23,12 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='slug',
-            field=models.CharField(max_length=50, db_index=True, help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Slug'),
+            field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Slug'),
         ),
         migrations.AlterField(
             model_name='organizer',
             name='slug',
-            field=models.CharField(max_length=50, db_index=True, help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBanlistValidator()], verbose_name='Slug'),
+            field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBanlistValidator()], verbose_name='Slug'),
         ),
         migrations.AlterField(
             model_name='voucher',

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

@@ -124,7 +124,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='slug',
-            field=models.CharField(max_length=50, db_index=True, help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This will be used in order codes, invoice numbers, links and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Short form'),
+            field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This will be used in order codes, invoice numbers, links and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Short form'),
         ),
         migrations.AddField(
             model_name='requiredaction',
@@ -179,7 +179,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='organizer',
             name='slug',
-            field=models.CharField(max_length=50, db_index=True, help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBanlistValidator()], verbose_name='Short form'),
+            field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBanlistValidator()], verbose_name='Short form'),
         ),
         migrations.RunPython(
             code=merge_names,