Bump version to 3.3.0

Update from Weblate

.travis.sh

@@ -14,18 +14,18 @@ if [ "$PRETIX_CONFIG_FILE" == "tests/travis_postgres.cfg" ]; then
 fi
 
 if [ "$1" == "style" ]; then
-	XDG_CACHE_HOME=/cache pip3 install -Ur src/requirements.txt -r src/requirements/dev.txt
+	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 -Ur doc/requirements.txt
+	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 -Ur doc/requirements.txt
+	XDG_CACHE_HOME=/cache pip3 install --no-use-pep517 -Ur doc/requirements.txt
 	cd doc
 	make spelling
 	if [ -s _build/spelling/output.txt ]; then
@@ -33,26 +33,26 @@ if [ "$1" == "doc-spelling" ]; then
 	fi
 fi
 if [ "$1" == "translation-spelling" ]; then
-	XDG_CACHE_HOME=/cache pip3 install -Ur src/requirements/dev.txt
+	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 -Ur src/requirements/dev.txt
+	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 -Ur src/requirements/dev.txt
+	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 -Ur src/requirements/dev.txt
+	pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt
 	cd src
 	python setup.py develop
 	make all compress

CONTRIBUTING.md

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

doc/admin/config.rst

@@ -57,6 +57,9 @@ Example::
     A comma-separated list of plugins that are not available even though they are installed.
     Defaults to an empty string.
 
+``auth_backends``
+    A comma-separated list of available auth backends. Defaults to ``pretix.base.auth.NativeAuthBackend``.
+
 ``cookie_domain``
     The cookie domain to be set. Defaults to ``None``.
 

doc/admin/installation/docker_smallscale.rst

@@ -276,7 +276,7 @@ choice)::
 
 Then, go to that directory and build the image::
 
-    $ docker build -t mypretix
+    $ docker build . -t mypretix
 
 You can now use that image ``mypretix`` instead of ``pretix/standalone`` in your service file (see above). Be sure
 to re-build your custom image after you pulled ``pretix/standalone`` if you want to perform an update.

doc/admin/installation/enterprise.rst

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

doc/api/resources/events.rst

@@ -1,3 +1,9 @@
+.. spelling::
+
+   geo
+   lat
+   lon
+
 Events
 ======
 
@@ -25,6 +31,8 @@ is_public                             boolean                    If ``true``, th
 presale_start                         datetime                   The date at which the ticket shop opens (or ``null``)
 presale_end                           datetime                   The date at which the ticket shop closes (or ``null``)
 location                              multi-lingual string       The event location (or ``null``)
+geo_lat                               float                      Latitude of the location (or ``null``)
+geo_lon                               float                      Longitude of the location (or ``null``)
 has_subevents                         boolean                    ``true`` if the event series feature is active for this
                                                                  event. Cannot change after event is created.
 meta_data                             object                     Values set for organizer-specific meta data parameters.
@@ -62,9 +70,17 @@ seat_category_mapping                 object                     An object mappi
 
    The attributes ``seating_plan`` and ``seat_category_mapping`` have been added.
 
+.. versionchanged:: 3.3
+
+   The attributes ``geo_lat`` and ``geo_lon`` have been added.
+
 Endpoints
 ---------
 
+.. versionchanged:: 3.3
+
+    The events resource can now be filtered by meta data attributes.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/
 
    Returns a list of all events within a given organizer the authenticated user/token has access to.
@@ -105,6 +121,8 @@ Endpoints
             "presale_start": null,
             "presale_end": null,
             "location": null,
+            "geo_lat": null,
+            "geo_lon": null,
             "has_subevents": false,
             "meta_data": {},
             "seating_plan": null,
@@ -129,6 +147,10 @@ Endpoints
    :query string ordering: Manually set the ordering of results. Valid fields to be used are ``date_from`` and
                            ``slug``. Keep in mind that ``date_from`` of event series does not really tell you anything.
                            Default: ``slug``.
+   :query array attr[meta_data_key]: By providing the key and value of a meta data attribute, the list of events will
+        only contain the events matching the set criteria. Providing ``?attr[Format]=Seminar`` would return only those
+        events having set their ``Format`` meta data to ``Seminar``, ``?attr[Format]=`` only those, that have no value
+        set. Please note that this filter will respect default values set on organizer level.
    :param organizer: The ``slug`` field of a valid organizer
    :statuscode 200: no error
    :statuscode 401: Authentication failure
@@ -169,6 +191,8 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
+        "geo_lat": null,
+        "geo_lon": null,
         "has_subevents": false,
         "seating_plan": null,
         "seat_category_mapping": {},
@@ -220,6 +244,8 @@ Endpoints
         "seating_plan": null,
         "seat_category_mapping": {},
         "location": null,
+        "geo_lat": null,
+        "geo_lon": null,
         "has_subevents": false,
         "meta_data": {},
         "plugins": [
@@ -249,6 +275,8 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
+        "geo_lat": null,
+        "geo_lon": null,
         "seating_plan": null,
         "seat_category_mapping": {},
         "has_subevents": false,
@@ -268,11 +296,11 @@ Endpoints
 
 .. http:post:: /api/v1/organizers/(organizer)/events/(event)/clone/
 
-   Creates a new event with properties as set in the request body. The properties that are copied are: 'is_public',
-   `testmode`, settings, plugin settings, items, variations, add-ons, quotas, categories, tax rules, questions.
+   Creates a new event with properties as set in the request body. The properties that are copied are: ``is_public``,
+   ``testmode``, ``has_subevents``, settings, plugin settings, items, variations, add-ons, quotas, categories, tax rules, questions.
 
-   If the 'plugins' and/or 'is_public' fields are present in the post body this will determine their value. Otherwise
-   their value will be copied from the existing event.
+   If the ``plugins``, ``has_subevents`` and/or ``is_public`` fields are present in the post body this will determine their
+   value. Otherwise their value will be copied from the existing event.
 
    Please note that you can only copy from events under the same organizer.
 
@@ -300,6 +328,8 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
+        "geo_lat": null,
+        "geo_lon": null,
         "seating_plan": null,
         "seat_category_mapping": {},
         "has_subevents": false,
@@ -331,6 +361,8 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
+        "geo_lat": null,
+        "geo_lon": null,
         "has_subevents": false,
         "seating_plan": null,
         "seat_category_mapping": {},
@@ -394,6 +426,8 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
+        "geo_lat": null,
+        "geo_lon": null,
         "has_subevents": false,
         "seating_plan": null,
         "seat_category_mapping": {},

doc/api/resources/giftcards.rst

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

doc/api/resources/index.rst

@@ -21,6 +21,7 @@ Resources and endpoints
    vouchers
    checkinlists
    waitinglist
+   giftcards
    carts
    webhooks
    seatingplans

doc/api/resources/items.rst

@@ -77,6 +77,7 @@ generate_tickets                      boolean                    If ``false``, t
                                                                  rules apply.
 allow_waitinglist                     boolean                    If ``false``, no waiting list will be shown for this
                                                                  product when it is sold out.
+issue_giftcard                        boolean                    If ``true``, buying this product will yield a gift card.
 show_quota_left                       boolean                    Publicly show how many tickets are still available.
                                                                  If this is ``null``, the event default is used.
 has_variations                        boolean                    Shows whether or not this item has variations.
@@ -206,6 +207,7 @@ Endpoints
             "tax_rate": "0.00",
             "tax_rule": 1,
             "admission": false,
+            "issue_giftcard": false,
             "position": 0,
             "picture": null,
             "available_from": null,
@@ -300,6 +302,7 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
+        "issue_giftcard": false,
         "position": 0,
         "picture": null,
         "available_from": null,
@@ -375,6 +378,7 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
+        "issue_giftcard": false,
         "position": 0,
         "picture": null,
         "available_from": null,
@@ -437,6 +441,7 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
+        "issue_giftcard": false,
         "position": 0,
         "picture": null,
         "available_from": null,
@@ -531,6 +536,7 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
+        "issue_giftcard": false,
         "position": 0,
         "picture": null,
         "available_from": null,

doc/api/resources/orders.rst

@@ -131,16 +131,16 @@ last_modified                         datetime                   Last modificati
 
    The ``sales_channel`` attribute has been added.
 
-.. versionchanged:: 2.4:
+.. versionchanged:: 2.4
 
    ``order.status`` can no longer be ``r``, ``…/mark_canceled/`` now accepts a ``cancellation_fee`` parameter and
    ``…/mark_refunded/`` has been deprecated.
 
-.. versionchanged:: 2.5:
+.. versionchanged:: 2.5
 
    The ``testmode`` attribute has been added and ``DELETE`` has been implemented for orders.
 
-.. versionchanged:: 3.1:
+.. versionchanged:: 3.1
 
    The ``invoice_address.state`` and ``url`` attributes have been added. When creating orders through the API,
    vouchers are now supported and many fields are now optional.
@@ -219,6 +219,11 @@ pdf_data                              object                     Data object req
 
   The value ``auto_checked_in`` has been added to the ``checkins``-attribute.
 
+.. versionchanged:: 3.3
+
+  The ``url`` of a ticket ``download`` can now also return a ``text/uri-list`` instead of a file. See
+  :ref:`order-position-ticket-download` for details.
+
 .. _order-payment-resource:
 
 Order payment resource
@@ -769,6 +774,8 @@ Creating orders
 
        * does not support file upload questions
 
+       * does not support redeeming gift cards
+
    You can supply the following fields of the resource:
 
    * ``code`` (optional)
@@ -785,8 +792,9 @@ Creating orders
    * ``locale``
    * ``sales_channel``
    * ``payment_provider`` (optional) – The identifier of the payment provider set for this order. This needs to be an
-    existing payment provider. You should use ``"free"`` for free orders, and we strongly advise to use ``"manual"``
-    for all orders you create as paid.
+     existing payment provider. You should use ``"free"`` for free orders, and we strongly advise to use ``"manual"``
+     for all orders you create as paid. This field is optional when the order status is ``"n"`` or the order total is
+     zero, otherwise it is required.
    * ``payment_info`` (optional) – You can pass a nested JSON object that will be set as the internal ``info``
      value of the payment object that will be created. How this value is handled is up to the payment provider and you
      should only use this if you know the specific payment provider in detail. Please keep in mind that the payment
@@ -1480,6 +1488,8 @@ Fetching individual positions
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
    :statuscode 404: The requested order position does not exist.
 
+.. _`order-position-ticket-download`:
+
 Order position ticket download
 ------------------------------
 
@@ -1489,6 +1499,11 @@ Order position ticket download
    Depending on the chosen output, the response might be a ZIP file, PDF file or something else. The order details
    response contains a list of output options for this particular order position.
 
+   Be aware that the output does not have to be a file, but can also be a regular HTTP response with a ``Content-Type``
+   set to ``text/uri-list``. In this case, the user is expected to navigate to that URL in order to access their ticket.
+   The referenced URL can provide a download or a regular, human-viewable website - so it is advised to open this URL
+   in a webbrowser and leave it up to the user to handle the result.
+
    Tickets can be only downloaded if the order is paid and if ticket downloads are active. Also, depending on event
    configuration downloads might be only unavailable for add-on products or non-admission products.
    Note that in some cases the ticket file might not yet have been created. In that case, you will receive a status

doc/api/resources/subevents.rst

@@ -1,3 +1,9 @@
+.. spelling::
+
+   geo
+   lat
+   lon
+
 .. _rest-subevents:
 
 Event series dates / Sub-events
@@ -28,6 +34,8 @@ date_admission                        datetime                   The sub-event's
 presale_start                         datetime                   The sub-date at which the ticket shop opens (or ``null``)
 presale_end                           datetime                   The sub-date at which the ticket shop closes (or ``null``)
 location                              multi-lingual string       The sub-event location (or ``null``)
+geo_lat                               float                      Latitude of the location (or ``null``)
+geo_lon                               float                      Longitude of the location (or ``null``)
 item_price_overrides                  list of objects            List of items for which this sub-event overrides the
                                                                  default price
 ├ item                                integer                    The internal item ID
@@ -62,9 +70,17 @@ seat_category_mapping                 object                     An object mappi
 
    The attributes ``seating_plan`` and ``seat_category_mapping`` have been added.
 
+.. versionchanged:: 3.3
+
+   The attributes ``geo_lat`` and ``geo_lon`` have been added.
+
 Endpoints
 ---------
 
+.. versionchanged:: 3.3
+
+    The sub-events resource can now be filtered by meta data attributes.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/subevents/
 
    Returns a list of all sub-events of an event.
@@ -104,6 +120,8 @@ Endpoints
             "seating_plan": null,
             "seat_category_mapping": {},
             "location": null,
+            "geo_lat": null,
+            "geo_lon": null,
             "item_price_overrides": [
               {
                 "item": 2,
@@ -123,6 +141,11 @@ Endpoints
    :query ends_after: If set to a date and time, only events that happen during of after the given time are returned.
    :param organizer: The ``slug`` field of a valid organizer
    :param event: The ``slug`` field of the main event
+   :query array attr[meta_data_key]: By providing the key and value of a meta data attribute, the list of sub-events
+        will only contain the sub-events matching the set criteria. Providing ``?attr[Format]=Seminar`` would return
+        only those sub-events having set their ``Format`` meta data to ``Seminar``, ``?attr[Format]=`` only those, that
+        have no value set. Please note that this filter will respect default values set on 
+        organizer or event level.
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer does not exist **or** you have no permission to view it.
@@ -152,6 +175,8 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
+        "geo_lat": null,
+        "geo_lon": null,
         "seating_plan": null,
         "seat_category_mapping": {},
         "item_price_overrides": [
@@ -184,6 +209,8 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
+        "geo_lat": null,
+        "geo_lon": null,
         "seating_plan": null,
         "seat_category_mapping": {},
         "item_price_overrides": [
@@ -237,6 +264,8 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
+        "geo_lat": null,
+        "geo_lon": null,
         "seating_plan": null,
         "seat_category_mapping": {},
         "item_price_overrides": [
@@ -303,6 +332,8 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
+        "geo_lat": null,
+        "geo_lon": null,
         "seating_plan": null,
         "seat_category_mapping": {},
         "item_price_overrides": [
@@ -389,6 +420,8 @@ Endpoints
             "presale_start": null,
             "presale_end": null,
             "location": null,
+            "geo_lat": null,
+            "geo_lon": null,
             "seating_plan": null,
             "seat_category_mapping": {},
             "item_price_overrides": [

doc/development/api/auth.rst

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

doc/development/api/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_expired, order_modified, order_changed, order_approved, order_denied, order_fee_type_name, allow_ticket_download, order_split
+   :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
 
 Frontend
 --------

doc/development/api/index.rst

@@ -16,5 +16,6 @@ Contents:
    invoice
    shredder
    customview
+   auth
    general
    quality

doc/development/api/placeholder.rst

@@ -1,8 +1,8 @@
 .. highlight:: python
    :linenothreshold: 5
 
-Writing an HTML e-mail placeholder plugin
-=========================================
+Writing an e-mail placeholder plugin
+====================================
 
 An email placeholder is a dynamic value that pretix users can use in their email templates.
 

doc/development/api/ticketoutput.rst

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

doc/spelling_wordlist.txt

@@ -31,6 +31,7 @@ deprovision
 discoverable
 django
 dockerfile
+downloadable
 durations
 eu
 filename
@@ -41,6 +42,7 @@ formsets
 frontend
 frontpage
 gettext
+giftcard
 gunicorn
 guid
 hardcoded
@@ -55,6 +57,7 @@ Jimdo
 libpretixprint
 libsass
 linters
+login
 memcached
 metadata
 middleware
@@ -76,6 +79,7 @@ overpayment
 param
 passphrase
 percental
+pluggable
 positionid
 pre
 prepend
@@ -137,6 +141,7 @@ username
 url
 versa
 versioning
+viewable
 viewset
 viewsets
 waitinglist

doc/user/events/giftcards.rst

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

doc/user/events/widget.rst

@@ -206,6 +206,21 @@ If you want, you can suppress us loading the widget and/or modify the user data
 
 If you then later want to trigger loading the widgets, just call ``window.PretixWidget.buildWidgets()``.
 
+Waiting for the widget to load
+------------------------------
+
+If you want to run custom JavaScript once the widget is fully loaded, you can register a callback function. Note that
+this function might be run multiple times, for example if you have multiple widgets on a page or if the user switches
+e.g. from an event list to an event detail view::
+
+    <script type="text/javascript">
+    window.pretixWidgetCallback = function () {
+        window.PretixWidget.addLoadListener(function () {
+            console.log("Widget has loaded!");
+        });
+    }
+    </script>
+
 
 Passing user data to the widget
 -------------------------------

doc/user/index.rst

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

src/pretix/__init__.py

@@ -1 +1 @@
-__version__ = "3.2.0"
+__version__ = "3.3.0"

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

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

src/pretix/api/models.py

@@ -43,6 +43,7 @@ class OAuthGrant(AbstractGrant):
         OAuthApplication, on_delete=models.CASCADE
     )
     organizers = models.ManyToManyField('pretixbase.Organizer')
+    redirect_uri = models.CharField(max_length=2500)  # Only 255 in AbstractGrant, which caused problems
 
 
 class OAuthAccessToken(AbstractAccessToken):

src/pretix/api/serializers/event.py

@@ -70,7 +70,7 @@ class EventSerializer(I18nAwareModelSerializer):
         model = Event
         fields = ('name', 'slug', 'live', 'testmode', 'currency', 'date_from',
                   'date_to', 'date_admission', 'is_public', 'presale_start',
-                  'presale_end', 'location', 'has_subevents', 'meta_data', 'seating_plan',
+                  'presale_end', 'location', 'geo_lat', 'geo_lon', 'has_subevents', 'meta_data', 'seating_plan',
                   'plugins', 'seat_category_mapping')
 
     def validate(self, data):
@@ -239,6 +239,7 @@ class CloneEventSerializer(EventSerializer):
         plugins = validated_data.pop('plugins', None)
         is_public = validated_data.pop('is_public', None)
         testmode = validated_data.pop('testmode', None)
+        has_subevents = validated_data.pop('has_subevents', None)
         new_event = super().create(validated_data)
 
         event = Event.objects.filter(slug=self.context['event'], organizer=self.context['organizer'].pk).first()
@@ -250,6 +251,8 @@ class CloneEventSerializer(EventSerializer):
             new_event.is_public = is_public
         if testmode is not None:
             new_event.testmode = testmode
+        if has_subevents is not None:
+            new_event.has_subevents = has_subevents
         new_event.save()
 
         return new_event
@@ -277,8 +280,9 @@ class SubEventSerializer(I18nAwareModelSerializer):
     class Meta:
         model = SubEvent
         fields = ('id', 'name', 'date_from', 'date_to', 'active', 'date_admission',
-                  'presale_start', 'presale_end', 'location', 'event', 'is_public', 'seating_plan',
-                  'item_price_overrides', 'variation_price_overrides', 'meta_data', 'seat_category_mapping')
+                  'presale_start', 'presale_end', 'location', 'geo_lat', 'geo_lon', 'event', 'is_public',
+                  'seating_plan', 'item_price_overrides', 'variation_price_overrides', 'meta_data',
+                  'seat_category_mapping')
 
     def validate(self, data):
         data = super().validate(data)

src/pretix/api/serializers/item.py

@@ -119,7 +119,7 @@ class ItemSerializer(I18nAwareModelSerializer):
                   'require_voucher', 'hide_without_voucher', 'allow_cancel', 'require_bundling',
                   'min_per_order', 'max_per_order', 'checkin_attention', 'has_variations', 'variations',
                   'addons', 'bundles', 'original_price', 'require_approval', 'generate_tickets',
-                  'show_quota_left', 'hidden_if_available', 'allow_waitinglist')
+                  'show_quota_left', 'hidden_if_available', 'allow_waitinglist', 'issue_giftcard')
         read_only_fields = ('has_variations', 'picture')
 
     def get_serializer_context(self):
@@ -134,6 +134,17 @@ class ItemSerializer(I18nAwareModelSerializer):
         Item.clean_per_order(data.get('min_per_order'), data.get('max_per_order'))
         Item.clean_available(data.get('available_from'), data.get('available_until'))
 
+        if data.get('issue_giftcard'):
+            if data.get('tax_rule') and data.get('tax_rule').rate > 0:
+                raise ValidationError(
+                    _("Gift card products should not be associated with non-zero tax rates since sales tax will be "
+                      "applied when the gift card is redeemed.")
+                )
+            if data.get('admission'):
+                raise ValidationError(_(
+                    "Gift card products should not be admission products at the same time."
+                ))
+
         return data
 
     def validate_category(self, value):
@@ -249,6 +260,9 @@ class QuestionSerializer(I18nAwareModelSerializer):
 
         dep = full_data.get('dependency_question')
         if dep:
+            if dep.ask_during_checkin:
+                raise ValidationError(_('Question cannot depend on a question asked during check-in.'))
+
             seen_ids = {self.instance.pk} if self.instance else set()
             while dep:
                 if dep.pk in seen_ids:

src/pretix/api/serializers/order.py

@@ -675,6 +675,20 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
             raise ValidationError(errs)
         return data
 
+    def validate_testmode(self, testmode):
+        if 'sales_channel' in self.initial_data:
+            try:
+                sales_channel = get_all_sales_channels()[self.initial_data['sales_channel']]
+
+                if testmode and not sales_channel.testmode_supported:
+                    raise ValidationError('This sales channel does not provide support for testmode.')
+            except KeyError:
+                # We do not need to raise a ValidationError here, since there is another check to validate the
+                # sales_channel
+                pass
+
+        return testmode
+
     def create(self, validated_data):
         fees_data = validated_data.pop('fees') if 'fees' in validated_data else []
         positions_data = validated_data.pop('positions') if 'positions' in validated_data else []
@@ -858,6 +872,9 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         order.total = sum([p.price for p in order.positions.all()]) + sum([f.value for f in order.fees.all()])
         order.save(update_fields=['total'])
 
+        if order.total == Decimal('0.00') and validated_data.get('status') == Order.STATUS_PAID and not payment_provider:
+            payment_provider = 'free'
+
         if order.total == Decimal('0.00') and validated_data.get('status') != Order.STATUS_PAID:
             order.status = Order.STATUS_PAID
             order.save()

src/pretix/api/serializers/organizer.py

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

src/pretix/api/urls.py

@@ -19,6 +19,7 @@ orga_router.register(r'events', event.EventViewSet)
 orga_router.register(r'subevents', event.SubEventViewSet)
 orga_router.register(r'webhooks', webhooks.WebHookViewSet)
 orga_router.register(r'seatingplans', organizer.SeatingPlanViewSet)
+orga_router.register(r'giftcards', organizer.GiftCardViewSet)
 
 event_router = routers.DefaultRouter()
 event_router.register(r'subevents', event.SubEventViewSet)

src/pretix/api/views/event.py

@@ -18,6 +18,7 @@ from pretix.base.models import (
 )
 from pretix.base.models.event import SubEvent
 from pretix.helpers.dicts import merge_dicts
+from pretix.presale.views.organizer import filter_qs_by_attr
 
 with scopes_disabled():
     class EventFilter(FilterSet):
@@ -85,6 +86,8 @@ class EventViewSet(viewsets.ModelViewSet):
                 organizer=self.request.organizer
             )
 
+        qs = filter_qs_by_attr(qs, self.request)
+
         return qs.prefetch_related(
             'meta_values', 'meta_values__property', 'seat_category_mappings'
         )
@@ -241,6 +244,9 @@ class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
                 event__organizer=self.request.organizer,
                 event__in=self.request.user.get_events_with_any_permission()
             )
+
+        qs = filter_qs_by_attr(qs, self.request)
+
         return qs.prefetch_related(
             'subeventitem_set', 'subeventitemvariation_set', 'seat_category_mappings'
         )

src/pretix/api/views/order.py

@@ -6,7 +6,7 @@ import pytz
 from django.db import transaction
 from django.db.models import F, Prefetch, Q
 from django.db.models.functions import Coalesce, Concat
-from django.http import FileResponse
+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 ugettext as _
@@ -148,12 +148,16 @@ class OrderViewSet(viewsets.ModelViewSet):
             generate.apply_async(args=('order', order.pk, provider.identifier))
             raise RetryException()
         else:
-            resp = FileResponse(ct.file.file, content_type=ct.type)
-            resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}{}"'.format(
-                self.request.event.slug.upper(), order.code,
-                provider.identifier, ct.extension
-            )
-            return resp
+            if ct.type == 'text/uri-list':
+                resp = HttpResponse(ct.file.file.read(), content_type='text/uri-list')
+                return resp
+            else:
+                resp = FileResponse(ct.file.file, content_type=ct.type)
+                resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}{}"'.format(
+                    self.request.event.slug.upper(), order.code,
+                    provider.identifier, ct.extension
+                )
+                return resp
 
     @action(detail=True, methods=['POST'])
     def mark_paid(self, request, **kwargs):
@@ -441,48 +445,50 @@ class OrderViewSet(viewsets.ModelViewSet):
                 user=request.user if request.user.is_authenticated else None,
                 auth=request.auth,
             )
-        order_placed.send(self.request.event, order=order)
 
-        gen_invoice = invoice_qualified(order) and (
-            (order.event.settings.get('invoice_generate') == 'True') or
-            (order.event.settings.get('invoice_generate') == 'paid' and order.status == Order.STATUS_PAID)
-        ) and not order.invoices.last()
-        invoice = None
-        if gen_invoice:
-            invoice = generate_invoice(order, trigger_pdf=True)
+        with language(order.locale):
+            order_placed.send(self.request.event, order=order)
 
-        if send_mail:
-            payment = order.payments.last()
-            free_flow = (
-                payment and order.total == Decimal('0.00') and order.status == Order.STATUS_PAID and
-                not order.require_approval and payment.provider == "free"
-            )
-            if free_flow:
-                email_template = request.event.settings.mail_text_order_free
-                log_entry = 'pretix.event.order.email.order_free'
-                email_attendees = request.event.settings.mail_send_order_free_attendee
-                email_attendees_template = request.event.settings.mail_text_order_free_attendee
-            else:
-                email_template = request.event.settings.mail_text_order_placed
-                log_entry = 'pretix.event.order.email.order_placed'
-                email_attendees = request.event.settings.mail_send_order_placed_attendee
-                email_attendees_template = request.event.settings.mail_text_order_placed_attendee
+            gen_invoice = invoice_qualified(order) and (
+                (order.event.settings.get('invoice_generate') == 'True') or
+                (order.event.settings.get('invoice_generate') == 'paid' and order.status == Order.STATUS_PAID)
+            ) and not order.invoices.last()
+            invoice = None
+            if gen_invoice:
+                invoice = generate_invoice(order, trigger_pdf=True)
 
-            _order_placed_email(
-                request.event, order, payment.payment_provider if payment else None, email_template,
-                log_entry, invoice, payment
-            )
-            if email_attendees:
-                for p in order.positions.all():
-                    if p.addon_to_id is None and p.attendee_email and p.attendee_email != order.email:
-                        _order_placed_email_attendee(request.event, order, p, email_attendees_template, log_entry)
+            if send_mail:
+                payment = order.payments.last()
+                free_flow = (
+                    payment and order.total == Decimal('0.00') and order.status == Order.STATUS_PAID and
+                    not order.require_approval and payment.provider == "free"
+                )
+                if free_flow:
+                    email_template = request.event.settings.mail_text_order_free
+                    log_entry = 'pretix.event.order.email.order_free'
+                    email_attendees = request.event.settings.mail_send_order_free_attendee
+                    email_attendees_template = request.event.settings.mail_text_order_free_attendee
+                else:
+                    email_template = request.event.settings.mail_text_order_placed
+                    log_entry = 'pretix.event.order.email.order_placed'
+                    email_attendees = request.event.settings.mail_send_order_placed_attendee
+                    email_attendees_template = request.event.settings.mail_text_order_placed_attendee
 
-            if not free_flow and order.status == Order.STATUS_PAID and payment:
-                payment._send_paid_mail(invoice, None, '')
-                if self.request.event.settings.mail_send_order_paid_attendee:
+                _order_placed_email(
+                    request.event, order, payment.payment_provider if payment else None, email_template,
+                    log_entry, invoice, payment
+                )
+                if email_attendees:
                     for p in order.positions.all():
                         if p.addon_to_id is None and p.attendee_email and p.attendee_email != order.email:
-                            payment._send_paid_mail_attendee(p, None)
+                            _order_placed_email_attendee(request.event, order, p, email_attendees_template, log_entry)
+
+                if not free_flow and order.status == Order.STATUS_PAID and payment:
+                    payment._send_paid_mail(invoice, None, '')
+                    if self.request.event.settings.mail_send_order_paid_attendee:
+                        for p in order.positions.all():
+                            if p.addon_to_id is None and p.attendee_email and p.attendee_email != order.email:
+                                payment._send_paid_mail_attendee(p, None)
 
         headers = self.get_success_headers(serializer.data)
         return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
@@ -759,12 +765,16 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, viewsets.ReadOnlyModelViewS
             generate.apply_async(args=('orderposition', pos.pk, provider.identifier))
             raise RetryException()
         else:
-            resp = FileResponse(ct.file.file, content_type=ct.type)
-            resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}-{}{}"'.format(
-                self.request.event.slug.upper(), pos.order.code, pos.positionid,
-                provider.identifier, ct.extension
-            )
-            return resp
+            if ct.type == 'text/uri-list':
+                resp = HttpResponse(ct.file.file.read(), content_type='text/uri-list')
+                return resp
+            else:
+                resp = FileResponse(ct.file.file, content_type=ct.type)
+                resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}-{}{}"'.format(
+                    self.request.event.slug.upper(), pos.order.code, pos.positionid,
+                    provider.identifier, ct.extension
+                )
+                return resp
 
     def perform_destroy(self, instance):
         try:

src/pretix/api/views/organizer.py

@@ -1,11 +1,14 @@
-from rest_framework import filters, viewsets
-from rest_framework.exceptions import PermissionDenied
+from django.db import transaction
+from rest_framework import filters, serializers, status, viewsets
+from rest_framework.decorators import action
+from rest_framework.exceptions import MethodNotAllowed, PermissionDenied
+from rest_framework.response import Response
 
 from pretix.api.models import OAuthAccessToken
 from pretix.api.serializers.organizer import (
-    OrganizerSerializer, SeatingPlanSerializer,
+    GiftCardSerializer, OrganizerSerializer, SeatingPlanSerializer,
 )
-from pretix.base.models import Organizer, SeatingPlan
+from pretix.base.models import GiftCard, Organizer, SeatingPlan
 from pretix.helpers.dicts import merge_dicts
 
 
@@ -81,3 +84,66 @@ class SeatingPlanViewSet(viewsets.ModelViewSet):
             data={'id': instance.pk}
         )
         instance.delete()
+
+
+class GiftCardViewSet(viewsets.ModelViewSet):
+    serializer_class = GiftCardSerializer
+    queryset = GiftCard.objects.none()
+    permission = 'can_manage_gift_cards'
+    write_permission = 'can_manage_gift_cards'
+
+    def get_queryset(self):
+        return self.request.organizer.issued_gift_cards.all()
+
+    def get_serializer_context(self):
+        ctx = super().get_serializer_context()
+        ctx['organizer'] = self.request.organizer
+        return ctx
+
+    @transaction.atomic()
+    def perform_create(self, serializer):
+        value = serializer.validated_data.pop('value')
+        inst = serializer.save(issuer=self.request.organizer)
+        inst.transactions.create(value=value)
+        inst.log_action(
+            'pretix.giftcards.transaction.manual',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=merge_dicts(self.request.data, {'id': inst.pk})
+        )
+
+    @transaction.atomic()
+    def perform_update(self, serializer):
+        GiftCard.objects.select_for_update().get(pk=self.get_object().pk)
+        old_value = serializer.instance.value
+        value = serializer.validated_data.pop('value')
+        inst = serializer.save(secret=serializer.instance.secret, currency=serializer.instance.currency,
+                               testmode=serializer.instance.testmode)
+        diff = value - old_value
+        inst.transactions.create(value=diff)
+        inst.log_action(
+            'pretix.giftcards.transaction.manual',
+            user=self.request.user,
+            auth=self.request.auth,
+            data={'value': diff}
+        )
+        return inst
+
+    @action(detail=True, methods=["POST"])
+    @transaction.atomic()
+    def transact(self, request, **kwargs):
+        gc = GiftCard.objects.select_for_update().get(pk=self.get_object().pk)
+        value = serializers.DecimalField(max_digits=10, decimal_places=2).to_internal_value(
+            request.data.get('value')
+        )
+        gc.transactions.create(value=value)
+        gc.log_action(
+            'pretix.giftcards.transaction.manual',
+            user=self.request.user,
+            auth=self.request.auth,
+            data={'value': value}
+        )
+        return Response(GiftCardSerializer(gc).data, status=status.HTTP_200_OK)
+
+    def perform_destroy(self, instance):
+        raise MethodNotAllowed("Gift cards cannot be deleted.")

src/pretix/base/__init__.py

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

src/pretix/base/auth.py

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

src/pretix/base/channels.py

@@ -35,6 +35,13 @@ class SalesChannel:
         """
         return "circle"
 
+    @property
+    def testmode_supported(self) -> bool:
+        """
+        Indication, if a saleschannels supports test mode orders
+        """
+        return True
+
 
 def get_all_sales_channels():
     global _ALL_CHANNELS

src/pretix/base/context.py

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

src/pretix/base/email.py

@@ -259,6 +259,9 @@ def base_placeholders(sender, **kwargs):
         SimpleFunctionalMailTextPlaceholder(
             'event', ['event'], lambda event: event.name, lambda event: event.name
         ),
+        SimpleFunctionalMailTextPlaceholder(
+            'event_slug', ['event'], lambda event: event.slug, lambda event: event.slug
+        ),
         SimpleFunctionalMailTextPlaceholder(
             'code', ['order'], lambda order: order.code, 'F8VVL'
         ),
@@ -374,6 +377,23 @@ def base_placeholders(sender, **kwargs):
             'code', ['waiting_list_entry'], lambda waiting_list_entry: waiting_list_entry.voucher.code,
             '68CYU2H6ZTP3WLK5'
         ),
+        SimpleFunctionalMailTextPlaceholder(
+            'voucher_list', ['voucher_list'], lambda voucher_list: '\n'.join(voucher_list),
+            '    68CYU2H6ZTP3WLK5\n    7MB94KKPVEPSMVF2'
+        ),
+        SimpleFunctionalMailTextPlaceholder(
+            'url', ['event', 'voucher_list'], lambda event, voucher_list: build_absolute_uri(event, 'presale:event.index', kwargs={
+                'event': event.slug,
+                'organizer': event.organizer.slug,
+            }), lambda event: build_absolute_uri(event, 'presale:event.index', kwargs={
+                'event': event.slug,
+                'organizer': event.organizer.slug,
+            })
+        ),
+        SimpleFunctionalMailTextPlaceholder(
+            'name', ['name'], lambda name: name,
+            _('John Doe')
+        ),
         SimpleFunctionalMailTextPlaceholder(
             'comment', ['comment'], lambda comment: comment,
             _('An individual text with a reason can be inserted here.'),

src/pretix/base/forms/auth.py

@@ -1,6 +1,5 @@
 from django import forms
 from django.conf import settings
-from django.contrib.auth import authenticate
 from django.contrib.auth.password_validation import (
     password_validators_help_texts, validate_password,
 )
@@ -14,32 +13,33 @@ class LoginForm(forms.Form):
     Base class for authenticating users. Extend this to get a form that accepts
     username/password logins.
     """
-    email = forms.EmailField(label=_("E-mail"), max_length=254, widget=forms.EmailInput(attrs={'autofocus': 'autofocus'}))
-    password = forms.CharField(label=_("Password"), widget=forms.PasswordInput)
     keep_logged_in = forms.BooleanField(label=_("Keep me logged in"), required=False)
 
     error_messages = {
-        'invalid_login': _("Please enter a correct email address and password."),
+        'invalid_login': _("This combination of credentials is not known to our system."),
         'inactive': _("This account is inactive.")
     }
 
-    def __init__(self, request=None, *args, **kwargs):
+    def __init__(self, backend, request=None, *args, **kwargs):
         """
         The 'request' parameter is set for custom auth use by subclasses.
         The form data comes in via the standard 'data' kwarg.
         """
         self.request = request
         self.user_cache = None
+        self.backend = backend
         super().__init__(*args, **kwargs)
+        for k, f in backend.login_form_fields.items():
+            self.fields[k] = f
+
         if not settings.PRETIX_LONG_SESSIONS:
             del self.fields['keep_logged_in']
+        else:
+            self.fields.move_to_end('keep_logged_in')
 
     def clean(self):
-        email = self.cleaned_data.get('email')
-        password = self.cleaned_data.get('password')
-
-        if email and password:
-            self.user_cache = authenticate(request=self.request, email=email.lower(), password=password)
+        if all(k in self.cleaned_data for k, f in self.fields.items() if f.required):
+            self.user_cache = self.backend.form_authenticate(self.request, self.cleaned_data)
             if self.user_cache is None:
                 raise forms.ValidationError(
                     self.error_messages['invalid_login'],
@@ -181,3 +181,44 @@ class PasswordForgotForm(forms.Form):
 
     def clean_email(self):
         return self.cleaned_data['email']
+
+
+class ReauthForm(forms.Form):
+    error_messages = {
+        'invalid_login': _("This combination of credentials is not known to our system."),
+        'inactive': _("This account is inactive.")
+    }
+
+    def __init__(self, backend, user, request=None, *args, **kwargs):
+        """
+        The 'request' parameter is set for custom auth use by subclasses.
+        The form data comes in via the standard 'data' kwarg.
+        """
+        self.request = request
+        self.user = user
+        self.backend = backend
+        super().__init__(*args, **kwargs)
+        for k, f in backend.login_form_fields.items():
+            self.fields[k] = f
+        if 'email' in self.fields:
+            self.fields['email'].disabled = True
+
+    def clean(self):
+        self.cleaned_data['email'] = self.user.email
+        user_cache = self.backend.form_authenticate(self.request, self.cleaned_data)
+        if user_cache != self.user:
+            raise forms.ValidationError(
+                self.error_messages['invalid_login'],
+                code='invalid_login'
+            )
+        else:
+            self.confirm_login_allowed(user_cache)
+
+        return self.cleaned_data
+
+    def confirm_login_allowed(self, user: User):
+        if not user.is_active:
+            raise forms.ValidationError(
+                self.error_messages['inactive'],
+                code='inactive',
+            )

src/pretix/base/forms/questions.py

@@ -348,6 +348,8 @@ class BaseQuestionsForm(forms.Form):
         question_cache = {f.question.pk: f.question for f in self.fields.values() if getattr(f, 'question', None)}
 
         def question_is_visible(parentid, qvals):
+            if parentid not in question_cache:
+                return False
             parentq = question_cache[parentid]
             if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
                 return False
@@ -493,7 +495,8 @@ class BaseInvoiceAddressForm(forms.ModelForm):
             initial=(self.instance.name_parts if self.instance else self.instance.name_parts),
         )
         if event.settings.invoice_address_required and not event.settings.invoice_address_company_required and not self.all_optional:
-            self.fields['name_parts'].widget.attrs['data-required-if'] = '#id_is_business_0'
+            if not event.settings.invoice_name_required:
+                self.fields['name_parts'].widget.attrs['data-required-if'] = '#id_is_business_0'
             self.fields['name_parts'].widget.attrs['data-no-required-attr'] = '1'
             self.fields['company'].widget.attrs['data-required-if'] = '#id_is_business_1'
 

src/pretix/base/forms/user.py

@@ -56,6 +56,11 @@ class UserSettingsForm(forms.ModelForm):
         self.user = kwargs.pop('user')
         super().__init__(*args, **kwargs)
         self.fields['email'].required = True
+        if self.user.auth_backend != 'native':
+            del self.fields['old_pw']
+            del self.fields['new_pw']
+            del self.fields['new_pw_repeat']
+            self.fields['email'].disabled = True
 
     def clean_old_pw(self):
         old_pw = self.cleaned_data.get('old_pw')

src/pretix/base/forms/widgets.py

@@ -46,6 +46,14 @@ class TimePickerWidget(forms.TimeInput):
 
 class UploadedFileWidget(forms.ClearableFileInput):
     def __init__(self, *args, **kwargs):
+        # Browsers can't recognize that the server already has a file uploaded
+        # Don't mark this input as being required if we already have an answer
+        # (this needs to be done via the attrs, otherwise we wouldn't get the "required" star on the field label)
+        attrs = kwargs.get('attrs', {})
+        if kwargs.get('required') and kwargs.get('initial'):
+            attrs.update({'required': None})
+        kwargs.update({'attrs': attrs})
+
         self.position = kwargs.pop('position')
         self.event = kwargs.pop('event')
         self.answer = kwargs.pop('answer')

src/pretix/base/management/commands/makemigrations.py

@@ -23,7 +23,7 @@ modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("default_manager_name")
 modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("permissions")
 modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("default_permissions")
 IGNORED_ATTRS = [
-    # (field type, attribute name, blacklist of field sub-types)
+    # (field type, attribute name, banlist of field sub-types)
     (models.Field, 'verbose_name', []),
     (models.Field, 'help_text', []),
     (models.Field, 'validators', []),
@@ -38,8 +38,8 @@ original_deconstruct = models.Field.deconstruct
 
 def new_deconstruct(self):
     name, path, args, kwargs = original_deconstruct(self)
-    for ftype, attr, blacklist in IGNORED_ATTRS:
-        if isinstance(self, ftype) and not any(isinstance(self, ft) for ft in blacklist):
+    for ftype, attr, banlist in IGNORED_ATTRS:
+        if isinstance(self, ftype) and not any(isinstance(self, ft) for ft in banlist):
             kwargs.pop(attr, None)
     return name, path, args, kwargs
 

src/pretix/base/management/commands/migrate.py

@@ -11,13 +11,13 @@ from django.core.management.commands.migrate import Command as Parent
 
 
 class OutputFilter(OutputWrapper):
-    blacklist = (
+    banlist = (
         "Your models have changes that are not yet reflected",
         "Run 'manage.py makemigrations' to make new "
     )
 
     def write(self, msg, style_func=None, ending=None):
-        if any(b in msg for b in self.blacklist):
+        if any(b in msg for b in self.banlist):
             return
         super().write(msg, style_func, ending)
 

src/pretix/base/middleware.py

@@ -14,6 +14,7 @@ from django.utils.translation.trans_real import (
     parse_accept_lang_header,
 )
 
+from pretix.base.settings import GlobalSettingsObject
 from pretix.multidomain.urlreverse import get_domain
 
 _supported = None
@@ -187,6 +188,11 @@ class SecurityMiddleware(MiddlewareMixin):
         # https://github.com/pretix/pretix/issues/765
         resp['P3P'] = 'CP=\"ALL DSP COR CUR ADM TAI OUR IND COM NAV INT\"'
 
+        img_src = []
+        gs = GlobalSettingsObject()
+        if gs.settings.leaflet_tiles:
+            img_src.append(gs.settings.leaflet_tiles[:gs.settings.leaflet_tiles.index("/", 10)].replace("{s}", "*"))
+
         h = {
             'default-src': ["{static}"],
             'script-src': ['{static}', 'https://checkout.stripe.com', 'https://js.stripe.com'],
@@ -196,7 +202,7 @@ class SecurityMiddleware(MiddlewareMixin):
             'child-src': ['{static}', 'https://checkout.stripe.com', 'https://js.stripe.com'],
             'style-src': ["{static}", "{media}"],
             'connect-src': ["{dynamic}", "{media}", "https://checkout.stripe.com"],
-            'img-src': ["{static}", "{media}", "data:", "https://*.stripe.com"],
+            'img-src': ["{static}", "{media}", "data:", "https://*.stripe.com"] + img_src,
             'font-src': ["{static}"],
             'media-src': ["{static}", "data:"],
             # form-action is not only used to match on form actions, but also on URLs

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.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.EventSlugBlacklistValidator()], 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.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.OrganizerSlugBlacklistValidator()], 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.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.EventSlugBlacklistValidator()], 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.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.OrganizerSlugBlacklistValidator()], 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.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.EventSlugBlacklistValidator()], 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.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.OrganizerSlugBlacklistValidator()], 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,

src/pretix/base/migrations/0052_team_teaminvite_squashed_0070_auto_20170719_0910.py

@@ -346,7 +346,7 @@ class Migration(migrations.Migration):
                 help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. We recommend some kind of abbreviation or a date with less than 10 characters that can be easily remembered, but you can also choose to use a random value. This will be used in URLs, order codes, invoice numbers, 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.EventSlugBlacklistValidator()], verbose_name='Short form'),
+                    pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Short form'),
         ),
         migrations.AlterField(
             model_name='invoice',

src/pretix/base/migrations/0053_auto_20170104_1252.py

@@ -33,7 +33,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='slug',
-            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.EventSlugBlacklistValidator()], 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',

src/pretix/base/migrations/0057_auto_20170107_1531.py

@@ -36,7 +36,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='organizer',
             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.OrganizerSlugBlacklistValidator()], 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(merge_names, migrations.RunPython.noop)
     ]

src/pretix/base/migrations/0063_auto_20170702_1711.py

@@ -38,7 +38,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='slug',
-            field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. We recommend some kind of abbreviation or a date with less than 10 characters that can be easily remembered, but you can also choose to use a random value. This will be used in URLs, order codes, invoice numbers, 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.EventSlugBlacklistValidator()], 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. We recommend some kind of abbreviation or a date with less than 10 characters that can be easily remembered, but you can also choose to use a random value. This will be used in URLs, order codes, invoice numbers, 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.AlterField(
             model_name='invoice',

src/pretix/base/migrations/0077_auto_20171124_1629.py

@@ -44,7 +44,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='slug',
-            field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes, and must be unique among your events. We recommend some kind of abbreviation or a date with less than 10 characters that can be easily remembered, but you can also choose to use a random value. This will be used in URLs, order codes, invoice numbers, 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.EventSlugBlacklistValidator()], verbose_name='Short form'),
+            field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes, and must be unique among your events. We recommend some kind of abbreviation or a date with less than 10 characters that can be easily remembered, but you can also choose to use a random value. This will be used in URLs, order codes, invoice numbers, 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.AlterField(
             model_name='eventmetaproperty',
@@ -54,7 +54,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='organizer',
             name='slug',
-            field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes. Every slug can only be used once. This is being used in URLs to refer to your organizer accounts and your events.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBlacklistValidator()], verbose_name='Short form'),
+            field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes. Every slug can only be used once. This is being used in URLs to refer to your organizer accounts and your events.', 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.CreateModel(
             name='CheckinList',

src/pretix/base/migrations/0077_auto_20171124_1629_squashed_0088_auto_20180328_1217.py

@@ -105,7 +105,7 @@ class Migration(migrations.Migration):
                           '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.EventSlugBlacklistValidator()], verbose_name='Short form'),
+                    pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Short form'),
         ),
         migrations.AlterField(
             model_name='eventmetaproperty',
@@ -125,7 +125,7 @@ class Migration(migrations.Migration):
                           ' events.',
                 validators=[django.core.validators.RegexValidator(
                     message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'),
-                    pretix.base.validators.OrganizerSlugBlacklistValidator()], verbose_name='Short form'),
+                    pretix.base.validators.OrganizerSlugBanlistValidator()], verbose_name='Short form'),
         ),
         migrations.CreateModel(
             name='CheckinList',

src/pretix/base/migrations/0098_auto_20180731_1243.py

@@ -27,7 +27,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='organizer',
             name='slug',
-            field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes. Every slug can only be used once. This is being used in URLs to refer to your organizer accounts and your events.', unique=True, validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBlacklistValidator()], verbose_name='Short form'),
+            field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes. Every slug can only be used once. This is being used in URLs to refer to your organizer accounts and your events.', unique=True, 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.AlterField(
             model_name='staffsession',

src/pretix/base/migrations/0098_auto_20180731_1243_squashed_0100_item_require_approval.py

@@ -29,7 +29,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='organizer',
             name='slug',
-            field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes. Every slug can only be used once. This is being used in URLs to refer to your organizer accounts and your events.', unique=True, validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBlacklistValidator()], verbose_name='Short form'),
+            field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes. Every slug can only be used once. This is being used in URLs to refer to your organizer accounts and your events.', unique=True, 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.AlterField(
             model_name='staffsession',

src/pretix/base/migrations/0137_auto_20191015_1141.py

@@ -0,0 +1,17 @@
+# Generated by Django 2.2.4 on 2019-10-15 11:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('pretixbase', '0136_auto_20190918_1742'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='auth_backend',
+            field=models.CharField(default='native', max_length=255),
+        ),
+    ]

src/pretix/base/migrations/0138_auto_20191017_1151.py

@@ -0,0 +1,107 @@
+# Generated by Django 2.2.4 on 2019-10-17 11:51
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+import pretix.base.models.base
+import pretix.base.models.fields
+import pretix.base.models.giftcards
+
+
+def fwd(app, schema_editor):
+    Team = app.get_model('pretixbase', 'Team')
+    Team.objects.filter(can_change_organizer_settings=True).update(can_manage_gift_cards=True)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('pretixbase', '0137_auto_20191015_1141'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='GiftCard',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('issuance', models.DateTimeField(auto_now_add=True)),
+                ('secret', models.CharField(db_index=True, default=pretix.base.models.giftcards.gen_giftcard_secret,
+                                            max_length=190)),
+                ('currency', models.CharField(max_length=10)),
+                ('issued_in', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT,
+                                                related_name='issued_gift_cards', to='pretixbase.OrderPosition')),
+                ('issuer',
+                 models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='issued_gift_cards',
+                                   to='pretixbase.Organizer')),
+                ('testmode', django.db.models.BooleanField(default=False)),
+            ],
+            options={
+                'unique_together': {('secret', 'issuer')},
+            },
+            bases=(models.Model, pretix.base.models.base.LoggingMixin),
+        ),
+        migrations.AddField(
+            model_name='item',
+            name='issue_giftcard',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='team',
+            name='can_manage_gift_cards',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='question',
+            name='dependency_values',
+            field=pretix.base.models.fields.MultiStringField(default=[]),
+        ),
+        migrations.AlterField(
+            model_name='voucher',
+            name='item',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vouchers',
+                                    to='pretixbase.Item'),
+        ),
+        migrations.AlterField(
+            model_name='voucher',
+            name='quota',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vouchers',
+                                    to='pretixbase.Quota'),
+        ),
+        migrations.AlterField(
+            model_name='voucher',
+            name='variation',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vouchers',
+                                    to='pretixbase.ItemVariation'),
+        ),
+        migrations.CreateModel(
+            name='GiftCardTransaction',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('datetime', models.DateTimeField(auto_now_add=True)),
+                ('value', models.DecimalField(decimal_places=2, max_digits=10)),
+                ('card', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='transactions',
+                                           to='pretixbase.GiftCard')),
+                ('order', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT,
+                                            related_name='gift_card_transactions', to='pretixbase.Order')),
+                ('payment', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT,
+                                              related_name='gift_card_transactions', to='pretixbase.OrderPayment')),
+                ('refund', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT,
+                                             related_name='gift_card_transactions', to='pretixbase.OrderRefund')),
+            ],
+            options={
+                'ordering': ('datetime',),
+            },
+        ),
+        migrations.CreateModel(
+            name='GiftCardAcceptance',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('collector', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
+                                                related_name='gift_card_issuer_acceptance', to='pretixbase.Organizer')),
+                ('issuer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
+                                             related_name='gift_card_collector_acceptance', to='pretixbase.Organizer')),
+            ],
+        ),
+        migrations.RunPython(
+            fwd, migrations.RunPython.noop
+        ),
+    ]

src/pretix/base/migrations/0139_auto_20191019_1317.py

@@ -0,0 +1,33 @@
+# Generated by Django 2.2.1 on 2019-10-19 13:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0138_auto_20191017_1151'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='geo_lat',
+            field=models.FloatField(null=True),
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='geo_lon',
+            field=models.FloatField(null=True),
+        ),
+        migrations.AddField(
+            model_name='subevent',
+            name='geo_lat',
+            field=models.FloatField(null=True),
+        ),
+        migrations.AddField(
+            model_name='subevent',
+            name='geo_lon',
+            field=models.FloatField(null=True),
+        ),
+    ]

src/pretix/base/models/__init__.py

@@ -7,6 +7,7 @@ from .event import (
     Event, Event_SettingsStore, EventLock, EventMetaProperty, EventMetaValue,
     RequiredAction, SubEvent, SubEventMetaValue, generate_invite_token,
 )
+from .giftcards import GiftCard, GiftCardAcceptance, GiftCardTransaction
 from .invoices import Invoice, InvoiceLine, invoice_filename
 from .items import (
     Item, ItemAddOn, ItemBundle, ItemCategory, ItemVariation, Question,

src/pretix/base/models/auth.py

@@ -109,6 +109,7 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
         help_text=_('If turned off, you will not get any notifications.')
     )
     notifications_token = models.CharField(max_length=255, default=generate_notifications_token)
+    auth_backend = models.CharField(max_length=255, default='native')
 
     objects = UserManager()
 
@@ -334,6 +335,25 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
             | Q(id__in=self.teams.filter(**kwargs).values_list('limit_events__id', flat=True))
         )
 
+    @scopes_disabled()
+    def get_organizers_with_permission(self, permission, request=None):
+        """
+        Returns a queryset of organizers the user has a specific permissions to.
+
+        :param request: The current request (optional). Required to detect staff sessions properly.
+        :return: Iterable of Organizers
+        """
+        from .event import Organizer
+
+        if request and self.has_active_staff_session(request.session.session_key):
+            return Organizer.objects.all()
+
+        kwargs = {permission: True}
+
+        return Organizer.objects.filter(
+            id__in=self.teams.filter(**kwargs).values_list('organizer', flat=True)
+        )
+
     def has_active_staff_session(self, session_key=None):
         """
         Returns whether or not a user has an active staff session (formerly known as superuser session)

src/pretix/base/models/event.py

@@ -22,7 +22,7 @@ from i18nfield.fields import I18nCharField, I18nTextField
 
 from pretix.base.models.base import LoggedModel
 from pretix.base.reldate import RelativeDateWrapper
-from pretix.base.validators import EventSlugBlacklistValidator
+from pretix.base.validators import EventSlugBanlistValidator
 from pretix.helpers.database import GroupConcat
 from pretix.helpers.daterange import daterange
 from pretix.helpers.json import safe_string
@@ -291,7 +291,7 @@ class Event(EventMixin, LoggedModel):
                 regex="^[a-zA-Z0-9.-]+$",
                 message=_("The slug may only contain letters, numbers, dots and dashes."),
             ),
-            EventSlugBlacklistValidator()
+            EventSlugBanlistValidator()
         ],
         verbose_name=_("Short form"),
     )
@@ -324,6 +324,14 @@ class Event(EventMixin, LoggedModel):
         max_length=200,
         verbose_name=_("Location"),
     )
+    geo_lat = models.FloatField(
+        verbose_name=_("Latitude"),
+        null=True, blank=True,
+    )
+    geo_lon = models.FloatField(
+        verbose_name=_("Longitude"),
+        null=True, blank=True,
+    )
     plugins = models.TextField(
         null=False, blank=True,
         verbose_name=_("Plugins"),
@@ -730,7 +738,7 @@ class Event(EventMixin, LoggedModel):
     def has_payment_provider(self):
         result = False
         for provider in self.get_payment_providers().values():
-            if provider.is_enabled and provider.identifier not in ('free', 'boxoffice', 'offsetting'):
+            if provider.is_enabled and provider.identifier not in ('free', 'boxoffice', 'offsetting', 'giftcard'):
                 result = True
                 break
         return result
@@ -929,6 +937,14 @@ class SubEvent(EventMixin, LoggedModel):
         max_length=200,
         verbose_name=_("Location"),
     )
+    geo_lat = models.FloatField(
+        verbose_name=_("Latitude"),
+        null=True, blank=True,
+    )
+    geo_lon = models.FloatField(
+        verbose_name=_("Longitude"),
+        null=True, blank=True
+    )
     frontpage_text = I18nTextField(
         null=True, blank=True,
         verbose_name=_("Frontpage text")

src/pretix/base/models/giftcards.py

@@ -0,0 +1,112 @@
+from decimal import Decimal
+
+from django.conf import settings
+from django.db import models
+from django.db.models import Sum
+from django.utils.crypto import get_random_string
+from django.utils.translation import ugettext_lazy as _
+
+from pretix.base.banlist import banned
+from pretix.base.models import LoggedModel
+
+
+def gen_giftcard_secret():
+    charset = list('ABCDEFGHJKLMNPQRSTUVWXYZ3789')
+    while True:
+        code = get_random_string(length=settings.ENTROPY['giftcard_secret'], allowed_chars=charset)
+        if not banned(code) and not GiftCard.objects.filter(secret=code).exists():
+            return code
+
+
+class GiftCardAcceptance(models.Model):
+    issuer = models.ForeignKey(
+        'Organizer',
+        related_name='gift_card_collector_acceptance',
+        on_delete=models.CASCADE
+    )
+    collector = models.ForeignKey(
+        'Organizer',
+        related_name='gift_card_issuer_acceptance',
+        on_delete=models.CASCADE
+    )
+
+
+class GiftCard(LoggedModel):
+    issuer = models.ForeignKey(
+        'Organizer',
+        related_name='issued_gift_cards',
+        on_delete=models.PROTECT,
+    )
+    issued_in = models.ForeignKey(
+        'OrderPosition',
+        related_name='issued_gift_cards',
+        on_delete=models.PROTECT,
+        null=True, blank=True
+    )
+    issuance = models.DateTimeField(
+        auto_now_add=True,
+    )
+    secret = models.CharField(
+        max_length=190,
+        default=gen_giftcard_secret,
+        db_index=True,
+        verbose_name=_('Gift card code'),
+    )
+    testmode = models.BooleanField(
+        verbose_name=_('Test mode card'),
+        default=False
+    )
+    CURRENCY_CHOICES = [(c.alpha_3, c.alpha_3 + " - " + c.name) for c in settings.CURRENCIES]
+    currency = models.CharField(max_length=10, choices=CURRENCY_CHOICES)
+
+    def __str__(self):
+        return self.secret
+
+    @property
+    def value(self):
+        return self.transactions.aggregate(s=Sum('value'))['s'] or Decimal('0.00')
+
+    def accepted_by(self, organizer):
+        return self.issuer == organizer or GiftCardAcceptance.objects.filter(issuer=self.issuer, collector=organizer).exists()
+
+    class Meta:
+        unique_together = (('secret', 'issuer'),)
+
+
+class GiftCardTransaction(models.Model):
+    card = models.ForeignKey(
+        'GiftCard',
+        related_name='transactions',
+        on_delete=models.PROTECT
+    )
+    datetime = models.DateTimeField(
+        auto_now_add=True
+    )
+    value = models.DecimalField(
+        decimal_places=2,
+        max_digits=10
+    )
+    order = models.ForeignKey(
+        'Order',
+        related_name='gift_card_transactions',
+        null=True,
+        blank=True,
+        on_delete=models.PROTECT
+    )
+    payment = models.ForeignKey(
+        'OrderPayment',
+        related_name='gift_card_transactions',
+        null=True,
+        blank=True,
+        on_delete=models.PROTECT
+    )
+    refund = models.ForeignKey(
+        'OrderRefund',
+        related_name='gift_card_transactions',
+        null=True,
+        blank=True,
+        on_delete=models.PROTECT
+    )
+
+    class Meta:
+        ordering = ("datetime",)

src/pretix/base/models/items.py

@@ -242,6 +242,8 @@ class Item(LoggedModel):
     :type require_approval: bool
     :param sales_channels: Sales channels this item is available on.
     :type sales_channels: bool
+    :param issue_giftcard: If ``True``, buying this product will give you a gift card with the value of the product's price
+    :type issue_giftcard: bool
     """
 
     objects = ItemQuerySetManager()
@@ -413,6 +415,12 @@ class Item(LoggedModel):
         verbose_name=_('Sales channels'),
         default=['web']
     )
+    issue_giftcard = models.BooleanField(
+        verbose_name=_('This product is a gift card'),
+        help_text=_('When a customer buys this product, they will get a gift card with a value corresponding to the '
+                    'product price.'),
+        default=False
+    )
     # !!! Attention: If you add new fields here, also add them to the copying code in
     # pretix/control/forms/item.py if applicable.
 

src/pretix/base/models/orders.py

@@ -39,6 +39,7 @@ from pretix.base.models import User
 from pretix.base.reldate import RelativeDateWrapper
 from pretix.base.services.locking import NoLockManager
 from pretix.base.settings import PERSON_NAME_SCHEMES
+from pretix.base.signals import order_gracefully_delete
 
 from .base import LockModel, LoggedModel
 from .event import Event, SubEvent
@@ -201,7 +202,7 @@ class Order(LockModel, LoggedModel):
         return self.full_code
 
     def gracefully_delete(self, user=None, auth=None):
-        from . import Voucher
+        from . import Voucher, GiftCard, GiftCardTransaction
 
         if not self.testmode:
             raise TypeError("Only test mode orders can be deleted.")
@@ -212,11 +213,17 @@ class Order(LockModel, LoggedModel):
             }
         )
 
+        order_gracefully_delete.send(self.event, order=self)
+
         if self.status != Order.STATUS_CANCELED:
             for position in self.positions.all():
                 if position.voucher:
                     Voucher.objects.filter(pk=position.voucher.pk).update(redeemed=Greatest(0, F('redeemed') - 1))
 
+        GiftCardTransaction.objects.filter(payment__in=self.payments.all()).update(payment=None)
+        GiftCardTransaction.objects.filter(refund__in=self.refunds.all()).update(refund=None)
+        GiftCardTransaction.objects.filter(order=self).update(order=None)
+        GiftCard.objects.filter(issued_in__in=self.positions.all()).update(issued_in=None)
         OrderPosition.all.filter(order=self, addon_to__isnull=False).delete()
         OrderPosition.all.filter(order=self).delete()
         OrderFee.all.filter(order=self).delete()
@@ -458,11 +465,15 @@ class Order(LockModel, LoggedModel):
         positions = list(
             self.positions.all().annotate(
                 has_checkin=Exists(Checkin.objects.filter(position_id=OuterRef('pk')))
-            ).select_related('item')
+            ).select_related('item').prefetch_related('issued_gift_cards')
         )
         cancelable = all([op.item.allow_cancel and not op.has_checkin for op in positions])
         if not cancelable or not positions:
             return False
+        for op in positions:
+            for gc in op.issued_gift_cards.all():
+                if gc.value != op.price:
+                    return False
         if self.user_cancel_deadline and now() > self.user_cancel_deadline:
             return False
         if self.status == Order.STATUS_PENDING:
@@ -713,7 +724,8 @@ class Order(LockModel, LoggedModel):
     def send_mail(self, subject: str, template: Union[str, LazyI18nString],
                   context: Dict[str, Any]=None, log_entry_type: str='pretix.event.order.email.sent',
                   user: User=None, headers: dict=None, sender: str=None, invoices: list=None,
-                  auth=None, attach_tickets=False, position: 'OrderPosition'=None, auto_email=True):
+                  auth=None, attach_tickets=False, position: 'OrderPosition'=None, auto_email=True,
+                  attach_ical=False):
         """
         Sends an email to the user that placed this order. Basically, this method does two things:
 
@@ -730,6 +742,7 @@ class Order(LockModel, LoggedModel):
         :param headers: Dictionary with additional mail headers
         :param sender: Custom email sender.
         :param attach_tickets: Attach tickets of this order, if they are existing and ready to download
+        :param attach_ical: Attach relevant ICS files
         :param position: An order position this refers to. If given, no invoices will be attached, the tickets will
                          only be attached for this position and child positions, the link will only point to the
                          position and the attendee email will be used if available.
@@ -753,7 +766,7 @@ class Order(LockModel, LoggedModel):
                     recipient, subject, template, context,
                     self.event, self.locale, self, headers=headers, sender=sender,
                     invoices=invoices, attach_tickets=attach_tickets,
-                    position=position, auto_email=auto_email
+                    position=position, auto_email=auto_email, attach_ical=attach_ical
                 )
             except SendMailException:
                 raise
@@ -769,6 +782,7 @@ class Order(LockModel, LoggedModel):
                         'recipient': recipient,
                         'invoices': [i.pk for i in invoices] if invoices else [],
                         'attach_tickets': attach_tickets,
+                        'attach_ical': attach_ical,
                     }
                 )
 
@@ -780,7 +794,7 @@ class Order(LockModel, LoggedModel):
             self.send_mail(
                 email_subject, email_template, email_context,
                 'pretix.event.order.email.resend', user=user, auth=auth,
-                attach_tickets=True
+                attach_tickets=True,
             )
 
     @property
@@ -1043,6 +1057,8 @@ class AbstractPosition(models.Model):
         }
 
         def question_is_visible(parentid, qvals):
+            if parentid not in question_cache:
+                return False
             parentq = question_cache[parentid]
             if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
                 return False
@@ -1322,7 +1338,8 @@ class OrderPayment(models.Model):
                     email_subject, email_template, email_context,
                     'pretix.event.order.email.order_paid', user,
                     invoices=[], position=position,
-                    attach_tickets=True
+                    attach_tickets=True,
+                    attach_ical=self.order.event.settings.mail_attach_ical
                 )
             except SendMailException:
                 logger.exception('Order paid email could not be sent')
@@ -1339,7 +1356,8 @@ class OrderPayment(models.Model):
                     email_subject, email_template, email_context,
                     'pretix.event.order.email.order_paid', user,
                     invoices=[invoice] if invoice and self.order.event.settings.invoice_email_attachment else [],
-                    attach_tickets=True
+                    attach_tickets=True,
+                    attach_ical=self.order.event.settings.mail_attach_ical
                 )
             except SendMailException:
                 logger.exception('Order paid email could not be sent')

src/pretix/base/models/organizer.py

@@ -2,12 +2,13 @@ import string
 
 from django.core.validators import RegexValidator
 from django.db import models
+from django.db.models import Exists, OuterRef, Q
 from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
 
 from pretix.base.models.base import LoggedModel
-from pretix.base.validators import OrganizerSlugBlacklistValidator
+from pretix.base.validators import OrganizerSlugBanlistValidator
 
 from ..settings import settings_hierarkey
 from .auth import User
@@ -39,7 +40,7 @@ class Organizer(LoggedModel):
                 regex="^[a-zA-Z0-9.-]+$",
                 message=_("The slug may only contain letters, numbers, dots and dashes.")
             ),
-            OrganizerSlugBlacklistValidator()
+            OrganizerSlugBanlistValidator()
         ],
         verbose_name=_("Short form"),
         unique=True
@@ -82,6 +83,24 @@ class Organizer(LoggedModel):
 
         return ObjectRelatedCache(self)
 
+    @property
+    def has_gift_cards(self):
+        return self.cache.get_or_set(
+            key='has_gift_cards',
+            timeout=15,
+            default=lambda: self.issued_gift_cards.exists() or self.gift_card_issuer_acceptance.exists()
+        )
+
+    @property
+    def accepted_gift_cards(self):
+        from .giftcards import GiftCard, GiftCardAcceptance
+
+        return GiftCard.objects.annotate(
+            accepted=Exists(GiftCardAcceptance.objects.filter(issuer=OuterRef('issuer'), collector=self))
+        ).filter(
+            Q(issuer=self) | Q(accepted=True)
+        )
+
     def allow_delete(self):
         from . import Order, Invoice
         return (
@@ -156,6 +175,10 @@ class Team(LoggedModel):
         help_text=_('Someone with this setting can get access to most data of all of your events, i.e. via privacy '
                     'reports, so be careful who you add to this team!')
     )
+    can_manage_gift_cards = models.BooleanField(
+        default=False,
+        verbose_name=_("Can manage gift cards")
+    )
 
     can_change_event_settings = models.BooleanField(
         default=False,

src/pretix/base/notifications.py

@@ -3,7 +3,7 @@ from collections import OrderedDict, namedtuple
 
 from django.dispatch import receiver
 from django.utils.formats import date_format
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import pgettext_lazy, ugettext_lazy as _
 
 from pretix.base.models import Event, LogEntry
 from pretix.base.signals import register_notification_types
@@ -175,12 +175,23 @@ class ParametrizedOrderNotificationType(NotificationType):
             url=order_url
         )
         n.add_attribute(_('Event'), order.event.name)
+        if order.event.has_subevents:
+            ses = []
+            for se in self.event.subevents.filter(id__in=order.positions.values_list('subevent', flat=True)):
+                ses.append('{} ({})'.format(se.name, se.get_date_range_display()))
+            n.add_attribute(pgettext_lazy('subevent', 'Dates'), '\n'.join(ses))
+        else:
+            n.add_attribute(_('Event date'), order.event.get_date_range_display())
         n.add_attribute(_('Order code'), order.code)
         n.add_attribute(_('Order total'), money_filter(order.total, logentry.event.currency))
         n.add_attribute(_('Pending amount'), money_filter(order.pending_sum, logentry.event.currency))
         n.add_attribute(_('Order date'), date_format(order.datetime, 'SHORT_DATETIME_FORMAT'))
         n.add_attribute(_('Order status'), order.get_status_display())
         n.add_attribute(_('Order positions'), str(order.positions.count()))
+        items = []
+        for it in self.event.items.filter(id__in=order.positions.values_list('item', flat=True)):
+            items.append(str(it.name))
+        n.add_attribute(_('Purchased products'), '\n'.join(items))
         n.add_action(_('View order details'), order_url)
         return n
 

src/pretix/base/payment.py

@@ -7,7 +7,9 @@ from typing import Any, Dict, Union
 import pytz
 from django import forms
 from django.conf import settings
+from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured
+from django.db import transaction
 from django.dispatch import receiver
 from django.forms import Form
 from django.http import HttpRequest
@@ -20,8 +22,8 @@ from i18nfield.strings import LazyI18nString
 
 from pretix.base.forms import PlaceholderValidator
 from pretix.base.models import (
-    CartPosition, Event, InvoiceAddress, Order, OrderPayment, OrderRefund,
-    Quota,
+    CartPosition, Event, GiftCard, InvoiceAddress, Order, OrderPayment,
+    OrderRefund, Quota,
 )
 from pretix.base.reldate import RelativeDateField, RelativeDateWrapper
 from pretix.base.settings import SettingsSandbox
@@ -29,7 +31,8 @@ from pretix.base.signals import register_payment_providers
 from pretix.base.templatetags.money import money_filter
 from pretix.base.templatetags.rich_text import rich_text
 from pretix.helpers.money import DecimalTextInput
-from pretix.presale.views import get_cart_total
+from pretix.multidomain.urlreverse import eventreverse
+from pretix.presale.views import get_cart, get_cart_total
 from pretix.presale.views.cart import cart_session, get_or_create_cart_id
 
 logger = logging.getLogger(__name__)
@@ -699,8 +702,9 @@ class FreeOrderProvider(BasePaymentProvider):
     def is_allowed(self, request: HttpRequest, total: Decimal=None) -> bool:
         from .services.cart import get_fees
 
+        cart = get_cart(request)
         total = get_cart_total(request)
-        total += sum([f.value for f in get_fees(self.event, request, total, None, None)])
+        total += sum([f.value for f in get_fees(self.event, request, total, None, None, cart)])
         return total == 0
 
     def order_change_allowed(self, order: Order) -> bool:
@@ -867,7 +871,7 @@ class OffsettingProvider(BasePaymentProvider):
             provider='offsetting',
             info=json.dumps({'orders': [refund.order.code]})
         )
-        p.confirm()
+        p.confirm(ignore_date=True)
 
     @property
     def settings_form_fields(self) -> dict:
@@ -888,6 +892,207 @@ class OffsettingProvider(BasePaymentProvider):
         return _('Balanced against orders: %s' % ', '.join(payment.info_data['orders']))
 
 
+class GiftCardPayment(BasePaymentProvider):
+    identifier = "giftcard"
+    verbose_name = _("Gift card")
+
+    @property
+    def settings_form_fields(self):
+        f = super().settings_form_fields
+        del f['_fee_abs']
+        del f['_fee_percent']
+        del f['_fee_reverse_calc']
+        del f['_total_min']
+        del f['_total_max']
+        del f['_invoice_text']
+        return f
+
+    @property
+    def test_mode_message(self) -> str:
+        return _("In test mode, only test cards will work.")
+
+    def is_allowed(self, request: HttpRequest, total: Decimal=None) -> bool:
+        return super().is_allowed(request, total) and self.event.organizer.has_gift_cards
+
+    def order_change_allowed(self, order: Order) -> bool:
+        return super().order_change_allowed(order) and self.event.organizer.has_gift_cards
+
+    def payment_form_render(self, request: HttpRequest, total: Decimal) -> str:
+        return get_template('pretixcontrol/giftcards/checkout.html').render({})
+
+    def checkout_confirm_render(self, request) -> str:
+        return get_template('pretixcontrol/giftcards/checkout_confirm.html').render({})
+
+    def payment_control_render(self, request, payment) -> str:
+        from .models import GiftCard
+
+        if 'gift_card' in payment.info_data:
+            gc = GiftCard.objects.get(pk=payment.info_data.get('gift_card'))
+            template = get_template('pretixcontrol/giftcards/payment.html')
+
+            ctx = {
+                'request': request,
+                'event': self.event,
+                'gc': gc,
+            }
+            return template.render(ctx)
+
+    def api_payment_details(self, payment: OrderPayment):
+        from .models import GiftCard
+        gc = GiftCard.objects.get(pk=payment.info_data.get('gift_card'))
+        return {
+            'gift_card': {
+                'id': gc.pk,
+                'secret': gc.secret,
+                'organizer': gc.issuer.slug
+            }
+        }
+
+    def payment_partial_refund_supported(self, payment: OrderPayment) -> bool:
+        return True
+
+    def payment_refund_supported(self, payment: OrderPayment) -> bool:
+        return True
+
+    def checkout_prepare(self, request: HttpRequest, cart: Dict[str, Any]) -> Union[bool, str, None]:
+        for p in get_cart(request):
+            if p.item.issue_giftcard:
+                messages.error(request, _("You cannot pay with gift cards when buying a gift card."))
+                return
+
+        cs = cart_session(request)
+        try:
+            gc = self.event.organizer.accepted_gift_cards.get(
+                secret=request.POST.get("giftcard")
+            )
+            if gc.currency != self.event.currency:
+                messages.error(request, _("This gift card does not support this currency."))
+                return
+            if gc.testmode and not self.event.testmode:
+                messages.error(request, _("This gift card can only be used in test mode."))
+                return
+            if not gc.testmode and self.event.testmode:
+                messages.error(request, _("Only test gift cards can be used in test mode."))
+                return
+            if gc.value <= Decimal("0.00"):
+                messages.error(request, _("All credit on this gift card has been used."))
+                return
+            if 'gift_cards' not in cs:
+                cs['gift_cards'] = []
+            elif gc.pk in cs['gift_cards']:
+                messages.error(request, _("This gift card is already used for your payment."))
+                return
+            cs['gift_cards'] = cs['gift_cards'] + [gc.pk]
+
+            remainder = cart['total'] - gc.value
+            if remainder >= Decimal('0.00'):
+                del cs['payment']
+                messages.success(request, _("Your gift card has been applied, but {} still need to be paid. Please select a payment method.").format(
+                    money_filter(remainder, self.event.currency)
+                ))
+            else:
+                messages.success(request, _("Your gift card has been applied."))
+
+            kwargs = {'step': 'payment'}
+            if request.resolver_match and 'cart_namespace' in request.resolver_match.kwargs:
+                kwargs['cart_namespace'] = request.resolver_match.kwargs['cart_namespace']
+            return eventreverse(self.event, 'presale:event.checkout', kwargs=kwargs)
+        except GiftCard.DoesNotExist:
+            if self.event.vouchers.filter(code__iexact=request.POST.get("giftcard")).exists():
+                messages.warning(request, _("You entered a voucher instead of a gift card. Vouchers can only be entered on the first page of the shop below "
+                                            "the product selection."))
+            else:
+                messages.error(request, _("This gift card is not known."))
+        except GiftCard.MultipleObjectsReturned:
+            messages.error(request, _("This gift card can not be redeemed since its code is not unique. Please contact the organizer of this event."))
+
+    def payment_prepare(self, request: HttpRequest, payment: OrderPayment) -> Union[bool, str, None]:
+        for p in payment.order.positions.all():
+            if p.item.issue_giftcard:
+                messages.error(request, _("You cannot pay with gift cards when buying a gift card."))
+                return
+
+        try:
+            gc = self.event.organizer.accepted_gift_cards.get(
+                secret=request.POST.get("giftcard")
+            )
+            if gc.currency != self.event.currency:
+                messages.error(request, _("This gift card does not support this currency."))
+                return
+            if gc.testmode and not payment.order.testmode:
+                messages.error(request, _("This gift card can only be used in test mode."))
+                return
+            if not gc.testmode and payment.order.testmode:
+                messages.error(request, _("Only test gift cards can be used in test mode."))
+                return
+            if gc.value <= Decimal("0.00"):
+                messages.error(request, _("All credit on this gift card has been used."))
+                return
+            payment.info_data = {
+                'gift_card': gc.pk,
+                'retry': True
+            }
+            payment.amount = min(payment.amount, gc.value)
+            payment.save()
+
+            return True
+        except GiftCard.DoesNotExist:
+            if self.event.vouchers.filter(code__iexact=request.POST.get("giftcard")).exists():
+                messages.warning(request, _("You entered a voucher instead of a gift card. Vouchers can only be entered on the first page of the shop below "
+                                            "the product selection."))
+            else:
+                messages.error(request, _("This gift card is not known."))
+        except GiftCard.MultipleObjectsReturned:
+            messages.error(request, _("This gift card can not be redeemed since its code is not unique. Please contact the organizer of this event."))
+
+    def execute_payment(self, request: HttpRequest, payment: OrderPayment) -> str:
+        # This method will only be called when retrying payments, e.g. after a payment_prepare call. It is not called
+        # during the order creation phase because this payment provider is a special case.
+        for p in payment.order.positions.all():  # noqa - just a safeguard
+            if p.item.issue_giftcard:
+                raise PaymentException(_("You cannot pay with gift cards when buying a gift card."))
+
+        gcpk = payment.info_data.get('gift_card')
+        if not gcpk or not payment.info_data.get('retry'):
+            raise PaymentException("Invalid state, should never occur.")
+        with transaction.atomic():
+            gc = GiftCard.objects.select_for_update().get(pk=gcpk)
+            if gc.currency != self.event.currency:  # noqa - just a safeguard
+                raise PaymentException(_("This gift card does not support this currency."))
+            if not gc.accepted_by(self.event.organizer):  # noqa - just a safeguard
+                raise PaymentException(_("This gift card is not accepted by this event organizer."))
+            if payment.amount > gc.value:  # noqa - just a safeguard
+                raise PaymentException(_("This gift card was used in the meantime. Please try again"))
+            trans = gc.transactions.create(
+                value=-1 * payment.amount,
+                order=payment.order,
+                payment=payment
+            )
+            payment.info_data = {
+                'gift_card': gc.pk,
+                'transaction_id': trans.pk,
+            }
+            payment.confirm()
+
+    def payment_is_valid_session(self, request: HttpRequest) -> bool:
+        return True
+
+    @transaction.atomic()
+    def execute_refund(self, refund: OrderRefund):
+        from .models import GiftCard
+        gc = GiftCard.objects.get(pk=refund.payment.info_data.get('gift_card'))
+        trans = gc.transactions.create(
+            value=refund.amount,
+            order=refund.order,
+            refund=refund
+        )
+        refund.info_data = {
+            'gift_card': gc.pk,
+            'transaction_id': trans.pk,
+        }
+        refund.done()
+
+
 @receiver(register_payment_providers, dispatch_uid="payment_free")
 def register_payment_provider(sender, **kwargs):
-    return [FreeOrderProvider, BoxOfficeProvider, OffsettingProvider, ManualPayment]
+    return [FreeOrderProvider, BoxOfficeProvider, OffsettingProvider, ManualPayment, GiftCardPayment]

src/pretix/base/pdf.py

@@ -14,6 +14,7 @@ from django.conf import settings
 from django.contrib.staticfiles import finders
 from django.dispatch import receiver
 from django.utils.formats import date_format
+from django.utils.html import escape
 from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
 from PyPDF2 import PdfFileReader
@@ -52,35 +53,40 @@ DEFAULT_VARIABLES = OrderedDict((
         "editor_sample": "A1B2C",
         "evaluate": lambda orderposition, order, event: orderposition.order.code
     }),
+    ("positionid", {
+        "label": _("Order position number"),
+        "editor_sample": "1",
+        "evaluate": lambda orderposition, order, event: str(orderposition.positionid)
+    }),
     ("item", {
         "label": _("Product name"),
         "editor_sample": _("Sample product"),
-        "evaluate": lambda orderposition, order, event: str(orderposition.item.name)
+        "evaluate": lambda orderposition, order, event: escape(str(orderposition.item.name))
     }),
     ("variation", {
         "label": _("Variation name"),
         "editor_sample": _("Sample variation"),
-        "evaluate": lambda op, order, event: str(op.variation) if op.variation else ''
+        "evaluate": lambda op, order, event: escape(str(op.variation) if op.variation else '')
     }),
     ("item_description", {
         "label": _("Product description"),
         "editor_sample": _("Sample product description"),
-        "evaluate": lambda orderposition, order, event: str(orderposition.item.description)
+        "evaluate": lambda orderposition, order, event: escape(str(orderposition.item.description))
     }),
     ("itemvar", {
         "label": _("Product name and variation"),
         "editor_sample": _("Sample product – sample variation"),
-        "evaluate": lambda orderposition, order, event: (
+        "evaluate": lambda orderposition, order, event: escape((
             '{} - {}'.format(orderposition.item.name, orderposition.variation)
             if orderposition.variation else str(orderposition.item.name)
-        )
+        ))
     }),
     ("item_category", {
         "label": _("Product category"),
         "editor_sample": _("Ticket category"),
-        "evaluate": lambda orderposition, order, event: (
+        "evaluate": lambda orderposition, order, event: escape((
             str(orderposition.item.category.name) if orderposition.item.category else ""
-        )
+        ))
     }),
     ("price", {
         "label": _("Price"),
@@ -99,12 +105,12 @@ DEFAULT_VARIABLES = OrderedDict((
     ("attendee_name", {
         "label": _("Attendee name"),
         "editor_sample": _("John Doe"),
-        "evaluate": lambda op, order, ev: op.attendee_name or (op.addon_to.attendee_name if op.addon_to else '')
+        "evaluate": lambda op, order, ev: escape(op.attendee_name or (op.addon_to.attendee_name if op.addon_to else ''))
     }),
     ("event_name", {
         "label": _("Event name"),
         "editor_sample": _("Sample event name"),
-        "evaluate": lambda op, order, ev: str(ev.name)
+        "evaluate": lambda op, order, ev: escape(str(ev.name))
     }),
     ("event_date", {
         "label": _("Event date"),
@@ -185,12 +191,12 @@ DEFAULT_VARIABLES = OrderedDict((
     ("invoice_name", {
         "label": _("Invoice address name"),
         "editor_sample": _("John Doe"),
-        "evaluate": lambda op, order, ev: order.invoice_address.name if getattr(order, 'invoice_address', None) else ''
+        "evaluate": lambda op, order, ev: escape(order.invoice_address.name if getattr(order, 'invoice_address', None) else '')
     }),
     ("invoice_company", {
         "label": _("Invoice address company"),
         "editor_sample": _("Sample company"),
-        "evaluate": lambda op, order, ev: order.invoice_address.company if getattr(order, 'invoice_address', None) else ''
+        "evaluate": lambda op, order, ev: escape(order.invoice_address.company if getattr(order, 'invoice_address', None) else '')
     }),
     ("addons", {
         "label": _("List of Add-Ons"),
@@ -207,7 +213,7 @@ DEFAULT_VARIABLES = OrderedDict((
     ("organizer", {
         "label": _("Organizer name"),
         "editor_sample": _("Event organizer company"),
-        "evaluate": lambda op, order, ev: str(order.event.organizer.name)
+        "evaluate": lambda op, order, ev: escape(str(order.event.organizer.name))
     }),
     ("organizer_info_text", {
         "label": _("Organizer info text"),
@@ -287,7 +293,7 @@ def variables_from_questions(sender, *args, **kwargs):
         if not a:
             return ""
         else:
-            return str(a).replace("\n", "<br/>\n")
+            return escape(str(a)).replace("\n", "<br/>\n")
 
     d = {}
     for q in sender.questions.all():
@@ -300,11 +306,11 @@ def variables_from_questions(sender, *args, **kwargs):
 
 
 def _get_attendee_name_part(key, op, order, ev):
-    return op.attendee_name_parts.get(key, '')
+    return escape(op.attendee_name_parts.get(key, ''))
 
 
 def _get_ia_name_part(key, op, order, ev):
-    return order.invoice_address.name_parts.get(key, '') if getattr(order, 'invoice_address', None) else ''
+    return escape(order.invoice_address.name_parts.get(key, '') if getattr(order, 'invoice_address', None) else '')
 
 
 def get_variables(event):

src/pretix/base/services/cart.py

@@ -97,6 +97,7 @@ error_messages = {
     'seat_forbidden': _('You can not select a seat for this position.'),
     'seat_unavailable': _('The seat you selected has already been taken. Please select a different seat.'),
     'seat_multiple': _('You can not select the same seat multiple times.'),
+    'gift_card': _("You entered a gift card instead of a voucher. Gift cards can be entered later on when you're asked for your payment details."),
 }
 
 
@@ -957,15 +958,42 @@ def update_tax_rates(event: Event, cart_id: str, invoice_address: InvoiceAddress
     return totaldiff
 
 
-def get_fees(event, request, total, invoice_address, provider):
-    fees = []
+def get_fees(event, request, total, invoice_address, provider, positions):
+    from pretix.presale.views.cart import cart_session
 
+    fees = []
     for recv, resp in fee_calculation_for_cart.send(sender=event, request=request, invoice_address=invoice_address,
-                                                    total=total):
+                                                    total=total, positions=positions):
         if resp:
             fees += resp
 
     total = total + sum(f.value for f in fees)
+
+    cs = cart_session(request)
+    if cs.get('gift_cards'):
+        gcs = cs['gift_cards']
+        gc_qs = event.organizer.accepted_gift_cards.filter(pk__in=cs.get('gift_cards'), currency=event.currency)
+        summed = 0
+        for gc in gc_qs:
+            if gc.testmode != event.testmode:
+                gcs.remove(gc.pk)
+                continue
+            fval = Decimal(gc.value)  # TODO: don't require an extra query
+            fval = min(fval, total - summed)
+            if fval > 0:
+                total -= fval
+                summed += fval
+                fees.append(OrderFee(
+                    fee_type=OrderFee.FEE_TYPE_GIFTCARD,
+                    internal_type='giftcard',
+                    description=gc.secret,
+                    value=-1 * fval,
+                    tax_rate=Decimal('0.00'),
+                    tax_value=Decimal('0.00'),
+                    tax_rule=TaxRule.zero()
+                ))
+        cs['gift_cards'] = gcs
+
     if provider and total != 0:
         provider = event.get_payment_providers().get(provider)
         if provider:

src/pretix/base/services/invoices.py

@@ -20,9 +20,7 @@ from django_scopes import scope, scopes_disabled
 from i18nfield.strings import LazyI18nString
 
 from pretix.base.i18n import language
-from pretix.base.models import (
-    Invoice, InvoiceAddress, InvoiceLine, Order, OrderPayment,
-)
+from pretix.base.models import Invoice, InvoiceAddress, InvoiceLine, Order
 from pretix.base.models.tax import EU_CURRENCIES
 from pretix.base.services.tasks import TransactionAwareTask
 from pretix.base.settings import GlobalSettingsObject
@@ -37,9 +35,6 @@ logger = logging.getLogger(__name__)
 @transaction.atomic
 def build_invoice(invoice: Invoice) -> Invoice:
     lp = invoice.order.payments.last()
-    open_payment = None
-    if lp and lp.state not in (OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED):
-        open_payment = lp
 
     with language(invoice.locale):
         invoice.invoice_from = invoice.event.settings.get('invoice_address_from')
@@ -53,13 +48,11 @@ def build_invoice(invoice: Invoice) -> Invoice:
         introductory = invoice.event.settings.get('invoice_introductory_text', as_type=LazyI18nString)
         additional = invoice.event.settings.get('invoice_additional_text', as_type=LazyI18nString)
         footer = invoice.event.settings.get('invoice_footer_text', as_type=LazyI18nString)
-        if open_payment and open_payment.payment_provider:
-            if 'payment' in inspect.signature(open_payment.payment_provider.render_invoice_text).parameters:
-                payment = open_payment.payment_provider.render_invoice_text(invoice.order, open_payment)
+        if lp and lp.payment_provider:
+            if 'payment' in inspect.signature(lp.payment_provider.render_invoice_text).parameters:
+                payment = lp.payment_provider.render_invoice_text(invoice.order, lp)
             else:
-                payment = open_payment.payment_provider.render_invoice_text(invoice.order)
-        elif invoice.order.status == Order.STATUS_PAID:
-            payment = pgettext('invoice', 'The payment for this invoice has already been received.')
+                payment = lp.payment_provider.render_invoice_text(invoice.order)
         else:
             payment = ""
 
@@ -210,6 +203,8 @@ def build_cancellation(invoice: Invoice):
 
 
 def generate_cancellation(invoice: Invoice, trigger_pdf=True):
+    if invoice.refered.exists():
+        raise ValueError("Invoice should not be canceled twice.")
     cancellation = modelcopy(invoice)
     cancellation.pk = None
     cancellation.invoice_no = None

src/pretix/base/services/mail.py

@@ -31,6 +31,7 @@ from pretix.base.services.tickets import get_tickets_for_order
 from pretix.base.signals import email_filter, global_email_filter
 from pretix.celery_app import app
 from pretix.multidomain.urlreverse import build_absolute_uri
+from pretix.presale.ical import get_ical
 
 logger = logging.getLogger('pretix.base.mail')
 INVALID_ADDRESS = 'invalid-pretix-mail-address'
@@ -50,7 +51,7 @@ class SendMailException(Exception):
 def mail(email: str, subject: str, template: Union[str, LazyI18nString],
          context: Dict[str, Any]=None, event: Event=None, locale: str=None,
          order: Order=None, position: OrderPosition=None, headers: dict=None, sender: str=None,
-         invoices: list=None, attach_tickets=False, auto_email=True, user=None):
+         invoices: list=None, attach_tickets=False, auto_email=True, user=None, attach_ical=False):
     """
     Sends out an email to a user. The mail will be sent synchronously or asynchronously depending on the installation.
 
@@ -85,6 +86,8 @@ def mail(email: str, subject: str, template: Union[str, LazyI18nString],
 
     :param attach_tickets: Whether to attach tickets to this email, if they are available to download.
 
+    :param attach_ical: Whether to attach relevant ``.ics`` files to this email
+
     :param auto_email: Whether this email is auto-generated
 
     :param user: The user this email is sent to
@@ -118,7 +121,7 @@ def mail(email: str, subject: str, template: Union[str, LazyI18nString],
                 })
         renderer = ClassicMailRenderer(None)
         content_plain = body_plain = render_mail(template, context)
-        subject = str(subject).format_map(context)
+        subject = str(subject).format_map(TolerantDict(context))
         sender = sender or (event.settings.get('mail_from') if event else settings.MAIL_FROM)
         if event:
             sender_name = event.settings.mail_from_name or str(event.name)
@@ -216,6 +219,7 @@ def mail(email: str, subject: str, template: Union[str, LazyI18nString],
             order=order.pk if order else None,
             position=position.pk if position else None,
             attach_tickets=attach_tickets,
+            attach_ical=attach_ical,
             user=user.pk if user else None
         )
 
@@ -231,7 +235,8 @@ def mail(email: str, subject: str, template: Union[str, LazyI18nString],
 @app.task(base=TransactionAwareTask, bind=True)
 def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: str, sender: str,
                    event: int=None, position: int=None, headers: dict=None, bcc: List[str]=None,
-                   invoices: List[int]=None, order: int=None, attach_tickets=False, user=None) -> bool:
+                   invoices: List[int]=None, order: int=None, attach_tickets=False, user=None,
+                   attach_ical=False) -> bool:
     email = EmailMultiAlternatives(subject, body, sender, to=to, bcc=bcc, headers=headers)
     if html is not None:
         html_with_cid, cid_images = replace_images_with_cid_paths(html)
@@ -301,6 +306,20 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
                                     'invoices': [],
                                 }
                             )
+                    if attach_ical:
+                        ical_events = set()
+                        if event.has_subevents:
+                            if position:
+                                ical_events.add(position.subevent)
+                            else:
+                                for p in order.positions.all():
+                                    ical_events.add(p.subevent)
+                        else:
+                            ical_events.add(order.event)
+
+                        for i, e in enumerate(ical_events):
+                            cal = get_ical([e])
+                            email.attach('event-{}.ics'.format(i), cal.serialize(), 'text/calendar')
 
             email = email_filter.send_chained(event, 'message', message=email, order=order, user=user)
 

src/pretix/base/services/orders.py

@@ -17,11 +17,13 @@ from django.utils.translation import ugettext as _
 from django_scopes import scopes_disabled
 
 from pretix.api.models import OAuthApplication
+from pretix.base.channels import get_all_sales_channels
 from pretix.base.email import get_email_context
 from pretix.base.i18n import LazyLocaleException, language
 from pretix.base.models import (
-    CartPosition, Device, Event, Item, ItemVariation, Order, OrderPayment,
-    OrderPosition, Quota, Seat, SeatCategoryMapping, User, Voucher,
+    CartPosition, Device, Event, GiftCard, Item, ItemVariation, Order,
+    OrderPayment, OrderPosition, Quota, Seat, SeatCategoryMapping, User,
+    Voucher,
 )
 from pretix.base.models.event import SubEvent
 from pretix.base.models.items import ItemBundle
@@ -30,7 +32,7 @@ from pretix.base.models.orders import (
     generate_secret,
 )
 from pretix.base.models.organizer import TeamAPIToken
-from pretix.base.models.tax import TaxedPrice
+from pretix.base.models.tax import TaxedPrice, TaxRule
 from pretix.base.payment import BasePaymentProvider, PaymentException
 from pretix.base.reldate import RelativeDateWrapper
 from pretix.base.services import tickets
@@ -43,8 +45,8 @@ from pretix.base.services.pricing import get_price
 from pretix.base.services.tasks import ProfiledEventTask, ProfiledTask
 from pretix.base.signals import (
     allow_ticket_download, order_approved, order_canceled, order_changed,
-    order_denied, order_expired, order_fee_calculation, order_placed,
-    order_split, periodic_task, validate_order,
+    order_denied, order_expired, order_fee_calculation, order_paid,
+    order_placed, order_split, periodic_task, validate_order,
 )
 from pretix.celery_app import app
 from pretix.helpers.models import modelcopy
@@ -154,7 +156,7 @@ def mark_order_expired(order, user=None, auth=None):
 
         order.log_action('pretix.event.order.expired', user=user, auth=auth)
         i = order.invoices.filter(is_cancellation=False).last()
-        if i:
+        if i and not i.refered.exists():
             generate_cancellation(i)
 
     order_expired.send(order.event, order=order)
@@ -291,6 +293,19 @@ def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device
         if i:
             generate_cancellation(i)
 
+        for position in order.positions.all():
+            for gc in position.issued_gift_cards.all():
+                gc = GiftCard.objects.select_for_update().get(pk=gc.pk)
+                if gc.value < position.price:
+                    raise OrderError(
+                        _('This order can not be canceled since the gift card {card} purchased in '
+                          'this order has already been redeemed.').format(
+                            card=gc.secret
+                        )
+                    )
+                else:
+                    gc.transactions.create(value=-position.price, order=order)
+
         if cancellation_fee:
             with order.event.lock():
                 for position in order.positions.all():
@@ -545,7 +560,7 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
 
 
 def _get_fees(positions: List[CartPosition], payment_provider: BasePaymentProvider, address: InvoiceAddress,
-              meta_info: dict, event: Event):
+              meta_info: dict, event: Event, gift_cards: List[GiftCard]):
     fees = []
     total = sum([c.price for c in positions])
 
@@ -553,8 +568,16 @@ def _get_fees(positions: List[CartPosition], payment_provider: BasePaymentProvid
                                                  meta_info=meta_info, positions=positions):
         if resp:
             fees += resp
-
     total += sum(f.value for f in fees)
+
+    gift_card_values = {}
+    for gc in gift_cards:
+        fval = Decimal(gc.value)  # TODO: don't require an extra query
+        fval = min(fval, total)
+        if fval > 0:
+            total -= fval
+            gift_card_values[gc] = fval
+
     if payment_provider:
         payment_fee = payment_provider.calculate_fee(total)
     else:
@@ -565,17 +588,36 @@ def _get_fees(positions: List[CartPosition], payment_provider: BasePaymentProvid
                       internal_type=payment_provider.identifier)
         fees.append(pf)
 
-    return fees, pf
+    return fees, pf, gift_card_values
 
 
 def _create_order(event: Event, email: str, positions: List[CartPosition], now_dt: datetime,
                   payment_provider: BasePaymentProvider, locale: str=None, address: InvoiceAddress=None,
-                  meta_info: dict=None, sales_channel: str='web'):
-    fees, pf = _get_fees(positions, payment_provider, address, meta_info, event)
-    total = sum([c.price for c in positions]) + sum([c.value for c in fees])
+                  meta_info: dict=None, sales_channel: str='web', gift_cards: list=None,
+                  shown_total=None):
     p = None
+    sales_channel = get_all_sales_channels()[sales_channel]
 
     with transaction.atomic():
+        checked_gift_cards = []
+        if gift_cards:
+            gc_qs = GiftCard.objects.select_for_update().filter(pk__in=gift_cards)
+            for gc in gc_qs:
+                if gc.currency != event.currency:
+                    raise OrderError(_("This gift card does not support this currency."))
+                if gc.testmode and not event.testmode:
+                    raise OrderError(_("This gift card can only be used in test mode."))
+                if not gc.testmode and event.testmode:
+                    raise OrderError(_("Only test gift cards can be used in test mode."))
+                if not gc.accepted_by(event.organizer):
+                    raise OrderError(_("This gift card is not accepted by this event organizer."))
+                checked_gift_cards.append(gc)
+        if checked_gift_cards and any(c.item.issue_giftcard for c in positions):
+            raise OrderError(_("You cannot pay with gift cards when buying a gift card."))
+
+        fees, pf, gift_card_values = _get_fees(positions, payment_provider, address, meta_info, event, checked_gift_cards)
+        total = pending_sum = sum([c.price for c in positions]) + sum([c.value for c in fees])
+
         order = Order(
             status=Order.STATUS_PENDING,
             event=event,
@@ -583,10 +625,10 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
             datetime=now_dt,
             locale=locale,
             total=total,
-            testmode=event.testmode,
+            testmode=True if sales_channel.testmode_supported and event.testmode else False,
             meta_info=json.dumps(meta_info or {}),
             require_approval=any(p.item.require_approval for p in positions),
-            sales_channel=sales_channel
+            sales_channel=sales_channel.identifier
         )
         order.set_expires(now_dt, event.subevents.filter(id__in=[p.subevent_id for p in positions]))
         order.save()
@@ -606,11 +648,41 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
                 fee.tax_rule = None  # TODO: deprecate
             fee.save()
 
+        for gc, val in gift_card_values.items():
+            p = order.payments.create(
+                state=OrderPayment.PAYMENT_STATE_CONFIRMED,
+                provider='giftcard',
+                amount=val,
+                fee=pf
+            )
+            trans = gc.transactions.create(
+                value=-1 * val,
+                order=order,
+                payment=p
+            )
+            p.info_data = {
+                'gift_card': gc.pk,
+                'transaction_id': trans.pk,
+            }
+            p.save()
+            pending_sum -= val
+
+        # Safety check: Is the amount we're now going to charge the same amount the user has been shown when they
+        # pressed "Confirm purchase"? If not, we should better warn the user and show the confirmation page again.
+        # The only *known* case where this happens is if a gift card is used in two concurrent sessions.
+        if shown_total is not None:
+            if Decimal(shown_total) != pending_sum:
+                raise OrderError(
+                    _('While trying to place your order, we noticed that the order total has changed. Either one of '
+                      'the prices changed just now, or a gift card you used has been used in the meantime. Please '
+                      'check the prices below and try again.')
+                )
+
         if payment_provider and not order.require_approval:
             p = order.payments.create(
                 state=OrderPayment.PAYMENT_STATE_CREATED,
                 provider=payment_provider.identifier,
-                amount=total,
+                amount=pending_sum,
                 fee=pf
             )
 
@@ -635,7 +707,8 @@ def _order_placed_email(event: Event, order: Order, pprov: BasePaymentProvider,
             email_subject, email_template, email_context,
             log_entry,
             invoices=[invoice] if invoice and event.settings.invoice_email_attachment else [],
-            attach_tickets=True
+            attach_tickets=True,
+            attach_ical=event.settings.mail_attach_ical
         )
     except SendMailException:
         logger.exception('Order received email could not be sent')
@@ -651,14 +724,16 @@ def _order_placed_email_attendee(event: Event, order: Order, position: OrderPosi
             log_entry,
             invoices=[],
             attach_tickets=True,
-            position=position
+            position=position,
+            attach_ical=event.settings.mail_attach_ical
         )
     except SendMailException:
         logger.exception('Order received email could not be sent to attendee')
 
 
 def _perform_order(event: Event, payment_provider: str, position_ids: List[str],
-                   email: str, locale: str, address: int, meta_info: dict=None, sales_channel: str='web'):
+                   email: str, locale: str, address: int, meta_info: dict=None, sales_channel: str='web',
+                   gift_cards: list=None, shown_total=None):
     if payment_provider:
         pprov = event.get_payment_providers().get(payment_provider)
         if not pprov:
@@ -707,9 +782,10 @@ def _perform_order(event: Event, payment_provider: str, position_ids: List[str],
             raise OrderError(error_messages['internal'])
         _check_positions(event, now_dt, positions, address=addr)
         order, payment = _create_order(event, email, positions, now_dt, pprov,
-                                       locale=locale, address=addr, meta_info=meta_info, sales_channel=sales_channel)
+                                       locale=locale, address=addr, meta_info=meta_info, sales_channel=sales_channel,
+                                       gift_cards=gift_cards, shown_total=shown_total)
 
-        free_order_flow = payment and payment_provider == 'free' and order.total == Decimal('0.00') and not order.require_approval
+        free_order_flow = payment and payment_provider == 'free' and order.pending_sum == Decimal('0.00') and not order.require_approval
         if free_order_flow:
             try:
                 payment.confirm(send_mail=False, lock=not locked)
@@ -894,6 +970,7 @@ class OrderChangeManager:
         'seat_subevent_mismatch': _('You selected seat "{seat}" for a date that does not match the selected ticket date. Please choose a seat again.'),
         'seat_required': _('The selected product requires you to select a seat.'),
         'seat_forbidden': _('The selected product does not allow to select a seat.'),
+        'gift_card_change': _('You cannot change the price of a position that has been used to issue a gift card.'),
     }
     ItemOperation = namedtuple('ItemOperation', ('position', 'item', 'variation'))
     SubeventOperation = namedtuple('SubeventOperation', ('position', 'subevent'))
@@ -902,6 +979,8 @@ class OrderChangeManager:
     CancelOperation = namedtuple('CancelOperation', ('position',))
     AddOperation = namedtuple('AddOperation', ('item', 'variation', 'price', 'addon_to', 'subevent', 'seat'))
     SplitOperation = namedtuple('SplitOperation', ('position',))
+    FeeValueOperation = namedtuple('FeeValueOperation', ('fee', 'value'))
+    CancelFeeOperation = namedtuple('CancelFeeOperation', ('fee',))
     RegenerateSecretOperation = namedtuple('RegenerateSecretOperation', ('position',))
 
     def __init__(self, order: Order, user=None, auth=None, notify=True, reissue_invoice=True):
@@ -961,6 +1040,9 @@ class OrderChangeManager:
     def change_price(self, position: OrderPosition, price: Decimal):
         price = position.item.tax(price, base_price_is='gross')
 
+        if position.issued_gift_cards.exists():
+            raise OrderError(self.error_messages['gift_card_change'])
+
         self._totaldiff += price.gross - position.price
 
         if self.order.event.settings.invoice_include_free or price.gross != Decimal('0.00') or position.price != Decimal('0.00'):
@@ -990,8 +1072,19 @@ class OrderChangeManager:
                     self._totaldiff += price.gross - pos.price
                     self._operations.append(self.PriceOperation(pos, price))
 
+    def cancel_fee(self, fee: OrderFee):
+        self._totaldiff -= fee.value
+        self._operations.append(self.CancelFeeOperation(fee))
+        self._invoice_dirty = True
+
+    def change_fee(self, fee: OrderFee, value: Decimal):
+        value = (fee.tax_rule or TaxRule.zero()).tax(value, base_price_is='gross')
+        self._totaldiff += value.gross - fee.value
+        self._invoice_dirty = True
+        self._operations.append(self.FeeValueOperation(fee, value))
+
     def cancel(self, position: OrderPosition):
-        self._totaldiff += -position.price
+        self._totaldiff -= position.price
         self._quotadiff.subtract(position.quotas)
         self._operations.append(self.CancelOperation(position))
         if position.seat:
@@ -1107,19 +1200,25 @@ class OrderChangeManager:
 
     def _check_paid_to_free(self):
         if self.order.total == 0 and (self._totaldiff < 0 or (self.split_order and self.split_order.total > 0)) and not self.order.require_approval:
-            # if the order becomes free, mark it paid using the 'free' provider
-            # this could happen if positions have been made cheaper or removed (_totaldiff < 0)
-            # or positions got split off to a new order (split_order with positive total)
-            p = self.order.payments.create(
-                state=OrderPayment.PAYMENT_STATE_CREATED,
-                provider='free',
-                amount=0,
-                fee=None
-            )
-            try:
-                p.confirm(send_mail=False, count_waitinglist=False, user=self.user, auth=self.auth)
-            except Quota.QuotaExceededException:
-                raise OrderError(self.error_messages['paid_to_free_exceeded'])
+            if not self.order.fees.exists() and not self.order.positions.exists():
+                # The order is completely empty now, so we cancel it.
+                self.order.status = Order.STATUS_CANCELED
+                self.order.save(update_fields=['status'])
+                order_canceled.send(self.order.event, order=self.order)
+            else:
+                # if the order becomes free, mark it paid using the 'free' provider
+                # this could happen if positions have been made cheaper or removed (_totaldiff < 0)
+                # or positions got split off to a new order (split_order with positive total)
+                p = self.order.payments.create(
+                    state=OrderPayment.PAYMENT_STATE_CREATED,
+                    provider='free',
+                    amount=0,
+                    fee=None
+                )
+                try:
+                    p.confirm(send_mail=False, count_waitinglist=False, user=self.user, auth=self.auth)
+                except Quota.QuotaExceededException:
+                    raise OrderError(self.error_messages['paid_to_free_exceeded'])
 
         if self.split_order and self.split_order.total == 0 and not self.split_order.require_approval:
             p = self.split_order.payments.create(
@@ -1176,6 +1275,15 @@ class OrderChangeManager:
                 })
                 op.position.subevent = op.subevent
                 op.position.save()
+            elif isinstance(op, self.FeeValueOperation):
+                self.order.log_action('pretix.event.order.changed.feevalue', user=self.user, auth=self.auth, data={
+                    'fee': op.fee.pk,
+                    'old_price': op.fee.value,
+                    'new_price': op.value.gross
+                })
+                op.fee.value = op.value.gross
+                op.fee._calculate_tax()
+                op.fee.save()
             elif isinstance(op, self.PriceOperation):
                 self.order.log_action('pretix.event.order.changed.price', user=self.user, auth=self.auth, data={
                     'position': op.position.pk,
@@ -1187,7 +1295,26 @@ class OrderChangeManager:
                 op.position.price = op.price.gross
                 op.position._calculate_tax()
                 op.position.save()
+            elif isinstance(op, self.CancelFeeOperation):
+                self.order.log_action('pretix.event.order.changed.cancelfee', user=self.user, auth=self.auth, data={
+                    'fee': op.fee.pk,
+                    'fee_type': op.fee.fee_type,
+                    'old_price': op.fee.value,
+                })
+                op.fee.canceled = True
+                op.fee.save(update_fields=['canceled'])
             elif isinstance(op, self.CancelOperation):
+                for gc in op.position.issued_gift_cards.all():
+                    gc = GiftCard.objects.select_for_update().get(pk=gc.pk)
+                    if gc.value < op.position.price:
+                        raise OrderError(_(
+                            'A position can not be canceled since the gift card {card} purchased in this order has '
+                            'already been redeemed.').format(
+                            card=gc.secret
+                        ))
+                    else:
+                        gc.transactions.create(value=-op.position.price, order=self.order)
+
                 for opa in op.position.addons.all():
                     self.order.log_action('pretix.event.order.changed.cancel', user=self.user, auth=self.auth, data={
                         'position': opa.pk,
@@ -1303,19 +1430,25 @@ class OrderChangeManager:
                 fee.delete()
             split_order.total += fee.value
 
+        remaining_total = sum([p.price for p in self.order.positions.all()]) + sum([f.value for f in self.order.fees.all()])
+        offset_amount = min(max(0, self.completed_payment_sum - remaining_total), split_order.total)
+        if offset_amount >= split_order.total:
+            split_order.status = Order.STATUS_PAID
+        else:
+            split_order.status = Order.STATUS_PENDING
         split_order.save()
 
-        if split_order.status == Order.STATUS_PAID:
+        if offset_amount > Decimal('0.00'):
             split_order.payments.create(
                 state=OrderPayment.PAYMENT_STATE_CONFIRMED,
-                amount=split_order.total,
+                amount=offset_amount,
                 payment_date=now(),
                 provider='offsetting',
                 info=json.dumps({'orders': [self.order.code]})
             )
             self.order.refunds.create(
                 state=OrderRefund.REFUND_STATE_DONE,
-                amount=split_order.total,
+                amount=offset_amount,
                 execution_date=now(),
                 provider='offsetting',
                 info=json.dumps({'orders': [split_order.code]})
@@ -1352,10 +1485,19 @@ class OrderChangeManager:
             fee = None
             if self.open_payment.fee:
                 fee = self.open_payment.fee
-                current_fee = self.open_payment.fee.value
+                if any(isinstance(op, (self.FeeValueOperation, self.CancelFeeOperation)) for op in self._operations):
+                    fee.refresh_from_db()
+                if not self.open_payment.fee.canceled:
+                    current_fee = self.open_payment.fee.value
             total -= current_fee
 
-            if self.order.pending_sum - current_fee != 0:
+            if fee and any([isinstance(op, self.FeeValueOperation) and op.fee == fee for op in self._operations]):
+                # Do not automatically modify a fee that is being manually modified right now
+                payment_fee = fee.value
+            elif fee and any([isinstance(op, self.CancelFeeOperation) and op.fee == fee for op in self._operations]):
+                # Do not automatically modify a fee that is being manually removed right now
+                payment_fee = Decimal('0.00')
+            elif self.order.pending_sum - current_fee != 0:
                 prov = self.open_payment.payment_provider
                 if prov:
                     payment_fee = prov.calculate_fee(total - self.completed_payment_sum)
@@ -1368,7 +1510,7 @@ class OrderChangeManager:
                 if not self.open_payment.fee:
                     self.open_payment.fee = fee
                     self.open_payment.save(update_fields=['fee'])
-            elif fee:
+            elif fee and not fee.canceled:
                 fee.delete()
 
         self.order.total = total + payment_fee
@@ -1398,9 +1540,10 @@ class OrderChangeManager:
             generate_invoice(self.order)
 
     def _check_complete_cancel(self):
+        current = self.order.positions.count()
         cancels = len([o for o in self._operations if isinstance(o, (self.CancelOperation, self.SplitOperation))])
         adds = len([o for o in self._operations if isinstance(o, self.AddOperation)])
-        if self.order.positions.count() - cancels + adds < 1:
+        if current > 0 and current - cancels + adds < 1:
             raise OrderError(self.error_messages['complete_cancel'])
 
     @property
@@ -1466,12 +1609,12 @@ class OrderChangeManager:
 @app.task(base=ProfiledEventTask, bind=True, max_retries=5, default_retry_delay=1, throws=(OrderError,))
 def perform_order(self, event: Event, payment_provider: str, positions: List[str],
                   email: str=None, locale: str=None, address: int=None, meta_info: dict=None,
-                  sales_channel: str='web'):
+                  sales_channel: str='web', gift_cards: list=None, shown_total=None):
     with language(locale):
         try:
             try:
                 return _perform_order(event, payment_provider, positions, email, locale, address, meta_info,
-                                      sales_channel)
+                                      sales_channel, gift_cards, shown_total)
             except LockTimeoutException:
                 self.retry()
         except (MaxRetriesExceededError, LockTimeoutException):
@@ -1615,3 +1758,25 @@ def change_payment_provider(order: Order, payment_provider, amount=None, new_pay
             generate_invoice(order)
 
     return old_fee, new_fee, fee, new_payment
+
+
+@receiver(order_paid, dispatch_uid="pretixbase_order_paid_giftcards")
+@transaction.atomic()
+def signal_listener_issue_giftcards(sender: Event, order: Order, **kwargs):
+    any_giftcards = False
+    for p in order.positions.all():
+        if p.item.issue_giftcard:
+            issued = Decimal('0.00')
+            for gc in p.issued_gift_cards.all():
+                issued += gc.transactions.first().value
+            if p.price - issued > 0:
+                gc = sender.organizer.issued_gift_cards.create(
+                    currency=sender.currency, issued_in=p, testmode=order.testmode
+                )
+                gc.transactions.create(value=p.price - issued, order=order)
+                any_giftcards = True
+                p.secret = gc.secret
+                p.save(update_fields=['secret'])
+
+    if any_giftcards:
+        tickets.invalidate_cache.apply_async(kwargs={'event': sender.pk, 'order': order.pk})

src/pretix/base/services/tickets.py

@@ -47,6 +47,9 @@ def generate_order(order: int, provider: str):
             prov = response(order.event)
             if prov.identifier == provider:
                 filename, ttype, data = prov.generate_order(order)
+                if ttype == 'text/uri-list':
+                    continue
+
                 path, ext = os.path.splitext(filename)
                 for ct in CachedCombinedTicket.objects.filter(order=order, provider=provider):
                     ct.delete()
@@ -155,6 +158,10 @@ def get_tickets_for_order(order, base_position=None):
                         if not retval:
                             continue
                         ct = CachedTicket.objects.get(pk=retval)
+
+                    if ct.type == 'text/uri-list':
+                        continue
+
                     tickets.append((
                         "{}-{}-{}-{}{}".format(
                             order.event.slug.upper(), order.code, pos.positionid, ct.provider, ct.extension,

src/pretix/base/services/vouchers.py

@@ -0,0 +1,46 @@
+from django.utils.translation import gettext
+from i18nfield.strings import LazyI18nString
+
+from pretix.base.email import get_email_context
+from pretix.base.i18n import language
+from pretix.base.models import Event, User, Voucher
+from pretix.base.services.mail import mail
+from pretix.base.services.tasks import TransactionAwareProfiledEventTask
+from pretix.celery_app import app
+
+
+@app.task(base=TransactionAwareProfiledEventTask)
+def vouchers_send(event: Event, vouchers: list, subject: str, message: str, recipients: list, user: int) -> None:
+    vouchers = list(Voucher.objects.filter(id__in=vouchers).order_by('id'))
+    user = User.objects.get(pk=user)
+    for r in recipients:
+        voucher_list = []
+        for i in range(r['number']):
+            voucher_list.append(vouchers.pop())
+        with language(event.settings.locale):
+            email_context = get_email_context(event=event, name=r.get('name') or '', voucher_list=[v.code for v in voucher_list])
+            mail(
+                r['email'],
+                subject,
+                LazyI18nString(message),
+                email_context,
+                event,
+                locale=event.settings.locale,
+            )
+            for v in voucher_list:
+                if r.get('tag') and r.get('tag') != v.tag:
+                    v.tag = r.get('tag')
+                if v.comment:
+                    v.comment += '\n\n'
+                v.comment = gettext('The voucher has been sent to {recipient}.').format(recipient=r['email'])
+                v.save(update_fields=['tag', 'comment'])
+                v.log_action(
+                    'pretix.voucher.sent',
+                    user=user,
+                    data={
+                        'recipient': r['email'],
+                        'name': r.get('name'),
+                        'subject': subject,
+                        'message': message,
+                    }
+                )

src/pretix/base/settings.py

@@ -133,6 +133,10 @@ DEFAULTS = {
         'default': 'True',
         'type': bool
     },
+    'payment_giftcard__enabled': {
+        'default': 'True',
+        'type': bool
+    },
     'payment_term_accept_late': {
         'default': 'True',
         'type': bool
@@ -293,6 +297,10 @@ DEFAULTS = {
         'default': 'classic',
         'type': str
     },
+    'mail_attach_ical': {
+        'default': 'False',
+        'type': bool
+    },
     'mail_prefix': {
         'default': None,
         'type': str
@@ -696,6 +704,18 @@ Your {event} team"""))
         'default': '',
         'type': LazyI18nString
     },
+    'opencagedata_apikey': {
+        'default': None,
+        'type': str
+    },
+    'leaflet_tiles': {
+        'default': None,
+        'type': str
+    },
+    'leaflet_tiles_attribution': {
+        'default': None,
+        'type': str
+    },
     'frontpage_subevent_ordering': {
         'default': 'date_ascending',
         'type': str

src/pretix/base/shredder.py

@@ -106,14 +106,14 @@ class BaseDataShredder:
         raise NotImplementedError()  # NOQA
 
 
-def shred_log_fields(logentry, blacklist=None, whitelist=None):
+def shred_log_fields(logentry, banlist=None, whitelist=None):
     d = logentry.parsed_data
     if whitelist:
         for k, v in d.items():
             if k not in whitelist:
                 d[k] = '█'
-    elif blacklist:
-        for f in blacklist:
+    elif banlist:
+        for f in banlist:
             if f in d:
                 d[f] = '█'
     logentry.data = json.dumps(d)
@@ -150,10 +150,10 @@ class EmailAddressShredder(BaseDataShredder):
             o.save(update_fields=['meta_info', 'email'])
 
         for le in self.event.logentry_set.filter(action_type__contains="order.email"):
-            shred_log_fields(le, blacklist=['recipient', 'message', 'subject'])
+            shred_log_fields(le, banlist=['recipient', 'message', 'subject'])
 
         for le in self.event.logentry_set.filter(action_type="pretix.event.order.contact.changed"):
-            shred_log_fields(le, blacklist=['old_email', 'new_email'])
+            shred_log_fields(le, banlist=['old_email', 'new_email'])
 
         for le in self.event.logentry_set.filter(action_type="pretix.event.order.modified").exclude(data=""):
             d = le.parsed_data

src/pretix/base/signals.py

@@ -391,6 +391,20 @@ as the first argument.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
+order_gracefully_delete = EventPluginSignal(
+    providing_args=["order"]
+)
+"""
+This signal is sent out every time a test-mode order is being deleted. The order object
+is given as the first argument.
+
+Any plugin receiving this signals is supposed to perform any cleanup necessary at this
+point, so that the underlying order has no more external constraints that would inhibit
+the deletion of the order.
+
+As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
+"""
+
 logentry_display = EventPluginSignal(
     providing_args=["logentry"]
 )
@@ -593,7 +607,7 @@ This signal allows you to modify the availability of a quota. You are passed the
 ``availability`` result calculated by pretix code or other plugins. ``availability`` is a tuple
 with the first entry being one of the ``Quota.AVAILABILITY_*`` constants and the second entry being
 the number of available tickets (or ``None`` for unlimited). You are expected to return a value
-of the same time. The parameter ``count_waitinglists`` specifies whether waiting lists should be taken
+of the same type. The parameter ``count_waitinglists`` specifies whether waiting lists should be taken
 into account.
 
 **Warning: Use this signal with great caution, it allows you to screw up the performance of the

src/pretix/base/templates/pretixbase/email/notification.html

@@ -26,7 +26,7 @@
                                     <strong>{{ attr.title }}</strong>
                                 </td>
                                 <td>
-                                    {{ attr.value }}
+                                    {{ attr.value|linebreaksbr }}
                                 </td>
                             </tr>
                         {% endfor %}

src/pretix/base/ticketoutput.py

@@ -46,12 +46,19 @@ class BaseTicketOutput:
         filename, a file type and file content. The extension will be taken from the filename
         which is otherwise ignored.
 
+        Alternatively, you can pass a tuple consisting of an arbitrary string, ``text/uri-list``
+        and a single URL. In this case, the user will be redirected to this link instead of
+        being asked to download a generated file.
+
         .. note:: If the event uses the event series feature (internally called subevents)
                   and your generated ticket contains information like the event name or date,
                   you probably want to display the properties of the subevent. A common pattern
                   to do this would be a declaration ``ev = position.subevent or position.order.event``
                   and then access properties that are present on both classes like ``ev.name`` or
                   ``ev.date_from``.
+
+        .. note:: Should you elect to use the URI redirection feature instead of offering downloads,
+                  you should also set the ``multi_download_enabled``-property to ``False``.
         """
         raise NotImplementedError()
 
@@ -161,3 +168,21 @@ class BaseTicketOutput:
         The Font Awesome icon on the download button in the frontend.
         """
         return 'fa-download'
+
+    @property
+    def preview_allowed(self) -> bool:
+        """
+        By default, the ``generate()`` method is called for generating a preview in the pretix backend.
+        In case your plugin cannot generate previews for any reason, you can manually disable it here.
+        """
+        return True
+
+    @property
+    def javascript_required(self) -> bool:
+        """
+        If this property is set to true, the download-button for this ticket-type will not be displayed
+        when the user's browser has JavaScript disabled.
+
+        Defaults to ``False``
+        """
+        return False

src/pretix/base/timeline.py

@@ -113,7 +113,7 @@ def timeline_for_event(event, subevent=None):
             event=event, subevent=subevent,
             datetime=rd.datetime(ev),
             description=pgettext_lazy('timeline', 'Customers can no longer cancel free or unpaid orders'),
-            edit_url=reverse('control:event.settings.tickets', kwargs={
+            edit_url=reverse('control:event.settings.cancel', kwargs={
                 'event': event.slug,
                 'organizer': event.organizer.slug
             })
@@ -125,7 +125,7 @@ def timeline_for_event(event, subevent=None):
             event=event, subevent=subevent,
             datetime=rd.datetime(ev),
             description=pgettext_lazy('timeline', 'Customers can no longer cancel paid orders'),
-            edit_url=reverse('control:event.settings.tickets', kwargs={
+            edit_url=reverse('control:event.settings.cancel', kwargs={
                 'event': event.slug,
                 'organizer': event.organizer.slug
             })

src/pretix/base/validators.py

@@ -4,13 +4,13 @@ from django.utils.deconstruct import deconstructible
 from django.utils.translation import ugettext_lazy as _
 
 
-class BlacklistValidator:
+class BanlistValidator:
 
-    blacklist = []
+    banlist = []
 
     def __call__(self, value):
         # Validation logic
-        if value in self.blacklist:
+        if value in self.banlist:
             raise ValidationError(
                 _('This field has an invalid value: %(value)s.'),
                 code='invalid',
@@ -19,9 +19,9 @@ class BlacklistValidator:
 
 
 @deconstructible
-class EventSlugBlacklistValidator(BlacklistValidator):
+class EventSlugBanlistValidator(BanlistValidator):
 
-    blacklist = [
+    banlist = [
         'download',
         'healthcheck',
         'locale',
@@ -39,9 +39,9 @@ class EventSlugBlacklistValidator(BlacklistValidator):
 
 
 @deconstructible
-class OrganizerSlugBlacklistValidator(BlacklistValidator):
+class OrganizerSlugBanlistValidator(BanlistValidator):
 
-    blacklist = [
+    banlist = [
         'download',
         'healthcheck',
         'locale',
@@ -60,8 +60,8 @@ class OrganizerSlugBlacklistValidator(BlacklistValidator):
 
 
 @deconstructible
-class EmailBlacklistValidator(BlacklistValidator):
+class EmailBanlistValidator(BanlistValidator):
 
-    blacklist = [
+    banlist = [
         settings.PRETIX_EMAIL_NONE_VALUE,
     ]

src/pretix/control/forms/event.py

@@ -112,6 +112,8 @@ class EventWizardBasicsForm(I18nModelForm):
             'presale_start',
             'presale_end',
             'location',
+            'geo_lat',
+            'geo_lon',
         ]
         field_classes = {
             'date_from': SplitDateTimeField,
@@ -282,6 +284,8 @@ class EventUpdateForm(I18nModelForm):
             'presale_start',
             'presale_end',
             'location',
+            'geo_lat',
+            'geo_lon',
         ]
         field_classes = {
             'date_from': SplitDateTimeField,
@@ -753,9 +757,6 @@ class InvoiceSettingsForm(SettingsForm):
     invoice_name_required = forms.BooleanField(
         label=_("Require customer name"),
         required=False,
-        widget=forms.CheckboxInput(
-            attrs={'data-inverse-dependency': '#id_invoice_address_required'}
-        ),
     )
     invoice_address_vatid = forms.BooleanField(
         label=_("Ask for VAT ID"),
@@ -979,6 +980,11 @@ class MailSettingsForm(SettingsForm):
         required=False,
         max_length=255
     )
+    mail_attach_ical = forms.BooleanField(
+        label=_("Attach calendar files"),
+        help_text=_("If enabled, we will attach an .ics calendar file to order confirmation emails."),
+        required=False
+    )
 
     mail_text_signature = I18nFormField(
         label=_("Signature"),

src/pretix/control/forms/filter.py

@@ -1,17 +1,20 @@
 from datetime import datetime, time
+from urllib.parse import urlencode
 
 from django import forms
 from django.apps import apps
 from django.db.models import Exists, F, OuterRef, Q
 from django.db.models.functions import Coalesce, ExtractWeekDay
 from django.urls import reverse, reverse_lazy
+from django.utils.functional import cached_property
 from django.utils.timezone import get_current_timezone, make_aware, now
 from django.utils.translation import pgettext_lazy, ugettext_lazy as _
 
 from pretix.base.forms.widgets import DatePickerWidget
 from pretix.base.models import (
-    Checkin, Event, Invoice, Item, Order, OrderPayment, OrderPosition,
-    OrderRefund, Organizer, Question, QuestionAnswer, SubEvent,
+    Checkin, Event, EventMetaProperty, EventMetaValue, Invoice, Item, Order,
+    OrderPayment, OrderPosition, OrderRefund, Organizer, Question,
+    QuestionAnswer, SubEvent,
 )
 from pretix.base.signals import register_payment_providers
 from pretix.control.forms.widgets import Select2
@@ -502,6 +505,29 @@ class OrganizerFilterForm(FilterForm):
         return qs
 
 
+class GiftCardFilterForm(FilterForm):
+    query = forms.CharField(
+        label=_('Search query'),
+        widget=forms.TextInput(attrs={
+            'placeholder': _('Search query'),
+            'autofocus': 'autofocus'
+        }),
+        required=False
+    )
+
+    def __init__(self, *args, **kwargs):
+        kwargs.pop('request')
+        super().__init__(*args, **kwargs)
+
+    def filter_qs(self, qs):
+        fdata = self.cleaned_data
+
+        if fdata.get('query'):
+            query = fdata.get('query')
+            qs = qs.filter(secret__icontains=query)
+        return qs
+
+
 class EventFilterForm(FilterForm):
     orders = {
         'slug': 'slug',
@@ -549,14 +575,35 @@ class EventFilterForm(FilterForm):
     )
 
     def __init__(self, *args, **kwargs):
-        request = kwargs.pop('request')
+        self.request = kwargs.pop('request')
+        self.organizer = kwargs.pop('organizer', None)
         super().__init__(*args, **kwargs)
-        if request.user.has_active_staff_session(request.session.session_key):
-            self.fields['organizer'].queryset = Organizer.objects.all()
-        else:
-            self.fields['organizer'].queryset = Organizer.objects.filter(
-                pk__in=request.user.teams.values_list('organizer', flat=True)
+        seen = set()
+        for p in self.meta_properties.all():
+            if p.name in seen:
+                continue
+            seen.add(p.name)
+            self.fields['meta_{}'.format(p.name)] = forms.CharField(
+                label=p.name,
+                required=False,
+                widget=forms.TextInput(
+                    attrs={
+                        'data-typeahead-url': reverse('control:events.meta.typeahead') + '?' + urlencode({
+                            'property': p.name,
+                            'organizer': self.organizer.slug if self.organizer else ''
+                        })
+                    }
+                )
             )
+        if self.organizer:
+            del self.fields['organizer']
+        else:
+            if self.request.user.has_active_staff_session(self.request.session.session_key):
+                self.fields['organizer'].queryset = Organizer.objects.all()
+            else:
+                self.fields['organizer'].queryset = Organizer.objects.filter(
+                    pk__in=self.request.user.teams.values_list('organizer', flat=True)
+                )
 
     def filter_qs(self, qs):
         fdata = self.cleaned_data
@@ -605,11 +652,46 @@ class EventFilterForm(FilterForm):
                 Q(name__icontains=i18ncomp(query)) | Q(slug__icontains=query)
             )
 
+        filters_by_property_name = {}
+        for i, p in enumerate(self.meta_properties):
+            d = fdata.get('meta_{}'.format(p.name))
+            if d:
+                emv_with_value = EventMetaValue.objects.filter(
+                    event=OuterRef('pk'),
+                    property__pk=p.pk,
+                    value=d
+                )
+                emv_with_any_value = EventMetaValue.objects.filter(
+                    event=OuterRef('pk'),
+                    property__pk=p.pk,
+                )
+                qs = qs.annotate(**{'attr_{}'.format(i): Exists(emv_with_value)})
+                if p.name in filters_by_property_name:
+                    filters_by_property_name[p.name] |= Q(**{'attr_{}'.format(i): True})
+                else:
+                    filters_by_property_name[p.name] = Q(**{'attr_{}'.format(i): True})
+                if p.default == d:
+                    qs = qs.annotate(**{'attr_{}_any'.format(i): Exists(emv_with_any_value)})
+                    filters_by_property_name[p.name] |= Q(**{'attr_{}_any'.format(i): False, 'organizer_id': p.organizer_id})
+        for f in filters_by_property_name.values():
+            qs = qs.filter(f)
+
         if fdata.get('ordering'):
             qs = qs.order_by(self.get_order_by())
 
         return qs
 
+    @cached_property
+    def meta_properties(self):
+        if self.organizer:
+            return self.organizer.meta_properties.all()
+        else:
+            # We ignore superuser permissions here. This is intentional – we do not want to show super
+            # users a form with all meta properties ever assigned.
+            return EventMetaProperty.objects.filter(
+                organizer_id__in=self.request.user.teams.values_list('organizer', flat=True)
+            )
+
 
 class CheckInFilterForm(FilterForm):
     orders = {

src/pretix/control/forms/global_settings.py

@@ -37,6 +37,20 @@ class GlobalSettingsForm(SettingsForm):
                 required=False,
                 label=_("Global message banner detail text"),
             )),
+            ('opencagedata_apikey', forms.CharField(
+                required=False,
+                label=_("OpenCage API key for geocoding"),
+            )),
+            ('leaflet_tiles', forms.CharField(
+                required=False,
+                label=_("Leaflet tiles URL pattern"),
+                help_text=_("e.g. {sample}").format(sample="https://a.tile.openstreetmap.org/{z}/{x}/{y}.png")
+            )),
+            ('leaflet_tiles_attribution', forms.CharField(
+                required=False,
+                label=_("Leaflet tiles attribution"),
+                help_text=_("e.g. {sample}").format(sample='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors')
+            )),
         ])
         responses = register_global_settings.send(self)
         for r, response in sorted(responses, key=lambda r: str(r[0])):

src/pretix/control/forms/item.py

@@ -48,7 +48,8 @@ class QuestionForm(I18nModelForm):
         self.fields['items'].queryset = self.instance.event.items.all()
         self.fields['items'].required = True
         self.fields['dependency_question'].queryset = self.instance.event.questions.filter(
-            type__in=(Question.TYPE_BOOLEAN, Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE)
+            type__in=(Question.TYPE_BOOLEAN, Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE),
+            ask_during_checkin=False
         )
         if self.instance.pk:
             self.fields['dependency_question'].queryset = self.fields['dependency_question'].queryset.exclude(
@@ -65,6 +66,9 @@ class QuestionForm(I18nModelForm):
     def clean_dependency_question(self):
         dep = val = self.cleaned_data.get('dependency_question')
         if dep:
+            if dep.ask_during_checkin:
+                raise ValidationError(_('Question cannot depend on a question asked during check-in.'))
+
             seen_ids = {self.instance.pk} if self.instance else set()
             while dep:
                 if dep.pk in seen_ids:
@@ -365,9 +369,9 @@ class ItemCreateForm(I18nModelForm):
 class ShowQuotaNullBooleanSelect(forms.NullBooleanSelect):
     def __init__(self, attrs=None):
         choices = (
-            ('1', _('(Event default)')),
-            ('2', _('Yes')),
-            ('3', _('No')),
+            ('unknown', _('(Event default)')),
+            ('true', _('Yes')),
+            ('false', _('No')),
         )
         super(forms.NullBooleanSelect, self).__init__(attrs, choices)
 
@@ -375,9 +379,9 @@ class ShowQuotaNullBooleanSelect(forms.NullBooleanSelect):
 class TicketNullBooleanSelect(forms.NullBooleanSelect):
     def __init__(self, attrs=None):
         choices = (
-            ('1', _('Choose automatically depending on event settings')),
-            ('2', _('Yes, if ticket generation is enabled in general')),
-            ('3', _('Never')),
+            ('unknown', _('Choose automatically depending on event settings')),
+            ('true', _('Yes, if ticket generation is enabled in general')),
+            ('false', _('Never')),
         )
         super(forms.NullBooleanSelect, self).__init__(attrs, choices)
 
@@ -417,6 +421,23 @@ class ItemUpdateForm(I18nModelForm):
         self.fields['hidden_if_available'].widget.choices = self.fields['hidden_if_available'].choices
         self.fields['hidden_if_available'].required = False
 
+    def clean(self):
+        d = super().clean()
+        if d['issue_giftcard']:
+            if d['tax_rule'] and d['tax_rule'].rate > 0:
+                self.add_error(
+                    'tax_rule',
+                    _("Gift card products should not be associated with non-zero tax rates since sales tax will be applied when the gift card is redeemed.")
+                )
+            if d['admission']:
+                self.add_error(
+                    'admission',
+                    _(
+                        "Gift card products should not be admission products at the same time."
+                    )
+                )
+        return d
+
     class Meta:
         model = Item
         localized_fields = '__all__'
@@ -447,6 +468,7 @@ class ItemUpdateForm(I18nModelForm):
             'require_bundling',
             'show_quota_left',
             'hidden_if_available',
+            'issue_giftcard',
         ]
         field_classes = {
             'available_from': SplitDateTimeField,

src/pretix/control/forms/orders.py

@@ -107,7 +107,7 @@ class CancelForm(ConfirmPaymentForm):
             del self.fields['cancellation_fee']
 
     def clean_cancellation_fee(self):
-        val = self.cleaned_data['cancellation_fee']
+        val = self.cleaned_data['cancellation_fee'] or Decimal('0.00')
         if val > self.instance.payment_refund_sum:
             raise ValidationError(_('The cancellation fee cannot be higher than the payment credit of this order.'))
         return val
@@ -400,9 +400,27 @@ class OrderPositionChangeForm(forms.Form):
         self.fields['itemvar'].choices = choices
         change_decimal_field(self.fields['price'], instance.order.event.currency)
 
-    def clean(self):
-        if self.cleaned_data.get('operation') == 'price' and not self.cleaned_data.get('price', '') != '':
-            raise ValidationError(_('You need to enter a price if you want to change the product price.'))
+
+class OrderFeeChangeForm(forms.Form):
+    value = forms.DecimalField(
+        required=False,
+        max_digits=10, decimal_places=2,
+        localize=True,
+        label=_('New price (gross)')
+    )
+    operation_cancel = forms.BooleanField(
+        required=False,
+        label=_('Remove this fee')
+    )
+
+    def __init__(self, *args, **kwargs):
+        instance = kwargs.pop('instance')
+        initial = kwargs.get('initial', {})
+
+        initial['value'] = instance.value
+        kwargs['initial'] = initial
+        super().__init__(*args, **kwargs)
+        change_decimal_field(self.fields['value'], instance.order.event.currency)
 
 
 class OrderContactForm(forms.ModelForm):

src/pretix/control/forms/organizer.py

@@ -1,9 +1,11 @@
+from decimal import Decimal
 from urllib.parse import urlparse
 
 from django import forms
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.validators import RegexValidator
+from django.db.models import Q
 from django.utils.safestring import mark_safe
 from django.utils.translation import pgettext_lazy, ugettext_lazy as _
 from django_scopes.forms import SafeModelMultipleChoiceField
@@ -12,7 +14,7 @@ from i18nfield.forms import I18nFormField, I18nTextarea
 from pretix.api.models import WebHook
 from pretix.api.webhooks import get_all_webhook_events
 from pretix.base.forms import I18nModelForm, SettingsForm
-from pretix.base.models import Device, Organizer, Team
+from pretix.base.models import Device, GiftCard, Organizer, Team
 from pretix.control.forms import (
     ExtFileField, FontSelect, MultipleLanguagesWidget,
 )
@@ -145,6 +147,7 @@ class TeamForm(forms.ModelForm):
         model = Team
         fields = ['name', 'all_events', 'limit_events', 'can_create_events',
                   'can_change_teams', 'can_change_organizer_settings',
+                  'can_manage_gift_cards',
                   'can_change_event_settings', 'can_change_items',
                   'can_view_orders', 'can_change_orders',
                   'can_view_vouchers', 'can_change_vouchers']
@@ -328,3 +331,30 @@ class WebHookForm(forms.ModelForm):
         field_classes = {
             'limit_events': SafeModelMultipleChoiceField
         }
+
+
+class GiftCardCreateForm(forms.ModelForm):
+    value = forms.DecimalField(
+        label=_('Gift card value'),
+        min_value=Decimal('0.00')
+    )
+
+    def __init__(self, *args, **kwargs):
+        self.organizer = kwargs.pop('organizer')
+        super().__init__(*args, **kwargs)
+
+    def clean_secret(self):
+        s = self.cleaned_data['secret']
+        if GiftCard.objects.filter(
+            secret__iexact=s
+        ).filter(
+            Q(issuer=self.organizer) | Q(issuer__gift_card_collector_acceptance__collector=self.organizer)
+        ).exists():
+            raise ValidationError(
+                _('A gift card with the same secret already exists in your or an affiliated organizer account.')
+            )
+        return s
+
+    class Meta:
+        model = GiftCard
+        fields = ['secret', 'currency', 'testmode']

src/pretix/control/forms/subevents.py

@@ -37,6 +37,8 @@ class SubEventForm(I18nModelForm):
             'presale_end',
             'location',
             'frontpage_text',
+            'geo_lat',
+            'geo_lon',
         ]
         field_classes = {
             'date_from': SplitDateTimeField,

src/pretix/control/forms/users.py

@@ -56,6 +56,10 @@ class UserEditForm(forms.ModelForm):
         super().__init__(*args, **kwargs)
         self.fields['email'].required = True
         self.fields['last_login'].disabled = True
+        if self.instance and self.instance.auth_backend != 'native':
+            del self.fields['new_pw']
+            del self.fields['new_pw_repeat']
+            self.fields['email'].disabled = True
 
     def clean_email(self):
         email = self.cleaned_data['email']

src/pretix/control/forms/vouchers.py

@@ -1,11 +1,17 @@
+import csv
+from collections import namedtuple
+from io import StringIO
+
 from django import forms
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.core.validators import EmailValidator
 from django.db.models.functions import Lower
 from django.urls import reverse
 from django.utils.translation import pgettext_lazy, ugettext_lazy as _
 from django_scopes.forms import SafeModelChoiceField
 
-from pretix.base.forms import I18nModelForm
+from pretix.base.email import get_available_placeholders
+from pretix.base.forms import I18nModelForm, PlaceholderValidator
 from pretix.base.models import Item, Voucher
 from pretix.control.forms import SplitDateTimeField, SplitDateTimePickerWidget
 from pretix.control.forms.widgets import Select2, Select2ItemVarQuota
@@ -191,6 +197,54 @@ class VoucherBulkForm(VoucherForm):
         ),
         required=True
     )
+    send = forms.BooleanField(
+        label=_("Send vouchers via email"),
+        required=False
+    )
+    send_subject = forms.CharField(
+        label=_("Subject"),
+        widget=forms.TextInput(attrs={'data-display-dependency': '#id_send'}),
+        required=False,
+        initial=_('Your voucher for {event}')
+    )
+    send_message = forms.CharField(
+        label=_("Message"),
+        widget=forms.Textarea(attrs={'data-display-dependency': '#id_send'}),
+        required=False,
+        initial=_('Hello,\n\n'
+                  'with this email, we\'re sending you one or more vouchers for {event}:\n\n{voucher_list}\n\n'
+                  'You can redeem them here in our ticket shop:\n\n{url}\n\nBest regards,\n\n'
+                  'Your {event} team')
+    )
+    send_recipients = forms.CharField(
+        label=_('Recipients'),
+        widget=forms.Textarea(attrs={
+            'data-display-dependency': '#id_send',
+            'placeholder': 'email,number,name,tag\njohn@example.org,3,John,example\n\n-- {} --\n\njohn@example.org\njane@example.net'.format(
+                _('or')
+            )
+        }),
+        required=False,
+        help_text=_('You can either supply a list of email addresses with one email address per line, or a CSV file with a title column '
+                    'and one or more of the columns "email", "number", "name", or "tag".')
+    )
+    Recipient = namedtuple('Recipient', 'email number name tag')
+
+    def _set_field_placeholders(self, fn, base_parameters):
+        phs = [
+            '{%s}' % p
+            for p in sorted(get_available_placeholders(self.instance.event, base_parameters).keys())
+        ]
+        ht = _('Available placeholders: {list}').format(
+            list=', '.join(phs)
+        )
+        if self.fields[fn].help_text:
+            self.fields[fn].help_text += ' ' + str(ht)
+        else:
+            self.fields[fn].help_text = ht
+        self.fields[fn].validators.append(
+            PlaceholderValidator(phs)
+        )
 
     class Meta:
         model = Voucher
@@ -213,6 +267,51 @@ class VoucherBulkForm(VoucherForm):
             'max_usages': _('Number of times times EACH of these vouchers can be redeemed.')
         }
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._set_field_placeholders('send_subject', ['event', 'name'])
+        self._set_field_placeholders('send_message', ['event', 'voucher_list', 'name'])
+
+    def clean_send_recipients(self):
+        raw = self.cleaned_data['send_recipients']
+        if not raw:
+            return []
+        r = raw.split('\n')
+        res = []
+        if ',' in raw or ';' in raw:
+            if '@' in r[0]:
+                raise ValidationError(_('CSV input needs to contain a header row in the first line.'))
+            dialect = csv.Sniffer().sniff(raw[:1024])
+            reader = csv.DictReader(StringIO(raw), dialect=dialect)
+            if 'email' not in reader.fieldnames:
+                raise ValidationError(_('CSV input needs to contain a field with the header "{header}".').format(header="email"))
+            unknown_fields = [f for f in reader.fieldnames if f not in ('email', 'name', 'tag', 'number')]
+            if unknown_fields:
+                raise ValidationError(_('CSV input contains an unknown field with the header "{header}".').format(header=unknown_fields[0]))
+            for i, row in enumerate(reader):
+                try:
+                    EmailValidator()(row['email'])
+                except ValidationError as err:
+                    raise ValidationError(_('{value} is not a valid email address.').format(value=row['email'])) from err
+                try:
+                    res.append(self.Recipient(
+                        name=row.get('name', ''),
+                        email=row['email'],
+                        number=int(row.get('number', 1)),
+                        tag=row.get('tag', None)
+                    ))
+                except ValueError as err:
+                    raise ValidationError(_('Invalid value in row {number}.').format(number=i + 1)) from err
+        else:
+            for e in r:
+                try:
+                    EmailValidator()(e.strip())
+                except ValidationError as err:
+                    raise ValidationError(_('{value} is not a valid email address.').format(value=e.strip())) from err
+                else:
+                    res.append(self.Recipient(email=e, number=1, tag=None, name=''))
+        return res
+
     def clean(self):
         data = super().clean()
 
@@ -222,6 +321,16 @@ class VoucherBulkForm(VoucherForm):
         if vouchers.exists():
             raise ValidationError(_('A voucher with one of these codes already exists.'))
 
+        if data.get('send') and not all([data.get('send_subject'), data.get('send_message'), data.get('send_recipients')]):
+            raise ValidationError(_('If vouchers should be sent by email, subject, message and recipients need to be specified.'))
+
+        if data.get('codes') and data.get('send'):
+            recp = self.cleaned_data.get('send_recipients', [])
+            code_len = len(data.get('codes'))
+            recp_len = sum(r.number for r in recp)
+            if code_len != recp_len:
+                raise ValidationError(_('You generated {codes} vouchers, but entered recipients for {recp} vouchers.').format(codes=code_len, recp=recp_len))
+
         return data
 
     def save(self, event, *args, **kwargs):

src/pretix/control/logdisplay.py

@@ -19,7 +19,7 @@ from pretix.base.models import (
 from pretix.base.signals import logentry_display
 from pretix.base.templatetags.money import money_filter
 
-OVERVIEW_BLACKLIST = [
+OVERVIEW_BANLIST = [
     'pretix.plugins.sendmail.order.email.sent'
 ]
 
@@ -65,6 +65,15 @@ def _display_order_changed(event: Event, logentry: LogEntry):
             old_price=money_filter(Decimal(data['old_price']), event.currency),
             new_price=money_filter(Decimal(data['new_price']), event.currency),
         )
+    elif logentry.action_type == 'pretix.event.order.changed.feevalue':
+        return text + ' ' + _('A fee was changed from {old_price} to {new_price}.').format(
+            old_price=money_filter(Decimal(data['old_price']), event.currency),
+            new_price=money_filter(Decimal(data['new_price']), event.currency),
+        )
+    elif logentry.action_type == 'pretix.event.order.changed.cancelfee':
+        return text + ' ' + _('A fee of {old_price} was removed.').format(
+            old_price=money_filter(Decimal(data['old_price']), event.currency),
+        )
     elif logentry.action_type == 'pretix.event.order.changed.cancel':
         old_item = str(event.items.get(pk=data['old_item']))
         if data['old_variation']:
@@ -244,6 +253,7 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
         'pretix.control.auth.user.forgot_password.recovered': _('The password has been reset.'),
         'pretix.organizer.deleted': _('The organizer "{name}" has been deleted.'),
         'pretix.voucher.added': _('The voucher has been created.'),
+        'pretix.voucher.sent': _('The voucher has been sent to {recipient}.'),
         'pretix.voucher.added.waitinglist': _('The voucher has been created and sent to a person on the waiting list.'),
         'pretix.voucher.changed': _('The voucher has been changed.'),
         'pretix.voucher.deleted': _('The voucher has been deleted.'),

src/pretix/control/navigation.py

@@ -437,6 +437,16 @@ def get_organizer_navigation(request):
             'active': 'organizer.device' in url.url_name,
             'icon': 'tablet',
         })
+    if 'can_manage_gift_cards' in request.orgapermset:
+        nav.append({
+            'label': _('Gift cards'),
+            'url': reverse('control:organizer.giftcards', kwargs={
+                'organizer': request.organizer.slug
+            }),
+            'active': 'organizer.giftcard' in url.url_name,
+            'icon': 'credit-card',
+        })
+    if 'can_change_organizer_settings' in request.orgapermset:
         nav.append({
             'label': _('Webhooks'),
             'url': reverse('control:organizer.webhooks', kwargs={

src/pretix/control/templates/pretixcontrol/auth/base.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load static %}
 <!DOCTYPE html>
-<html>
+<html{% if rtl %} dir="rtl" class="rtl"{% endif %}>
 <head>
     <title>{{ django_settings.PRETIX_INSTANCE_NAME }}</title>
     {% compress css %}

src/pretix/control/templates/pretixcontrol/auth/login.html

@@ -2,28 +2,40 @@
 {% load bootstrap3 %}
 {% load i18n %}
 {% load static %}
+{% load urlreplace %}
 {% block content %}
     <form class="form-signin" action="" method="post">
-        {% bootstrap_form_errors form type='all' layout='inline' %}
-        {% csrf_token %}
-        {% bootstrap_field form.email %}
-        {% bootstrap_field form.password %}
-        {% if form.keep_logged_in %}
-            {% bootstrap_field form.keep_logged_in %}
+        {% if backends|length > 1 %}
+            <ul class="nav nav-pills">
+                {% for b in backends %}
+                    {% if b.visible %}
+                        <li class="{% if backend.identifier == b.identifier %}active{% endif %}">
+                            <a href="{% if b.url %}{{ b.url }}{% else %}?{% url_replace request "backend" b.identifier %}{% endif %}">
+                                {{ b.verbose_name }}
+                            </a>
+                        </li>
+                    {% endif %}
+                {% endfor %}
+            </ul>
+            <br>
         {% endif %}
+        {% csrf_token %}
+        {% bootstrap_form form %}
         <div class="form-group buttons">
             <button type="submit" class="btn btn-primary btn-block">
                 {% trans "Log in" %}
             </button>
-            {% if can_reset %}
-                <a href="{% url "control:auth.forgot" %}" class="btn btn-link btn-block">
-                    {% trans "Lost password?" %}
-                </a>
-            {% endif %}
-            {% if can_register %}
-                <a href="{% url "control:auth.register" %}" class="btn btn-link btn-block">
-                    {% trans "Register" %}
-                </a>
+            {% if backend.identifier == "native" %}
+                {% if can_reset %}
+                    <a href="{% url "control:auth.forgot" %}" class="btn btn-link btn-block">
+                        {% trans "Lost password?" %}
+                    </a>
+                {% endif %}
+                {% if can_register %}
+                    <a href="{% url "control:auth.register" %}" class="btn btn-link btn-block">
+                        {% trans "Register" %}
+                    </a>
+                {% endif %}
             {% endif %}
         </div>
     </form>

src/pretix/control/templates/pretixcontrol/base.html

@@ -6,7 +6,7 @@
 {% load eventsignal %}
 {% load eventurl %}
 <!DOCTYPE html>
-<html>
+<html{% if rtl %} dir="rtl" class="rtl"{% endif %}>
 	<head>
 		<title>{% block title %}{% endblock %}{% if url_name != "index" %} :: {% endif %}
             {{ settings.PRETIX_INSTANCE_NAME }}</title>
@@ -43,14 +43,18 @@
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/quota.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/subevent.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/question.js" %}"></script>
+            <script type="text/javascript" src="{% static "pretixcontrol/js/ui/dragndroplist.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/mail.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/orderchange.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/typeahead.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/quicksetup.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/dashboard.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/tabs.js" %}"></script>
+            <script type="text/javascript" src="{% static "leaflet/leaflet.js" %}"></script>
+            <script type="text/javascript" src="{% static "pretixcontrol/js/ui/geo.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixbase/js/details.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixbase/js/asynctask.js" %}"></script>
+            <script type="text/javascript" src="{% static "sortable/Sortable.js" %}"></script>
             <script type="text/javascript" src="{% static "colorpicker/bootstrap-colorpicker.js" %}"></script>
             <script type="text/javascript" src="{% static "fileupload/jquery.ui.widget.js" %}"></script>
             <script type="text/javascript" src="{% static "fileupload/jquery.fileupload.js" %}"></script>
@@ -121,7 +125,7 @@
                         {{ settings.PRETIX_INSTANCE_NAME }}
                     </a>
                 </div>
-                <ul class="nav navbar-nav navbar-top-links navbar-left hidden-xs">
+                <ul class="nav navbar-nav navbar-top-links navbar-left flip hidden-xs">
                     {% if request.event %}
                         <li>
                             {% if has_domain and not request.event.live %}
@@ -145,7 +149,7 @@
                         </li>
                     {% endif %}
                 </ul>
-                <ul class="nav navbar-nav navbar-top-links navbar-right">
+                <ul class="nav navbar-nav navbar-top-links navbar-right flip">
                     {% for nav in nav_topbar %}
                         <li {% if nav.children %}class="dropdown"{% endif %}>
                             <a href="{{ nav.url }}" title="{{ nav.title }}" {% if nav.active %}class="active"{% endif %}

src/pretix/control/templates/pretixcontrol/checkin/lists.html

@@ -19,6 +19,13 @@
             performances.
         {% endblocktrans %}
     </p>
+    <p>
+        {% blocktrans trimmed %}
+            If you have the appropriate organizer-level permissions, you can connect new devices to your account and
+            use them to validate tickets. Since the devices are connected on the organizer level, you do not have to
+            create a new device for every event but can reuse them over and over again.
+        {% endblocktrans %}
+    </p>
     {% if request.event.has_subevents %}
         <form class="form-inline helper-display-inline" action="" method="get">
             <form class="form-inline helper-display-inline" action="" method="get">
@@ -40,17 +47,24 @@
 
             {% if "can_change_event_settings" in request.eventpermset %}
                 <a href="{% url "control:event.orders.checkinlists.add" organizer=request.event.organizer.slug event=request.event.slug %}"
-                        class="btn btn-primary btn-lg"><i class="fa fa-plus"></i>
-                    {% trans "Create a new check-in list" %}</a>
+                   class="btn btn-primary btn-lg"><i class="fa fa-plus"></i> {% trans "Create a new check-in list" %}</a>
+            {% endif %}
+            {% if can_change_organizer_settings %}
+                <a href="{% url "control:organizer.devices" organizer=request.organizer.slug %}"
+                   class="btn btn-default btn-lg"><i class="fa fa-tablet"></i> {% trans "Connected devices" %}</a>
             {% endif %}
         </div>
     {% else %}
-        {% if "can_change_event_settings" in request.eventpermset %}
-            <p>
-                <a href="{% url "control:event.orders.checkinlists.add" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new check-in list" %}
-                </a>
-            </p>
-        {% endif %}
+        <p>
+            {% if "can_change_event_settings" in request.eventpermset %}
+                <a href="{% url "control:event.orders.checkinlists.add" organizer=request.event.organizer.slug event=request.event.slug %}"
+                   class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new check-in list" %}</a>
+            {% endif %}
+            {% if can_change_organizer_settings %}
+                <a href="{% url "control:organizer.devices" organizer=request.organizer.slug %}"
+                   class="btn btn-default"><i class="fa fa-tablet"></i> {% trans "Connected devices" %}</a>
+            {% endif %}
+        </p>
         <div class="table-responsive">
             <table class="table table-hover table-quotas">
                 <thead>
@@ -104,7 +118,7 @@
                                 </ul>
                             {% endif %}
                         </td>
-                        <td class="text-right">
+                        <td class="text-right flip">
                             <a href="{% url "control:event.orders.checkinlists.show" organizer=request.event.organizer.slug event=request.event.slug list=cl.id %}" class="btn btn-default btn-sm"><i class="fa fa-eye"></i></a>
                             {% if "can_change_event_settings" in request.eventpermset %}
                                 <a href="{% url "control:event.orders.checkinlists.edit" organizer=request.event.organizer.slug event=request.event.slug list=cl.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>

src/pretix/control/templates/pretixcontrol/event/actions.html

@@ -8,7 +8,7 @@
             <li class="list-group-item logentry">
                 <p>
                     <a href="{% url "control:event.requiredaction.discard" event=request.event.slug organizer=request.event.organizer.slug id=action.id %}"
-                            class="btn btn-default btn-xs pull-right">
+                            class="btn btn-default btn-xs pull-right flip">
                         {% trans "Hide message" %}
                     </a>
                     <small><span class="fa fa-clock-o"></span> {{ action.datetime|date:"SHORT_DATETIME_FORMAT" }}</small>

src/pretix/control/templates/pretixcontrol/event/index.html

@@ -66,7 +66,7 @@
                     <li class="list-group-item logentry">
                         <p>
                             <a href="{% url "control:event.requiredaction.discard" event=request.event.slug organizer=request.event.organizer.slug id=action.id %}"
-                               class="btn btn-default btn-xs pull-right">
+                               class="btn btn-default btn-xs pull-right flip">
                                 {% trans "Hide message" %}
                             </a>
                             <small><span
@@ -139,7 +139,7 @@
                 <div class="row">
                     {% bootstrap_field comment_form.comment layout="horizontal" show_help=True show_label=False horizontal_field_class="col-md-12" %}
                 </div>
-                <p class="text-right">
+                <p class="text-right flip">
                     <br>
                     <button class="btn btn-default">
                         {% trans "Update comment" %}

src/pretix/control/templates/pretixcontrol/event/live.html

@@ -12,7 +12,7 @@
                 <p>
                     {% trans "Your shop is currently live. If you take it down, it will only be visible to you and your team." %}
                 </p>
-                <form action="" method="post" class="text-right">
+                <form action="" method="post" class="text-right flip">
                     {% csrf_token %}
                     <input type="hidden" name="live" value="false">
                     <button type="submit" class="btn btn-lg btn-danger btn-save">
@@ -46,7 +46,7 @@
                     <p>
                         {% trans "If you want to, you can publish your ticket shop now." %}
                     </p>
-                    <form action="" method="post" class="text-right">
+                    <form action="" method="post" class="flip text-right">
                         {% csrf_token %}
                         <input type="hidden" name="live" value="true">
                         <button type="submit" class="btn btn-primary btn-lg btn-save">
@@ -100,7 +100,7 @@
                         {% trans "It looks like you already have some real orders in your shop. We do not recommend enabling test mode if your customers already know your shop, as it will confuse them." %}
                     </div>
                 {% endif %}
-                <form action="" method="post" class="text-right">
+                <form action="" method="post" class="flip text-right">
                     {% csrf_token %}
                     <input type="hidden" name="testmode" value="true">
                     <button type="submit" class="btn btn-danger btn-lg btn-save">

src/pretix/control/templates/pretixcontrol/event/mail.html

@@ -16,6 +16,7 @@
                 {% bootstrap_field form.mail_from_name layout="control" %}
                 {% bootstrap_field form.mail_text_signature layout="control" %}
                 {% bootstrap_field form.mail_bcc layout="control" %}
+                {% bootstrap_field form.mail_attach_ical layout="control" %}
             </fieldset>
             <fieldset>
                 <legend>{% trans "E-mail design" %}</legend>

src/pretix/control/templates/pretixcontrol/event/payment.html

@@ -28,7 +28,7 @@
                                 </span>
                                 {% endif %}
                             </td>
-                            <td class="text-right">
+                            <td class="text-right flip">
                                 <a href="{% url 'control:event.settings.payment.provider' event=request.event.slug organizer=request.organizer.slug provider=provider.identifier %}"
                                         class="btn btn-default">
                                     <span class="fa fa-cog"></span>