Bump version to 3.0.1

Update from Weblate

doc/admin/config.rst

@@ -78,6 +78,15 @@ Example::
     Enables or disables nagging staff users for leaving comments on their sessions for auditability.
     Defaults to ``off``.
 
+``obligatory_2fa``
+    Enables or disables obligatory usage of Two-Factor Authentication for users of the pretix backend.
+    Defaults to ``False``
+
+``trust_x_forwarded_for``
+    Specifies whether the ``X-Forwarded-For`` header can be trusted. Only set to ``on`` if you have a reverse
+    proxy that actively removes and re-adds the header to make sure the correct client IP is the first value.
+    Defaults to ``off``.
+
 
 Locale settings
 ---------------

doc/api/resources/carts.rst

@@ -36,12 +36,20 @@ answers                               list of objects            Answers to user
 ├ question_identifier                 string                     The question's ``identifier`` field
 ├ options                             list of integers           Internal IDs of selected option(s)s (only for choice types)
 └ option_identifiers                  list of strings            The ``identifier`` fields of the selected option(s)s
+seat                                  objects                    The assigned seat. Can be ``null``.
+├ id                                  integer                    Internal ID of the seat instance
+├ name                                string                     Human-readable seat name
+└ seat_guid                           string                     Identifier of the seat within the seating plan
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.17
 
    This resource has been added.
 
+.. versionchanged:: 3.0
+
+   This ``seat`` attribute has been added.
+
 
 Cart position endpoints
 -----------------------
@@ -87,6 +95,7 @@ Cart position endpoints
             "datetime": "2018-06-11T10:00:00Z",
             "expires": "2018-06-11T10:00:00Z",
             "includes_tax": true,
+            "seat": null,
             "answers": []
           }
         ]
@@ -132,6 +141,7 @@ Cart position endpoints
         "datetime": "2018-06-11T10:00:00Z",
         "expires": "2018-06-11T10:00:00Z",
         "includes_tax": true,
+        "seat": null,
         "answers": []
       }
 
@@ -178,6 +188,7 @@ Cart position endpoints
    * ``item``
    * ``variation`` (optional)
    * ``price``
+   * ``seat`` (The ``seat_guid`` attribute of a seat. Required when the specified ``item`` requires a seat, otherwise must be ``null``.)
    * ``attendee_name`` **or** ``attendee_name_parts`` (optional)
    * ``attendee_email`` (optional)
    * ``subevent`` (optional)
@@ -196,7 +207,7 @@ Cart position endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/cartpositions/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content: application/json
+      Content-Type: application/json
 
       {
         "item": 1,

doc/api/resources/categories.rst

@@ -131,7 +131,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/categories/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content: application/json
+      Content-Type: application/json
 
       {
         "name": {"en": "Tickets"},

doc/api/resources/checkinlists.rst

@@ -209,7 +209,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/checkinlists/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content: application/json
+      Content-Type: application/json
 
       {
         "name": "VIP entry",
@@ -396,6 +396,7 @@ Order position endpoints
             "addon_to": null,
             "subevent": null,
             "pseudonymization_id": "MQLJvANO3B",
+            "seat": null,
             "checkins": [
               {
                 "list": 1,
@@ -505,6 +506,7 @@ Order position endpoints
         "addon_to": null,
         "subevent": null,
         "pseudonymization_id": "MQLJvANO3B",
+        "seat": null,
         "checkins": [
           {
             "list": 1,
@@ -546,6 +548,8 @@ Order position endpoints
                                        you do not implement question handling in your user interface, you **must**
                                        set this to ``false``. In that case, questions will just be ignored. Defaults
                                        to ``true``.
+   :<json boolean canceled_supported: When this parameter is set to ``true``, the response code ``canceled`` may be
+                                      returned. Otherwise, canceled orders will return ``unpaid``.
    :<json datetime datetime: Specifies the datetime of the check-in. If not supplied, the current time will be used.
    :<json boolean force: Specifies that the check-in should succeed regardless of previous check-ins or required
                          questions that have not been filled. Defaults to ``false``.
@@ -574,6 +578,7 @@ Order position endpoints
         "nonce": "Pvrk50vUzQd0DhdpNRL4I4OcXsvg70uA",
         "datetime": null,
         "questions_supported": true,
+        "canceled_supported": true,
         "answers": {
           "4": "XS"
         }
@@ -657,7 +662,9 @@ Order position endpoints
 
    Possible error reasons:
 
-   * ``unpaid`` - Ticket is not paid for or has been refunded
+   * ``unpaid`` - Ticket is not paid for
+   * ``canceled`` – Ticket is canceled or expired. This reason is only sent when your request sets
+     ``canceled_supported`` to ``true``, otherwise these orders return ``unpaid``.
    * ``already_redeemed`` - Ticket already has been redeemed
    * ``product`` - Tickets with this product may not be scanned at this device
 

doc/api/resources/events.rst

@@ -27,9 +27,13 @@ presale_end                           datetime                   The date at whi
 location                              multi-lingual string       The event location (or ``null``)
 has_subevents                         boolean                    ``true`` if the event series feature is active for this
                                                                  event. Cannot change after event is created.
-meta_data                             dict                       Values set for organizer-specific meta data parameters.
+meta_data                             object                     Values set for organizer-specific meta data parameters.
 plugins                               list                       A list of package names of the enabled plugins for this
                                                                  event.
+seating_plan                          integer                    If reserved seating is in use, the ID of a seating
+                                                                 plan. Otherwise ``null``.
+seat_category_mapping                 object                     An object mapping categories of the seating plan
+                                                                 (strings) to items in the event (integers or ``null``).
 ===================================== ========================== =======================================================
 
 
@@ -54,6 +58,10 @@ plugins                               list                       A list of packa
 
     When cloning events, the ``testmode`` attribute will now be cloned, too.
 
+.. versionchanged:: 3.0
+
+   The attributes ``seating_plan`` and ``seat_category_mapping`` have been added.
+
 Endpoints
 ---------
 
@@ -99,6 +107,8 @@ Endpoints
             "location": null,
             "has_subevents": false,
             "meta_data": {},
+            "seating_plan": null,
+            "seat_category_mapping": {},
             "plugins": [
               "pretix.plugins.banktransfer"
               "pretix.plugins.stripe"
@@ -160,6 +170,8 @@ Endpoints
         "presale_end": null,
         "location": null,
         "has_subevents": false,
+        "seating_plan": null,
+        "seat_category_mapping": {},
         "meta_data": {},
         "plugins": [
           "pretix.plugins.banktransfer"
@@ -191,7 +203,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content: application/json
+      Content-Type: application/json
 
       {
         "name": {"en": "Sample Conference"},
@@ -205,6 +217,8 @@ Endpoints
         "is_public": false,
         "presale_start": null,
         "presale_end": null,
+        "seating_plan": null,
+        "seat_category_mapping": {},
         "location": null,
         "has_subevents": false,
         "meta_data": {},
@@ -235,6 +249,8 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
+        "seating_plan": null,
+        "seat_category_mapping": {},
         "has_subevents": false,
         "meta_data": {},
         "plugins": [
@@ -269,7 +285,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/clone/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content: application/json
+      Content-Type: application/json
 
       {
         "name": {"en": "Sample Conference"},
@@ -284,6 +300,8 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
+        "seating_plan": null,
+        "seat_category_mapping": {},
         "has_subevents": false,
         "meta_data": {},
         "plugins": [
@@ -314,6 +332,8 @@ Endpoints
         "presale_end": null,
         "location": null,
         "has_subevents": false,
+        "seating_plan": null,
+        "seat_category_mapping": {},
         "meta_data": {},
         "plugins": [
           "pretix.plugins.stripe",
@@ -342,7 +362,7 @@ Endpoints
       PATCH /api/v1/organizers/bigevents/events/sampleconf/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content: application/json
+      Content-Type: application/json
 
       {
         "plugins": [
@@ -375,6 +395,8 @@ Endpoints
         "presale_end": null,
         "location": null,
         "has_subevents": false,
+        "seating_plan": null,
+        "seat_category_mapping": {},
         "meta_data": {},
         "plugins": [
           "pretix.plugins.banktransfer",

doc/api/resources/index.rst

@@ -23,4 +23,5 @@ Resources and endpoints
    waitinglist
    carts
    webhooks
+   seatingplans
    billing_invoices

doc/api/resources/item_add-ons.rst

@@ -134,7 +134,7 @@ Endpoints
       POST /api/v1/organizers/(organizer)/events/(event)/items/(item)/addons/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content: application/json
+      Content-Type: application/json
 
       {
         "addon_category": 1,

doc/api/resources/item_bundles.rst

@@ -134,7 +134,7 @@ Endpoints
       POST /api/v1/organizers/(organizer)/events/(event)/items/(item)/bundles/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content: application/json
+      Content-Type: application/json
 
       {
         "bundled_item": 3,

doc/api/resources/item_variations.rst

@@ -152,7 +152,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/items/1/variations/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content: application/json
+      Content-Type: application/json
 
       {
         "value": {"en": "Student"},

doc/api/resources/items.rst

@@ -44,6 +44,9 @@ available_from                        datetime                   The first date
                                                                  (or ``null``).
 available_until                       datetime                   The last date time at which this item can be bought
                                                                  (or ``null``).
+hidden_if_available                   integer                    The internal ID of a quota object, or ``null``. If
+                                                                 set, this item won't be shown publicly as long as this
+                                                                 quota is available.
 require_voucher                       boolean                    If ``true``, this item can only be bought using a
                                                                  voucher that is specifically assigned to this item.
 hide_without_voucher                  boolean                    If ``true``, this item is only shown during the voucher
@@ -72,6 +75,10 @@ generate_tickets                      boolean                    If ``false``, t
                                                                  non-admission or add-on product, regardless of event
                                                                  settings. If this is ``null``, regular ticketing
                                                                  rules apply.
+allow_waitinglist                     boolean                    If ``false``, no waiting list will be shown for this
+                                                                 product when it is sold out.
+show_quota_left                       boolean                    Publicly show how many tickets are still available.
+                                                                 If this is ``null``, the event default is used.
 has_variations                        boolean                    Shows whether or not this item has variations.
 variations                            list of objects            A list with one object for each variation of this item.
                                                                  Can be empty. Only writable during creation,
@@ -142,6 +149,10 @@ bundles                               list of objects            Definition of b
 
    The ``bundles`` and ``require_bundling`` attributes have been added.
 
+.. versionchanged:: 3.0
+
+   The ``show_quota_left``, ``allow_waitinglist``, and ``hidden_if_available`` attributes have been added.
+
 Notes
 -----
 
@@ -199,6 +210,7 @@ Endpoints
             "picture": null,
             "available_from": null,
             "available_until": null,
+            "hidden_if_available": null,
             "require_voucher": false,
             "hide_without_voucher": false,
             "allow_cancel": true,
@@ -207,6 +219,8 @@ Endpoints
             "checkin_attention": false,
             "has_variations": false,
             "generate_tickets": null,
+            "allow_waitinglist": true,
+            "show_quota_left": null,
             "require_approval": false,
             "require_bundling": false,
             "variations": [
@@ -290,10 +304,13 @@ Endpoints
         "picture": null,
         "available_from": null,
         "available_until": null,
+        "hidden_if_available": null,
         "require_voucher": false,
         "hide_without_voucher": false,
         "allow_cancel": true,
         "generate_tickets": null,
+        "allow_waitinglist": true,
+        "show_quota_left": null,
         "min_per_order": null,
         "max_per_order": null,
         "checkin_attention": false,
@@ -342,7 +359,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/items/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content: application/json
+      Content-Type: application/json
 
       {
         "id": 1,
@@ -362,10 +379,13 @@ Endpoints
         "picture": null,
         "available_from": null,
         "available_until": null,
+        "hidden_if_available": null,
         "require_voucher": false,
         "hide_without_voucher": false,
         "allow_cancel": true,
         "generate_tickets": null,
+        "allow_waitinglist": true,
+        "show_quota_left": null,
         "min_per_order": null,
         "max_per_order": null,
         "checkin_attention": false,
@@ -421,12 +441,15 @@ Endpoints
         "picture": null,
         "available_from": null,
         "available_until": null,
+        "hidden_if_available": null,
         "require_voucher": false,
         "hide_without_voucher": false,
         "allow_cancel": true,
         "min_per_order": null,
         "max_per_order": null,
         "generate_tickets": null,
+        "allow_waitinglist": true,
+        "show_quota_left": null,
         "checkin_attention": false,
         "has_variations": true,
         "require_approval": false,
@@ -512,9 +535,12 @@ Endpoints
         "picture": null,
         "available_from": null,
         "available_until": null,
+        "hidden_if_available": null,
         "require_voucher": false,
         "hide_without_voucher": false,
         "generate_tickets": null,
+        "allow_waitinglist": true,
+        "show_quota_left": null,
         "allow_cancel": true,
         "min_per_order": null,
         "max_per_order": null,

doc/api/resources/orders.rst

@@ -176,6 +176,10 @@ answers                               list of objects            Answers to user
 ├ question_identifier                 string                     The question's ``identifier`` field
 ├ options                             list of integers           Internal IDs of selected option(s)s (only for choice types)
 └ option_identifiers                  list of strings            The ``identifier`` fields of the selected option(s)s
+seat                                  objects                    The assigned seat. Can be ``null``.
+├ id                                  integer                    Internal ID of the seat instance
+├ name                                string                     Human-readable seat name
+└ seat_guid                           string                     Identifier of the seat within the seating plan
 pdf_data                              object                     Data object required for ticket PDF generation. By default,
                                                                  this field is missing. It will be added only if you add the
                                                                  ``pdf_data=true`` query parameter to your request.
@@ -197,6 +201,10 @@ pdf_data                              object                     Data object req
 
   The attributes ``pseudonymization_id`` and ``pdf_data`` have been added.
 
+.. versionchanged:: 3.0
+
+  The attribute ``seat`` has been added.
+
 .. _order-payment-resource:
 
 Order payment resource
@@ -328,6 +336,7 @@ List of all orders
                 "addon_to": null,
                 "subevent": null,
                 "pseudonymization_id": "MQLJvANO3B",
+                "seat": null,
                 "checkins": [
                   {
                     "list": 44,
@@ -470,6 +479,7 @@ Fetching individual orders
             "addon_to": null,
             "subevent": null,
             "pseudonymization_id": "MQLJvANO3B",
+            "seat": null,
             "checkins": [
               {
                 "list": 44,
@@ -688,8 +698,6 @@ Creating orders
 
    Creates a new order.
 
-   .. warning:: This endpoint is considered **experimental**. It might change at any time without prior notice.
-
    .. warning::
 
        This endpoint is intended for advanced users. It is not designed to be used to build your own shop frontend,
@@ -737,7 +745,7 @@ Creating orders
      then call the ``mark_paid`` API method.
    * ``testmode`` (optional) – Defaults to ``false``
    * ``consume_carts`` (optional) – A list of cart IDs. All cart positions with these IDs will be deleted if the
-     order creation is successful. Any quotas that become free by this operation will be credited to your order
+     order creation is successful. Any quotas or seats that become free by this operation will be credited to your order
      creation.
    * ``email``
    * ``locale``
@@ -771,6 +779,7 @@ Creating orders
       * ``item``
       * ``variation``
       * ``price``
+      * ``seat`` (The ``seat_guid`` attribute of a seat. Required when the specified ``item`` requires a seat, otherwise must be ``null``.)
       * ``attendee_name`` **or** ``attendee_name_parts``
       * ``attendee_email``
       * ``secret`` (optional)
@@ -1287,6 +1296,7 @@ List of all order positions
             "tax_value": "0.00",
             "secret": "z3fsn8jyufm5kpk768q69gkbyr5f4h6w",
             "pseudonymization_id": "MQLJvANO3B",
+            "seat": null,
             "addon_to": null,
             "subevent": null,
             "checkins": [
@@ -1389,6 +1399,7 @@ Fetching individual positions
         "addon_to": null,
         "subevent": null,
         "pseudonymization_id": "MQLJvANO3B",
+        "seat": null,
         "checkins": [
           {
             "list": 44,

doc/api/resources/questions.rst

@@ -54,11 +54,12 @@ dependency_question                   integer                    Internal ID of
                                                                  this attribute is set to the value given in
                                                                  ``dependency_value``. This cannot be combined with
                                                                  ``ask_during_checkin``.
-dependency_value                      string                     The value ``dependency_question`` needs to be set to.
-                                                                 If ``dependency_question`` is set to a boolean
-                                                                 question, this should be ``"true"`` or ``"false"``.
-                                                                 Otherwise, it should be the ``identifier`` of a
-                                                                 question option.
+dependency_values                     list of strings            If ``dependency_question`` is set to a boolean
+                                                                 question, this should be ``["True"]`` or ``["False"]``.
+                                                                 Otherwise, it should be a list of ``identifier`` values
+                                                                 of question options.
+dependency_value                      string                     An old version of ``dependency_values`` that only allows
+                                                                 for one value. **Deprecated.**
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.12
@@ -75,6 +76,10 @@ dependency_value                      string                     The value ``dep
 
   The attribute ``hidden`` and the question type ``CC`` have been added.
 
+.. versionchanged:: 3.0
+
+  The attribute ``dependency_values`` has been added.
+
 Endpoints
 ---------
 
@@ -120,6 +125,7 @@ Endpoints
             "hidden": false,
             "dependency_question": null,
             "dependency_value": null,
+            "dependency_values": [],
             "options": [
               {
                 "id": 1,
@@ -188,6 +194,7 @@ Endpoints
         "hidden": false,
         "dependency_question": null,
         "dependency_value": null,
+        "dependency_values": [],
         "options": [
           {
             "id": 1,
@@ -228,7 +235,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/questions/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content: application/json
+      Content-Type: application/json
 
       {
         "question": {"en": "T-Shirt size"},
@@ -239,7 +246,7 @@ Endpoints
         "ask_during_checkin": false,
         "hidden": false,
         "dependency_question": null,
-        "dependency_value": null,
+        "dependency_values": [],
         "options": [
           {
             "answer": {"en": "S"}
@@ -274,6 +281,7 @@ Endpoints
         "hidden": false,
         "dependency_question": null,
         "dependency_value": null,
+        "dependency_values": [],
         "options": [
           {
             "id": 1,
@@ -346,6 +354,7 @@ Endpoints
         "hidden": false,
         "dependency_question": null,
         "dependency_value": null,
+        "dependency_values": [],
         "options": [
           {
             "id": 1,

doc/api/resources/quotas.rst

@@ -20,12 +20,22 @@ size                                  integer                    The size of the
 items                                 list of integers           List of item IDs this quota acts on.
 variations                            list of integers           List of item variation IDs this quota acts on.
 subevent                              integer                    ID of the date inside an event series this quota belongs to (or ``null``).
+close_when_sold_out                   boolean                    If ``true``, the quota will "close" as soon as it is
+                                                                 sold out once. Even if tickets become available again,
+                                                                 they will not be sold unless the quota is set to open
+                                                                 again.
+closed                                boolean                    Whether the quota is currently closed (see above
+                                                                 field).
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.10
 
    The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
 
+.. versionchanged:: 3.0
+
+   The attributes ``close_when_sold_out`` and ``closed`` have been added.
+
 
 Endpoints
 ---------
@@ -61,7 +71,9 @@ Endpoints
             "size": 200,
             "items": [1, 2],
             "variations": [1, 4, 5, 7],
-            "subevent": null
+            "subevent": null,
+            "close_when_sold_out": false,
+            "closed": false
           }
         ]
       }
@@ -102,7 +114,9 @@ Endpoints
         "size": 200,
         "items": [1, 2],
         "variations": [1, 4, 5, 7],
-        "subevent": null
+        "subevent": null,
+        "close_when_sold_out": false,
+        "closed": false
       }
 
    :param organizer: The ``slug`` field of the organizer to fetch
@@ -123,14 +137,16 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/quotas/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content: application/json
+      Content-Type: application/json
 
       {
         "name": "Ticket Quota",
         "size": 200,
         "items": [1, 2],
         "variations": [1, 4, 5, 7],
-        "subevent": null
+        "subevent": null,
+        "close_when_sold_out": false,
+        "closed": false
       }
 
    **Example response**:
@@ -147,7 +163,9 @@ Endpoints
         "size": 200,
         "items": [1, 2],
         "variations": [1, 4, 5, 7],
-        "subevent": null
+        "subevent": null,
+        "close_when_sold_out": false,
+        "closed": false
       }
 
    :param organizer: The ``slug`` field of the organizer of the event/item to create a quota for
@@ -200,7 +218,9 @@ Endpoints
           1,
           2
         ],
-        "subevent": null
+        "subevent": null,
+        "close_when_sold_out": false,
+        "closed": false
       }
 
    :param organizer: The ``slug`` field of the organizer to modify

doc/api/resources/seatingplans.rst

@@ -0,0 +1,209 @@
+.. _`rest-seatingplans`:
+
+Seating plans
+=============
+
+Resource description
+--------------------
+
+The seating plan resource contains the following public fields:
+
+.. rst-class:: rest-resource-table
+
+===================================== ========================== =======================================================
+Field                                 Type                       Description
+===================================== ========================== =======================================================
+id                                    integer                    Internal ID of the plan
+name                                  string                     Human-readable name of the plan
+layout                                object                     JSON representation of the seating plan. These
+                                                                 representations follow a JSON schema that currently
+                                                                 still evolves. The version in use can be found `here`_.
+===================================== ========================== =======================================================
+
+.. versionchanged:: 3.0
+
+   This endpoint has been added.
+
+Endpoints
+---------
+
+.. http:get:: /api/v1/organizers/(organizer)/seatingplans/
+
+   Returns a list of all seating plans within a given organizer.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/seatingplans/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "count": 1,
+        "next": null,
+        "previous": null,
+        "results": [
+          {
+            "id": 2,
+            "name": "Main plan",
+            "layout": { … }
+          }
+        ]
+      }
+
+   :query integer page: The page number in case of a multi-page result set, default is 1
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer does not exist **or** you have no permission to view this resource.
+
+.. http:get:: /api/v1/organizers/(organizer)/seatingplans/(id)/
+
+   Returns information on one plan, identified by its ID.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/seatingplans/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 2,
+        "name": "Main plan",
+        "layout": { … }
+      }
+
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param id: The ``id`` field of the seating plan to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer does not exist **or** you have no permission to view this resource.
+
+.. http:post:: /api/v1/organizers/(organizer)/seatingplans/
+
+   Creates a new seating plan
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      POST /api/v1/organizers/bigevents/seatingplans/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+
+      {
+        "name": "Main plan",
+        "layout": { … }
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 201 Created
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 3,
+        "name": "Main plan",
+        "layout": { … }
+      }
+
+   :param organizer: The ``slug`` field of the organizer to create a seating plan for
+   :statuscode 201: no error
+   :statuscode 400: The seating plan could not be created due to invalid submitted data.
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.
+
+.. http:patch:: /api/v1/organizers/(organizer)/seatingplans/(id)/
+
+   Update a plan. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
+   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
+   want to change.
+
+   You can change all fields of the resource except the ``id`` field. **You can not change a plan while it is in use for
+   any events.**
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      PATCH /api/v1/organizers/bigevents/seatingplans/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+      Content-Length: 94
+
+      {
+        "name": "Old plan"
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "name": "Old plan",
+        "layout": { … }
+      }
+
+   :param organizer: The ``slug`` field of the organizer to modify
+   :param id: The ``id`` field of the plan to modify
+   :statuscode 200: no error
+   :statuscode 400: The plan could not be modified due to invalid submitted data
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer does not exist **or** you have no permission to change this resource **or** the plan is currently in use.
+
+.. http:delete:: /api/v1/organizers/(organizer)/seatingplans/(id)/
+
+   Delete a plan. You can not delete plans which are currently in use by any events.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      DELETE /api/v1/organizers/bigevents/seatingplans/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 204 No Content
+      Vary: Accept
+
+   :param organizer: The ``slug`` field of the organizer to modify
+   :param id: The ``id`` field of the plan to delete
+   :statuscode 204: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer does not exist **or** you have no permission to delete this resource **or** the plan is currently in use.
+
+
+.. _here: https://github.com/pretix/pretix/blob/master/src/pretix/static/seating/seating-plan.schema.json

doc/api/resources/subevents.rst

@@ -36,7 +36,11 @@ variation_price_overrides             list of objects            List of variati
                                                                  the default price
 ├ variation                           integer                    The internal variation ID
 └ price                               money (string)             The price or ``null`` for the default price
-meta_data                             dict                       Values set for organizer-specific meta data parameters.
+meta_data                             object                     Values set for organizer-specific meta data parameters.
+seating_plan                          integer                    If reserved seating is in use, the ID of a seating
+                                                                 plan. Otherwise ``null``.
+seat_category_mapping                 object                     An object mapping categories of the seating plan
+                                                                 (strings) to items in the event (integers or ``null``).
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.7
@@ -54,6 +58,10 @@ meta_data                             dict                       Values set for
 
    The attribute ``is_public`` has been added.
 
+.. versionchanged:: 3.0
+
+   The attributes ``seating_plan`` and ``seat_category_mapping`` have been added.
+
 Endpoints
 ---------
 
@@ -93,6 +101,8 @@ Endpoints
             "date_admission": null,
             "presale_start": null,
             "presale_end": null,
+            "seating_plan": null,
+            "seat_category_mapping": {},
             "location": null,
             "item_price_overrides": [
               {
@@ -130,7 +140,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/events/sampleconf/subevents/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content: application/json
+      Content-Type: application/json
 
       {
         "name": {"en": "First Sample Conference"},
@@ -142,6 +152,8 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
+        "seating_plan": null,
+        "seat_category_mapping": {},
         "item_price_overrides": [
           {
             "item": 2,
@@ -172,6 +184,8 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
+        "seating_plan": null,
+        "seat_category_mapping": {},
         "item_price_overrides": [
           {
             "item": 2,
@@ -223,6 +237,8 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
+        "seating_plan": null,
+        "seat_category_mapping": {},
         "item_price_overrides": [
           {
             "item": 2,
@@ -255,7 +271,7 @@ Endpoints
       PATCH /api/v1/organizers/bigevents/events/sampleconf/subevents/1/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content: application/json
+      Content-Type: application/json
 
       {
         "name": {"en": "New Subevent Name"},
@@ -287,6 +303,8 @@ Endpoints
         "presale_start": null,
         "presale_end": null,
         "location": null,
+        "seating_plan": null,
+        "seat_category_mapping": {},
         "item_price_overrides": [
           {
             "item": 2,
@@ -371,6 +389,8 @@ Endpoints
             "presale_start": null,
             "presale_end": null,
             "location": null,
+            "seating_plan": null,
+            "seat_category_mapping": {},
             "item_price_overrides": [
               {
                 "item": 2,

doc/api/resources/vouchers.rst

@@ -41,6 +41,7 @@ quota                                 integer                    An ID of a quot
 tag                                   string                     A string that is used for grouping vouchers
 comment                               string                     An internal comment on the voucher
 subevent                              integer                    ID of the date inside an event series this voucher belongs to (or ``null``).
+show_hidden_items                     boolean                    Only if set to ``true``, this voucher allows to buy products with the property ``hide_without_voucher``. Defaults to ``true``.
 ===================================== ========================== =======================================================
 
 
@@ -48,6 +49,10 @@ subevent                              integer                    ID of the date
 
    The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
 
+.. versionchanged:: 3.0
+
+   The attribute ``show_hidden_items`` has been added.
+
 Endpoints
 ---------
 

doc/api/resources/webhooks.rst

@@ -137,7 +137,7 @@ Endpoints
       POST /api/v1/organizers/bigevents/webhooks/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
-      Content: application/json
+      Content-Type: application/json
 
       {
         "enabled": true,

doc/development/api/email.rst

@@ -101,9 +101,12 @@ The template is passed the following context variables:
    The ``Event`` object
 
 ``signature`` (optional, only if configured)
-   The body as markdown (render with ``{{ signature|safe }}``)
+   The signature with event organizer contact details as markdown (render with ``{{ signature|safe }}``)
 
 ``order`` (optional, only if applicable)
    The ``Order`` object
 
+``position`` (optional, only if applicable)
+   The ``OrderPosition`` object
+
 .. _inlinestyler: https://pypi.org/project/inlinestyler/

doc/development/api/general.rst

@@ -12,7 +12,7 @@ Core
 
 .. automodule:: pretix.base.signals
    :members: periodic_task, event_live_issues, event_copy_data, email_filter, register_notification_types,
-      item_copy_data, register_sales_channels, register_global_settings
+      item_copy_data, register_sales_channels, register_global_settings, quota_availability
 
 Order events
 """"""""""""
@@ -20,13 +20,17 @@ Order events
 There are multiple signals that will be sent out in the ordering cycle:
 
 .. automodule:: pretix.base.signals
-   :members: validate_cart, validate_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
+   :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
 
 Frontend
 --------
 
 .. automodule:: pretix.presale.signals
-   :members: html_head, html_footer, footer_link, front_page_top, front_page_bottom, fee_calculation_for_cart, contact_form_fields, question_form_fields, checkout_confirm_messages, checkout_confirm_page_content, checkout_all_optional, html_page_header, sass_preamble, sass_postamble, checkout_flow_steps, order_info, order_meta_from_request, position_info
+   :members: html_head, html_footer, footer_link, front_page_top, front_page_bottom, fee_calculation_for_cart, contact_form_fields, question_form_fields, checkout_confirm_messages, checkout_confirm_page_content, checkout_all_optional, html_page_header, sass_preamble, sass_postamble, render_seating_plan, checkout_flow_steps, position_info
+
+
+.. automodule:: pretix.presale.signals
+   :members: order_info, order_meta_from_request
 
 Request flow
 """"""""""""
@@ -45,7 +49,7 @@ Backend
 
 .. automodule:: pretix.control.signals
    :members: nav_event, html_head, html_page_start, quota_detail_html, nav_topbar, nav_global, nav_organizer, nav_event_settings,
-             order_info, event_settings_widget, oauth_application_registered, order_position_buttons, nav_item
+             order_info, event_settings_widget, oauth_application_registered, order_position_buttons, subevent_forms, item_formsets
 
 
 .. automodule:: pretix.base.signals

doc/development/setup.rst

@@ -65,9 +65,7 @@ Then, create the local database::
     python manage.py migrate
 
 A first user with username ``admin@localhost`` and password ``admin`` will be automatically
-created. If you want to generate more test data, run::
-
-    python make_testdata.py
+created. 
 
 If you want to see pretix in a different language than English, you have to compile our language
 files::

doc/spelling_wordlist.txt

@@ -36,10 +36,13 @@ eu
 filename
 filesystem
 fontawesome
+formset
+formsets
 frontend
 frontpage
 gettext
 gunicorn
+guid
 hardcoded
 hostname
 idempotency
@@ -134,6 +137,7 @@ versa
 versioning
 viewset
 viewsets
+waitinglist
 webhook
 webhooks
 webserver

doc/user/events/structureguide.rst

@@ -45,8 +45,8 @@ In addition, you will need quotas. If you do not care how many of your tickets a
 
 If you want to limit the number of student tickets to 50 to ensure a certain minimum revenue, but do not want to limit the number of regular tickets artificially, we suggest you to create the same quota of 200 that is linked to both products, and then create a **second quota** of 50 that is only linked to the student ticket. This way, the system will reduce both quotas whenever a student ticket is sold and only the larger quota when a regular ticket is sold.
 
-Use case: Early-bird tiers
---------------------------
+Use case: Early-bird tiers based on dates
+-----------------------------------------
 
 Let's say you run a conference that has the following pricing scheme:
 
@@ -58,9 +58,53 @@ Of course, you could just set up one product and change its price at the given d
 
 Create three products (e.g. "super early bird", "early bird", "regular ticket") with the respective prices and one shared quota of your total event capacity. Then, set the **available from** and **available until** configuration fields of the products to automatically turn them on and off based on the current date.
 
-.. note::
+Use case: Early-bird tiers based on ticket numbers
+--------------------------------------------------
 
-   pretix currently can't do early-bird tiers based on **ticket number** instead of time. We're planning this feature for later in 2019. For now, you'll need to monitor that manually.
+Let's say you run a conference with 400 tickets that has the following pricing scheme:
+
+* First 100 tickets ("super early bird"): € 450
+* Next 100 tickets ("early bird"): € 550
+* Remaining tickets ("regular"): € 650
+
+First of all, create three products:
+
+* "Super early bird ticket"
+* "Early bird ticket"
+* "Regular ticket"
+
+Then, create three quotas:
+
+* "Super early bird" with a **size of 100** and the "Super early bird ticket" product selected. At "Advanced options",
+  select the box "Close this quota permanently once it is sold out".
+
+* "Early bird and lower" with a **size of 200** and both of the "Super early bird ticket" and "Early bird ticket"
+  products selected. At "Advanced options", select the box "Close this quota permanently once it is sold out".
+
+* "All participants" with a **size of 400**, all three products selected and **no additional options**.
+
+Next, modify the product "Regular ticket". In the section "Availability", you should look for the option "Only show
+after sellout of" and select your quota "Early bird and lower". Do the same for the "Early bird ticket" with the quota
+"Super early bird ticket".
+
+This will ensure the following things:
+
+* Each ticket level is only visible after the previous level is sold out.
+
+* As soon as one level is really sold out, it's not coming back, because the quota "closes", i.e. locks in place.
+
+* By creating a total quota of 400 with all tickets included, you can still make sure to sell the maximum number of
+  tickets, even if e.g. early-bird tickets are canceled.
+
+Optionally, if you want to hide the early bird prices once they are sold out, go to "Settings", then "Display" and
+select "Hide all products that are sold out". Of course, it might be a nice idea to keep showing the prices to remind
+people to buy earlier next time ;)
+
+Please note that there might be short time intervals where the prices switch back and forth: When the last early bird
+tickets are in someone's cart (but not yet sold!), the early bird tickets will show as "Reserved" and the regular
+tickets start showing up. However, if the customers holding the reservations do not complete their order,
+the early bird tickets will become available again. This is not avoidable if we want to prevent malicious users
+from blocking all the cheap tickets without an actual sale happening.
 
 Use case: Up-selling of ticket extras
 -------------------------------------
@@ -85,8 +129,14 @@ Use case: Conference with workshops
 
 When running a conference, you might also organize a number of workshops with smaller capacity. To be able to plan, it would be great to know which workshops an attendee plans to attend.
 
+Option A: Questions
+"""""""""""""""""""
+
 Your first and simplest option is to just create a multiple-choice question. This has the upside of making it easy for users to change their mind later on, but will not allow you to restrict the number of attendees signing up for a given workshop – or even charge extra for a given workshop.
 
+Option B: Add-on products with fixed time slots
+"""""""""""""""""""""""""""""""""""""""""""""""
+
 The usually better option is to go with add-on products. Let's take for example the following conference schedule, in which the lecture can be attended by anyone, but the workshops only have space for 20 persons each:
 
 ==================== =================================== ===================================
@@ -117,6 +167,42 @@ Assuming you already created one or more products for your general conference ad
 
 * One add-on configuration on your base product that allows users to choose between 0 and 2 products from the category "Workshops"
 
+Option C: Add-on products with variable time slots
+""""""""""""""""""""""""""""""""""""""""""""""""""
+
+The above option only works if your conference uses fixed time slots and every workshop uses exactly one time slot. If
+your schedule looks like this, it's not going to work great:
+
++-------------+------------+-----------+
+| Time        | Room A     | Room B    |
++=============+============+===========+
+| 09:00-11:00 | Talk 1     | Long      |
++-------------+------------+ Workshop 1|
+| 11:00-13:00 | Talk 2     |           |
++-------------+------------+-----------+
+| 14:00-16:00 | Long       | Talk 3    |
++-------------+ workshop 2 +-----------+
+| 16:00-18:00 |            | Talk 4    |
++-------------+------------+-----------+
+
+In this case, we recommend that you go to *Settings*, then *Plugins* and activate the plugin **Agenda constraints**.
+
+Then, create a product (without variations) for every single part that should be bookable (talks 1-4 and long workshops
+1 and 2) as well as appropriate quotas for each of them.
+
+All of these products should be part of the same category. In your base product (e.g. your conference ticket), you
+can then create an add-on product configuration allowing users to add products from this category.
+
+If you edit these products, you will be able to enter the "Start date" and "End date" of the talk or workshop close
+to the bottom of the page. If you fill in these values, pretix will automatically ensure no overlapping talks are
+booked.
+
+.. note::
+
+    This option is currently only available on pretix Hosted. If you are interested in using it with pretix Enterprise,
+    please contact sales@pretix.eu.
+
+
 Use case: Discounted packages
 -----------------------------
 

doc/user/events/widget.rst

@@ -143,6 +143,11 @@ You can see an example here:
         </div>
     </noscript>
 
+You can filter events by meta data attributes. You can create those attributes in your order profile and set their values in both event and series date
+settings. For example, if you set up a meta data property called "Promoted" that you set to "Yes" on some events, you can pass a filter like this::
+
+   <pretix-widget event="https://pretix.eu/demo/series/" style="list" filter="attr[Promoted]=Yes"></pretix-widget>
+
 pretix Button
 -------------
 

src/make_testdata.py

@@ -1,71 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-from datetime import datetime
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pretix.settings")
-
-import django
-
-django.setup()
-
-from pretix.base.models import *  # NOQA
-from django.utils.timezone import now
-
-if Organizer.objects.exists():
-    print("There already is data in your DB!")
-    sys.exit(0)
-user = User.objects.get_or_create(
-    email='admin@localhost',
-)[0]
-user.set_password('admin')
-user.save()
-organizer = Organizer.objects.create(
-    name='BigEvents LLC', slug='bigevents'
-)
-year = now().year + 1
-event = Event.objects.create(
-    organizer=organizer, name='Demo Conference {}'.format(year),
-    slug=year, currency='EUR', live=True,
-    date_from=datetime(year, 9, 4, 17, 0, 0),
-    date_to=datetime(year, 9, 6, 17, 0, 0),
-)
-t = Team.objects.get_or_create(
-    organizer=organizer, name='Admin Team',
-    all_events=True, can_create_events=True, can_change_teams=True,
-    can_change_organizer_settings=True, can_change_event_settings=True, can_change_items=True,
-    can_view_orders=True, can_change_orders=True, can_view_vouchers=True, can_change_vouchers=True
-)
-t[0].members.add(user)
-cat_tickets = ItemCategory.objects.create(
-    event=event, name='Tickets'
-)
-cat_merch = ItemCategory.objects.create(
-    event=event, name='Merchandise'
-)
-question = Question.objects.create(
-    event=event, question='Age',
-    type=Question.TYPE_NUMBER, required=False
-)
-tr19 = event.tax_rules.create(rate=19)
-item_ticket = Item.objects.create(
-    event=event, category=cat_tickets, name='Ticket',
-    default_price=23, tax_rule=tr19, admission=True
-)
-item_ticket.questions.add(question)
-item_shirt = Item.objects.create(
-    event=event, category=cat_merch, name='T-Shirt',
-    default_price=15, tax_rule=tr19
-)
-var_s = ItemVariation.objects.create(item=item_shirt, value='S')
-var_m = ItemVariation.objects.create(item=item_shirt, value='M')
-var_l = ItemVariation.objects.create(item=item_shirt, value='L')
-ticket_quota = Quota.objects.create(
-    event=event, name='Ticket quota', size=400,
-)
-ticket_quota.items.add(item_ticket)
-ticket_shirts = Quota.objects.create(
-    event=event, name='Shirt quota', size=200,
-)
-ticket_quota.items.add(item_shirt)
-ticket_quota.variations.add(var_s, var_m, var_l)

src/pretix/__init__.py

@@ -1 +1 @@
-__version__ = "2.9.0.dev0"
+__version__ = "3.0.1"

src/pretix/api/serializers/cart.py

@@ -8,31 +8,33 @@ from rest_framework.exceptions import ValidationError
 
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.api.serializers.order import (
-    AnswerCreateSerializer, AnswerSerializer,
+    AnswerCreateSerializer, AnswerSerializer, InlineSeatSerializer,
 )
-from pretix.base.models import Quota
+from pretix.base.models import Quota, Seat
 from pretix.base.models.orders import CartPosition
 
 
 class CartPositionSerializer(I18nAwareModelSerializer):
     answers = AnswerSerializer(many=True)
+    seat = InlineSeatSerializer()
 
     class Meta:
         model = CartPosition
         fields = ('id', 'cart_id', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
                   'attendee_email', 'voucher', 'addon_to', 'subevent', 'datetime', 'expires', 'includes_tax',
-                  'answers',)
+                  'answers', 'seat')
 
 
 class CartPositionCreateSerializer(I18nAwareModelSerializer):
     answers = AnswerCreateSerializer(many=True, required=False)
     expires = serializers.DateTimeField(required=False)
     attendee_name = serializers.CharField(required=False, allow_null=True)
+    seat = serializers.CharField(required=False, allow_null=True)
 
     class Meta:
         model = CartPosition
         fields = ('cart_id', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts', 'attendee_email',
-                  'subevent', 'expires', 'includes_tax', 'answers',)
+                  'subevent', 'expires', 'includes_tax', 'answers', 'seat')
 
     def create(self, validated_data):
         answers_data = validated_data.pop('answers')
@@ -71,6 +73,22 @@ class CartPositionCreateSerializer(I18nAwareModelSerializer):
                 validated_data['attendee_name_parts'] = {
                     '_legacy': attendee_name
                 }
+
+            seated = validated_data.get('item').seat_category_mappings.filter(subevent=validated_data.get('subevent')).exists()
+            if validated_data.get('seat'):
+                if not seated:
+                    raise ValidationError('The specified product does not allow to choose a seat.')
+                try:
+                    seat = self.context['event'].seats.get(seat_guid=validated_data['seat'], subevent=validated_data.get('subevent'))
+                except Seat.DoesNotExist:
+                    raise ValidationError('The specified seat does not exist.')
+                else:
+                    validated_data['seat'] = seat
+                    if not seat.is_available():
+                        raise ValidationError(ugettext_lazy('The selected seat "{seat}" is not available.').format(seat=seat.name))
+            elif seated:
+                raise ValidationError('The specified product requires to choose a seat.')
+
             cp = CartPosition.objects.create(event=self.context['event'], **validated_data)
 
         for answ_data in answers_data:

src/pretix/api/serializers/event.py

@@ -11,6 +11,9 @@ from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.base.models import Event, TaxRule
 from pretix.base.models.event import SubEvent
 from pretix.base.models.items import SubEventItem, SubEventItemVariation
+from pretix.base.services.seating import (
+    SeatProtected, generate_seats, validate_plan_change,
+)
 
 
 class MetaDataField(Field):
@@ -26,6 +29,22 @@ class MetaDataField(Field):
         }
 
 
+class SeatCategoryMappingField(Field):
+
+    def to_representation(self, value):
+        qs = value.seat_category_mappings.all()
+        if isinstance(value, Event):
+            qs = qs.filter(subevent=None)
+        return {
+            v.layout_category: v.product_id for v in qs
+        }
+
+    def to_internal_value(self, data):
+        return {
+            'seat_category_mapping': data or {}
+        }
+
+
 class PluginsField(Field):
 
     def to_representation(self, obj):
@@ -45,12 +64,14 @@ class PluginsField(Field):
 class EventSerializer(I18nAwareModelSerializer):
     meta_data = MetaDataField(required=False, source='*')
     plugins = PluginsField(required=False, source='*')
+    seat_category_mapping = SeatCategoryMappingField(source='*', required=False)
 
     class Meta:
         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', 'plugins')
+                  'presale_end', 'location', 'has_subevents', 'meta_data', 'seating_plan',
+                  'plugins', 'seat_category_mapping')
 
     def validate(self, data):
         data = super().validate(data)
@@ -61,6 +82,9 @@ class EventSerializer(I18nAwareModelSerializer):
         Event.clean_dates(data.get('date_from'), data.get('date_to'))
         Event.clean_presale(data.get('presale_start'), data.get('presale_end'))
 
+        if full_data.get('has_subevents') and full_data.get('seating_plan'):
+            raise ValidationError('Event series should not directly be assigned a seating plan.')
+
         return data
 
     def validate_has_subevents(self, value):
@@ -92,6 +116,27 @@ class EventSerializer(I18nAwareModelSerializer):
                 raise ValidationError(_('Meta data property \'{name}\' does not exist.').format(name=key))
         return value
 
+    def validate_seating_plan(self, value):
+        if value and value.organizer != self.context['request'].organizer:
+            raise ValidationError('Invalid seating plan.')
+        if self.instance and self.instance.pk:
+            try:
+                validate_plan_change(self.instance, None, value)
+            except SeatProtected as e:
+                raise ValidationError(str(e))
+        return value
+
+    def validate_seat_category_mapping(self, value):
+        if value and value['seat_category_mapping'] and (not self.instance or not self.instance.pk):
+            raise ValidationError('You cannot specify seat category mappings on event creation.')
+        item_cache = {i.pk: i for i in self.instance.items.all()}
+        result = {}
+        for k, item in value['seat_category_mapping'].items():
+            if item not in item_cache:
+                raise ValidationError('Item \'{id}\' does not exist.'.format(id=item))
+            result[k] = item_cache[item]
+        return {'seat_category_mapping': result}
+
     def validate_plugins(self, value):
         from pretix.base.plugins import get_all_plugins
 
@@ -109,6 +154,7 @@ class EventSerializer(I18nAwareModelSerializer):
     @transaction.atomic
     def create(self, validated_data):
         meta_data = validated_data.pop('meta_data', None)
+        validated_data.pop('seat_category_mapping', None)
         plugins = validated_data.pop('plugins', settings.PRETIX_PLUGINS_DEFAULT.split(','))
         event = super().create(validated_data)
 
@@ -120,6 +166,10 @@ class EventSerializer(I18nAwareModelSerializer):
                     value=value
                 )
 
+        # Seats
+        if event.seating_plan:
+            generate_seats(event, None, event.seating_plan, {})
+
         # Plugins
         if plugins is not None:
             event.set_active_plugins(plugins)
@@ -131,6 +181,7 @@ class EventSerializer(I18nAwareModelSerializer):
     def update(self, instance, validated_data):
         meta_data = validated_data.pop('meta_data', None)
         plugins = validated_data.pop('plugins', None)
+        seat_category_mapping = validated_data.pop('seat_category_mapping', None)
         event = super().update(instance, validated_data)
 
         # Meta data
@@ -151,6 +202,29 @@ class EventSerializer(I18nAwareModelSerializer):
                 if prop.name not in meta_data:
                     current_object.delete()
 
+        # Seats
+        if seat_category_mapping is not None or ('seating_plan' in validated_data and validated_data['seating_plan'] is None):
+            current_mappings = {
+                m.layout_category: m
+                for m in event.seat_category_mappings.filter(subevent=None)
+            }
+            if not event.seating_plan:
+                seat_category_mapping = {}
+            for key, value in seat_category_mapping.items():
+                if key in current_mappings:
+                    m = current_mappings.pop(key)
+                    m.product = value
+                    m.save()
+                else:
+                    event.seat_category_mappings.create(product=value, layout_category=key)
+            for m in current_mappings.values():
+                m.delete()
+        if 'seating_plan' in validated_data or seat_category_mapping is not None:
+            generate_seats(event, None, event.seating_plan, {
+                m.layout_category: m.product
+                for m in event.seat_category_mappings.select_related('product').filter(subevent=None)
+            })
+
         # Plugins
         if plugins is not None:
             event.set_active_plugins(plugins)
@@ -196,14 +270,15 @@ class SubEventItemVariationSerializer(I18nAwareModelSerializer):
 class SubEventSerializer(I18nAwareModelSerializer):
     item_price_overrides = SubEventItemSerializer(source='subeventitem_set', many=True, required=False)
     variation_price_overrides = SubEventItemVariationSerializer(source='subeventitemvariation_set', many=True, required=False)
+    seat_category_mapping = SeatCategoryMappingField(source='*', required=False)
     event = SlugRelatedField(slug_field='slug', read_only=True)
     meta_data = MetaDataField(source='*')
 
     class Meta:
         model = SubEvent
         fields = ('id', 'name', 'date_from', 'date_to', 'active', 'date_admission',
-                  'presale_start', 'presale_end', 'location', 'event', 'is_public',
-                  'item_price_overrides', 'variation_price_overrides', 'meta_data')
+                  'presale_start', 'presale_end', 'location', 'event', 'is_public', 'seating_plan',
+                  'item_price_overrides', 'variation_price_overrides', 'meta_data', 'seat_category_mapping')
 
     def validate(self, data):
         data = super().validate(data)
@@ -225,6 +300,25 @@ class SubEventSerializer(I18nAwareModelSerializer):
     def validate_variation_price_overrides(self, data):
         return list(filter(lambda i: 'variation' in i, data))
 
+    def validate_seating_plan(self, value):
+        if value and value.organizer != self.context['request'].organizer:
+            raise ValidationError('Invalid seating plan.')
+        if self.instance and self.instance.pk:
+            try:
+                validate_plan_change(self.context['request'].event, self.instance, value)
+            except SeatProtected as e:
+                raise ValidationError(str(e))
+        return value
+
+    def validate_seat_category_mapping(self, value):
+        item_cache = {i.pk: i for i in self.context['request'].event.items.all()}
+        result = {}
+        for k, item in value['seat_category_mapping'].items():
+            if item not in item_cache:
+                raise ValidationError('Item \'{id}\' does not exist.'.format(id=item))
+            result[k] = item_cache[item]
+        return {'seat_category_mapping': result}
+
     @cached_property
     def meta_properties(self):
         return {
@@ -242,6 +336,7 @@ class SubEventSerializer(I18nAwareModelSerializer):
         item_price_overrides_data = validated_data.pop('subeventitem_set') if 'subeventitem_set' in validated_data else {}
         variation_price_overrides_data = validated_data.pop('subeventitemvariation_set') if 'subeventitemvariation_set' in validated_data else {}
         meta_data = validated_data.pop('meta_data', None)
+        seat_category_mapping = validated_data.pop('seat_category_mapping', None)
         subevent = super().create(validated_data)
 
         for item_price_override_data in item_price_overrides_data:
@@ -257,6 +352,18 @@ class SubEventSerializer(I18nAwareModelSerializer):
                     value=value
                 )
 
+        # Seats
+        if subevent.seating_plan:
+            if seat_category_mapping is not None:
+                for key, value in seat_category_mapping.items():
+                    self.context['request'].event.seat_category_mappings.create(
+                        product=value, layout_category=key, subevent=subevent
+                    )
+            generate_seats(self.context['request'].event, subevent, subevent.seating_plan, {
+                m.layout_category: m.product
+                for m in self.context['request'].event.seat_category_mappings.select_related('product').filter(subevent=subevent)
+            })
+
         return subevent
 
     @transaction.atomic
@@ -264,6 +371,7 @@ class SubEventSerializer(I18nAwareModelSerializer):
         item_price_overrides_data = validated_data.pop('subeventitem_set') if 'subeventitem_set' in validated_data else {}
         variation_price_overrides_data = validated_data.pop('subeventitemvariation_set') if 'subeventitemvariation_set' in validated_data else {}
         meta_data = validated_data.pop('meta_data', None)
+        seat_category_mapping = validated_data.pop('seat_category_mapping', None)
         subevent = super().update(instance, validated_data)
 
         existing_item_overrides = {item.item: item.id for item in SubEventItem.objects.filter(subevent=subevent)}
@@ -300,6 +408,31 @@ class SubEventSerializer(I18nAwareModelSerializer):
                 if prop.name not in meta_data:
                     current_object.delete()
 
+        # Seats
+        if seat_category_mapping is not None or ('seating_plan' in validated_data and validated_data['seating_plan'] is None):
+            current_mappings = {
+                m.layout_category: m
+                for m in self.context['request'].event.seat_category_mappings.filter(subevent=subevent)
+            }
+            if not subevent.seating_plan:
+                seat_category_mapping = {}
+            for key, value in seat_category_mapping.items():
+                if key in current_mappings:
+                    m = current_mappings.pop(key)
+                    m.product = value
+                    m.save()
+                else:
+                    self.context['request'].event.seat_category_mappings.create(
+                        product=value, layout_category=key, subevent=subevent
+                    )
+            for m in current_mappings.values():
+                m.delete()
+        if 'seating_plan' in validated_data or seat_category_mapping is not None:
+            generate_seats(self.context['request'].event, subevent, subevent.seating_plan, {
+                m.layout_category: m.product
+                for m in self.context['request'].event.seat_category_mappings.select_related('product').filter(subevent=subevent)
+            })
+
         return subevent
 
 

src/pretix/api/serializers/item.py

@@ -118,7 +118,8 @@ class ItemSerializer(I18nAwareModelSerializer):
                   'position', 'picture', 'available_from', 'available_until',
                   'require_voucher', 'hide_without_voucher', 'allow_cancel', 'require_bundling',
                   'min_per_order', 'max_per_order', 'checkin_attention', 'has_variations', 'variations',
-                  'addons', 'bundles', 'original_price', 'require_approval', 'generate_tickets')
+                  'addons', 'bundles', 'original_price', 'require_approval', 'generate_tickets',
+                  'show_quota_left', 'hidden_if_available', 'allow_waitinglist')
         read_only_fields = ('has_variations', 'picture')
 
     def get_serializer_context(self):
@@ -200,15 +201,25 @@ class InlineQuestionOptionSerializer(I18nAwareModelSerializer):
         fields = ('id', 'identifier', 'answer', 'position')
 
 
+class LegacyDependencyValueField(serializers.CharField):
+
+    def to_representation(self, obj):
+        return obj[0] if obj else None
+
+    def to_internal_value(self, data):
+        return [data] if data else []
+
+
 class QuestionSerializer(I18nAwareModelSerializer):
     options = InlineQuestionOptionSerializer(many=True, required=False)
     identifier = serializers.CharField(allow_null=True)
+    dependency_value = LegacyDependencyValueField(source='dependency_values', required=False, allow_null=True)
 
     class Meta:
         model = Question
         fields = ('id', 'question', 'type', 'required', 'items', 'options', 'position',
-                  'ask_during_checkin', 'identifier', 'dependency_question', 'dependency_value',
-                  'hidden')
+                  'ask_during_checkin', 'identifier', 'dependency_question', 'dependency_values',
+                  'hidden', 'dependency_value')
 
     def validate_identifier(self, value):
         Question._clean_identifier(self.context['event'], value, self.instance)
@@ -262,6 +273,7 @@ class QuestionSerializer(I18nAwareModelSerializer):
     def create(self, validated_data):
         options_data = validated_data.pop('options') if 'options' in validated_data else []
         items = validated_data.pop('items')
+
         question = Question.objects.create(**validated_data)
         question.items.set(items)
         for opt_data in options_data:
@@ -273,7 +285,7 @@ class QuotaSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = Quota
-        fields = ('id', 'name', 'size', 'items', 'variations', 'subevent')
+        fields = ('id', 'name', 'size', 'items', 'variations', 'subevent', 'closed', 'close_when_sold_out')
 
     def validate(self, data):
         data = super().validate(data)

src/pretix/api/serializers/order.py

@@ -1,5 +1,4 @@
 import json
-from collections import Counter
 from decimal import Decimal
 
 from django.utils.timezone import now
@@ -15,7 +14,7 @@ from pretix.base.channels import get_all_sales_channels
 from pretix.base.i18n import language
 from pretix.base.models import (
     Checkin, Invoice, InvoiceAddress, InvoiceLine, Item, ItemVariation, Order,
-    OrderPosition, Question, QuestionAnswer, SubEvent,
+    OrderPosition, Question, QuestionAnswer, Seat, SubEvent,
 )
 from pretix.base.models.orders import (
     CartPosition, OrderFee, OrderPayment, OrderRefund,
@@ -71,6 +70,13 @@ class AnswerQuestionOptionsIdentifierField(serializers.Field):
         return [o.identifier for o in instance.options.all()]
 
 
+class InlineSeatSerializer(I18nAwareModelSerializer):
+
+    class Meta:
+        model = Seat
+        fields = ('id', 'name', 'seat_guid')
+
+
 class AnswerSerializer(I18nAwareModelSerializer):
     question_identifier = AnswerQuestionIdentifierField(source='*', read_only=True)
     option_identifiers = AnswerQuestionOptionsIdentifierField(source='*', read_only=True)
@@ -166,12 +172,13 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
     downloads = PositionDownloadsField(source='*')
     order = serializers.SlugRelatedField(slug_field='code', read_only=True)
     pdf_data = PdfDataSerializer(source='*')
+    seat = InlineSeatSerializer(read_only=True)
 
     class Meta:
         model = OrderPosition
         fields = ('id', 'order', 'positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
                   'attendee_email', 'voucher', 'tax_rate', 'tax_value', 'secret', 'addon_to', 'subevent', 'checkins',
-                  'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data')
+                  'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -305,7 +312,6 @@ class OrderSerializer(I18nAwareModelSerializer):
         # Even though all fields that shouldn't be edited are marked as read_only in the serializer
         # (hopefully), we'll be extra careful here and be explicit about the model fields we update.
         update_fields = ['comment', 'checkin_attention', 'email', 'locale']
-        print(validated_data)
 
         if 'invoice_address' in validated_data:
             iadata = validated_data.pop('invoice_address')
@@ -430,11 +436,12 @@ class OrderPositionCreateSerializer(I18nAwareModelSerializer):
     addon_to = serializers.IntegerField(required=False, allow_null=True)
     secret = serializers.CharField(required=False)
     attendee_name = serializers.CharField(required=False, allow_null=True)
+    seat = serializers.CharField(required=False, allow_null=True)
 
     class Meta:
         model = OrderPosition
         fields = ('positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts', 'attendee_email',
-                  'secret', 'addon_to', 'subevent', 'answers')
+                  'secret', 'addon_to', 'subevent', 'answers', 'seat')
 
     def validate_secret(self, secret):
         if secret and OrderPosition.all.filter(order__event=self.context['event'], secret=secret).exists():
@@ -590,6 +597,9 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                 {'positionid': ["If you set addon_to on any position, you need to specify position IDs manually."]}
                 for p in data
             ]
+        else:
+            for i, p in enumerate(data):
+                p['positionid'] = i + 1
 
         if any(errs):
             raise ValidationError(errs)
@@ -615,13 +625,15 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
             ia = None
 
         with self.context['event'].lock() as now_dt:
-            quotadiff = Counter()
-
+            free_seats = set()
+            seats_seen = set()
             consume_carts = validated_data.pop('consume_carts', [])
             delete_cps = []
             quota_avail_cache = {}
             if consume_carts:
-                for cp in CartPosition.objects.filter(event=self.context['event'], cart_id__in=consume_carts):
+                for cp in CartPosition.objects.filter(
+                    event=self.context['event'], cart_id__in=consume_carts, expires__gt=now()
+                ):
                     quotas = (cp.variation.quotas.filter(subevent=cp.subevent)
                               if cp.variation else cp.item.quotas.filter(subevent=cp.subevent))
                     for quota in quotas:
@@ -630,7 +642,8 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                         if quota_avail_cache[quota][1] is not None:
                             quota_avail_cache[quota][1] += 1
                     if cp.expires > now_dt:
-                        quotadiff.subtract(quotas)
+                        if cp.seat:
+                            free_seats.add(cp.seat)
                     delete_cps.append(cp)
 
             errs = [{} for p in positions_data]
@@ -658,7 +671,22 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                                         )
                                     ]
 
-                    quotadiff.update(new_quotas)
+            for i, pos_data in enumerate(positions_data):
+                seated = pos_data.get('item').seat_category_mappings.filter(subevent=pos_data.get('subevent')).exists()
+                if pos_data.get('seat'):
+                    if not seated:
+                        errs[i]['seat'] = ['The specified product does not allow to choose a seat.']
+                    try:
+                        seat = self.context['event'].seats.get(seat_guid=pos_data['seat'], subevent=pos_data.get('subevent'))
+                    except Seat.DoesNotExist:
+                        errs[i]['seat'] = ['The specified seat does not exist.']
+                    else:
+                        pos_data['seat'] = seat
+                        if (seat not in free_seats and not seat.is_available()) or seat in seats_seen:
+                            errs[i]['seat'] = [ugettext_lazy('The selected seat "{seat}" is not available.').format(seat=seat.name)]
+                        seats_seen.add(seat)
+                elif seated:
+                    errs[i]['seat'] = ['The specified product requires to choose a seat.']
 
             if any(errs):
                 raise ValidationError({'positions': errs})

src/pretix/api/serializers/organizer.py

@@ -1,8 +1,20 @@
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
-from pretix.base.models import Organizer
+from pretix.api.serializers.order import CompatibleJSONField
+from pretix.base.models import Organizer, SeatingPlan
+from pretix.base.models.seating import SeatingPlanLayoutValidator
 
 
 class OrganizerSerializer(I18nAwareModelSerializer):
     class Meta:
         model = Organizer
         fields = ('name', 'slug')
+
+
+class SeatingPlanSerializer(I18nAwareModelSerializer):
+    layout = CompatibleJSONField(
+        validators=[SeatingPlanLayoutValidator()]
+    )
+
+    class Meta:
+        model = SeatingPlan
+        fields = ('id', 'name', 'layout')

src/pretix/api/serializers/voucher.py

@@ -27,7 +27,7 @@ class VoucherSerializer(I18nAwareModelSerializer):
         model = Voucher
         fields = ('id', 'code', 'max_usages', 'redeemed', 'valid_until', 'block_quota',
                   'allow_ignore_quota', 'price_mode', 'value', 'item', 'variation', 'quota',
-                  'tag', 'comment', 'subevent')
+                  'tag', 'comment', 'subevent', 'show_hidden_items')
         read_only_fields = ('id', 'redeemed')
         list_serializer_class = VoucherListSerializer
 

src/pretix/api/urls.py

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

src/pretix/api/views/cart.py

@@ -24,7 +24,7 @@ class CartPositionViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnly
         return CartPosition.objects.filter(
             event=self.request.event,
             cart_id__endswith="@api"
-        )
+        ).select_related('seat').prefetch_related('answers')
 
     def get_serializer_context(self):
         ctx = super().get_serializer_context()

src/pretix/api/views/checkin.py

@@ -93,6 +93,7 @@ class CheckinListViewSet(viewsets.ModelViewSet):
         )
         if not clist.all_products:
             pqs = pqs.filter(item__in=clist.limit_products.values_list('id', flat=True))
+            cqs = cqs.filter(position__item__in=clist.limit_products.values_list('id', flat=True))
 
         ev = clist.subevent or clist.event
         response = {
@@ -231,7 +232,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                     )
                 ))
             ).select_related(
-                'item', 'variation', 'item__category', 'addon_to', 'order', 'order__invoice_address'
+                'item', 'variation', 'item__category', 'addon_to', 'order', 'order__invoice_address', 'seat'
             )
         else:
             qs = qs.prefetch_related(
@@ -241,7 +242,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                 ),
                 'answers', 'answers__options', 'answers__question',
                 Prefetch('addons', OrderPosition.objects.select_related('item', 'variation'))
-            ).select_related('item', 'variation', 'order', 'addon_to', 'order__invoice_address', 'order')
+            ).select_related('item', 'variation', 'order', 'addon_to', 'order__invoice_address', 'order', 'seat')
 
         if not self.checkinlist.all_products:
             qs = qs.filter(item__in=self.checkinlist.limit_products.values_list('id', flat=True))
@@ -280,6 +281,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                 nonce=nonce,
                 datetime=dt,
                 questions_supported=self.request.data.get('questions_supported', True),
+                canceled_supported=self.request.data.get('canceled_supported', False),
                 user=self.request.user,
                 auth=self.request.auth,
             )

src/pretix/api/views/event.py

@@ -86,7 +86,7 @@ class EventViewSet(viewsets.ModelViewSet):
             )
 
         return qs.prefetch_related(
-            'meta_values', 'meta_values__property'
+            'meta_values', 'meta_values__property', 'seat_category_mappings'
         )
 
     def perform_update(self, serializer):
@@ -242,7 +242,7 @@ class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
                 event__in=self.request.user.get_events_with_any_permission()
             )
         return qs.prefetch_related(
-            'subeventitem_set', 'subeventitemvariation_set'
+            'subeventitem_set', 'subeventitemvariation_set', 'seat_category_mappings'
         )
 
     def perform_update(self, serializer):

src/pretix/api/views/item.py

@@ -473,6 +473,19 @@ class QuotaViewSet(ConditionalListView, viewsets.ModelViewSet):
             # This costs us a few cycles on save, but avoids thousands of lines in our log.
             return
 
+        if original_data['closed'] is True and serializer.instance.closed is False:
+            serializer.instance.log_action(
+                'pretix.event.quota.opened',
+                user=self.request.user,
+                auth=self.request.auth,
+            )
+        elif original_data['closed'] is False and serializer.instance.closed is True:
+            serializer.instance.log_action(
+                'pretix.event.quota.closed',
+                user=self.request.user,
+                auth=self.request.auth,
+            )
+
         serializer.instance.log_action(
             'pretix.event.quota.changed',
             user=self.request.user,

src/pretix/api/views/order.py

@@ -93,8 +93,8 @@ class OrderViewSet(viewsets.ModelViewSet):
                     'positions',
                     OrderPosition.objects.all().prefetch_related(
                         'checkins', 'item', 'variation', 'answers', 'answers__options', 'answers__question',
-                        'item__category', 'addon_to',
-                        Prefetch('addons', OrderPosition.objects.select_related('item', 'variation'))
+                        'item__category', 'addon_to', 'seat',
+                        Prefetch('addons', OrderPosition.objects.select_related('item', 'variation', 'seat'))
                     )
                 )
             )
@@ -103,7 +103,7 @@ class OrderViewSet(viewsets.ModelViewSet):
                 Prefetch(
                     'positions',
                     OrderPosition.objects.all().prefetch_related(
-                        'checkins', 'item', 'variation', 'answers', 'answers__options', 'answers__question',
+                        'checkins', 'item', 'variation', 'answers', 'answers__options', 'answers__question', 'seat',
                     )
                 )
             )
@@ -611,13 +611,13 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, viewsets.ReadOnlyModelViewS
                     )
                 ))
             ).select_related(
-                'item', 'variation', 'item__category', 'addon_to'
+                'item', 'variation', 'item__category', 'addon_to', 'seat'
             )
         else:
             qs = qs.prefetch_related(
                 'checkins', 'answers', 'answers__options', 'answers__question'
             ).select_related(
-                'item', 'order', 'order__event', 'order__event__organizer'
+                'item', 'order', 'order__event', 'order__event__organizer', 'seat'
             )
         return qs
 

src/pretix/api/views/organizer.py

@@ -1,8 +1,12 @@
 from rest_framework import filters, viewsets
+from rest_framework.exceptions import PermissionDenied
 
 from pretix.api.models import OAuthAccessToken
-from pretix.api.serializers.organizer import OrganizerSerializer
-from pretix.base.models import Organizer
+from pretix.api.serializers.organizer import (
+    OrganizerSerializer, SeatingPlanSerializer,
+)
+from pretix.base.models import Organizer, SeatingPlan
+from pretix.helpers.dicts import merge_dicts
 
 
 class OrganizerViewSet(viewsets.ReadOnlyModelViewSet):
@@ -30,3 +34,50 @@ class OrganizerViewSet(viewsets.ReadOnlyModelViewSet):
             return Organizer.objects.filter(pk=self.request.auth.organizer_id)
         else:
             return Organizer.objects.filter(pk=self.request.auth.team.organizer_id)
+
+
+class SeatingPlanViewSet(viewsets.ModelViewSet):
+    serializer_class = SeatingPlanSerializer
+    queryset = SeatingPlan.objects.none()
+    permission = 'can_change_organizer_settings'
+    write_permission = 'can_change_organizer_settings'
+
+    def get_queryset(self):
+        return self.request.organizer.seating_plans.all()
+
+    def get_serializer_context(self):
+        ctx = super().get_serializer_context()
+        ctx['organizer'] = self.request.organizer
+        return ctx
+
+    def perform_create(self, serializer):
+        inst = serializer.save(organizer=self.request.organizer)
+        self.request.organizer.log_action(
+            'pretix.seatingplan.added',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=merge_dicts(self.request.data, {'id': inst.pk})
+        )
+
+    def perform_update(self, serializer):
+        if serializer.instance.events.exists() or serializer.instance.subevents.exists():
+            raise PermissionDenied('This plan can not be changed while it is in use for an event.')
+        inst = serializer.save(organizer=self.request.organizer)
+        self.request.organizer.log_action(
+            'pretix.seatingplan.changed',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=merge_dicts(self.request.data, {'id': serializer.instance.pk})
+        )
+        return inst
+
+    def perform_destroy(self, instance):
+        if instance.events.exists() or instance.subevents.exists():
+            raise PermissionDenied('This plan can not be deleted while it is in use for an event.')
+        instance.log_action(
+            'pretix.seatingplan.deleted',
+            user=self.request.user,
+            auth=self.request.auth,
+            data={'id': instance.pk}
+        )
+        instance.delete()

src/pretix/base/exporter.py

@@ -71,6 +71,8 @@ class BaseExporter:
 
         :type form_data: dict
         :param form_data: The form data of the export details form
+        :param output_file: You can optionally accept a parameter that will be given a file handle to write the
+                            output to. In this case, you can return None instead of the file content.
 
         Note: If you use a ``ModelChoiceField`` (or a ``ModelMultipleChoiceField``), the
         ``form_data`` will not contain the model instance but only it's primary key (or
@@ -111,14 +113,20 @@ class ListExporter(BaseExporter):
     def get_filename(self):
         return 'export.csv'
 
-    def _render_csv(self, form_data, **kwargs):
-        output = io.StringIO()
-        writer = csv.writer(output, **kwargs)
-        for line in self.iterate_list(form_data):
-            writer.writerow(line)
-        return self.get_filename() + '.csv', 'text/csv', output.getvalue().encode("utf-8")
+    def _render_csv(self, form_data, output_file=None, **kwargs):
+        if output_file:
+            writer = csv.writer(output_file, **kwargs)
+            for line in self.iterate_list(form_data):
+                writer.writerow(line)
+            return self.get_filename() + '.csv', 'text/csv', None
+        else:
+            output = io.StringIO()
+            writer = csv.writer(output, **kwargs)
+            for line in self.iterate_list(form_data):
+                writer.writerow(line)
+            return self.get_filename() + '.csv', 'text/csv', output.getvalue().encode("utf-8")
 
-    def _render_xlsx(self, form_data):
+    def _render_xlsx(self, form_data, output_file=None):
         wb = Workbook()
         ws = wb.get_active_sheet()
         try:
@@ -129,20 +137,24 @@ class ListExporter(BaseExporter):
             for j, val in enumerate(line):
                 ws.cell(row=i + 1, column=j + 1).value = str(val) if not isinstance(val, KNOWN_TYPES) else val
 
-        with tempfile.NamedTemporaryFile(suffix='.xlsx') as f:
-            wb.save(f.name)
-            f.seek(0)
-            return self.get_filename() + '.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', f.read()
+        if output_file:
+            wb.save(output_file)
+            return self.get_filename() + '.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', None
+        else:
+            with tempfile.NamedTemporaryFile(suffix='.xlsx') as f:
+                wb.save(f.name)
+                f.seek(0)
+                return self.get_filename() + '.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', f.read()
 
-    def render(self, form_data: dict) -> Tuple[str, str, bytes]:
+    def render(self, form_data: dict, output_file=None) -> Tuple[str, str, bytes]:
         if form_data.get('_format') == 'xlsx':
-            return self._render_xlsx(form_data)
+            return self._render_xlsx(form_data, output_file=output_file)
         elif form_data.get('_format') == 'default':
-            return self._render_csv(form_data, quoting=csv.QUOTE_NONNUMERIC, delimiter=',')
+            return self._render_csv(form_data, quoting=csv.QUOTE_NONNUMERIC, delimiter=',', output_file=output_file)
         elif form_data.get('_format') == 'csv-excel':
-            return self._render_csv(form_data, dialect='excel')
+            return self._render_csv(form_data, dialect='excel', output_file=output_file)
         elif form_data.get('_format') == 'semicolon':
-            return self._render_csv(form_data, dialect='excel', delimiter=';')
+            return self._render_csv(form_data, dialect='excel', delimiter=';', output_file=output_file)
 
 
 class MultiSheetListExporter(ListExporter):
@@ -180,14 +192,20 @@ class MultiSheetListExporter(ListExporter):
     def iterate_sheet(self, form_data, sheet):
         raise NotImplementedError()  # noqa
 
-    def _render_sheet_csv(self, form_data, sheet, **kwargs):
-        output = io.StringIO()
-        writer = csv.writer(output, **kwargs)
-        for line in self.iterate_sheet(form_data, sheet):
-            writer.writerow(line)
-        return self.get_filename() + '.csv', 'text/csv', output.getvalue().encode("utf-8")
+    def _render_sheet_csv(self, form_data, sheet, output_file=None, **kwargs):
+        if output_file:
+            writer = csv.writer(output_file, **kwargs)
+            for line in self.iterate_sheet(form_data, sheet):
+                writer.writerow(line)
+            return self.get_filename() + '.csv', 'text/csv', None
+        else:
+            output = io.StringIO()
+            writer = csv.writer(output, **kwargs)
+            for line in self.iterate_sheet(form_data, sheet):
+                writer.writerow(line)
+            return self.get_filename() + '.csv', 'text/csv', output.getvalue().encode("utf-8")
 
-    def _render_xlsx(self, form_data):
+    def _render_xlsx(self, form_data, output_file=None):
         wb = Workbook()
         ws = wb.get_active_sheet()
         wb.remove(ws)
@@ -197,19 +215,24 @@ class MultiSheetListExporter(ListExporter):
                 for j, val in enumerate(line):
                     ws.cell(row=i + 1, column=j + 1).value = str(val) if not isinstance(val, KNOWN_TYPES) else val
 
-        with tempfile.NamedTemporaryFile(suffix='.xlsx') as f:
-            wb.save(f.name)
-            f.seek(0)
-            return self.get_filename() + '.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', f.read()
+        if output_file:
+            wb.save(output_file)
+            return self.get_filename() + '.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', None
+        else:
+            with tempfile.NamedTemporaryFile(suffix='.xlsx') as f:
+                wb.save(f.name)
+                f.seek(0)
+                return self.get_filename() + '.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', f.read()
 
-    def render(self, form_data: dict) -> Tuple[str, str, bytes]:
+    def render(self, form_data: dict, output_file=None) -> Tuple[str, str, bytes]:
         if form_data.get('_format') == 'xlsx':
-            return self._render_xlsx(form_data)
+            return self._render_xlsx(form_data, output_file=output_file)
         elif ':' in form_data.get('_format'):
             sheet, f = form_data.get('_format').split(':')
             if f == 'default':
-                return self._render_sheet_csv(form_data, sheet, quoting=csv.QUOTE_NONNUMERIC, delimiter=',')
+                return self._render_sheet_csv(form_data, sheet, quoting=csv.QUOTE_NONNUMERIC, delimiter=',',
+                                              output_file=output_file)
             elif f == 'excel':
-                return self._render_sheet_csv(form_data, sheet, dialect='excel')
+                return self._render_sheet_csv(form_data, sheet, dialect='excel', output_file=output_file)
             elif f == 'semicolon':
-                return self._render_sheet_csv(form_data, sheet, dialect='excel', delimiter=';')
+                return self._render_sheet_csv(form_data, sheet, dialect='excel', delimiter=';', output_file=output_file)

src/pretix/base/exporters/invoices.py

@@ -20,7 +20,7 @@ class InvoiceExporter(BaseExporter):
     identifier = 'invoices'
     verbose_name = _('All invoices')
 
-    def render(self, form_data: dict):
+    def render(self, form_data: dict, output_file=None):
         qs = self.event.invoices.filter(shredded=False)
 
         if form_data.get('payment_provider'):
@@ -47,7 +47,7 @@ class InvoiceExporter(BaseExporter):
 
         with tempfile.TemporaryDirectory() as d:
             any = False
-            with ZipFile(os.path.join(d, 'tmp.zip'), 'w') as zipf:
+            with ZipFile(output_file or os.path.join(d, 'tmp.zip'), 'w') as zipf:
                 for i in qs:
                     try:
                         if not i.file:
@@ -68,8 +68,11 @@ class InvoiceExporter(BaseExporter):
             if not any:
                 return None
 
-            with open(os.path.join(d, 'tmp.zip'), 'rb') as zipf:
-                return '{}_invoices.zip'.format(self.event.slug), 'application/zip', zipf.read()
+            if output_file:
+                return '{}_invoices.zip'.format(self.event.slug), 'application/zip', None
+            else:
+                with open(os.path.join(d, 'tmp.zip'), 'rb') as zipf:
+                    return '{}_invoices.zip'.format(self.event.slug), 'application/zip', zipf.read()
 
     @property
     def export_form_fields(self):

src/pretix/base/forms/auth.py

@@ -14,7 +14,7 @@ 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)
+    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)
 

src/pretix/base/forms/questions.py

@@ -1,6 +1,8 @@
 import copy
+import json
 import logging
 from decimal import Decimal
+from urllib.error import HTTPError
 
 import dateutil.parser
 import pytz
@@ -9,6 +11,8 @@ import vat_moss.id
 from django import forms
 from django.contrib import messages
 from django.core.exceptions import ValidationError
+from django.db.models import QuerySet
+from django.forms import Select
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import get_language, ugettext_lazy as _
@@ -21,9 +25,10 @@ from pretix.base.forms.widgets import (
 )
 from pretix.base.models import InvoiceAddress, Question, QuestionOption
 from pretix.base.models.tax import EU_COUNTRIES
-from pretix.base.settings import PERSON_NAME_SCHEMES
+from pretix.base.settings import PERSON_NAME_SCHEMES, PERSON_NAME_TITLE_GROUPS
 from pretix.base.templatetags.rich_text import rich_text
 from pretix.control.forms import SplitDateTimeField
+from pretix.helpers.escapejson import escapejson_attr
 from pretix.helpers.i18n import get_format_without_seconds
 from pretix.presale.signals import question_form_fields
 
@@ -33,14 +38,18 @@ logger = logging.getLogger(__name__)
 class NamePartsWidget(forms.MultiWidget):
     widget = forms.TextInput
 
-    def __init__(self, scheme: dict, field: forms.Field, attrs=None):
+    def __init__(self, scheme: dict, field: forms.Field, attrs=None, titles: list=None):
         widgets = []
         self.scheme = scheme
         self.field = field
+        self.titles = titles
         for fname, label, size in self.scheme['fields']:
             a = copy.copy(attrs) or {}
             a['data-fname'] = fname
-            widgets.append(self.widget(attrs=a))
+            if fname == 'title' and self.titles:
+                widgets.append(Select(attrs=a, choices=[('', '')] + [(d, d) for d in self.titles[1]]))
+            else:
+                widgets.append(self.widget(attrs=a))
         super().__init__(widgets, attrs)
 
     def decompress(self, value):
@@ -99,19 +108,34 @@ class NamePartsFormField(forms.MultiValueField):
             'max_length': kwargs.pop('max_length', None),
         }
         self.scheme_name = kwargs.pop('scheme')
+        self.titles = kwargs.pop('titles')
         self.scheme = PERSON_NAME_SCHEMES.get(self.scheme_name)
+        if self.titles:
+            self.scheme_titles = PERSON_NAME_TITLE_GROUPS.get(self.titles)
+        else:
+            self.scheme_titles = None
         self.one_required = kwargs.get('required', True)
         require_all_fields = kwargs.pop('require_all_fields', False)
         kwargs['required'] = False
         kwargs['widget'] = (kwargs.get('widget') or self.widget)(
-            scheme=self.scheme, field=self, **kwargs.pop('widget_kwargs', {})
+            scheme=self.scheme, titles=self.scheme_titles, field=self, **kwargs.pop('widget_kwargs', {})
         )
         defaults.update(**kwargs)
         for fname, label, size in self.scheme['fields']:
             defaults['label'] = label
-            field = forms.CharField(**defaults)
-            field.part_name = fname
-            fields.append(field)
+            if fname == 'title' and self.scheme_titles:
+                d = dict(defaults)
+                d.pop('max_length', None)
+                field = forms.ChoiceField(
+                    **d,
+                    choices=[('', '')] + [(d, d) for d in self.scheme_titles[1]]
+                )
+                field.part_name = fname
+                fields.append(field)
+            else:
+                field = forms.CharField(**defaults)
+                field.part_name = fname
+                fields.append(field)
         super().__init__(
             fields=fields, require_all_fields=False, *args, **kwargs
         )
@@ -156,6 +180,7 @@ class BaseQuestionsForm(forms.Form):
                 max_length=255,
                 required=event.settings.attendee_names_required,
                 scheme=event.settings.name_scheme,
+                titles=event.settings.name_scheme_titles,
                 label=_('Attendee name'),
                 initial=(cartpos.attendee_name_parts if cartpos else orderpos.attendee_name_parts),
             )
@@ -277,7 +302,7 @@ class BaseQuestionsForm(forms.Form):
 
             if q.dependency_question_id:
                 field.widget.attrs['data-question-dependency'] = q.dependency_question_id
-                field.widget.attrs['data-question-dependency-value'] = q.dependency_value
+                field.widget.attrs['data-question-dependency-values'] = escapejson_attr(json.dumps(q.dependency_values))
                 if q.type != 'M':
                     field.widget.attrs['required'] = q.required and not self.all_optional
                     field._required = q.required and not self.all_optional
@@ -298,26 +323,24 @@ 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, qval):
+        def question_is_visible(parentid, qvals):
             parentq = question_cache[parentid]
-            if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_value):
+            if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
                 return False
             if 'question_%d' % parentid not in d:
                 return False
             dval = d.get('question_%d' % parentid)
-            if qval == 'True':
-                return dval
-            elif qval == 'False':
-                return not dval
-            elif isinstance(dval, QuestionOption):
-                return dval.identifier == qval
-            else:
-                return qval in [o.identifier for o in dval]
+            return (
+                ('True' in qvals and dval)
+                or ('False' in qvals and not dval)
+                or (isinstance(dval, QuestionOption) and dval.identifier in qvals)
+                or (isinstance(dval, (list, QuerySet)) and any(qval in [o.identifier for o in dval] for qval in qvals))
+            )
 
         def question_is_required(q):
             return (
                 q.required and
-                (not q.dependency_question_id or question_is_visible(q.dependency_question_id, q.dependency_value))
+                (not q.dependency_question_id or question_is_visible(q.dependency_question_id, q.dependency_values))
             )
 
         if not self.all_optional:
@@ -398,6 +421,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
             max_length=255,
             required=event.settings.invoice_name_required and not self.all_optional,
             scheme=event.settings.name_scheme,
+            titles=event.settings.name_scheme_titles,
             label=_('Name'),
             initial=(self.instance.name_parts if self.instance else self.instance.name_parts),
         )
@@ -451,7 +475,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
                                                      'your country is currently not available. We will therefore '
                                                      'need to charge VAT on your invoice. You can get the tax amount '
                                                      'back via the VAT reimbursement process.'))
-            except vat_moss.errors.WebServiceError:
+            except (vat_moss.errors.WebServiceError, HTTPError):
                 logger.exception('VAT ID checking failed for country {}'.format(data.get('country')))
                 self.instance.vat_id_validated = False
                 if self.request and self.vat_warning:

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

@@ -0,0 +1,58 @@
+import json
+import sys
+
+from django.core.management.base import BaseCommand
+from django.utils.timezone import override
+from django_scopes import scope
+
+from pretix.base.i18n import language
+from pretix.base.models import Event, Organizer
+from pretix.base.signals import register_data_exporters
+
+
+class Command(BaseCommand):
+    help = "Run an exporter to get data out of pretix"
+
+    def add_arguments(self, parser):
+        parser.add_argument('organizer_slug', nargs=1, type=str)
+        parser.add_argument('event_slug', nargs=1, type=str)
+        parser.add_argument('export_provider', nargs=1, type=str)
+        parser.add_argument('output_file', nargs=1, type=str)
+        parser.add_argument('--parameters', action='store', type=str, help='JSON-formatted parameters')
+
+    def handle(self, *args, **options):
+        try:
+            o = Organizer.objects.get(slug=options['organizer_slug'][0])
+        except Organizer.DoesNotExist:
+            self.stderr.write(self.style.ERROR('Organizer not found.'))
+            sys.exit(1)
+
+        with scope(organizer=o):
+            try:
+                e = o.events.get(slug=options['event_slug'][0])
+            except Event.DoesNotExist:
+                self.stderr.write(self.style.ERROR('Event not found.'))
+                sys.exit(1)
+
+            with language(e.settings.locale), override(e.settings.timezone):
+                responses = register_data_exporters.send(e)
+                for receiver, response in responses:
+                    ex = response(e)
+                    if ex.identifier == options['export_provider'][0]:
+                        params = json.loads(options.get('parameters') or '{}')
+                        with open(options['output_file'][0], 'wb') as f:
+                            try:
+                                ex.render(form_data=params, output_file=f)
+                            except TypeError:
+                                self.stderr.write(self.style.WARNING(
+                                    'Provider does not support direct file writing, need to buffer export in memory.'))
+                                d = ex.render(form_data=params)
+                                if d is None:
+                                    self.stderr.write(self.style.ERROR('Empty export.'))
+                                    sys.exit(2)
+                                f.write(d[2])
+
+                            sys.exit(0)
+
+            self.stderr.write(self.style.ERROR('Export provider not found.'))
+            sys.exit(1)

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

@@ -2,7 +2,7 @@
 Django tries to be helpful by suggesting to run "makemigrations" in red font on every "migrate"
 run when there are things we have no migrations for. Usually, this is intended, and running
 "makemigrations" can really screw up the environment of a user, so we want to prevent novice
-users from doing that by going really dirty and fitlering it from the output.
+users from doing that by going really dirty and filtering it from the output.
 """
 import sys
 

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

@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.core.management import call_command
 from django.core.management.base import BaseCommand
 
@@ -8,5 +9,12 @@ class Command(BaseCommand):
     help = "Run periodic tasks"
 
     def handle(self, *args, **options):
-        periodic_task.send(self)
+        for recv, resp in periodic_task.send_robust(self):
+            if isinstance(resp, Exception):
+                if settings.SENTRY_ENABLED:
+                    from sentry_sdk import capture_exception
+                    capture_exception(resp)
+                else:
+                    raise resp
+
         call_command('clearsessions')

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

@@ -0,0 +1,39 @@
+import sys
+
+from django.apps import apps
+from django.core.management import call_command
+from django.core.management.base import BaseCommand
+from django_scopes import scope, scopes_disabled
+
+
+class Command(BaseCommand):
+    def create_parser(self, *args, **kwargs):
+        parser = super().create_parser(*args, **kwargs)
+        parser.parse_args = lambda x: parser.parse_known_args(x)[0]
+        return parser
+
+    def handle(self, *args, **options):
+        parser = self.create_parser(sys.argv[0], sys.argv[1])
+        flags = parser.parse_known_args(sys.argv[2:])[1]
+        if "--override" in flags:
+            with scopes_disabled():
+                return call_command("shell_plus", *args, **options)
+
+        lookups = {}
+        for flag in flags:
+            lookup, value = flag.lstrip("-").split("=")
+            lookup = lookup.split("__", maxsplit=1)
+            lookups[lookup[0]] = {
+                lookup[1] if len(lookup) > 1 else "pk": value
+            }
+        models = {
+            model_name.split(".")[-1]: model_class
+            for app_name, app_content in apps.all_models.items()
+            for (model_name, model_class) in app_content.items()
+        }
+        scope_options = {
+            app_name: models[app_name].objects.get(**app_value)
+            for app_name, app_value in lookups.items()
+        }
+        with scope(**scope_options):
+            return call_command("shell_plus", *args, **options)

src/pretix/base/migrations/0123_auto_20190530_1035.py

@@ -0,0 +1,70 @@
+# Generated by Django 2.2.1 on 2019-05-30 10:35
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+import pretix.base.models.base
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0122_orderposition_web_secret'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SeatingPlan',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=190)),
+                ('layout', models.TextField()),
+                ('organizer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='seating_plans', to='pretixbase.Organizer')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=(models.Model, pretix.base.models.base.LoggingMixin),
+        ),
+        migrations.CreateModel(
+            name='SeatCategoryMapping',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('layout_category', models.CharField(max_length=190)),
+                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='seat_category_mappings', to='pretixbase.Event')),
+                ('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='seat_category_mappings', to='pretixbase.Item')),
+                ('subevent', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='seat_category_mappings', to='pretixbase.SubEvent')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Seat',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=190)),
+                ('blocked', models.BooleanField(default=False)),
+                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='seats', to='pretixbase.Event')),
+                ('product', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='seats', to='pretixbase.Item')),
+                ('subevent', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='seats', to='pretixbase.SubEvent')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='cartposition',
+            name='seat',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='pretixbase.Seat'),
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='seating_plan',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='events', to='pretixbase.SeatingPlan'),
+        ),
+        migrations.AddField(
+            model_name='orderposition',
+            name='seat',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='pretixbase.Seat'),
+        ),
+        migrations.AddField(
+            model_name='subevent',
+            name='seating_plan',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='subevents', to='pretixbase.SeatingPlan'),
+        ),
+    ]

src/pretix/base/migrations/0124_seat_seat_guid.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.1 on 2019-05-30 11:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0123_auto_20190530_1035'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='seat',
+            name='seat_guid',
+            field=models.CharField(db_index=True, default=None, max_length=190),
+            preserve_default=False,
+        ),
+    ]

src/pretix/base/migrations/0125_voucher_show_hidden_items.py

@@ -0,0 +1,26 @@
+# Generated by Django 2.2.1 on 2019-07-07 10:10
+
+from django.db import migrations, models
+
+
+def set_show_hidden_items(apps, schema_editor):
+    Voucher = apps.get_model('pretixbase', 'Voucher')
+    Voucher.objects.filter(quota__isnull=False).update(show_hidden_items=False)
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0124_seat_seat_guid'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='voucher',
+            name='show_hidden_items',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.RunPython(
+            set_show_hidden_items,
+            migrations.RunPython.noop,
+        )
+    ]

src/pretix/base/migrations/0126_item_show_quota_left.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.1 on 2019-07-10 13:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0125_voucher_show_hidden_items'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='item',
+            name='show_quota_left',
+            field=models.NullBooleanField(),
+        ),
+    ]

src/pretix/base/migrations/0127_auto_20190711_0705.py

@@ -0,0 +1,25 @@
+# Generated by Django 2.2.1 on 2019-07-11 07:05
+
+from django.db import migrations
+
+import pretix.base.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0126_item_show_quota_left'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='question',
+            old_name='dependency_value',
+            new_name='dependency_values',
+        ),
+        migrations.AlterField(
+            model_name='question',
+            name='dependency_values',
+            field=pretix.base.models.fields.MultiStringField(default=['']),
+        ),
+    ]

src/pretix/base/migrations/0128_auto_20190715_1510.py

@@ -0,0 +1,26 @@
+# Generated by Django 2.2.1 on 2019-07-15 15:10
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+import pretix.base.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0127_auto_20190711_0705'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='quota',
+            name='close_when_sold_out',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='quota',
+            name='closed',
+            field=models.BooleanField(default=False),
+        ),
+    ]

src/pretix/base/migrations/0129_auto_20190724_1548.py

@@ -0,0 +1,21 @@
+# Generated by Django 2.2.1 on 2019-07-24 15:48
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+import pretix.base.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0128_auto_20190715_1510'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='item',
+            name='hidden_if_available',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='pretixbase.Quota'),
+        ),
+    ]

src/pretix/base/migrations/0130_auto_20190729_1311.py

@@ -0,0 +1,31 @@
+# Generated by Django 2.2.1 on 2019-07-29 13:11
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+import pretix.base.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0129_auto_20190724_1548'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='seat',
+            name='row_name',
+            field=models.CharField(default='', max_length=190),
+        ),
+        migrations.AddField(
+            model_name='seat',
+            name='seat_number',
+            field=models.CharField(default='', max_length=190),
+        ),
+        migrations.AddField(
+            model_name='seat',
+            name='zone_name',
+            field=models.CharField(default='', max_length=190),
+        ),
+    ]

src/pretix/base/migrations/0131_auto_20190729_1422.py

@@ -0,0 +1,21 @@
+# Generated by Django 2.2.1 on 2019-07-29 14:22
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+import pretix.base.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0130_auto_20190729_1311'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='item',
+            name='allow_waitinglist',
+            field=models.BooleanField(default=True),
+        ),
+    ]

src/pretix/base/models/__init__.py

@@ -24,6 +24,7 @@ from .orders import (
 from .organizer import (
     Organizer, Organizer_SettingsStore, Team, TeamAPIToken, TeamInvite,
 )
+from .seating import Seat, SeatCategoryMapping, SeatingPlan
 from .tax import TaxRule
 from .vouchers import Voucher
 from .waitinglist import WaitingListEntry

src/pretix/base/models/base.py

@@ -86,7 +86,7 @@ class LoggingMixin:
                     if (sensitivekey in k) and v:
                         data[k] = "********"
 
-            logentry.data = json.dumps(data, cls=CustomJSONEncoder)
+            logentry.data = json.dumps(data, cls=CustomJSONEncoder, sort_keys=True)
         elif data:
             raise TypeError("You should only supply dictionaries as log data.")
         if save:

src/pretix/base/models/devices.py

@@ -4,11 +4,12 @@ from django.db import models
 from django.db.models import Max
 from django.utils.crypto import get_random_string
 from django.utils.translation import ugettext_lazy as _
-from django_scopes import ScopedManager
+from django_scopes import ScopedManager, scopes_disabled
 
 from pretix.base.models import LoggedModel
 
 
+@scopes_disabled()
 def generate_serial():
     serial = get_random_string(allowed_chars='ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', length=16)
     while Device.objects.filter(unique_serial=serial).exists():
@@ -16,6 +17,7 @@ def generate_serial():
     return serial
 
 
+@scopes_disabled()
 def generate_initialization_token():
     token = get_random_string(length=16, allowed_chars=string.ascii_lowercase + string.digits)
     while Device.objects.filter(initialization_token=token).exists():
@@ -23,6 +25,7 @@ def generate_initialization_token():
     return token
 
 
+@scopes_disabled()
 def generate_api_token():
     token = get_random_string(length=64, allowed_chars=string.ascii_lowercase + string.digits)
     while Device.objects.filter(api_token=token).exists():

src/pretix/base/models/event.py

@@ -17,7 +17,7 @@ from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
 from django.utils.timezone import make_aware, now
 from django.utils.translation import ugettext_lazy as _
-from django_scopes import ScopedManager
+from django_scopes import ScopedManager, scopes_disabled
 from i18nfield.fields import I18nCharField, I18nTextField
 
 from pretix.base.models.base import LoggedModel
@@ -100,14 +100,14 @@ class EventMixin:
             "DATETIME_FORMAT" if self.settings.show_times else "DATE_FORMAT"
         )
 
-    def get_date_range_display(self, tz=None) -> str:
+    def get_date_range_display(self, tz=None, force_show_end=False) -> str:
         """
         Returns a formatted string containing the start date and the end date
         of the event with respect to the current locale and to the ``show_times`` and
         ``show_date_to`` settings.
         """
         tz = tz or self.timezone
-        if not self.settings.show_date_to or not self.date_to:
+        if (not self.settings.show_date_to and not force_show_end) or not self.date_to:
             return _date(self.date_from.astimezone(tz), "DATE_FORMAT")
         return daterange(self.date_from.astimezone(tz), self.date_to.astimezone(tz))
 
@@ -336,6 +336,8 @@ class Event(EventMixin, LoggedModel):
         verbose_name=_('Event series'),
         default=False
     )
+    seating_plan = models.ForeignKey('SeatingPlan', on_delete=models.PROTECT, null=True, blank=True,
+                                     related_name='events')
 
     objects = ScopedManager(organizer='organizer')
 
@@ -348,6 +350,26 @@ class Event(EventMixin, LoggedModel):
     def __str__(self):
         return str(self.name)
 
+    @property
+    def free_seats(self):
+        from .orders import CartPosition, Order, OrderPosition
+        return self.seats.annotate(
+            has_order=Exists(
+                OrderPosition.objects.filter(
+                    order__event=self,
+                    seat_id=OuterRef('pk'),
+                    order__status__in=[Order.STATUS_PENDING, Order.STATUS_PAID]
+                )
+            ),
+            has_cart=Exists(
+                CartPosition.objects.filter(
+                    event=self,
+                    seat_id=OuterRef('pk'),
+                    expires__gte=now()
+                )
+            )
+        ).filter(has_order=False, has_cart=False, blocked=False)
+
     @property
     def presale_has_ended(self):
         if self.has_subevents:
@@ -494,14 +516,21 @@ class Event(EventMixin, LoggedModel):
         for q in Quota.objects.filter(event=other, subevent__isnull=True).prefetch_related('items', 'variations'):
             items = list(q.items.all())
             vars = list(q.variations.all())
+            oldid = q.pk
             q.pk = None
             q.event = self
+            q.cached_availability_state = None
+            q.cached_availability_number = None
+            q.cached_availability_paid_orders = None
+            q.cached_availability_time = None
+            q.closed = False
             q.save()
             for i in items:
                 if i.pk in item_map:
                     q.items.add(item_map[i.pk])
             for v in vars:
                 q.variations.add(variation_map[v.pk])
+            self.items.filter(hidden_if_available_id=oldid).update(hidden_if_available=q)
 
         question_map = {}
         for q in Question.objects.filter(event=other).prefetch_related('items', 'options'):
@@ -531,6 +560,24 @@ class Event(EventMixin, LoggedModel):
             for i in items:
                 cl.limit_products.add(item_map[i.pk])
 
+        if other.seating_plan:
+            if other.seating_plan.organizer_id == self.organizer_id:
+                self.seating_plan = other.seating_plan
+            else:
+                self.organizer.seating_plans.create(name=other.seating_plan.name, layout=other.seating_plan.layout)
+            self.save()
+
+        for m in other.seat_category_mappings.filter(subevent__isnull=True):
+            m.pk = None
+            m.event = self
+            m.product = item_map[m.product_id]
+            m.save()
+
+        for s in other.seats.filter(subevent__isnull=True):
+            s.pk = None
+            s.event = self
+            s.save()
+
         for s in other.settings._objects.all():
             s.object = self
             s.pk = None
@@ -670,8 +717,12 @@ class Event(EventMixin, LoggedModel):
     @property
     def meta_data(self):
         data = {p.name: p.default for p in self.organizer.meta_properties.all()}
-        data.update({v.property.name: v.value for v in self.meta_values.select_related('property').all()})
-        return data
+        if hasattr(self, 'meta_values_cached'):
+            data.update({v.property.name: v.value for v in self.meta_values_cached})
+        else:
+            data.update({v.property.name: v.value for v in self.meta_values.select_related('property').all()})
+
+        return OrderedDict((k, v) for k, v in sorted(data.items(), key=lambda k: k[0]))
 
     @property
     def has_payment_provider(self):
@@ -874,6 +925,8 @@ class SubEvent(EventMixin, LoggedModel):
         null=True, blank=True,
         verbose_name=_("Frontpage text")
     )
+    seating_plan = models.ForeignKey('SeatingPlan', on_delete=models.PROTECT, null=True, blank=True,
+                                     related_name='subevents')
 
     items = models.ManyToManyField('Item', through='SubEventItem')
     variations = models.ManyToManyField('ItemVariation', through='SubEventItemVariation')
@@ -888,6 +941,28 @@ class SubEvent(EventMixin, LoggedModel):
     def __str__(self):
         return '{} - {}'.format(self.name, self.get_date_range_display())
 
+    @property
+    def free_seats(self):
+        from .orders import CartPosition, Order, OrderPosition
+        return self.seats.annotate(
+            has_order=Exists(
+                OrderPosition.objects.filter(
+                    order__event_id=self.event_id,
+                    subevent=self,
+                    seat_id=OuterRef('pk'),
+                    order__status__in=[Order.STATUS_PENDING, Order.STATUS_PAID]
+                )
+            ),
+            has_cart=Exists(
+                CartPosition.objects.filter(
+                    event_id=self.event_id,
+                    subevent=self,
+                    seat_id=OuterRef('pk'),
+                    expires__gte=now()
+                )
+            )
+        ).filter(has_order=False, has_cart=False, blocked=False)
+
     @cached_property
     def settings(self):
         return self.event.settings
@@ -946,6 +1021,7 @@ class SubEvent(EventMixin, LoggedModel):
                 raise ValidationError(_('One or more variations do not belong to this event.'))
 
 
+@scopes_disabled()
 def generate_invite_token():
     return get_random_string(length=32, allowed_chars=string.ascii_lowercase + string.digits)
 

src/pretix/base/models/invoices.py

@@ -175,6 +175,8 @@ class Invoice(models.Model):
             self.organizer = self.order.event.organizer
         if not self.prefix:
             self.prefix = self.event.settings.invoice_numbers_prefix or (self.event.slug.upper() + '-')
+            if self.is_cancellation:
+                self.prefix = self.event.settings.invoice_numbers_prefix_cancellations or self.prefix
         if not self.invoice_no:
             if self.order.testmode:
                 self.prefix += 'TEST-'

src/pretix/base/models/items.py

@@ -22,7 +22,9 @@ from i18nfield.fields import I18nCharField, I18nTextField
 
 from pretix.base.models import fields
 from pretix.base.models.base import LoggedModel
+from pretix.base.models.fields import MultiStringField
 from pretix.base.models.tax import TaxedPrice
+from pretix.base.signals import quota_availability
 
 from .event import Event, SubEvent
 
@@ -167,16 +169,18 @@ def filter_available(qs, channel='web', voucher=None, allow_addons=False):
     )
     if not allow_addons:
         q &= Q(Q(category__isnull=True) | Q(category__is_addon=False))
-    qs = qs.filter(q)
 
-    vouchq = Q(hide_without_voucher=False)
     if voucher:
         if voucher.item_id:
-            vouchq |= Q(pk=voucher.item_id)
-            qs = qs.filter(pk=voucher.item_id)
+            q &= Q(pk=voucher.item_id)
         elif voucher.quota_id:
-            qs = qs.filter(quotas__in=[voucher.quota_id])
-    return qs.filter(vouchq)
+            q &= Q(quotas__in=[voucher.quota_id])
+        else:
+            return qs.none()
+    if not voucher or not voucher.show_hidden_items:
+        q &= Q(hide_without_voucher=False)
+
+    return qs.filter(q)
 
 
 class ItemQuerySet(models.QuerySet):
@@ -307,6 +311,16 @@ class Item(LoggedModel):
         verbose_name=_("Generate tickets"),
         blank=True, null=True,
     )
+    allow_waitinglist = models.BooleanField(
+        verbose_name=_("Show a waiting list for this ticket"),
+        help_text=_("This will only work of waiting lists are enabled for this event."),
+        default=True
+    )
+    show_quota_left = models.NullBooleanField(
+        verbose_name=_("Show number of tickets left"),
+        help_text=_("Publicly show how many tickets are still available."),
+        blank=True, null=True,
+    )
     position = models.IntegerField(
         default=0
     )
@@ -325,6 +339,17 @@ class Item(LoggedModel):
         null=True, blank=True,
         help_text=_('This product will not be sold after the given date.')
     )
+    hidden_if_available = models.ForeignKey(
+        'Quota',
+        null=True, blank=True,
+        on_delete=models.SET_NULL,
+        verbose_name=_("Only show after sellout of"),
+        help_text=_("If you select a quota here, this product will only be shown when that quota is "
+                    "unavailable. If combined with the option to hide sold-out products, this allows you to "
+                    "swap out products for more expensive ones once they are sold out. There might be a short period "
+                    "in which both products are visible while all tickets in the referenced quota are reserved, "
+                    "but not yet sold.")
+    )
     require_voucher = models.BooleanField(
         verbose_name=_('This product can only be bought using a voucher.'),
         default=False,
@@ -342,7 +367,7 @@ class Item(LoggedModel):
         verbose_name=_('This product will only be shown if a voucher matching the product is redeemed.'),
         default=False,
         help_text=_('This product will be hidden from the event page until the user enters a voucher '
-                    'code that is specifically tied to this product (and not via a quota).')
+                    'that unlocks this product.')
     )
     require_bundling = models.BooleanField(
         verbose_name=_('Only sell this product as part of a bundle'),
@@ -405,10 +430,17 @@ class Item(LoggedModel):
             self.event.cache.clear()
 
     def delete(self, *args, **kwargs):
+        self.vouchers.update(item=None, variation=None, quota=None)
         super().delete(*args, **kwargs)
         if self.event:
             self.event.cache.clear()
 
+    @property
+    def do_show_quota_left(self):
+        if self.show_quota_left is None:
+            return self.event.settings.show_quota_left
+        return self.show_quota_left
+
     def tax(self, price=None, base_price_is='auto', currency=None, include_bundled=False):
         price = price if price is not None else self.default_price
 
@@ -461,7 +493,7 @@ class Item(LoggedModel):
         return check_quotas
 
     def check_quotas(self, ignored_quotas=None, count_waitinglist=True, subevent=None, _cache=None,
-                     include_bundled=False, trust_parameters=False):
+                     include_bundled=False, trust_parameters=False, fail_on_no_quotas=False):
         """
         This method is used to determine whether this Item is currently available
         for sale.
@@ -509,6 +541,8 @@ class Item(LoggedModel):
                 res = (code_avail, num_avail)
 
         if len(quotacounter) == 0:
+            if fail_on_no_quotas:
+                return Quota.AVAILABILITY_GONE, 0
             return Quota.AVAILABILITY_OK, sys.maxsize  # backwards compatibility
         return res
 
@@ -643,6 +677,7 @@ class ItemVariation(models.Model):
         return t
 
     def delete(self, *args, **kwargs):
+        self.vouchers.update(item=None, variation=None, quota=None)
         super().delete(*args, **kwargs)
         if self.item:
             self.item.event.cache.clear()
@@ -663,7 +698,7 @@ class ItemVariation(models.Model):
         return check_quotas
 
     def check_quotas(self, ignored_quotas=None, count_waitinglist=True, subevent=None, _cache=None,
-                     include_bundled=False, trust_parameters=False) -> Tuple[int, int]:
+                     include_bundled=False, trust_parameters=False, fail_on_no_quotas=False) -> Tuple[int, int]:
         """
         This method is used to determine whether this ItemVariation is currently
         available for sale in terms of quotas.
@@ -705,6 +740,8 @@ class ItemVariation(models.Model):
             if code_avail < res[0] or res[1] is None or num_avail < res[1]:
                 res = (code_avail, num_avail)
         if len(quotacounter) == 0:
+            if fail_on_no_quotas:
+                return Quota.AVAILABILITY_GONE, 0
             return Quota.AVAILABILITY_OK, sys.maxsize  # backwards compatibility
         return res
 
@@ -918,8 +955,8 @@ class Question(LoggedModel):
     :type identifier: str
     :param dependency_question: This question will only show up if the referenced question is set to `dependency_value`.
     :type dependency_question: Question
-    :param dependency_value: The value that `dependency_question` needs to be set to for this question to be applicable.
-    :type dependency_value: str
+    :param dependency_values: The values that `dependency_question` needs to be set to for this question to be applicable.
+    :type dependency_values: list[str]
     """
     TYPE_NUMBER = "N"
     TYPE_STRING = "S"
@@ -999,7 +1036,7 @@ class Question(LoggedModel):
     dependency_question = models.ForeignKey(
         'Question', null=True, blank=True, on_delete=models.SET_NULL, related_name='dependent_questions'
     )
-    dependency_value = models.TextField(null=True, blank=True)
+    dependency_values = MultiStringField(default=[])
 
     objects = ScopedManager(organizer='event__organizer')
 
@@ -1252,6 +1289,15 @@ class Quota(LoggedModel):
     cached_availability_paid_orders = models.PositiveIntegerField(null=True, blank=True)
     cached_availability_time = models.DateTimeField(null=True, blank=True)
 
+    close_when_sold_out = models.BooleanField(
+        verbose_name=_('Close this quota permanently once it is sold out'),
+        help_text=_('If you enable this, when the quota is sold out once, no more tickets will be sold, '
+                    'even if tickets become available again through cancellations or expiring orders. Of course, '
+                    'you can always re-open it manually.'),
+        default=False
+    )
+    closed = models.BooleanField(default=False)
+
     objects = ScopedManager(organizer='event__organizer')
 
     class Meta:
@@ -1263,6 +1309,7 @@ class Quota(LoggedModel):
         return self.name
 
     def delete(self, *args, **kwargs):
+        self.vouchers.update(item=None, variation=None, quota=None)
         super().delete(*args, **kwargs)
         if self.event:
             self.event.cache.clear()
@@ -1312,6 +1359,14 @@ class Quota(LoggedModel):
             return _cache[self.pk]
         now_dt = now_dt or now()
         res = self._availability(now_dt, count_waitinglist)
+        for recv, resp in quota_availability.send(sender=self.event, quota=self, result=res,
+                                                  count_waitinglist=count_waitinglist):
+            res = resp
+
+        if res[0] <= Quota.AVAILABILITY_ORDERED and self.close_when_sold_out and not self.closed:
+            self.closed = True
+            self.save(update_fields=['closed'])
+            self.log_action('pretix.event.quota.closed')
 
         self.event.cache.delete('item_quota_cache')
         rewrite_cache = count_waitinglist and (
@@ -1337,8 +1392,11 @@ class Quota(LoggedModel):
             _cache['_count_waitinglist'] = count_waitinglist
         return res
 
-    def _availability(self, now_dt: datetime=None, count_waitinglist=True):
+    def _availability(self, now_dt: datetime=None, count_waitinglist=True, ignore_closed=False):
         now_dt = now_dt or now()
+        if self.closed and not ignore_closed:
+            return Quota.AVAILABILITY_ORDERED, 0
+
         size_left = self.size
         if size_left is None:
             return Quota.AVAILABILITY_OK, None

src/pretix/base/models/orders.py

@@ -630,7 +630,7 @@ class Order(LockModel, LoggedModel):
             ), tz)
         return term_last
 
-    def _can_be_paid(self, count_waitinglist=True, ignore_date=False) -> Union[bool, str]:
+    def _can_be_paid(self, count_waitinglist=True, ignore_date=False, force=False) -> Union[bool, str]:
         error_messages = {
             'late_lastdate': _("The payment can not be accepted as the last date of payments configured in the "
                                "payment settings is over."),
@@ -638,29 +638,37 @@ class Order(LockModel, LoggedModel):
                       "payments should be accepted in the payment settings."),
             'require_approval': _('This order is not yet approved by the event organizer.')
         }
-        if self.require_approval:
-            return error_messages['require_approval']
-        term_last = self.payment_term_last
-        if term_last and not ignore_date:
-            if now() > term_last:
-                return error_messages['late_lastdate']
+        if not force:
+            if self.require_approval:
+                return error_messages['require_approval']
+            term_last = self.payment_term_last
+            if term_last and not ignore_date:
+                if now() > term_last:
+                    return error_messages['late_lastdate']
 
         if self.status == self.STATUS_PENDING:
             return True
-        if not self.event.settings.get('payment_term_accept_late') and not ignore_date:
+        if not self.event.settings.get('payment_term_accept_late') and not ignore_date and not force:
             return error_messages['late']
 
-        return self._is_still_available(count_waitinglist=count_waitinglist)
+        return self._is_still_available(count_waitinglist=count_waitinglist, force=force)
 
-    def _is_still_available(self, now_dt: datetime=None, count_waitinglist=True) -> Union[bool, str]:
+    def _is_still_available(self, now_dt: datetime=None, count_waitinglist=True, force=False) -> Union[bool, str]:
         error_messages = {
             'unavailable': _('The ordered product "{item}" is no longer available.'),
+            'seat_unavailable': _('The seat "{seat}" is no longer available.'),
         }
         now_dt = now_dt or now()
-        positions = self.positions.all().select_related('item', 'variation')
+        positions = self.positions.all().select_related('item', 'variation', 'seat')
         quota_cache = {}
         try:
             for i, op in enumerate(positions):
+                if op.seat:
+                    if not op.seat.is_available(ignore_orderpos=op):
+                        raise Quota.QuotaExceededException(error_messages['seat_unavailable'].format(seat=op.seat))
+                if force:
+                    continue
+
                 quotas = list(op.quotas)
                 if len(quotas) == 0:
                     raise Quota.QuotaExceededException(error_messages['unavailable'].format(
@@ -862,6 +870,10 @@ class QuestionAnswer(models.Model):
             return url
         return ""
 
+    @property
+    def is_image(self):
+        return any(self.file.name.endswith(e) for e in ('.jpg', '.png', '.gif', '.tiff', '.bmp', '.jpeg'))
+
     @property
     def file_name(self):
         return self.file.name.split('.', 1)[-1]
@@ -938,6 +950,8 @@ class AbstractPosition(models.Model):
     :type voucher: Voucher
     :param meta_info: Additional meta information on the position, JSON-encoded.
     :type meta_info: str
+    :param seat: Seat, if reserved seating is used.
+    :type seat: Seat
     """
     subevent = models.ForeignKey(
         SubEvent,
@@ -984,6 +998,9 @@ class AbstractPosition(models.Model):
         verbose_name=_("Meta information"),
         null=True, blank=True
     )
+    seat = models.ForeignKey(
+        'Seat', null=True, blank=True, on_delete=models.PROTECT
+    )
 
     class Meta:
         abstract = True
@@ -1025,18 +1042,17 @@ class AbstractPosition(models.Model):
             q.pk: q for q in questions
         }
 
-        def question_is_visible(parentid, qval):
+        def question_is_visible(parentid, qvals):
             parentq = question_cache[parentid]
-            if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_value):
+            if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
                 return False
             if parentid not in self.answ:
                 return False
-            if qval == 'True':
-                return self.answ[parentid].answer == 'True'
-            elif qval == 'False':
-                return self.answ[parentid].answer == 'False'
-            else:
-                return qval in [o.identifier for o in self.answ[parentid].options.all()]
+            return (
+                ('True' in qvals and self.answ[parentid].answer == 'True')
+                or ('False' in qvals and self.answ[parentid].answer == 'False')
+                or (any(qval in [o.identifier for o in self.answ[parentid].options.all()] for qval in qvals))
+            )
 
         self.questions = []
         for q in questions:
@@ -1045,7 +1061,7 @@ class AbstractPosition(models.Model):
                 q.answer.question = q  # cache object
             else:
                 q.answer = ""
-            if not q.dependency_question_id or question_is_visible(q.dependency_question_id, q.dependency_value):
+            if not q.dependency_question_id or question_is_visible(q.dependency_question_id, q.dependency_values):
                 self.questions.append(q)
 
     @property
@@ -1172,7 +1188,7 @@ class OrderPayment(models.Model):
 
     @info_data.setter
     def info_data(self, d):
-        self.info = json.dumps(d)
+        self.info = json.dumps(d, sort_keys=True)
 
     @cached_property
     def payment_provider(self):
@@ -1183,8 +1199,8 @@ class OrderPayment(models.Model):
 
     def _mark_paid(self, force, count_waitinglist, user, auth, ignore_date=False, overpaid=False):
         from pretix.base.signals import order_paid
-        can_be_paid = self.order._can_be_paid(count_waitinglist=count_waitinglist, ignore_date=ignore_date)
-        if not force and can_be_paid is not True:
+        can_be_paid = self.order._can_be_paid(count_waitinglist=count_waitinglist, ignore_date=ignore_date, force=force)
+        if can_be_paid is not True:
             self.order.log_action('pretix.event.order.quotaexceeded', {
                 'message': can_be_paid
             }, user=user, auth=auth)
@@ -1530,7 +1546,7 @@ class OrderRefund(models.Model):
 
     @info_data.setter
     def info_data(self, d):
-        self.info = json.dumps(d)
+        self.info = json.dumps(d, sort_keys=True)
 
     @cached_property
     def payment_provider(self):
@@ -1857,6 +1873,7 @@ class OrderPosition(AbstractPosition):
 
         return super().save(*args, **kwargs)
 
+    @scopes_disabled()
     def assign_pseudonymization_id(self):
         # This omits some character pairs completely because they are hard to read even on screens (1/I and O/0)
         # and includes only one of two characters for some pairs because they are sometimes hard to distinguish in

src/pretix/base/models/seating.py

@@ -0,0 +1,124 @@
+import json
+from collections import namedtuple
+
+import jsonschema
+from django.contrib.staticfiles import finders
+from django.core.exceptions import ValidationError
+from django.db import models
+from django.utils.deconstruct import deconstructible
+from django.utils.timezone import now
+from django.utils.translation import gettext, ugettext_lazy as _
+
+from pretix.base.models import Event, Item, LoggedModel, Organizer, SubEvent
+
+
+@deconstructible
+class SeatingPlanLayoutValidator:
+    def __call__(self, value):
+        if not isinstance(value, dict):
+            try:
+                val = json.loads(value)
+            except ValueError:
+                raise ValidationError(_('Your layout file is not a valid JSON file.'))
+        else:
+            val = value
+        with open(finders.find('seating/seating-plan.schema.json'), 'r') as f:
+            schema = json.loads(f.read())
+        try:
+            jsonschema.validate(val, schema)
+        except jsonschema.ValidationError as e:
+            raise ValidationError(_('Your layout file is not a valid seating plan. Error message: {}').format(str(e)))
+
+
+class SeatingPlan(LoggedModel):
+    """
+    Represents an abstract seating plan, without relation to any event.
+    """
+    name = models.CharField(max_length=190, verbose_name=_('Name'))
+    organizer = models.ForeignKey(Organizer, related_name='seating_plans', on_delete=models.CASCADE)
+    layout = models.TextField(validators=[SeatingPlanLayoutValidator()])
+
+    Category = namedtuple('Categrory', 'name')
+    RawSeat = namedtuple('Seat', 'name guid number row category zone')
+
+    def __str__(self):
+        return self.name
+
+    @property
+    def layout_data(self):
+        return json.loads(self.layout)
+
+    @layout_data.setter
+    def layout_data(self, v):
+        self.layout = json.dumps(v)
+
+    def get_categories(self):
+        return [
+            self.Category(name=c['name'])
+            for c in self.layout_data['categories']
+        ]
+
+    def iter_all_seats(self):
+        for z in self.layout_data['zones']:
+            for r in z['rows']:
+                for s in r['seats']:
+                    yield self.RawSeat(
+                        number=s['seat_number'],
+                        guid=s['seat_guid'],
+                        name='{} {}'.format(r['row_number'], s['seat_number']),  # TODO: Zone? Variable scheme?
+                        row=r['row_number'],
+                        zone=z['name'],
+                        category=s['category']
+                    )
+
+
+class SeatCategoryMapping(models.Model):
+    """
+    Input seating plans have abstract "categories", such as "Balcony seat", etc. This model maps them to actual
+    pretix product on a per-(sub)event level.
+    """
+    event = models.ForeignKey(Event, related_name='seat_category_mappings', on_delete=models.CASCADE)
+    subevent = models.ForeignKey(SubEvent, null=True, blank=True, related_name='seat_category_mappings', on_delete=models.CASCADE)
+    layout_category = models.CharField(max_length=190)
+    product = models.ForeignKey(Item, related_name='seat_category_mappings', on_delete=models.CASCADE)
+
+
+class Seat(models.Model):
+    """
+    This model is used to represent every single specific seat within an (sub)event that can be selected. It's mainly
+    used for internal bookkeeping and not to be modified by users directly.
+    """
+    event = models.ForeignKey(Event, related_name='seats', on_delete=models.CASCADE)
+    subevent = models.ForeignKey(SubEvent, null=True, blank=True, related_name='seats', on_delete=models.CASCADE)
+    name = models.CharField(max_length=190)
+    zone_name = models.CharField(max_length=190, blank=True, default="")
+    row_name = models.CharField(max_length=190, blank=True, default="")
+    seat_number = models.CharField(max_length=190, blank=True, default="")
+    seat_guid = models.CharField(max_length=190, db_index=True)
+    product = models.ForeignKey('Item', null=True, blank=True, related_name='seats', on_delete=models.CASCADE)
+    blocked = models.BooleanField(default=False)
+
+    def __str__(self):
+        parts = []
+        if self.zone_name:
+            parts.append(self.zone_name)
+        if self.row_name:
+            parts.append(gettext('Row {number}').format(number=self.row_name))
+        if self.seat_number:
+            parts.append(gettext('Seat {number}').format(number=self.seat_number))
+        if not parts:
+            return self.name
+        return ', '.join(parts)
+
+    def is_available(self, ignore_cart=None, ignore_orderpos=None):
+        from .orders import Order
+
+        if self.blocked:
+            return False
+        opqs = self.orderposition_set.filter(order__status__in=[Order.STATUS_PENDING, Order.STATUS_PAID])
+        cpqs = self.cartposition_set.filter(expires__gte=now())
+        if ignore_cart:
+            cpqs = cpqs.exclude(pk=ignore_cart.pk)
+        if ignore_orderpos:
+            opqs = opqs.exclude(pk=ignore_orderpos.pk)
+        return not opqs.exists() and not cpqs.exists()

src/pretix/base/models/vouchers.py

@@ -8,7 +8,9 @@ from django.db.models import Q
 from django.utils.crypto import get_random_string
 from django.utils.timezone import now
 from django.utils.translation import pgettext_lazy, ugettext_lazy as _
-from django_scopes import ScopedManager
+from django_scopes import ScopedManager, scopes_disabled
+
+from pretix.base.models import SeatCategoryMapping
 
 from ..decimal import round_decimal
 from .base import LoggedModel
@@ -24,6 +26,7 @@ def _generate_random_code(prefix=None):
     return get_random_string(length=settings.ENTROPY['voucher_code'], allowed_chars=charset)
 
 
+@scopes_disabled()
 def generate_code(prefix=None):
     while True:
         code = _generate_random_code(prefix=prefix)
@@ -139,22 +142,26 @@ class Voucher(LoggedModel):
     item = models.ForeignKey(
         Item, related_name='vouchers',
         verbose_name=_("Product"),
-        null=True, blank=True, on_delete=models.CASCADE,
+        null=True, blank=True,
+        on_delete=models.PROTECT,  # We use a fake version of SET_NULL in Item.delete()
         help_text=_(
             "This product is added to the user's cart if the voucher is redeemed."
         )
     )
     variation = models.ForeignKey(
         ItemVariation, related_name='vouchers',
-        null=True, blank=True, on_delete=models.CASCADE,
+        null=True, blank=True,
+        on_delete=models.PROTECT,  # We use a fake version of SET_NULL in ItemVariation.delete() to avoid the semantic change
+                                   # that would happen if we just set variation to None
         verbose_name=_("Product variation"),
         help_text=_(
             "This variation of the product select above is being used."
         )
     )
     quota = models.ForeignKey(
-        Quota, related_name='quota',
-        null=True, blank=True, on_delete=models.CASCADE,
+        Quota, related_name='vouchers',
+        null=True, blank=True,
+        on_delete=models.PROTECT,  # We use a fake version of SET_NULL in Quota.delete()
         verbose_name=_("Quota"),
         help_text=_(
             "If enabled, the voucher is valid for any product affected by this quota."
@@ -173,6 +180,10 @@ class Voucher(LoggedModel):
         help_text=_("The text entered in this field will not be visible to the user and is available for your "
                     "convenience.")
     )
+    show_hidden_items = models.BooleanField(
+        verbose_name=_("Shows hidden products that match this voucher"),
+        default=True
+    )
 
     objects = ScopedManager(organizer='event__organizer')
 
@@ -394,3 +405,14 @@ class Voucher(LoggedModel):
         """
 
         return Order.objects.filter(all_positions__voucher__in=[self]).distinct()
+
+    def seating_available(self):
+        kwargs = {}
+        if self.subevent:
+            kwargs['subevent'] = self.subevent
+        if self.quota_id:
+            return SeatCategoryMapping.objects.filter(product__quotas__pk=self.quota_id, **kwargs).exists()
+        elif self.item_id:
+            return self.item.seat_category_mappings.filter(**kwargs).exists()
+        else:
+            return False

src/pretix/base/payment.py

@@ -249,9 +249,7 @@ class BasePaymentProvider:
             ('_fee_percent',
              forms.DecimalField(
                  label=_('Additional fee'),
-                 help_text=_('Percentage of the order total. Note that this percentage will currently only '
-                             'be calculated on the summed price of sold tickets, not on other fees like e.g. shipping '
-                             'fees, if there are any.'),
+                 help_text=_('Percentage of the order total.'),
                  localize=True,
                  required=False,
              )),
@@ -298,11 +296,12 @@ class BasePaymentProvider:
         """
         return ""
 
-    def render_invoice_text(self, order: Order) -> str:
+    def render_invoice_text(self, order: Order, payment: OrderPayment) -> str:
         """
         This is called when an invoice for an order with this payment provider is generated.
         The default implementation returns the content of the _invoice_text configuration
-        variable (an I18nString), or an empty string if unconfigured.
+        variable (an I18nString), or an empty string if unconfigured. For paid orders, the
+        default implementation always renders a string stating that the invoice is already paid.
         """
         if order.status == Order.STATUS_PAID:
             return pgettext_lazy('invoice', 'The payment for this invoice has already been received.')
@@ -547,13 +546,14 @@ class BasePaymentProvider:
         """
         return None
 
-    def order_pending_mail_render(self, order: Order) -> str:
+    def order_pending_mail_render(self, order: Order, payment: OrderPayment) -> str:
         """
         After the user has submitted their order, they will receive a confirmation
         email. You can return a string from this method if you want to add additional
         information to this email.
 
         :param order: The order object
+        :param payment: The payment object
         """
         return ""
 

src/pretix/base/pdf.py

@@ -114,7 +114,7 @@ DEFAULT_VARIABLES = OrderedDict((
     ("event_date_range", {
         "label": _("Event date range"),
         "editor_sample": _("May 31st – June 4th, 2017"),
-        "evaluate": lambda op, order, ev: ev.get_date_range_display()
+        "evaluate": lambda op, order, ev: ev.get_date_range_display(force_show_end=True)
     }),
     ("event_begin", {
         "label": _("Event begin date and time"),
@@ -238,6 +238,26 @@ DEFAULT_VARIABLES = OrderedDict((
             "TIME_FORMAT"
         ) if ev.date_admission else ""
     }),
+    ("seat", {
+        "label": _("Seat: Full name"),
+        "editor_sample": _("Ground floor, Row 3, Seat 4"),
+        "evaluate": lambda op, order, ev: str(op.seat if op.seat else _('General admission'))
+    }),
+    ("seat_zone", {
+        "label": _("Seat: zone"),
+        "editor_sample": _("Ground floor"),
+        "evaluate": lambda op, order, ev: str(op.seat.zone_name if op.seat else _('General admission'))
+    }),
+    ("seat_row", {
+        "label": _("Seat: row"),
+        "editor_sample": "3",
+        "evaluate": lambda op, order, ev: str(op.seat.row_name if op.seat else "")
+    }),
+    ("seat_number", {
+        "label": _("Seat: seat number"),
+        "editor_sample": 4,
+        "evaluate": lambda op, order, ev: str(op.seat.seat_number if op.seat else "")
+    }),
 ))
 
 

src/pretix/base/services/cart.py

@@ -6,7 +6,7 @@ from typing import List, Optional
 from celery.exceptions import MaxRetriesExceededError
 from django.core.exceptions import ValidationError
 from django.db import DatabaseError, transaction
-from django.db.models import Q
+from django.db.models import Count, Exists, OuterRef, Q
 from django.dispatch import receiver
 from django.utils.timezone import make_aware, now
 from django.utils.translation import pgettext_lazy, ugettext as _
@@ -14,8 +14,8 @@ from django_scopes import scopes_disabled
 
 from pretix.base.i18n import language
 from pretix.base.models import (
-    CartPosition, Event, InvoiceAddress, Item, ItemBundle, ItemVariation,
-    Voucher,
+    CartPosition, Event, InvoiceAddress, Item, ItemBundle, ItemVariation, Seat,
+    SeatCategoryMapping, Voucher,
 )
 from pretix.base.models.event import SubEvent
 from pretix.base.models.orders import OrderFee
@@ -26,6 +26,7 @@ from pretix.base.services.locking import LockTimeoutException, NoLockManager
 from pretix.base.services.pricing import get_price
 from pretix.base.services.tasks import ProfiledEventTask
 from pretix.base.settings import PERSON_NAME_SCHEMES
+from pretix.base.signals import validate_cart_addons
 from pretix.base.templatetags.rich_text import rich_text
 from pretix.celery_app import app
 from pretix.presale.signals import (
@@ -91,15 +92,20 @@ error_messages = {
                          'product %(base)s.'),
     'addon_only': _('One of the products you selected can only be bought as an add-on to another project.'),
     'bundled_only': _('One of the products you selected can only be bought part of a bundle.'),
+    'seat_required': _('You need to select a specific seat.'),
+    'seat_invalid': _('Please select a valid seat.'),
+    '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.'),
 }
 
 
 class CartManager:
     AddOperation = namedtuple('AddOperation', ('count', 'item', 'variation', 'price', 'voucher', 'quotas',
-                                               'addon_to', 'subevent', 'includes_tax', 'bundled'))
+                                               'addon_to', 'subevent', 'includes_tax', 'bundled', 'seat'))
     RemoveOperation = namedtuple('RemoveOperation', ('position',))
     ExtendOperation = namedtuple('ExtendOperation', ('position', 'count', 'item', 'variation', 'price', 'voucher',
-                                                     'quotas', 'subevent'))
+                                                     'quotas', 'subevent', 'seat'))
     order = {
         RemoveOperation: 10,
         ExtendOperation: 20,
@@ -117,6 +123,7 @@ class CartManager:
         self._items_cache = {}
         self._subevents_cache = {}
         self._variations_cache = {}
+        self._seated_cache = {}
         self._expiry = None
         self.invoice_address = invoice_address
         self._widget_data = widget_data or {}
@@ -128,6 +135,11 @@ class CartManager:
             Q(cart_id=self.cart_id) & Q(event=self.event)
         ).select_related('item', 'subevent')
 
+    def _is_seated(self, item, subevent):
+        if (item, subevent) not in self._seated_cache:
+            self._seated_cache[item, subevent] = item.seat_category_mappings.filter(subevent=subevent).exists()
+        return self._seated_cache[item, subevent]
+
     def _calculate_expiry(self):
         self._expiry = self.now_dt + timedelta(minutes=self.event.settings.get('reservation_time', as_type=int))
 
@@ -188,6 +200,8 @@ class CartManager:
             i.pk: i
             for i in self.event.items.select_related('category').prefetch_related(
                 'addons', 'bundles', 'addons__addon_category', 'quotas'
+            ).annotate(
+                has_variations=Count('variations'),
             ).filter(
                 id__in=[i for i in item_ids if i and i not in self._items_cache]
             )
@@ -215,7 +229,7 @@ class CartManager:
             if op.item.require_voucher and op.voucher is None:
                 raise CartError(error_messages['voucher_required'])
 
-            if op.item.hide_without_voucher and (op.voucher is None or op.voucher.item is None or op.voucher.item.pk != op.item.pk):
+            if op.item.hide_without_voucher and (op.voucher is None or not op.voucher.show_hidden_items):
                 raise CartError(error_messages['voucher_required'])
 
             if not op.item.is_available() or (op.variation and not op.variation.active):
@@ -224,6 +238,12 @@ class CartManager:
             if self._sales_channel not in op.item.sales_channels:
                 raise CartError(error_messages['unavailable'])
 
+            if op.item.has_variations and not op.variation:
+                raise CartError(error_messages['not_for_sale'])
+
+            if op.variation and op.variation.item_id != op.item.pk:
+                raise CartError(error_messages['not_for_sale'])
+
             if op.voucher and not op.voucher.applies_to(op.item, op.variation):
                 raise CartError(error_messages['voucher_invalid_item'])
 
@@ -239,6 +259,16 @@ class CartManager:
             if op.subevent and op.subevent.presale_has_ended:
                 raise CartError(error_messages['ended'])
 
+            seated = self._is_seated(op.item, op.subevent)
+            if seated and (not op.seat or op.seat.blocked):
+                raise CartError(error_messages['seat_invalid'])
+            elif op.seat and not seated:
+                raise CartError(error_messages['seat_forbidden'])
+            elif op.seat and op.seat.product != op.item:
+                raise CartError(error_messages['seat_invalid'])
+            elif op.seat and op.count > 1:
+                raise CartError('Invalid request: A seat can only be bought once.')
+
             if op.subevent:
                 tlv = self.event.settings.get('payment_term_last', as_type=RelativeDateWrapper)
                 if tlv:
@@ -301,6 +331,13 @@ class CartManager:
     def extend_expired_positions(self):
         expired = self.positions.filter(expires__lte=self.now_dt).select_related(
             'item', 'variation', 'voucher', 'addon_to', 'addon_to__item'
+        ).annotate(
+            requires_seat=Exists(
+                SeatCategoryMapping.objects.filter(
+                    Q(product=OuterRef('item'))
+                    & (Q(subevent=OuterRef('subevent')) if self.event.has_subevents else Q(subevent__isnull=True))
+                )
+            )
         ).prefetch_related(
             'item__quotas',
             'variation__quotas',
@@ -313,6 +350,8 @@ class CartManager:
             if cp.pk in removed_positions or (cp.addon_to_id and cp.addon_to_id in removed_positions):
                 continue
 
+            cp.item.requires_seat = cp.requires_seat
+
             if cp.is_bundled:
                 try:
                     bundle = cp.addon_to.item.bundles.get(bundled_item=cp.item, bundled_variation=cp.variation)
@@ -359,7 +398,7 @@ class CartManager:
 
             op = self.ExtendOperation(
                 position=cp, item=cp.item, variation=cp.variation, voucher=cp.voucher, count=1,
-                price=price, quotas=quotas, subevent=cp.subevent
+                price=price, quotas=quotas, subevent=cp.subevent, seat=cp.seat
             )
             self._check_item_constraints(op)
 
@@ -378,12 +417,6 @@ class CartManager:
         operations = []
 
         for i in items:
-            # Check whether the specified items are part of what we just fetched from the database
-            # If they are not, the user supplied item IDs which either do not exist or belong to
-            # a different event
-            if i['item'] not in self._items_cache or (i['variation'] and i['variation'] not in self._variations_cache):
-                raise CartError(error_messages['not_for_sale'])
-
             if self.event.has_subevents:
                 if not i.get('subevent'):
                     raise CartError(error_messages['subevent_required'])
@@ -391,6 +424,24 @@ class CartManager:
             else:
                 subevent = None
 
+            # When a seat is given, we ignore the item that was given, since we can infer it from the
+            # seat. The variation is still relevant, though!
+            seat = None
+            if i.get('seat'):
+                try:
+                    seat = (subevent or self.event).seats.get(seat_guid=i.get('seat'))
+                except Seat.DoesNotExist:
+                    raise CartError(error_messages['seat_invalid'])
+                i['item'] = seat.product_id
+                if i['item'] not in self._items_cache:
+                    self._update_items_cache([i['item']], [i['variation']])
+
+            # Check whether the specified items are part of what we just fetched from the database
+            # If they are not, the user supplied item IDs which either do not exist or belong to
+            # a different event
+            if i['item'] not in self._items_cache or (i['variation'] and i['variation'] not in self._variations_cache):
+                raise CartError(error_messages['not_for_sale'])
+
             item = self._items_cache[i['item']]
             variation = self._variations_cache[i['variation']] if i['variation'] is not None else None
             voucher = None
@@ -446,7 +497,7 @@ class CartManager:
                 bop = self.AddOperation(
                     count=bundle.count, item=bitem, variation=bvar, price=bprice,
                     voucher=None, quotas=bundle_quotas, addon_to='FAKE', subevent=subevent,
-                    includes_tax=bool(bprice.rate), bundled=[]
+                    includes_tax=bool(bprice.rate), bundled=[], seat=None
                 )
                 self._check_item_constraints(bop)
                 bundled.append(bop)
@@ -455,7 +506,7 @@ class CartManager:
 
             op = self.AddOperation(
                 count=i['count'], item=item, variation=variation, price=price, voucher=voucher, quotas=quotas,
-                addon_to=False, subevent=subevent, includes_tax=bool(price.rate), bundled=bundled
+                addon_to=False, subevent=subevent, includes_tax=bool(price.rate), bundled=bundled, seat=seat
             )
             self._check_item_constraints(op)
             operations.append(op)
@@ -561,7 +612,7 @@ class CartManager:
 
                 op = self.AddOperation(
                     count=1, item=item, variation=variation, price=price, voucher=None, quotas=quotas,
-                    addon_to=cp, subevent=cp.subevent, includes_tax=bool(price.rate), bundled=[]
+                    addon_to=cp, subevent=cp.subevent, includes_tax=bool(price.rate), bundled=[], seat=cp.seat
                 )
                 self._check_item_constraints(op)
                 operations.append(op)
@@ -593,6 +644,15 @@ class CartManager:
                             'cat': str(iao.addon_category.name),
                         }
                     )
+                validate_cart_addons.send(
+                    sender=self.event,
+                    addons={
+                        (self._items_cache[s[0]], self._variations_cache[s[1]] if s[1] else None)
+                        for s in selected
+                    },
+                    base_position=cp,
+                    iao=iao
+                )
 
         # Detect removed add-ons and create RemoveOperations
         for cp, al in current_addons.items():
@@ -687,6 +747,7 @@ class CartManager:
         err = err or self._check_min_per_product()
 
         self._operations.sort(key=lambda a: self.order[type(a)])
+        seats_seen = set()
 
         for op in self._operations:
             if isinstance(op, self.RemoveOperation):
@@ -700,6 +761,11 @@ class CartManager:
                 # Create a CartPosition for as much items as we can
                 requested_count = quota_available_count = voucher_available_count = op.count
 
+                if op.seat:
+                    if op.seat in seats_seen:
+                        err = err or error_messages['seat_multiple']
+                    seats_seen.add(op.seat)
+
                 if op.quotas:
                     quota_available_count = min(requested_count, min(quotas_ok[q] for q in op.quotas))
 
@@ -723,14 +789,19 @@ class CartManager:
 
                 if isinstance(op, self.AddOperation):
                     for b in op.bundled:
-                        b_quota_available_count = min(available_count * b.count, min(quotas_ok[q] for q in b.quotas))
+                        b_quotas = list(b.quotas)
+                        if not b_quotas:
+                            err = err or error_messages['unavailable']
+                            available_count = 0
+                            continue
+                        b_quota_available_count = min(available_count * b.count, min(quotas_ok[q] for q in b_quotas))
                         if b_quota_available_count < b.count:
                             err = err or error_messages['unavailable']
                             available_count = 0
                         elif b_quota_available_count < available_count * b.count:
                             err = err or error_messages['in_part']
                             available_count = b_quota_available_count // b.count
-                        for q in b.quotas:
+                        for q in b_quotas:
                             quotas_ok[q] -= available_count * b.count
                             # TODO: is this correct?
 
@@ -745,12 +816,16 @@ class CartManager:
                     available_count = 0
 
                 if isinstance(op, self.AddOperation):
+                    if op.seat and not op.seat.is_available():
+                        available_count = 0
+                        err = err or error_messages['seat_unavailable']
+
                     for k in range(available_count):
                         cp = CartPosition(
                             event=self.event, item=op.item, variation=op.variation,
                             price=op.price.gross, expires=self._expiry, cart_id=self.cart_id,
                             voucher=op.voucher, addon_to=op.addon_to if op.addon_to else None,
-                            subevent=op.subevent, includes_tax=op.includes_tax
+                            subevent=op.subevent, includes_tax=op.includes_tax, seat=op.seat
                         )
                         if self.event.settings.attendee_names_asked:
                             scheme = PERSON_NAME_SCHEMES.get(self.event.settings.name_scheme)
@@ -789,7 +864,11 @@ class CartManager:
 
                         new_cart_positions.append(cp)
                 elif isinstance(op, self.ExtendOperation):
-                    if available_count == 1:
+                    if op.seat and not op.seat.is_available(ignore_cart=op.position):
+                        err = err or error_messages['seat_unavailable']
+                        op.position.addons.all().delete()
+                        op.position.delete()
+                    elif available_count == 1:
                         op.position.expires = self._expiry
                         op.position.price = op.price.gross
                         try:
@@ -820,6 +899,9 @@ class CartManager:
             # If any quotas are affected that are not unlimited, we lock
             return True
 
+        if any(getattr(o, 'seat', False) for o in self._operations):
+            return True
+
         return False
 
     def commit(self):
@@ -871,6 +953,12 @@ def update_tax_rates(event: Event, cart_id: str, invoice_address: InvoiceAddress
 def get_fees(event, request, total, invoice_address, provider):
     fees = []
 
+    for recv, resp in fee_calculation_for_cart.send(sender=event, request=request, invoice_address=invoice_address,
+                                                    total=total):
+        if resp:
+            fees += resp
+
+    total = total + sum(f.value for f in fees)
     if provider and total != 0:
         provider = event.get_payment_providers().get(provider)
         if provider:
@@ -896,10 +984,6 @@ def get_fees(event, request, total, invoice_address, provider):
                         tax_rule=payment_fee_tax_rule
                     ))
 
-    for recv, resp in fee_calculation_for_cart.send(sender=event, request=request, invoice_address=invoice_address,
-                                                    total=total):
-        fees += resp
-
     return fees
 
 
@@ -909,7 +993,7 @@ def add_items_to_cart(self, event: int, items: List[dict], cart_id: str=None, lo
     """
     Adds a list of items to a user's cart.
     :param event: The event ID in question
-    :param items: A list of dicts with the keys item, variation, count, custom_price, voucher
+    :param items: A list of dicts with the keys item, variation, count, custom_price, voucher, seat ID
     :param cart_id: Session ID of a guest
     :raises CartError: On any error that occured
     """

src/pretix/base/services/checkin.py

@@ -60,7 +60,7 @@ def _save_answers(op, answers, given_answers):
 @transaction.atomic
 def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict, force=False,
                     ignore_unpaid=False, nonce=None, datetime=None, questions_supported=True,
-                    user=None, auth=None):
+                    user=None, auth=None, canceled_supported=False):
     """
     Create a checkin for this particular order position and check-in list. Fails with CheckInError if the check in is
     not valid at this time.
@@ -90,10 +90,10 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
         'answers'
     ).get(pk=op.pk)
 
-    if op.canceled:
+    if op.canceled or op.order.status not in (Order.STATUS_PAID, Order.STATUS_PENDING):
         raise CheckInError(
             _('This order position has been canceled.'),
-            'unpaid'
+            'canceled' if canceled_supported else 'unpaid'
         )
 
     answers = {a.question: a for a in op.answers.all()}

src/pretix/base/services/invoices.py

@@ -1,3 +1,4 @@
+import inspect
 import json
 import logging
 import urllib.error
@@ -53,7 +54,10 @@ def build_invoice(invoice: Invoice) -> Invoice:
         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:
-            payment = open_payment.payment_provider.render_invoice_text(invoice.order)
+            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)
+            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.')
         else:

src/pretix/base/services/mail.py

@@ -1,10 +1,18 @@
+import inspect
 import logging
+import os
+import re
 import smtplib
 import warnings
+from email.encoders import encode_noop
+from email.mime.image import MIMEImage
 from email.utils import formataddr
 from typing import Any, Dict, List, Union
+from urllib.parse import urljoin, urlparse
 
 import cssutils
+import requests
+from bs4 import BeautifulSoup
 from celery import chain
 from django.conf import settings
 from django.core.mail import EmailMultiAlternatives, get_connection
@@ -177,9 +185,9 @@ def mail(email: str, subject: str, template: Union[str, LazyI18nString],
             body_plain += "\r\n"
 
         try:
-            try:
+            if 'position' in inspect.signature(renderer.render).parameters:
                 body_html = renderer.render(content_plain, signature, str(subject), order, position)
-            except TypeError:
+            else:
                 # Backwards compatibility
                 warnings.warn('E-mail renderer called without position argument because position argument is not '
                               'supported.',
@@ -219,20 +227,9 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
                    invoices: List[int]=None, order: int=None, attach_tickets=False) -> bool:
     email = EmailMultiAlternatives(subject, body, sender, to=to, bcc=bcc, headers=headers)
     if html is not None:
-        email.attach_alternative(html, "text/html")
-    if invoices:
-        invoices = Invoice.objects.filter(pk__in=invoices)
-        for inv in invoices:
-            if inv.file:
-                try:
-                    email.attach(
-                        '{}.pdf'.format(inv.number),
-                        inv.file.file.read(),
-                        'application/pdf'
-                    )
-                except:
-                    logger.exception('Could not attach invoice to email')
-                    pass
+        html_with_cid, cid_images = replace_images_with_cid_paths(html)
+        email = attach_cid_images(email, cid_images, verify_ssl=True)
+        email.attach_alternative(html_with_cid, "text/html")
 
     if event:
         with scopes_disabled():
@@ -244,6 +241,19 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
         cm = lambda: scopes_disabled()  # noqa
 
     with cm():
+        if invoices:
+            invoices = Invoice.objects.filter(pk__in=invoices)
+            for inv in invoices:
+                if inv.file:
+                    try:
+                        email.attach(
+                            '{}.pdf'.format(inv.number),
+                            inv.file.file.read(),
+                            'application/pdf'
+                        )
+                    except:
+                        logger.exception('Could not attach invoice to email')
+                        pass
         if event:
             if order:
                 try:
@@ -331,3 +341,92 @@ def render_mail(template, context):
         tpl = get_template(template)
         body = tpl.render(context)
     return body
+
+
+def replace_images_with_cid_paths(body_html):
+    if body_html:
+        email = BeautifulSoup(body_html, "lxml")
+        cid_images = []
+        for image in email.findAll('img'):
+            original_image_src = image['src']
+
+            try:
+                cid_id = "image_%s" % cid_images.index(original_image_src)
+            except ValueError:
+                cid_images.append(original_image_src)
+                cid_id = "image_%s" % (len(cid_images) - 1)
+
+            image['src'] = "cid:%s" % cid_id
+
+        return email.prettify(), cid_images
+    else:
+        return body_html, []
+
+
+def attach_cid_images(msg, cid_images, verify_ssl=True):
+    if cid_images and len(cid_images) > 0:
+
+        msg.mixed_subtype = 'related'
+        for key, image in enumerate(cid_images):
+            cid = 'image_%s' % key
+            try:
+                mime_image = convert_image_to_cid(
+                    image, cid, verify_ssl)
+                if mime_image:
+                    msg.attach(mime_image)
+            except:
+                logger.exception("ERROR attaching CID image %s[%s]" % (cid, image))
+
+    return msg
+
+
+def convert_image_to_cid(image_src, cid_id, verify_ssl=True):
+    try:
+        if image_src.startswith('data:image/'):
+            image_type, image_content = image_src.split(',', 1)
+            image_type = re.findall(r'data:image/(\w+);base64', image_type)[0]
+            mime_image = MIMEImage(image_content, _subtype=image_type, _encoder=encode_noop)
+            mime_image.add_header('Content-Transfer-Encoding', 'base64')
+        elif image_src.startswith('data:'):
+            logger.exception("ERROR creating MIME element %s[%s]" % (cid_id, image_src))
+            return None
+        else:
+            image_src = normalize_image_url(image_src)
+
+            path = urlparse(image_src).path
+            guess_subtype = os.path.splitext(path)[1][1:]
+
+            response = requests.get(image_src, verify=verify_ssl)
+            mime_image = MIMEImage(
+                response.content, _subtype=guess_subtype)
+
+        mime_image.add_header('Content-ID', '<%s>' % cid_id)
+
+        return mime_image
+    except:
+        logger.exception("ERROR creating mime_image %s[%s]" % (cid_id, image_src))
+        return None
+
+
+def normalize_image_url(url):
+    if '://' not in url:
+        """
+        If we see a relative URL in an email, we can't know if it is meant to be a media file
+        or a static file, so we need to guess. If it is a static file included with the
+        ``{% static %}`` template tag (as it should be), then ``STATIC_URL`` is already prepended.
+        If ``STATIC_URL`` is absolute, then ``url`` should already be absolute and this
+        function should not be triggered. Thus, if we see a relative URL and ``STATIC_URL``
+        is absolute *or* ``url`` does not start with ``STATIC_URL``, we can be sure this
+        is a media file (or a programmer error …).
+
+        Constructing the URL of either a static file or a media file from settings is still
+        not clean, since custom storage backends might very well use more complex approaches
+        to build those URLs. However, this is good enough as a best-effort approach. Complex
+        storage backends (such as cloud storages) will return absolute URLs anyways so this
+        function is not needed in that case.
+        """
+        if '://' not in settings.STATIC_URL and url.startswith(settings.STATIC_URL):
+            url = urljoin(settings.SITE_URL, url)
+        else:
+            url = urljoin(settings.MEDIA_URL, url)
+    return url

src/pretix/base/services/notifications.py

@@ -32,7 +32,7 @@ def notify(logentry_id: int):
     # All users that have the permission to get the notification
     users = logentry.event.get_users_with_permission(
         notification_type.required_permission
-    ).filter(notifications_send=True)
+    ).filter(notifications_send=True, is_active=True)
     if logentry.user:
         users = users.exclude(pk=logentry.user.pk)
 

src/pretix/base/services/orders.py

@@ -1,3 +1,4 @@
+import inspect
 import json
 import logging
 from collections import Counter, namedtuple
@@ -24,7 +25,7 @@ from pretix.base.i18n import (
 )
 from pretix.base.models import (
     CartPosition, Device, Event, Item, ItemVariation, Order, OrderPayment,
-    OrderPosition, Quota, User, Voucher,
+    OrderPosition, Quota, Seat, SeatCategoryMapping, User, Voucher,
 )
 from pretix.base.models.event import SubEvent
 from pretix.base.models.items import ItemBundle
@@ -48,7 +49,7 @@ from pretix.base.settings import PERSON_NAME_SCHEMES
 from pretix.base.signals import (
     allow_ticket_download, order_approved, order_canceled, order_changed,
     order_denied, order_expired, order_fee_calculation, order_placed,
-    periodic_task, validate_order,
+    order_split, periodic_task, validate_order,
 )
 from pretix.celery_app import app
 from pretix.helpers.models import modelcopy
@@ -82,6 +83,8 @@ error_messages = {
                                    'affected positions have been removed from your cart.'),
     'some_subevent_ended': _('The presale period for one of the events in your cart has ended. The affected '
                              'positions have been removed from your cart.'),
+    'seat_invalid': _('One of the seats in your order was invalid, we removed the position from your cart.'),
+    'seat_unavailable': _('One of the seats in your order has been taken in the meantime, we removed the position from your cart.'),
 }
 
 logger = logging.getLogger(__name__)
@@ -428,6 +431,7 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
     products_seen = Counter()
     changed_prices = {}
     deleted_positions = set()
+    seats_seen = set()
 
     def delete(cp):
         # Delete a cart position, including parents and children, if applicable
@@ -490,17 +494,32 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
             delete(cp)
             break
 
+        if (cp.requires_seat and not cp.seat) or (cp.seat and not cp.requires_seat) or (cp.seat and cp.seat.product != cp.item) or cp.seat in seats_seen:
+            err = err or error_messages['seat_invalid']
+            delete(cp)
+            break
+        if cp.seat:
+            seats_seen.add(cp.seat)
+
         if cp.item.require_voucher and cp.voucher is None:
             delete(cp)
             err = err or error_messages['voucher_required']
             break
 
-        if cp.item.hide_without_voucher and (cp.voucher is None or cp.voucher.item is None
-                                             or cp.voucher.item.pk != cp.item.pk):
+        if cp.item.hide_without_voucher and (cp.voucher is None or not cp.voucher.show_hidden_items or not cp.voucher.applies_to(cp.item, cp.variation)):
             delete(cp)
+            cp.delete()
             err = error_messages['voucher_required']
             break
 
+        if cp.seat:
+            # Unlike quotas (which we blindly trust as long as the position is not expired), we check seats every time, since we absolutely
+            # can not overbook a seat.
+            if not cp.seat.is_available(ignore_cart=cp) or cp.seat.blocked:
+                err = err or error_messages['seat_unavailable']
+                cp.delete()
+                continue
+
         if cp.expires >= now_dt and not cp.voucher:
             # Other checks are not necessary
             continue
@@ -573,6 +592,13 @@ def _get_fees(positions: List[CartPosition], payment_provider: BasePaymentProvid
               meta_info: dict, event: Event):
     fees = []
     total = sum([c.price for c in positions])
+
+    for recv, resp in order_fee_calculation.send(sender=event, invoice_address=address, total=total,
+                                                 meta_info=meta_info, positions=positions):
+        if resp:
+            fees += resp
+
+    total += sum(f.value for f in fees)
     if payment_provider:
         payment_fee = payment_provider.calculate_fee(total)
     else:
@@ -583,9 +609,6 @@ def _get_fees(positions: List[CartPosition], payment_provider: BasePaymentProvid
                       internal_type=payment_provider.identifier)
         fees.append(pf)
 
-    for recv, resp in order_fee_calculation.send(sender=event, invoice_address=address, total=total,
-                                                 meta_info=meta_info, positions=positions):
-        fees += resp
     return fees, pf
 
 
@@ -648,7 +671,7 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
 
 
 def _order_placed_email(event: Event, order: Order, pprov: BasePaymentProvider, email_template, log_entry: str,
-                        invoice):
+                        invoice, payment: OrderPayment):
     try:
         invoice_name = order.invoice_address.name
         invoice_company = order.invoice_address.company
@@ -657,7 +680,10 @@ def _order_placed_email(event: Event, order: Order, pprov: BasePaymentProvider,
         invoice_company = ""
 
     if pprov:
-        payment_info = str(pprov.order_pending_mail_render(order))
+        if 'payment' in inspect.signature(pprov.order_pending_mail_render).parameters:
+            payment_info = str(pprov.order_pending_mail_render(order, payment))
+        else:
+            payment_info = str(pprov.order_pending_mail_render(order))
     else:
         payment_info = None
 
@@ -736,21 +762,30 @@ def _perform_order(event: Event, payment_provider: str, position_ids: List[str],
         except InvoiceAddress.DoesNotExist:
             pass
 
-    positions = CartPosition.objects.filter(id__in=position_ids, event=event)
+    positions = CartPosition.objects.annotate(
+        requires_seat=Exists(
+            SeatCategoryMapping.objects.filter(
+                Q(product=OuterRef('item'))
+                & (Q(subevent=OuterRef('subevent')) if event.has_subevents else Q(subevent__isnull=True))
+            )
+        )
+    ).filter(
+        id__in=position_ids, event=event
+    )
 
     validate_order.send(event, payment_provider=pprov, email=email, positions=positions,
                         locale=locale, invoice_address=addr, meta_info=meta_info)
 
     lockfn = NoLockManager
     locked = False
-    if positions.filter(Q(voucher__isnull=False) | Q(expires__lt=now() + timedelta(minutes=2))).exists():
+    if positions.filter(Q(voucher__isnull=False) | Q(expires__lt=now() + timedelta(minutes=2)) | Q(seat__isnull=False)).exists():
         # Performance optimization: If no voucher is used and no cart position is dangerously close to its expiry date,
         # creating this order shouldn't be prone to any race conditions and we don't need to lock the event.
         locked = True
         lockfn = event.lock
 
     with lockfn() as now_dt:
-        positions = list(positions.select_related('item', 'variation', 'subevent', 'addon_to').prefetch_related('addons'))
+        positions = list(positions.select_related('item', 'variation', 'subevent', 'seat', 'addon_to').prefetch_related('addons'))
         if len(positions) == 0:
             raise OrderError(error_messages['empty'])
         if len(position_ids) != len(positions):
@@ -794,7 +829,7 @@ def _perform_order(event: Event, payment_provider: str, position_ids: List[str],
             email_attendees = event.settings.mail_send_order_placed_attendee
             email_attendees_template = event.settings.mail_text_order_placed_attendee
 
-        _order_placed_email(event, order, pprov, email_template, log_entry, invoice)
+        _order_placed_email(event, order, pprov, 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:
@@ -948,6 +983,35 @@ def send_download_reminders(sender, **kwargs):
                                     logger.exception('Reminder email could not be sent to attendee')
 
 
+def notify_user_changed_order(order, user=None, auth=None):
+    with language(order.locale):
+        try:
+            invoice_name = order.invoice_address.name
+            invoice_company = order.invoice_address.company
+        except InvoiceAddress.DoesNotExist:
+            invoice_name = ""
+            invoice_company = ""
+        email_template = order.event.settings.mail_text_order_changed
+        email_context = {
+            'event': order.event.name,
+            'url': build_absolute_uri(order.event, 'presale:event.order.open', kwargs={
+                'order': order.code,
+                'secret': order.secret,
+                'hash': order.email_confirm_hash()
+            }),
+            'invoice_name': invoice_name,
+            'invoice_company': invoice_company,
+        }
+        email_subject = _('Your order has been changed: %(code)s') % {'code': order.code}
+        try:
+            order.send_mail(
+                email_subject, email_template, email_context,
+                'pretix.event.order.email.order_changed', user, auth=auth
+            )
+        except SendMailException:
+            logger.exception('Order changed email could not be sent')
+
+
 class OrderChangeManager:
     error_messages = {
         'product_without_variation': _('You need to select a variation of the product.'),
@@ -961,12 +1025,17 @@ class OrderChangeManager:
         'addon_to_required': _('This is an add-on product, please select the base position it should be added to.'),
         'addon_invalid': _('The selected base position does not allow you to add this product as an add-on.'),
         'subevent_required': _('You need to choose a subevent for the new position.'),
+        'seat_unavailable': _('The selected seat "{seat}" is not available.'),
+        '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.'),
     }
     ItemOperation = namedtuple('ItemOperation', ('position', 'item', 'variation'))
     SubeventOperation = namedtuple('SubeventOperation', ('position', 'subevent'))
+    SeatOperation = namedtuple('SubeventOperation', ('position', 'seat'))
     PriceOperation = namedtuple('PriceOperation', ('position', 'price'))
     CancelOperation = namedtuple('CancelOperation', ('position',))
-    AddOperation = namedtuple('AddOperation', ('item', 'variation', 'price', 'addon_to', 'subevent'))
+    AddOperation = namedtuple('AddOperation', ('item', 'variation', 'price', 'addon_to', 'subevent', 'seat'))
     SplitOperation = namedtuple('SplitOperation', ('position',))
     RegenerateSecretOperation = namedtuple('RegenerateSecretOperation', ('position',))
 
@@ -979,6 +1048,7 @@ class OrderChangeManager:
         self._committed = False
         self._totaldiff = 0
         self._quotadiff = Counter()
+        self._seatdiff = Counter()
         self._operations = []
         self.notify = notify
         self._invoice_dirty = False
@@ -996,6 +1066,13 @@ class OrderChangeManager:
         self._quotadiff.subtract(position.quotas)
         self._operations.append(self.ItemOperation(position, item, variation))
 
+    def change_seat(self, position: OrderPosition, seat: Seat):
+        if position.seat:
+            self._seatdiff.subtract([position.seat])
+        if seat:
+            self._seatdiff.update([seat])
+        self._operations.append(self.SeatOperation(position, seat))
+
     def change_subevent(self, position: OrderPosition, subevent: SubEvent):
         price = get_price(position.item, position.variation, voucher=position.voucher, subevent=subevent,
                           invoice_address=self._invoice_address)
@@ -1051,12 +1128,14 @@ class OrderChangeManager:
         self._totaldiff += -position.price
         self._quotadiff.subtract(position.quotas)
         self._operations.append(self.CancelOperation(position))
+        if position.seat:
+            self._seatdiff.subtract([position.seat])
 
         if self.order.event.settings.invoice_include_free or position.price != Decimal('0.00'):
             self._invoice_dirty = True
 
     def add_position(self, item: Item, variation: ItemVariation, price: Decimal, addon_to: Order = None,
-                     subevent: SubEvent = None):
+                     subevent: SubEvent = None, seat: Seat = None):
         if price is None:
             price = get_price(item, variation, subevent=subevent, invoice_address=self._invoice_address)
         else:
@@ -1075,6 +1154,14 @@ class OrderChangeManager:
         if self.order.event.has_subevents and not subevent:
             raise OrderError(self.error_messages['subevent_required'])
 
+        seated = item.seat_category_mappings.filter(subevent=subevent).exists()
+        if seated and not seat:
+            raise OrderError(self.error_messages['seat_required'])
+        elif not seated and seat:
+            raise OrderError(self.error_messages['seat_forbidden'])
+        if seat and subevent and seat.subevent_id != subevent:
+            raise OrderError(self.error_messages['seat_subevent_mismatch'].format(seat=seat.name))
+
         new_quotas = (variation.quotas.filter(subevent=subevent)
                       if variation else item.quotas.filter(subevent=subevent))
         if not new_quotas:
@@ -1085,7 +1172,9 @@ class OrderChangeManager:
 
         self._totaldiff += price.gross
         self._quotadiff.update(new_quotas)
-        self._operations.append(self.AddOperation(item, variation, price, addon_to, subevent))
+        if seat:
+            self._seatdiff.update([seat])
+        self._operations.append(self.AddOperation(item, variation, price, addon_to, subevent, seat))
 
     def split(self, position: OrderPosition):
         if self.order.event.settings.invoice_include_free or position.price != Decimal('0.00'):
@@ -1093,6 +1182,26 @@ class OrderChangeManager:
 
         self._operations.append(self.SplitOperation(position))
 
+    def _check_seats(self):
+        for seat, diff in self._seatdiff.items():
+            if diff <= 0:
+                continue
+            if not seat.is_available() or diff > 1:
+                raise OrderError(self.error_messages['seat_unavailable'].format(seat=seat.name))
+
+        if self.event.has_subevents:
+            state = {}
+            for p in self.order.positions.all():
+                state[p] = {'seat': p.seat, 'subevent': p.subevent}
+            for op in self._operations:
+                if isinstance(op, self.SeatOperation):
+                    state[op.position]['seat'] = op.seat
+                elif isinstance(op, self.SubeventOperation):
+                    state[op.position]['subevent'] = op.subevent
+            for v in state.values():
+                if v['seat'] and v['seat'].subevent_id != v['subevent'].pk:
+                    raise OrderError(self.error_messages['seat_subevent_mismatch'].format(seat=v['seat'].name))
+
     def _check_quotas(self):
         for quota, diff in self._quotadiff.items():
             if diff <= 0:
@@ -1159,7 +1268,7 @@ class OrderChangeManager:
                 raise OrderError(self.error_messages['paid_to_free_exceeded'])
 
     def _perform_operations(self):
-        nextposid = self.order.positions.aggregate(m=Max('positionid'))['m'] + 1
+        nextposid = self.order.all_positions.aggregate(m=Max('positionid'))['m'] + 1
         split_positions = []
 
         for op in self._operations:
@@ -1179,6 +1288,17 @@ class OrderChangeManager:
                 op.position.variation = op.variation
                 op.position._calculate_tax()
                 op.position.save()
+            elif isinstance(op, self.SeatOperation):
+                self.order.log_action('pretix.event.order.changed.seat', user=self.user, auth=self.auth, data={
+                    'position': op.position.pk,
+                    'positionid': op.position.positionid,
+                    'old_seat': op.position.seat.name if op.position.seat else "-",
+                    'new_seat': op.seat.name if op.seat else "-",
+                    'old_seat_id': op.position.seat.pk if op.position.seat else None,
+                    'new_seat_id': op.seat.pk if op.seat else None,
+                })
+                op.position.seat = op.seat
+                op.position.save()
             elif isinstance(op, self.SubeventOperation):
                 self.order.log_action('pretix.event.order.changed.subevent', user=self.user, auth=self.auth, data={
                     'position': op.position.pk,
@@ -1232,7 +1352,7 @@ class OrderChangeManager:
                     item=op.item, variation=op.variation, addon_to=op.addon_to,
                     price=op.price.gross, order=self.order, tax_rate=op.price.rate,
                     tax_value=op.price.tax, tax_rule=op.item.tax_rule,
-                    positionid=nextposid, subevent=op.subevent
+                    positionid=nextposid, subevent=op.subevent, seat=op.seat
                 )
                 nextposid += 1
                 self.order.log_action('pretix.event.order.changed.add', user=self.user, auth=self.auth, data={
@@ -1243,6 +1363,7 @@ class OrderChangeManager:
                     'price': op.price.gross,
                     'positionid': pos.positionid,
                     'subevent': op.subevent.pk if op.subevent else None,
+                    'seat': op.seat.pk if op.seat else None,
                 })
             elif isinstance(op, self.SplitOperation):
                 split_positions.append(op.position)
@@ -1293,6 +1414,14 @@ class OrderChangeManager:
             pass
 
         split_order.total = sum([p.price for p in split_positions if not p.canceled])
+
+        for fee in self.order.fees.exclude(fee_type=OrderFee.FEE_TYPE_PAYMENT):
+            new_fee = modelcopy(fee)
+            new_fee.pk = None
+            new_fee.order = split_order
+            split_order.total += new_fee.value
+            new_fee.save()
+
         if split_order.total != Decimal('0.00') and self.order.status != Order.STATUS_PAID:
             pp = self._get_payment_provider()
             if pp:
@@ -1308,13 +1437,6 @@ class OrderChangeManager:
                 fee.delete()
             split_order.total += fee.value
 
-        for fee in self.order.fees.exclude(fee_type=OrderFee.FEE_TYPE_PAYMENT):
-            new_fee = modelcopy(fee)
-            new_fee.pk = None
-            new_fee.order = split_order
-            split_order.total += new_fee.value
-            new_fee.save()
-
         split_order.save()
 
         if split_order.status == Order.STATUS_PAID:
@@ -1335,6 +1457,8 @@ class OrderChangeManager:
 
         if split_order.total != Decimal('0.00') and self.order.invoices.filter(is_cancellation=False).last():
             generate_invoice(split_order)
+
+        order_split.send(sender=self.order.event, original=self.order, split_order=split_order)
         return split_order
 
     @cached_property
@@ -1420,34 +1544,6 @@ class OrderChangeManager:
         except InvoiceAddress.DoesNotExist:
             return None
 
-    def _notify_user(self, order):
-        with language(order.locale):
-            try:
-                invoice_name = order.invoice_address.name
-                invoice_company = order.invoice_address.company
-            except InvoiceAddress.DoesNotExist:
-                invoice_name = ""
-                invoice_company = ""
-            email_template = order.event.settings.mail_text_order_changed
-            email_context = {
-                'event': order.event.name,
-                'url': build_absolute_uri(self.order.event, 'presale:event.order.open', kwargs={
-                    'order': order.code,
-                    'secret': order.secret,
-                    'hash': order.email_confirm_hash()
-                }),
-                'invoice_name': invoice_name,
-                'invoice_company': invoice_company,
-            }
-            email_subject = _('Your order has been changed: %(code)s') % {'code': order.code}
-            try:
-                order.send_mail(
-                    email_subject, email_template, email_context,
-                    'pretix.event.order.email.order_changed', self.user, auth=self.auth
-                )
-            except SendMailException:
-                logger.exception('Order changed email could not be sent')
-
     def commit(self, check_quotas=True):
         if self._committed:
             # an order change can only be committed once
@@ -1467,6 +1563,7 @@ class OrderChangeManager:
                     raise OrderError(self.error_messages['not_pending_or_paid'])
                 if check_quotas:
                     self._check_quotas()
+                self._check_seats()
                 self._check_complete_cancel()
                 self._perform_operations()
             self._recalculate_total_and_payment_fee()
@@ -1477,9 +1574,9 @@ class OrderChangeManager:
         self._check_paid_to_free()
 
         if self.notify:
-            self._notify_user(self.order)
+            notify_user_changed_order(self.order, self.user, self.auth)
             if self.split_order:
-                self._notify_user(self.split_order)
+                notify_user_changed_order(self.split_order, self.user, self.auth)
 
         order_changed.send(self.order.event, order=self.order)
 

src/pretix/base/services/seating.py

@@ -0,0 +1,73 @@
+from django.db.models import Count
+from django.utils.translation import ugettext_lazy as _
+
+from pretix.base.models import CartPosition, Seat
+
+
+class SeatProtected(Exception):
+    pass
+
+
+def validate_plan_change(event, subevent, plan):
+    current_taken_seats = set(
+        event.seats.select_related('product')
+             .annotate(has_op=Count('orderposition'))
+             .filter(subevent=subevent, has_op=True)
+             .values_list('seat_guid', flat=True)
+    )
+    new_seats = {
+        ss.guid for ss in plan.iter_all_seats()
+    } if plan else set()
+    leftovers = list(current_taken_seats - new_seats)
+    if leftovers:
+        raise SeatProtected(_('You can not change the plan since seat "{}" is not present in the new plan and is '
+                              'already sold.').format(leftovers[0]))
+
+
+def generate_seats(event, subevent, plan, mapping):
+    current_seats = {
+        s.seat_guid: s for s in
+        event.seats.select_related('product').annotate(has_op=Count('orderposition')).filter(subevent=subevent)
+    }
+
+    def update(o, a, v):
+        if getattr(o, a) != v:
+            setattr(o, a, v)
+            return True
+        return False
+
+    create_seats = []
+    if plan:
+        for ss in plan.iter_all_seats():
+            p = mapping.get(ss.category)
+            if ss.guid in current_seats:
+                seat = current_seats.pop(ss.guid)
+                updated = any([
+                    update(seat, 'product', p),
+                    update(seat, 'name', ss.name),
+                    update(seat, 'row_name', ss.row),
+                    update(seat, 'seat_number', ss.number),
+                    update(seat, 'zone_name', ss.zone),
+                ])
+                if updated:
+                    seat.save()
+            else:
+                create_seats.append(Seat(
+                    event=event,
+                    subevent=subevent,
+                    seat_guid=ss.guid,
+                    name=ss.name,
+                    row_name=ss.row,
+                    seat_number=ss.number,
+                    zone_name=ss.zone,
+                    product=p,
+                ))
+
+    for s in current_seats.values():
+        if s.has_op:
+            raise SeatProtected(_('You can not change the plan since seat "{}" is not present in the new plan and is '
+                                  'already sold.').format(s.name))
+
+    Seat.objects.bulk_create(create_seats)
+    CartPosition.objects.filter(seat__in=[s.pk for s in current_seats.values()]).delete()
+    Seat.objects.filter(pk__in=[s.pk for s in current_seats.values()]).delete()

src/pretix/base/services/stats.py

@@ -1,12 +1,16 @@
+from datetime import date, datetime, time, timedelta
 from decimal import Decimal
 from typing import Any, Dict, Iterable, List, Tuple
 
-from django.db.models import Case, Count, F, Sum, Value, When
+from django.db.models import (
+    Case, Count, DateTimeField, F, Max, OuterRef, Subquery, Sum, Value, When,
+)
+from django.utils.timezone import make_aware
 from django.utils.translation import ugettext_lazy as _
 
 from pretix.base.models import Event, Item, ItemCategory, Order, OrderPosition
 from pretix.base.models.event import SubEvent
-from pretix.base.models.orders import OrderFee
+from pretix.base.models.orders import OrderFee, OrderPayment
 from pretix.base.signals import order_fee_type_name
 
 
@@ -71,8 +75,9 @@ def dictsum(*dicts) -> dict:
     return res
 
 
-def order_overview(event: Event, subevent: SubEvent=None) -> Tuple[List[Tuple[ItemCategory, List[Item]]],
-                                                                   Dict[str, Tuple[Decimal, Decimal]]]:
+def order_overview(
+        event: Event, subevent: SubEvent=None, date_filter='', date_from=None, date_until=None
+) -> Tuple[List[Tuple[ItemCategory, List[Item]]], Dict[str, Tuple[Decimal, Decimal]]]:
     items = event.items.all().select_related(
         'category',  # for re-grouping
     ).prefetch_related(
@@ -82,6 +87,38 @@ def order_overview(event: Event, subevent: SubEvent=None) -> Tuple[List[Tuple[It
     qs = OrderPosition.all
     if subevent:
         qs = qs.filter(subevent=subevent)
+
+    if date_from and isinstance(date_from, date):
+        date_from = make_aware(datetime.combine(
+            date_from,
+            time(hour=0, minute=0, second=0, microsecond=0)
+        ), event.timezone)
+
+    if date_until and isinstance(date_until, date):
+        date_until = make_aware(datetime.combine(
+            date_until + timedelta(days=1),
+            time(hour=0, minute=0, second=0, microsecond=0)
+        ), event.timezone)
+
+    if date_filter == 'order_date':
+        if date_from:
+            qs = qs.filter(order__datetime__gte=date_from)
+        if date_until:
+            qs = qs.filter(order__datetime__lt=date_until)
+    elif date_filter == 'last_payment_date':
+        p_date = OrderPayment.objects.filter(
+            order=OuterRef('order'),
+            state__in=[OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED],
+            payment_date__isnull=False
+        ).values('order').annotate(
+            m=Max('payment_date')
+        ).values('m').order_by()
+        qs = qs.annotate(payment_date=Subquery(p_date, output_field=DateTimeField()))
+        if date_from:
+            qs = qs.filter(payment_date__gte=date_from)
+        if date_until:
+            qs = qs.filter(payment_date__lt=date_until)
+
     counters = qs.filter(
         order__event=event
     ).annotate(
@@ -153,14 +190,26 @@ def order_overview(event: Event, subevent: SubEvent=None) -> Tuple[List[Tuple[It
     payment_items = []
 
     if not subevent:
-        counters = OrderFee.all.filter(
+        qs = OrderFee.all.filter(
             order__event=event
         ).annotate(
             status=Case(
                 When(canceled=True, then=Value('c')),
                 default=F('order__status')
             )
-        ).values(
+        )
+        if date_filter == 'order_date':
+            if date_from:
+                qs = qs.filter(order__datetime__gte=date_from)
+            if date_until:
+                qs = qs.filter(order__datetime__lt=date_until)
+        elif date_filter == 'last_payment_date':
+            qs = qs.annotate(payment_date=Subquery(p_date, output_field=DateTimeField()))
+            if date_from:
+                qs = qs.filter(payment_date__gte=date_from)
+            if date_until:
+                qs = qs.filter(payment_date__lt=date_until)
+        counters = qs.values(
             'fee_type', 'internal_type', 'status'
         ).annotate(cnt=Count('id'), value=Sum('value'), tax_value=Sum('tax_value')).order_by()
 

src/pretix/base/services/waitinglist.py

@@ -22,7 +22,7 @@ def assign_automatically(event: Event, user_id: int=None, subevent_id: int=None)
 
     qs = WaitingListEntry.objects.filter(
         event=event, voucher__isnull=True
-    ).select_related('item', 'variation').prefetch_related(
+    ).select_related('item', 'variation', 'subevent').prefetch_related(
         'item__quotas', 'variation__quotas'
     ).order_by('-priority', 'created')
 
@@ -34,12 +34,14 @@ def assign_automatically(event: Event, user_id: int=None, subevent_id: int=None)
 
     with event.lock():
         for wle in qs:
-            if (wle.item, wle.variation) in gone:
+            if (wle.item, wle.variation, wle.subevent) in gone:
                 continue
 
             ev = (wle.subevent or event)
             if not ev.presale_is_running or (wle.subevent and not wle.subevent.active):
                 continue
+            if wle.subevent and not wle.subevent.presale_is_running:
+                continue
 
             quotas = (wle.variation.quotas.filter(subevent=wle.subevent)
                       if wle.variation
@@ -63,7 +65,7 @@ def assign_automatically(event: Event, user_id: int=None, subevent_id: int=None)
                         quota_cache[q.pk][1] - 1 if quota_cache[q.pk][1] is not None else sys.maxsize
                     )
             else:
-                gone.add((wle.item, wle.variation))
+                gone.add((wle.item, wle.variation, wle.subevent))
 
     return sent
 
@@ -75,5 +77,5 @@ def process_waitinglist(sender, **kwargs):
         live=True
     ).prefetch_related('_settings_objects', 'organizer___settings_objects').select_related('organizer')
     for e in qs:
-        if e.settings.waiting_list_auto and e.presale_is_running:
+        if e.settings.waiting_list_auto and (e.presale_is_running or e.has_subevents):
             assign_automatically.apply_async(args=(e.pk,))

src/pretix/base/settings.py

@@ -93,6 +93,10 @@ DEFAULTS = {
         'default': '',
         'type': str,
     },
+    'invoice_numbers_prefix_cancellations': {
+        'default': '',
+        'type': str,
+    },
     'invoice_renderer': {
         'default': 'classic',
         'type': str,
@@ -701,6 +705,23 @@ Your {event} team"""))
         'type': str
     }
 }
+PERSON_NAME_TITLE_GROUPS = OrderedDict([
+    ('english_common', (_('Most common English titles'), (
+        'Mr',
+        'Ms',
+        'Mrs',
+        'Miss',
+        'Mx',
+        'Dr',
+        'Professor',
+        'Sir'
+    ))),
+    ('german_common', (_('Most common German titles'), (
+        'Dr.',
+        'Prof.',
+        'Prof. Dr.',
+    )))
+])
 PERSON_NAME_SCHEMES = OrderedDict([
     ('given_family', {
         'fields': (
@@ -730,6 +751,22 @@ PERSON_NAME_SCHEMES = OrderedDict([
             '_scheme': 'title_given_family',
         },
     }),
+    ('title_given_family', {
+        'fields': (
+            ('title', pgettext_lazy('person_name', 'Title'), 1),
+            ('given_name', _('Given name'), 2),
+            ('family_name', _('Family name'), 2),
+        ),
+        'concatenation': lambda d: ' '.join(
+            str(p) for p in [d.get('title', ''), d.get('given_name', ''), d.get('family_name', '')] if p
+        ),
+        'sample': {
+            'title': pgettext_lazy('person_name_sample', 'Dr'),
+            'given_name': pgettext_lazy('person_name_sample', 'John'),
+            'family_name': pgettext_lazy('person_name_sample', 'Doe'),
+            '_scheme': 'title_given_family',
+        },
+    }),
     ('given_middle_family', {
         'fields': (
             ('given_name', _('First name'), 2),

src/pretix/base/signals.py

@@ -265,6 +265,21 @@ appropriate exception message.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
+validate_cart_addons = EventPluginSignal(
+    providing_args=["addons", "base_position", "iao"]
+)
+"""
+This signal is sent when a user tries to select a combination of addons. In contrast to
+ ``validate_cart``, this is executed before the cart is actually modified. You are passed
+an argument ``addons`` containing a set of ``(item, variation or None)`` tuples as well
+as the ``ItemAddOn`` object as the argument ``iao`` and the base cart position as
+``base_position``.
+The response of receivers will be ignored, but you can raise a CartError with an
+appropriate exception message.
+
+As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
+"""
+
 order_placed = EventPluginSignal(
     providing_args=["order"]
 )
@@ -524,3 +539,28 @@ a ``subevent`` argument which might be none and you are expected to return a lis
 ``pretix.base.timeline.TimelineEvent``, which is a ``namedtuple`` with the fields ``event``, ``subevent``,
 ``datetime``, ``description`` and ``edit_url``.
 """
+
+
+quota_availability = EventPluginSignal(
+    providing_args=['quota', 'result', 'count_waitinglist']
+)
+"""
+This signal allows you to modify the availability of a quota. You are passed the ``quota`` and an
+``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
+into account.
+
+**Warning: Use this signal with great caution, it allows you to screw up the performance of the
+system really bad.** Also, keep in mind that your response is subject to caching and out-of-date
+quotas might be used for display (not for actual order processing).
+"""
+
+order_split = EventPluginSignal(
+    providing_args=["original", "split_order"]
+)
+"""
+This signal is sent out when an order is split into two orders and allows you to copy related models
+to the new order. You will be passed the old order as ``original`` and the new order as ``split_order``.
+"""

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

@@ -159,8 +159,7 @@
         <!--[if !mso]><!-- -->
         <tr>
             <td>
-                <img class="wide" src="data:image/png;base64,
-                iVBORw0KGgoAAAANSUhEUgAAAlgAAAA8CAAAAACf95tlAAAAAXNCSVQI5gpbmQAAAAlwSFlzAAAOxAAADsQBlSsOGwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAG/SURBVHja7dvRboMwDIXhvf/DLiQQAwkku9+qDgq2hPyfN6j1qTlx06/uMunbLMnnhL98fuzRDtYILEeZ7GBNwAIWsIB1LdkOVgaWo4gdLAGWo6x2sFZgOUq1g1WB5SjNDlYDlqcEK1dDB5anmK3eE7C4FnIpBNbVFLo7sB7d3huwKFlULGA9pWQJsJxls4G1ActbooWr2IHlLbMFrBlY7rJbwNqBxb2QZ8nAuiUGO9ICLOo71R1YN0X9td8KLJ8ZeDEDrAd+Za3A4mLIz4TAujGqv+tUYPmN4v8LcweW3zS1t++hActzCrtRYD3pMJQOLOeJ7NyBpZFdoWaFDVjuJ6BRswpTBZbCAn5hpsDq/fbHpDMTBZbC1TAzT2ApyMIVsDROQ2GWwFJo8PR2YP3eOtywzwrsGYD1J9vlHXzcmSKw7q/wU2OEwHpdtALHILA00jJfV8DSaVofvYOPlckB658sp/8VNrBkANahqnXqfhhXJgasgymHD8REZwfWmezzga+tQdhcAet0qry1FYV3osD6dP1QJL3YbYUkhfUCsK6einWRPI0pxjROWZbK+QcsAiwCLEKARYBFgEXIu/wAYbjtwujw8KwAAAAASUVORK5CYII="
+                <img class="wide" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAlgAAAA8CAAAAACf95tlAAAAAXNCSVQI5gpbmQAAAAlwSFlzAAAOxAAADsQBlSsOGwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAG/SURBVHja7dvRboMwDIXhvf/DLiQQAwkku9+qDgq2hPyfN6j1qTlx06/uMunbLMnnhL98fuzRDtYILEeZ7GBNwAIWsIB1LdkOVgaWo4gdLAGWo6x2sFZgOUq1g1WB5SjNDlYDlqcEK1dDB5anmK3eE7C4FnIpBNbVFLo7sB7d3huwKFlULGA9pWQJsJxls4G1ActbooWr2IHlLbMFrBlY7rJbwNqBxb2QZ8nAuiUGO9ICLOo71R1YN0X9td8KLJ8ZeDEDrAd+Za3A4mLIz4TAujGqv+tUYPmN4v8LcweW3zS1t++hActzCrtRYD3pMJQOLOeJ7NyBpZFdoWaFDVjuJ6BRswpTBZbCAn5hpsDq/fbHpDMTBZbC1TAzT2ApyMIVsDROQ2GWwFJo8PR2YP3eOtywzwrsGYD1J9vlHXzcmSKw7q/wU2OEwHpdtALHILA00jJfV8DSaVofvYOPlckB658sp/8VNrBkANahqnXqfhhXJgasgymHD8REZwfWmezzga+tQdhcAet0qry1FYV3osD6dP1QJL3YbYUkhfUCsK6einWRPI0pxjROWZbK+QcsAiwCLEKARYBFgEXIu/wAYbjtwujw8KwAAAAASUVORK5CYII="
                 style="max-height: 60px;">
             </td>
         </tr>

src/pretix/base/templatetags/escapejson.py

@@ -1,3 +1,5 @@
+import json
+
 from django import template
 from django.template.defaultfilters import stringfilter
 
@@ -11,3 +13,9 @@ register = template.Library()
 def escapejs_filter(value):
     """Hex encodes characters for use in a application/json type script."""
     return escapejson(value)
+
+
+@register.filter("escapejson_dumps")
+def escapejs_dumps_filter(value):
+    """Hex encodes characters for use in a application/json type script."""
+    return escapejson(json.dumps(value))

src/pretix/control/forms/event.py

@@ -24,7 +24,7 @@ from pretix.base.forms import I18nModelForm, PlaceholderValidator, SettingsForm
 from pretix.base.models import Event, Organizer, TaxRule
 from pretix.base.models.event import EventMetaValue, SubEvent
 from pretix.base.reldate import RelativeDateField, RelativeDateTimeField
-from pretix.base.settings import PERSON_NAME_SCHEMES
+from pretix.base.settings import PERSON_NAME_SCHEMES, PERSON_NAME_TITLE_GROUPS
 from pretix.control.forms import (
     ExtFileField, FontSelect, MultipleLanguagesWidget, SingleLanguageWidget,
     SlugWidget, SplitDateTimeField, SplitDateTimePickerWidget,
@@ -325,7 +325,7 @@ class EventSettingsForm(SettingsForm):
     )
     timezone = forms.ChoiceField(
         choices=((a, a) for a in common_timezones),
-        label=_("Default timezone"),
+        label=_("Event timezone"),
     )
     locales = forms.MultipleChoiceField(
         choices=settings.LANGUAGES,
@@ -383,6 +383,12 @@ class EventSettingsForm(SettingsForm):
                     "orders might lead to unexpected behaviour when sorting or changing names."),
         required=True,
     )
+    name_scheme_titles = forms.ChoiceField(
+        label=_("Allowed titles"),
+        help_text=_("If the naming scheme you defined above allows users to input a title, you can use this to "
+                    "restrict the set of selectable titles."),
+        required=False,
+    )
     attendee_emails_asked = forms.BooleanField(
         label=_("Ask for email addresses per ticket"),
         help_text=_("Normally, pretix asks for one email address per order and the order confirmation will be sent "
@@ -435,6 +441,96 @@ class EventSettingsForm(SettingsForm):
         required=False,
         help_text=_("We'll show this publicly to allow attendees to contact you.")
     )
+    show_variations_expanded = forms.BooleanField(
+        label=_("Show variations of a product expanded by default"),
+        required=False
+    )
+    hide_sold_out = forms.BooleanField(
+        label=_("Hide all products that are sold out"),
+        required=False
+    )
+    meta_noindex = forms.BooleanField(
+        label=_('Ask search engines not to index the ticket shop'),
+        required=False
+    )
+    redirect_to_checkout_directly = forms.BooleanField(
+        label=_('Directly redirect to check-out after a product has been added to the cart.'),
+        required=False
+    )
+    frontpage_subevent_ordering = forms.ChoiceField(
+        label=pgettext('subevent', 'Date ordering'),
+        choices=[
+            ('date_ascending', _('Event start time')),
+            ('date_descending', _('Event start time (descending)')),
+            ('name_ascending', _('Name')),
+            ('name_descending', _('Name (descending)')),
+        ],  # When adding a new ordering, remember to also define it in the event model
+    )
+    logo_image = ExtFileField(
+        label=_('Logo image'),
+        ext_whitelist=(".png", ".jpg", ".gif", ".jpeg"),
+        required=False,
+        help_text=_('If you provide a logo image, we will by default not show your events name and date '
+                    'in the page header. We will show your logo with a maximal height of 120 pixels.')
+    )
+    frontpage_text = I18nFormField(
+        label=_("Frontpage text"),
+        required=False,
+        widget=I18nTextarea
+    )
+    presale_has_ended_text = I18nFormField(
+        label=_("End of presale text"),
+        required=False,
+        widget=I18nTextarea,
+        widget_kwargs={'attrs': {'rows': '2'}},
+        help_text=_("This text will be shown above the ticket shop once the designated sales timeframe for this event "
+                    "is over. You can use it to describe other options to get a ticket, such as a box office.")
+    )
+    voucher_explanation_text = I18nFormField(
+        label=_("Voucher explanation"),
+        required=False,
+        widget=I18nTextarea,
+        widget_kwargs={'attrs': {'rows': '2'}},
+        help_text=_("This text will be shown next to the input for a voucher code. You can use it e.g. to explain "
+                    "how to obtain a voucher code.")
+    )
+    primary_color = forms.CharField(
+        label=_("Primary color"),
+        required=False,
+        validators=[
+            RegexValidator(regex='^#[0-9a-fA-F]{6}$',
+                           message=_('Please enter the hexadecimal code of a color, e.g. #990000.')),
+        ],
+        widget=forms.TextInput(attrs={'class': 'colorpickerfield'})
+    )
+    theme_color_success = forms.CharField(
+        label=_("Accent color for success"),
+        help_text=_("We strongly suggest to use a shade of green."),
+        required=False,
+        validators=[
+            RegexValidator(regex='^#[0-9a-fA-F]{6}$',
+                           message=_('Please enter the hexadecimal code of a color, e.g. #990000.')),
+        ],
+        widget=forms.TextInput(attrs={'class': 'colorpickerfield'})
+    )
+    theme_color_danger = forms.CharField(
+        label=_("Accent color for errors"),
+        help_text=_("We strongly suggest to use a dark shade of red."),
+        required=False,
+        validators=[
+            RegexValidator(regex='^#[0-9a-fA-F]{6}$',
+                           message=_('Please enter the hexadecimal code of a color, e.g. #990000.')),
+        ],
+        widget=forms.TextInput(attrs={'class': 'colorpickerfield'})
+    )
+    primary_font = forms.ChoiceField(
+        label=_('Font'),
+        choices=[
+            ('Open Sans', 'Open Sans')
+        ],
+        widget=FontSelect,
+        help_text=_('Only respected by modern browsers.')
+    )
 
     def clean(self):
         data = super().clean()
@@ -453,6 +549,7 @@ class EventSettingsForm(SettingsForm):
         return data
 
     def __init__(self, *args, **kwargs):
+        event = kwargs['obj']
         super().__init__(*args, **kwargs)
         self.fields['confirm_text'].widget.attrs['rows'] = '3'
         self.fields['confirm_text'].widget.attrs['placeholder'] = _(
@@ -466,6 +563,18 @@ class EventSettingsForm(SettingsForm):
             ))
             for k, v in PERSON_NAME_SCHEMES.items()
         )
+        self.fields['name_scheme_titles'].choices = [('', _('Free text input'))] + [
+            (k, '{scheme}: {samples}'.format(
+                scheme=v[0],
+                samples=', '.join(v[1])
+            ))
+            for k, v in PERSON_NAME_TITLE_GROUPS.items()
+        ]
+        if not event.has_subevents:
+            del self.fields['frontpage_subevent_ordering']
+        self.fields['primary_font'].choices += [
+            (a, a) for a in get_fonts()
+        ]
 
 
 class CancelSettingsForm(SettingsForm):
@@ -678,6 +787,12 @@ class InvoiceSettingsForm(SettingsForm):
                     "used at most once over all of your events. This setting only affects future invoices."),
         required=False,
     )
+    invoice_numbers_prefix_cancellations = forms.CharField(
+        label=_("Invoice number prefix for cancellations"),
+        help_text=_("This will be prepended to invoice numbers of cancellations. If you leave this field empty, "
+                    "the same numbering scheme will be used that you configured for regular invoices."),
+        required=False,
+    )
     invoice_generate = forms.ChoiceField(
         label=_("Generate invoices"),
         required=False,
@@ -811,6 +926,10 @@ class InvoiceSettingsForm(SettingsForm):
             (r.identifier, r.verbose_name) for r in event.get_invoice_renderers().values()
         ]
         self.fields['invoice_numbers_prefix'].widget.attrs['placeholder'] = event.slug.upper() + '-'
+        if event.settings.invoice_numbers_prefix:
+            self.fields['invoice_numbers_prefix_cancellations'].widget.attrs['placeholder'] = event.settings.invoice_numbers_prefix
+        else:
+            self.fields['invoice_numbers_prefix_cancellations'].widget.attrs['placeholder'] = event.slug.upper() + '-'
         locale_names = dict(settings.LANGUAGES)
         self.fields['invoice_language'].choices = [('__user__', _('The user\'s language'))] + [(a, locale_names[a]) for a in event.settings.locales]
         self.fields['invoice_generate_sales_channels'].choices = (
@@ -957,7 +1076,7 @@ class MailSettingsForm(SettingsForm):
     )
     mail_days_order_expire_warning = forms.IntegerField(
         label=_("Number of days"),
-        required=False,
+        required=True,
         min_value=0,
         help_text=_("This email will be sent out this many days before the order expires. If the "
                     "value is 0, the mail will never be sent.")
@@ -1124,104 +1243,6 @@ class MailSettingsForm(SettingsForm):
             raise ValidationError(_('You can activate either SSL or STARTTLS security, but not both at the same time.'))
 
 
-class DisplaySettingsForm(SettingsForm):
-    primary_color = forms.CharField(
-        label=_("Primary color"),
-        required=False,
-        validators=[
-            RegexValidator(regex='^#[0-9a-fA-F]{6}$',
-                           message=_('Please enter the hexadecimal code of a color, e.g. #990000.')),
-        ],
-        widget=forms.TextInput(attrs={'class': 'colorpickerfield'})
-    )
-    theme_color_success = forms.CharField(
-        label=_("Accent color for success"),
-        help_text=_("We strongly suggest to use a shade of green."),
-        required=False,
-        validators=[
-            RegexValidator(regex='^#[0-9a-fA-F]{6}$',
-                           message=_('Please enter the hexadecimal code of a color, e.g. #990000.')),
-        ],
-        widget=forms.TextInput(attrs={'class': 'colorpickerfield'})
-    )
-    theme_color_danger = forms.CharField(
-        label=_("Accent color for errors"),
-        help_text=_("We strongly suggest to use a dark shade of red."),
-        required=False,
-        validators=[
-            RegexValidator(regex='^#[0-9a-fA-F]{6}$',
-                           message=_('Please enter the hexadecimal code of a color, e.g. #990000.')),
-        ],
-        widget=forms.TextInput(attrs={'class': 'colorpickerfield'})
-    )
-    logo_image = ExtFileField(
-        label=_('Logo image'),
-        ext_whitelist=(".png", ".jpg", ".gif", ".jpeg"),
-        required=False,
-        help_text=_('If you provide a logo image, we will by default not show your events name and date '
-                    'in the page header. We will show your logo with a maximal height of 120 pixels.')
-    )
-    primary_font = forms.ChoiceField(
-        label=_('Font'),
-        choices=[
-            ('Open Sans', 'Open Sans')
-        ],
-        widget=FontSelect,
-        help_text=_('Only respected by modern browsers.')
-    )
-    frontpage_text = I18nFormField(
-        label=_("Frontpage text"),
-        required=False,
-        widget=I18nTextarea
-    )
-    presale_has_ended_text = I18nFormField(
-        label=_("End of presale text"),
-        required=False,
-        widget=I18nTextarea,
-        widget_kwargs={'attrs': {'rows': '2'}},
-        help_text=_("This text will be shown above the ticket shop once the designated sales timeframe for this event "
-                    "is over. You can use it to describe other options to get a ticket, such as a box office.")
-    )
-    voucher_explanation_text = I18nFormField(
-        label=_("Voucher explanation"),
-        required=False,
-        widget=I18nTextarea,
-        widget_kwargs={'attrs': {'rows': '2'}},
-        help_text=_("This text will be shown next to the input for a voucher code. You can use it e.g. to explain "
-                    "how to obtain a voucher code.")
-    )
-    show_variations_expanded = forms.BooleanField(
-        label=_("Show variations of a product expanded by default"),
-        required=False
-    )
-    frontpage_subevent_ordering = forms.ChoiceField(
-        label=pgettext('subevent', 'Date ordering'),
-        choices=[
-            ('date_ascending', _('Event start time')),
-            ('date_descending', _('Event start time (descending)')),
-            ('name_ascending', _('Name')),
-            ('name_descending', _('Name (descending)')),
-        ],  # When adding a new ordering, remember to also define it in the event model
-    )
-    meta_noindex = forms.BooleanField(
-        label=_('Ask search engines not to index the ticket shop'),
-        required=False
-    )
-    redirect_to_checkout_directly = forms.BooleanField(
-        label=_('Directly redirect to check-out after a product has been added to the cart.'),
-        required=False
-    )
-
-    def __init__(self, *args, **kwargs):
-        event = kwargs['obj']
-        super().__init__(*args, **kwargs)
-        self.fields['primary_font'].choices += [
-            (a, a) for a in get_fonts()
-        ]
-        if not event.has_subevents:
-            del self.fields['frontpage_subevent_ordering']
-
-
 class TicketSettingsForm(SettingsForm):
     ticket_download = forms.BooleanField(
         label=_("Use feature"),

src/pretix/control/forms/filter.py

@@ -132,7 +132,7 @@ class OrderFilterForm(FilterForm):
             matching_positions = OrderPosition.objects.filter(
                 Q(order=OuterRef('pk')) & Q(
                     Q(attendee_name_cached__icontains=u) | Q(attendee_email__icontains=u)
-                    | Q(secret__istartswith=u)
+                    | Q(secret__istartswith=u) | Q(voucher__code__icontains=u)
                 )
             ).values('id')
 
@@ -177,11 +177,9 @@ class EventOrderFilterForm(OrderFilterForm):
     orders = {'code': 'code', 'email': 'email', 'total': 'total',
               'datetime': 'datetime', 'status': 'status'}
 
-    item = forms.ModelChoiceField(
+    item = forms.ChoiceField(
         label=_('Products'),
-        queryset=Item.objects.none(),
         required=False,
-        empty_label=_('All products')
     )
     subevent = forms.ModelChoiceField(
         label=pgettext_lazy('subevent', 'Date'),
@@ -241,12 +239,28 @@ class EventOrderFilterForm(OrderFilterForm):
         elif 'subevent':
             del self.fields['subevent']
 
+        choices = [('', _('All products'))]
+        for i in self.event.items.prefetch_related('variations').all():
+            variations = list(i.variations.all())
+            if variations:
+                choices.append((str(i.pk), _('{product} – Any variation').format(product=i.name)))
+                for v in variations:
+                    choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (i.name, v.value)))
+            else:
+                choices.append((str(i.pk), i.name))
+        self.fields['item'].choices = choices
+
     def filter_qs(self, qs):
         fdata = self.cleaned_data
         qs = super().filter_qs(qs)
 
-        if fdata.get('item'):
-            qs = qs.filter(all_positions__item=fdata.get('item'), all_positions__canceled=False).distinct()
+        item = fdata.get('item')
+        if item:
+            if '-' in item:
+                var = item.split('-')[1]
+                qs = qs.filter(all_positions__variation_id=var, all_positions__canceled=False).distinct()
+            else:
+                qs = qs.filter(all_positions__item_id=fdata.get('item'), all_positions__canceled=False).distinct()
 
         if fdata.get('subevent'):
             qs = qs.filter(all_positions__subevent=fdata.get('subevent'), all_positions__canceled=False).distinct()
@@ -926,3 +940,51 @@ class RefundFilterForm(FilterForm):
                                       OrderRefund.REFUND_STATE_EXTERNAL])
 
         return qs
+
+
+class OverviewFilterForm(FilterForm):
+    subevent = forms.ModelChoiceField(
+        label=pgettext_lazy('subevent', 'Date'),
+        queryset=SubEvent.objects.none(),
+        required=False,
+        empty_label=pgettext_lazy('subevent', 'All dates')
+    )
+    date_axis = forms.ChoiceField(
+        label=_('Date filter'),
+        choices=(
+            ('', _('Filter by…')),
+            ('order_date', _('Order date')),
+            ('last_payment_date', _('Date of last successful payment')),
+        ),
+        required=False,
+    )
+    date_from = forms.DateField(
+        label=_('Date from'),
+        required=False,
+        widget=DatePickerWidget,
+    )
+    date_until = forms.DateField(
+        label=_('Date until'),
+        required=False,
+        widget=DatePickerWidget,
+    )
+
+    def __init__(self, *args, **kwargs):
+        self.event = kwargs.pop('event')
+        super().__init__(*args, **kwargs)
+
+        if self.event.has_subevents:
+            self.fields['subevent'].queryset = self.event.subevents.all()
+            self.fields['subevent'].widget = Select2(
+                attrs={
+                    'data-model-select2': 'event',
+                    'data-select2-url': reverse('control:event.subevents.select2', kwargs={
+                        'event': self.event.slug,
+                        'organizer': self.event.organizer.slug,
+                    }),
+                    'data-placeholder': pgettext_lazy('subevent', 'All dates')
+                }
+            )
+            self.fields['subevent'].widget.choices = self.fields['subevent'].choices
+        elif 'subevent':
+            del self.fields['subevent']

src/pretix/control/forms/item.py

@@ -55,8 +55,13 @@ class QuestionForm(I18nModelForm):
                 pk=self.instance.pk
             )
         self.fields['identifier'].required = False
+        self.fields['dependency_values'].required = False
         self.fields['help_text'].widget.attrs['rows'] = 3
 
+    def clean_dependency_values(self):
+        val = self.data.getlist('dependency_values')
+        return val
+
     def clean_dependency_question(self):
         dep = val = self.cleaned_data.get('dependency_question')
         if dep:
@@ -70,8 +75,8 @@ class QuestionForm(I18nModelForm):
 
     def clean(self):
         d = super().clean()
-        if d.get('dependency_question') and not d.get('dependency_value'):
-            raise ValidationError({'dependency_value': [_('This field is required')]})
+        if d.get('dependency_question') and not d.get('dependency_values'):
+            raise ValidationError({'dependency_values': [_('This field is required')]})
         if d.get('dependency_question') and d.get('ask_during_checkin'):
             raise ValidationError(_('Dependencies between questions are not supported during check-in.'))
         return d
@@ -89,13 +94,13 @@ class QuestionForm(I18nModelForm):
             'identifier',
             'items',
             'dependency_question',
-            'dependency_value'
+            'dependency_values'
         ]
         widgets = {
             'items': forms.CheckboxSelectMultiple(
                 attrs={'class': 'scrolling-multiple-choice'}
             ),
-            'dependency_value': forms.Select,
+            'dependency_values': forms.SelectMultiple,
         }
         field_classes = {
             'items': SafeModelMultipleChoiceField,
@@ -164,7 +169,8 @@ class QuotaForm(I18nModelForm):
         fields = [
             'name',
             'size',
-            'subevent'
+            'subevent',
+            'close_when_sold_out'
         ]
         field_classes = {
             'subevent': SafeModelChoiceField,
@@ -352,10 +358,19 @@ class ItemCreateForm(I18nModelForm):
             'admission',
             'default_price',
             'tax_rule',
-            'allow_cancel'
         ]
 
 
+class ShowQuotaNullBooleanSelect(forms.NullBooleanSelect):
+    def __init__(self, attrs=None):
+        choices = (
+            ('1', _('(Event default)')),
+            ('2', _('Yes')),
+            ('3', _('No')),
+        )
+        super(forms.NullBooleanSelect, self).__init__(attrs, choices)
+
+
 class TicketNullBooleanSelect(forms.NullBooleanSelect):
     def __init__(self, attrs=None):
         choices = (
@@ -387,6 +402,19 @@ class ItemUpdateForm(I18nModelForm):
             widget=forms.CheckboxSelectMultiple
         )
         change_decimal_field(self.fields['default_price'], self.event.currency)
+        self.fields['hidden_if_available'].queryset = self.event.quotas.all()
+        self.fields['hidden_if_available'].widget = Select2(
+            attrs={
+                'data-model-select2': 'generic',
+                'data-select2-url': reverse('control:event.items.quotas.select2', kwargs={
+                    'event': self.event.slug,
+                    'organizer': self.event.organizer.slug,
+                }),
+                'data-placeholder': _('Quota')
+            }
+        )
+        self.fields['hidden_if_available'].widget.choices = self.fields['hidden_if_available'].choices
+        self.fields['hidden_if_available'].required = False
 
     class Meta:
         model = Item
@@ -409,25 +437,33 @@ class ItemUpdateForm(I18nModelForm):
             'require_approval',
             'hide_without_voucher',
             'allow_cancel',
+            'allow_waitinglist',
             'max_per_order',
             'min_per_order',
             'checkin_attention',
             'generate_tickets',
             'original_price',
             'require_bundling',
+            'show_quota_left',
+            'hidden_if_available',
         ]
         field_classes = {
             'available_from': SplitDateTimeField,
             'available_until': SplitDateTimeField,
+            'hidden_if_available': SafeModelChoiceField,
         }
         widgets = {
             'available_from': SplitDateTimePickerWidget(),
             'available_until': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_available_from_0'}),
-            'generate_tickets': TicketNullBooleanSelect()
+            'generate_tickets': TicketNullBooleanSelect(),
+            'show_quota_left': ShowQuotaNullBooleanSelect()
         }
 
 
 class ItemVariationsFormSet(I18nFormSet):
+    template = "pretixcontrol/item/include_variations.html"
+    title = _('Variations')
+
     def clean(self):
         super().clean()
         for f in self.forms:
@@ -484,6 +520,9 @@ class ItemVariationForm(I18nModelForm):
 
 
 class ItemAddOnsFormSet(I18nFormSet):
+    title = _('Add-ons')
+    template = "pretixcontrol/item/include_addons.html"
+
     def __init__(self, *args, **kwargs):
         self.event = kwargs.get('event')
         super().__init__(*args, **kwargs)
@@ -549,6 +588,9 @@ class ItemAddOnForm(I18nModelForm):
 
 
 class ItemBundleFormSet(I18nFormSet):
+    template = "pretixcontrol/item/include_bundles.html"
+    title = _('Bundled products')
+
     def __init__(self, *args, **kwargs):
         self.event = kwargs.get('event')
         self.item = kwargs.pop('item')

src/pretix/control/forms/orders.py

@@ -10,7 +10,9 @@ from django.utils.translation import pgettext_lazy, ugettext_lazy as _
 
 from pretix.base.forms import I18nModelForm, PlaceholderValidator
 from pretix.base.forms.widgets import DatePickerWidget
-from pretix.base.models import InvoiceAddress, ItemAddOn, Order, OrderPosition
+from pretix.base.models import (
+    InvoiceAddress, ItemAddOn, Order, OrderPosition, Seat,
+)
 from pretix.base.models.event import SubEvent
 from pretix.base.services.pricing import get_price
 from pretix.control.forms.widgets import Select2
@@ -196,6 +198,12 @@ class OrderPositionAddForm(forms.Form):
         required=False,
         label=_('Add-on to'),
     )
+    seat = forms.ModelChoiceField(
+        Seat.objects.none(),
+        required=False,
+        label=_('Seat'),
+        empty_label=_('General admission')
+    )
     price = forms.DecimalField(
         required=False,
         max_digits=10, decimal_places=2,
@@ -241,6 +249,19 @@ class OrderPositionAddForm(forms.Form):
         else:
             del self.fields['addon_to']
 
+        self.fields['seat'].queryset = order.event.seats.all()
+        self.fields['seat'].widget = Select2(
+            attrs={
+                'data-model-select2': 'seat',
+                'data-select2-url': reverse('control:event.seats.select2', kwargs={
+                    'event': order.event.slug,
+                    'organizer': order.event.organizer.slug,
+                }),
+                'data-placeholder': _('General admission')
+            }
+        )
+        self.fields['seat'].widget.choices = self.fields['seat'].choices
+
         if order.event.has_subevents:
             self.fields['subevent'].queryset = order.event.subevents.all()
             self.fields['subevent'].widget = Select2(
@@ -269,6 +290,11 @@ class OrderPositionChangeForm(forms.Form):
         required=False,
         empty_label=_('(Unchanged)')
     )
+    seat = forms.ModelChoiceField(
+        Seat.objects.none(),
+        required=False,
+        empty_label=_('(Unchanged)')
+    )
     price = forms.DecimalField(
         required=False,
         max_digits=10, decimal_places=2,
@@ -312,6 +338,22 @@ class OrderPositionChangeForm(forms.Form):
         else:
             del self.fields['subevent']
 
+        if instance.seat:
+            self.fields['seat'].queryset = instance.order.event.seats.all()
+            self.fields['seat'].widget = Select2(
+                attrs={
+                    'data-model-select2': 'seat',
+                    'data-select2-url': reverse('control:event.seats.select2', kwargs={
+                        'event': instance.order.event.slug,
+                        'organizer': instance.order.event.organizer.slug,
+                    }),
+                    'data-placeholder': _('(Unchanged)')
+                }
+            )
+            self.fields['seat'].widget.choices = self.fields['seat'].choices
+        else:
+            del self.fields['seat']
+
         choices = [
             ('', _('(Unchanged)'))
         ]

src/pretix/control/forms/organizer.py

@@ -173,6 +173,13 @@ class DeviceForm(forms.ModelForm):
         super().__init__(*args, **kwargs)
         self.fields['limit_events'].queryset = organizer.events.all()
 
+    def clean(self):
+        d = super().clean()
+        if not d['all_events'] and not d['limit_events']:
+            raise ValidationError(_('Your device will not have access to anything, please select some events.'))
+
+        return d
+
     class Meta:
         model = Device
         fields = ['name', 'all_events', 'limit_events']
@@ -194,9 +201,6 @@ class OrganizerSettingsForm(SettingsForm):
         widget=I18nTextarea,
         help_text=_('Not displayed anywhere by default, but if you want to, you can use this e.g. in ticket templates.')
     )
-
-
-class OrganizerDisplaySettingsForm(SettingsForm):
     primary_color = forms.CharField(
         label=_("Primary color"),
         required=False,

src/pretix/control/forms/subevents.py

@@ -36,7 +36,7 @@ class SubEventForm(I18nModelForm):
             'presale_start',
             'presale_end',
             'location',
-            'frontpage_text'
+            'frontpage_text',
         ]
         field_classes = {
             'date_from': SplitDateTimeField,

src/pretix/control/forms/vouchers.py

@@ -32,7 +32,7 @@ class VoucherForm(I18nModelForm):
         localized_fields = '__all__'
         fields = [
             'code', 'valid_until', 'block_quota', 'allow_ignore_quota', 'value', 'tag',
-            'comment', 'max_usages', 'price_mode', 'subevent'
+            'comment', 'max_usages', 'price_mode', 'subevent', 'show_hidden_items'
         ]
         field_classes = {
             'valid_until': SplitDateTimeField,
@@ -148,14 +148,16 @@ class VoucherForm(I18nModelForm):
             data, self.instance.event,
             self.instance.quota, self.instance.item, self.instance.variation
         )
-        if self.instance.quota:
-            if all(i.hide_without_voucher for i in self.instance.quota.items.all()):
-                raise ValidationError({
-                    'itemvar': [
-                        _('The quota you selected only contains hidden products. Hidden products can currently only be '
-                          'shown by using vouchers that directly apply to the product, not via a quota.')
-                    ]
-                })
+        if not self.instance.show_hidden_items and (
+            (self.instance.quota and all(i.hide_without_voucher for i in self.instance.quota.items.all()))
+            or (self.instance.item and self.instance.item.hide_without_voucher)
+        ):
+            raise ValidationError({
+                'show_hidden_items': [
+                    _('The voucher only matches hidden products but you have not selected that it should show '
+                      'them.')
+                ]
+            })
         Voucher.clean_subevent(
             data, self.instance.event
         )
@@ -197,7 +199,7 @@ class VoucherBulkForm(VoucherForm):
         localized_fields = '__all__'
         fields = [
             'valid_until', 'block_quota', 'allow_ignore_quota', 'value', 'tag', 'comment',
-            'max_usages', 'price_mode', 'subevent'
+            'max_usages', 'price_mode', 'subevent', 'show_hidden_items'
         ]
         field_classes = {
             'valid_until': SplitDateTimeField,

src/pretix/control/logdisplay.py

@@ -42,6 +42,12 @@ 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.seat':
+        return text + ' ' + _('Position #{posid}: Seat "{old_seat}" changed '
+                              'to "{new_seat}".').format(
+            posid=data.get('positionid', '?'),
+            old_seat=data.get('old_seat'), new_seat=data.get('new_seat'),
+        )
     elif logentry.action_type == 'pretix.event.order.changed.subevent':
         old_se = str(event.subevents.get(pk=data['old_subevent']))
         new_se = str(event.subevents.get(pk=data['new_subevent']))
@@ -257,6 +263,8 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
         'pretix.event.quota.added': _('The quota has been added.'),
         'pretix.event.quota.deleted': _('The quota has been deleted.'),
         'pretix.event.quota.changed': _('The quota has been changed.'),
+        'pretix.event.quota.closed': _('The quota has closed.'),
+        'pretix.event.quota.opened': _('The quota has been re-opened.'),
         'pretix.event.category.added': _('The category has been added.'),
         'pretix.event.category.deleted': _('The category has been deleted.'),
         'pretix.event.category.changed': _('The category has been changed.'),

src/pretix/control/middleware.py

@@ -35,6 +35,19 @@ class PermissionMiddleware:
         "user.settings.notifications.off",
     )
 
+    EXCEPTIONS_2FA = (
+        "user.settings.2fa",
+        "user.settings.2fa.add",
+        "user.settings.2fa.enable",
+        "user.settings.2fa.disable",
+        "user.settings.2fa.regenemergency",
+        "user.settings.2fa.confirm.totp",
+        "user.settings.2fa.confirm.u2f",
+        "user.settings.2fa.delete",
+        "auth.logout",
+        "user.reauth"
+    )
+
     def __init__(self, get_response=None):
         self.get_response = get_response
         super().__init__()
@@ -83,6 +96,10 @@ class PermissionMiddleware:
             if url_name not in ('user.reauth', 'auth.logout'):
                 return redirect(reverse('control:user.reauth') + '?next=' + quote(request.get_full_path()))
 
+        if not request.user.require_2fa and settings.PRETIX_OBLIGATORY_2FA \
+                and url_name not in self.EXCEPTIONS_2FA:
+            return redirect(reverse('control:user.settings.2fa'))
+
         if 'event' in url.kwargs and 'organizer' in url.kwargs:
             with scope(organizer=None):
                 request.event = Event.objects.filter(

src/pretix/control/navigation.py

@@ -48,14 +48,6 @@ def get_event_navigation(request: HttpRequest):
                 }),
                 'active': url.url_name == 'event.settings.plugins',
             },
-            {
-                'label': _('Display'),
-                'url': reverse('control:event.settings.display', kwargs={
-                    'event': request.event.slug,
-                    'organizer': request.event.organizer.slug,
-                }),
-                'active': url.url_name == 'event.settings.display',
-            },
             {
                 'label': _('Tickets'),
                 'url': reverse('control:event.settings.tickets', kwargs={
@@ -78,7 +70,7 @@ def get_event_navigation(request: HttpRequest):
                     'event': request.event.slug,
                     'organizer': request.event.organizer.slug,
                 }),
-                'active': url.url_name == 'event.settings.tax',
+                'active': url.url_name.startswith('event.settings.tax'),
             },
             {
                 'label': _('Invoicing'),
@@ -425,13 +417,6 @@ def get_organizer_navigation(request):
                     }),
                     'active': url.url_name == 'organizer.edit',
                 },
-                {
-                    'label': _('Display'),
-                    'url': reverse('control:organizer.display', kwargs={
-                        'organizer': request.organizer.slug
-                    }),
-                    'active': url.url_name == 'organizer.display',
-                },
             ]
         })
     if 'can_change_teams' in request.orgapermset:

src/pretix/control/signals.py

@@ -237,24 +237,6 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 A second keyword argument ``request`` will contain the request object.
 """
 
-nav_item = EventPluginSignal(
-    providing_args=['request', 'item']
-)
-"""
-This signal is sent out to include tab links on the settings page of an item.
-Receivers are expected to return a list of dictionaries. The dictionaries
-should contain at least the keys ``label`` and ``url``. You should also return
-an ``active`` key with a boolean set to ``True``, when this item should be marked
-as active.
-
-If your linked view should stay in the tab-like context of this page, we recommend
-that you use ``pretix.control.views.item.ItemDetailMixin`` for your view
-and your template inherits from ``pretixcontrol/item/base.html``.
-
-As with all plugin signals, the ``sender`` keyword argument will contain the event.
-A second keyword argument ``request`` will contain the request object.
-"""
-
 event_settings_widget = EventPluginSignal(
     providing_args=['request']
 )
@@ -279,6 +261,40 @@ styles. It is advisable to set a prefix for your form to avoid clashes with othe
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
+item_formsets = EventPluginSignal(
+    providing_args=['request', 'item']
+)
+"""
+This signal allows you to return additional formsets that should be rendered on the product
+modification page. You are passed ``request`` and ``item`` arguments and are expected to return
+an instance of a formset class that you bind yourself when appropriate. Your formset will be
+executed as part of the standard validation and rendering cycle and rendered using default
+bootstrap styles. It is advisable to set a prefix for your formset to avoid clashes with other
+plugins.
+
+Your formset needs to have two special properties: ``template`` with a template that will be
+included to render the formset and ``title`` that will be used as a headline. Your template
+will be passed a ``formset`` variable with your formset.
+
+As with all plugin signals, the ``sender`` keyword argument will contain the event.
+"""
+
+subevent_forms = EventPluginSignal(
+    providing_args=['request', 'subevent']
+)
+"""
+This signal allows you to return additional forms that should be rendered on the subevent creation
+or modification page. You are passed ``request`` and ``subevent`` arguments and are expected to return
+an instance of a form class that you bind yourself when appropriate. Your form will be executed
+as part of the standard validation and rendering cycle and rendered using default bootstrap
+styles. It is advisable to set a prefix for your form to avoid clashes with other plugins.
+
+``subevent`` can be ``None`` during creation. Before ``save()`` is called, a ``subevent`` property of
+your form instance will automatically being set to the subevent that has just been created.
+
+As with all plugin signals, the ``sender`` keyword argument will contain the event.
+"""
+
 oauth_application_registered = Signal(
     providing_args=["user", "application"]
 )

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

@@ -47,6 +47,7 @@
             <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/tabs.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 "colorpicker/bootstrap-colorpicker.js" %}"></script>
@@ -145,7 +146,11 @@
                             <a href="{{ nav.url }}" title="{{ nav.title }}" {% if nav.active %}class="active"{% endif %}
                                     {% if nav.children %}class="dropdown-toggle" data-toggle="dropdown"{% endif %}>
                                 {% if nav.icon %}
-                                    <span class="fa fa-{{ nav.icon }}"></span>
+                                    {% if "<svg" in nav.icon %}
+                                        {{ nav.icon|safe }}
+                                    {% else %}
+                                        <span class="fa fa-{{ nav.icon }}"></span>
+                                    {% endif %}
                                     <span class="visible-xs-inline">{{ nav.label }}</span>
                                 {% else %}
                                     {{ nav.label }}
@@ -270,7 +275,11 @@
                                         <a href="{{ nav.url }}" {% if nav.active %}class="active"{% endif %}
                                                 {% if nav.children %}class="has-children"{% endif %}>
                                             {% if nav.icon %}
-                                                <i class="fa fa-{{ nav.icon }} fa-fw"></i>
+                                                {% if "<svg" in nav.icon %}
+                                                    {{ nav.icon|safe }}
+                                                {% else %}
+                                                    <span class="fa fa-fw fa-{{ nav.icon }}"></span>
+                                                {% endif %}
                                             {% endif %}
                                             {{ nav.label }}
                                         </a>

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

@@ -6,31 +6,33 @@
     <form action="" method="post" class="form-horizontal" enctype="multipart/form-data">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
-        <fieldset>
-            <legend>{% trans "Cancellation of unpaid or free orders" %}</legend>
-            {% bootstrap_field form.cancel_allow_user layout="control" %}
-            {% bootstrap_field form.cancel_allow_user_until layout="control" %}
-        </fieldset>
-        <fieldset>
-            <legend>{% trans "Cancellation of paid orders" %}</legend>
-            {% bootstrap_field form.cancel_allow_user_paid layout="control" %}
-            {% bootstrap_field form.cancel_allow_user_paid_keep layout="control" %}
-            {% bootstrap_field form.cancel_allow_user_paid_keep_percentage layout="control" %}
-            {% bootstrap_field form.cancel_allow_user_paid_keep_fees layout="control" %}
-            {% bootstrap_field form.cancel_allow_user_paid_until layout="control" %}
-            {% if not gets_notification %}
-                <div class="alert alert-warning">
-                    {% blocktrans trimmed %}
-                        If a user requests cancels a paid order and the money can not be refunded automatically, e.g.
-                        due to the selected payment method, you will need to take manual action. However, you have
-                        currently turned off notifications for this event.
-                    {% endblocktrans %}
-                    <a href="{% url "control:user.settings.notifications" %}" class="btn btn-default">
-                        {% trans "Change notification settings" %}
-                    </a>
-                </div>
-            {% endif %}
-        </fieldset>
+        <div class="tabbed-form">
+            <fieldset>
+                <legend>{% trans "Unpaid or free orders" %}</legend>
+                {% bootstrap_field form.cancel_allow_user layout="control" %}
+                {% bootstrap_field form.cancel_allow_user_until layout="control" %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Paid orders" %}</legend>
+                {% bootstrap_field form.cancel_allow_user_paid layout="control" %}
+                {% bootstrap_field form.cancel_allow_user_paid_keep layout="control" %}
+                {% bootstrap_field form.cancel_allow_user_paid_keep_percentage layout="control" %}
+                {% bootstrap_field form.cancel_allow_user_paid_keep_fees layout="control" %}
+                {% bootstrap_field form.cancel_allow_user_paid_until layout="control" %}
+                {% if not gets_notification %}
+                    <div class="alert alert-warning">
+                        {% blocktrans trimmed %}
+                            If a user requests cancels a paid order and the money can not be refunded automatically, e.g.
+                            due to the selected payment method, you will need to take manual action. However, you have
+                            currently turned off notifications for this event.
+                        {% endblocktrans %}
+                        <a href="{% url "control:user.settings.notifications" %}" class="btn btn-default">
+                            {% trans "Change notification settings" %}
+                        </a>
+                    </div>
+                {% endif %}
+            </fieldset>
+        </div>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}

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

@@ -1,43 +0,0 @@
-{% extends "pretixcontrol/event/settings_base.html" %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% load hierarkey_form %}
-{% block custom_header %}
-    {{ block.super }}
-    <link type="text/css" rel="stylesheet" href="{% url "control:pdf.css" %}">
-{% endblock %}
-{% block inside %}
-    <h1>{% trans "Display settings" %}</h1>
-    <form action="" method="post" class="form-horizontal" enctype="multipart/form-data">
-        {% csrf_token %}
-        {% bootstrap_form_errors form %}
-        <fieldset>
-            <legend>{% trans "Event page" %}</legend>
-            {% bootstrap_field form.logo_image layout="control" %}
-            {% bootstrap_field form.frontpage_text layout="control" %}
-            {% bootstrap_field form.presale_has_ended_text layout="control" %}
-            {% bootstrap_field form.voucher_explanation_text layout="control" %}
-            {% bootstrap_field form.show_variations_expanded layout="control" %}
-            {% bootstrap_field form.meta_noindex layout="control" %}
-            {% if form.frontpage_subevent_ordering %}
-                {% bootstrap_field form.frontpage_subevent_ordering layout="control" %}
-            {% endif %}
-            {% bootstrap_field form.redirect_to_checkout_directly layout="control" %}
-        </fieldset>
-        <fieldset>
-            <legend>{% trans "Shop design" %}</legend>
-            {% url "control:organizer.display" organizer=request.organizer.slug as org_url %}
-            {% propagated request.event org_url "primary_color" "primary_font" "theme_color_success" "theme_color_danger" %}
-                {% bootstrap_field form.primary_color layout="control" %}
-                {% bootstrap_field form.theme_color_success layout="control" %}
-                {% bootstrap_field form.theme_color_danger layout="control" %}
-                {% bootstrap_field form.primary_font layout="control" %}
-            {% endpropagated %}
-        </fieldset>
-        <div class="form-group submit-group">
-            <button type="submit" class="btn btn-primary btn-save">
-                {% trans "Save" %}
-            </button>
-        </div>
-    </form>
-{% endblock %}

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

@@ -4,48 +4,51 @@
 {% block inside %}
     <h1>{% trans "Invoice settings" %}</h1>
     <form action="" method="post" class="form-horizontal" enctype="multipart/form-data">
-        {% csrf_token %}
-        {% bootstrap_form_errors form %}
-        <fieldset>
-            <legend>{% trans "General settings" %}</legend>
-            {% bootstrap_field form.invoice_generate layout="control" %}
-            {% bootstrap_field form.invoice_generate_sales_channels layout="control" %}
-            {% bootstrap_field form.invoice_email_attachment layout="control" %}
-            {% bootstrap_field form.invoice_numbers_prefix layout="control" %}
-            {% bootstrap_field form.invoice_numbers_consecutive layout="control" %}
-            {% bootstrap_field form.invoice_language layout="control" %}
-            {% bootstrap_field form.invoice_include_free layout="control" %}
-            {% bootstrap_field form.invoice_attendee_name layout="control" %}
-        </fieldset>
-        <fieldset>
-            <legend>{% trans "Invoice address form" %}</legend>
-            {% bootstrap_field form.invoice_address_asked layout="control" %}
-            {% bootstrap_field form.invoice_address_required layout="control" %}
-            {% bootstrap_field form.invoice_name_required layout="control" %}
-            {% bootstrap_field form.invoice_address_company_required layout="control" %}
-            {% bootstrap_field form.invoice_address_vatid layout="control" %}
-            {% bootstrap_field form.invoice_address_beneficiary layout="control" %}
-            {% bootstrap_field form.invoice_address_not_asked_free layout="control" %}
-        </fieldset>
-        <fieldset>
-            <legend>{% trans "Your invoice details" %}</legend>
-            {% bootstrap_field form.invoice_address_from_name layout="control" %}
-            {% bootstrap_field form.invoice_address_from layout="control" %}
-            {% bootstrap_field form.invoice_address_from_zipcode layout="control" %}
-            {% bootstrap_field form.invoice_address_from_city layout="control" %}
-            {% bootstrap_field form.invoice_address_from_country layout="control" %}
-            {% bootstrap_field form.invoice_address_from_tax_id layout="control" %}
-            {% bootstrap_field form.invoice_address_from_vat_id layout="control" %}
-        </fieldset>
-        <fieldset>
-            <legend>{% trans "Invoice customization" %}</legend>
-            {% bootstrap_field form.invoice_renderer layout="control" %}
-            {% bootstrap_field form.invoice_introductory_text layout="control" %}
-            {% bootstrap_field form.invoice_additional_text layout="control" %}
-            {% bootstrap_field form.invoice_footer_text layout="control" %}
-            {% bootstrap_field form.invoice_logo_image layout="control" %}
-            {% bootstrap_field form.invoice_address_explanation_text layout="control" %}
-        </fieldset>
+        <div class="tabbed-form">
+            {% csrf_token %}
+            {% bootstrap_form_errors form %}
+            <fieldset>
+                <legend>{% trans "Invoice generation" %}</legend>
+                {% bootstrap_field form.invoice_generate layout="control" %}
+                {% bootstrap_field form.invoice_generate_sales_channels layout="control" %}
+                {% bootstrap_field form.invoice_email_attachment layout="control" %}
+                {% bootstrap_field form.invoice_language layout="control" %}
+                {% bootstrap_field form.invoice_include_free layout="control" %}
+                {% bootstrap_field form.invoice_numbers_consecutive layout="control" %}
+                {% bootstrap_field form.invoice_numbers_prefix layout="control" %}
+                {% bootstrap_field form.invoice_numbers_prefix_cancellations layout="control" %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Address form" %}</legend>
+                {% bootstrap_field form.invoice_address_asked layout="control" %}
+                {% bootstrap_field form.invoice_address_required layout="control" %}
+                {% bootstrap_field form.invoice_name_required layout="control" %}
+                {% bootstrap_field form.invoice_address_company_required layout="control" %}
+                {% bootstrap_field form.invoice_address_vatid layout="control" %}
+                {% bootstrap_field form.invoice_address_beneficiary layout="control" %}
+                {% bootstrap_field form.invoice_address_not_asked_free layout="control" %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Issuer details" %}</legend>
+                {% bootstrap_field form.invoice_address_from_name layout="control" %}
+                {% bootstrap_field form.invoice_address_from layout="control" %}
+                {% bootstrap_field form.invoice_address_from_zipcode layout="control" %}
+                {% bootstrap_field form.invoice_address_from_city layout="control" %}
+                {% bootstrap_field form.invoice_address_from_country layout="control" %}
+                {% bootstrap_field form.invoice_address_from_tax_id layout="control" %}
+                {% bootstrap_field form.invoice_address_from_vat_id layout="control" %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Invoice customization" %}</legend>
+                {% bootstrap_field form.invoice_renderer layout="control" %}
+                {% bootstrap_field form.invoice_attendee_name layout="control" %}
+                {% bootstrap_field form.invoice_introductory_text layout="control" %}
+                {% bootstrap_field form.invoice_additional_text layout="control" %}
+                {% bootstrap_field form.invoice_footer_text layout="control" %}
+                {% bootstrap_field form.invoice_logo_image layout="control" %}
+                {% bootstrap_field form.invoice_address_explanation_text layout="control" %}
+            </fieldset>
+        </div>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-default btn-lg" name="preview" value="preview" formtarget="_blank">
                 {% trans "Save and show preview" %}

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

@@ -5,85 +5,87 @@
 {% block inside %}
     <h1>{% trans "E-mail settings" %}</h1>
     <form action="" method="post" class="form-horizontal" enctype="multipart/form-data"
-          mail-preview-url="{% url "control:event.settings.mail.preview" event=request.event.slug organizer=request.event.organizer.slug %}">
+            mail-preview-url="{% url "control:event.settings.mail.preview" event=request.event.slug organizer=request.event.organizer.slug %}">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
-        <fieldset>
-            <legend>{% trans "General settings" %}</legend>
-            {% bootstrap_field form.mail_prefix layout="control" %}
-            {% bootstrap_field form.mail_from layout="control" %}
-            {% bootstrap_field form.mail_from_name layout="control" %}
-            {% bootstrap_field form.mail_text_signature layout="control" %}
-            {% bootstrap_field form.mail_bcc layout="control" %}
-        </fieldset>
-        <fieldset>
-            <legend>{% trans "E-mail design" %}</legend>
-            <div class="row">
-                {% for r in renderers.values %}
-                    <div class="col-md-3">
-                        <div class="well maildesignpreview text-center">
-                            <label class="radio">
-                                <input type="radio" name="mail_html_renderer" value="{{ r.identifier }}"
-                                    {% if request.event.settings.mail_html_renderer == r.identifier %}checked{% endif %}>
-                                {{ r.verbose_name }}
-                            </label>
-                            <img src="{% static r.thumbnail_filename %}">
-                            <a class="btn btn-default btn-sm" target="_blank"
-                                href="{% url "control:event.settings.mail.preview.layout" event=request.event.slug organizer=request.event.organizer.slug %}?renderer={{ r.identifier }}">
-                                {% trans "Preview" %}
-                            </a>
+        <div class="tabbed-form">
+            <fieldset>
+                <legend>{% trans "General" %}</legend>
+                {% bootstrap_field form.mail_prefix layout="control" %}
+                {% bootstrap_field form.mail_from layout="control" %}
+                {% bootstrap_field form.mail_from_name layout="control" %}
+                {% bootstrap_field form.mail_text_signature layout="control" %}
+                {% bootstrap_field form.mail_bcc layout="control" %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "E-mail design" %}</legend>
+                <div class="row">
+                    {% for r in renderers.values %}
+                        <div class="col-md-3">
+                            <div class="well maildesignpreview text-center">
+                                <label class="radio">
+                                    <input type="radio" name="mail_html_renderer" value="{{ r.identifier }}"
+                                            {% if request.event.settings.mail_html_renderer == r.identifier %}checked{% endif %}>
+                                    {{ r.verbose_name }}
+                                </label>
+                                <img src="{% static r.thumbnail_filename %}">
+                                <a class="btn btn-default btn-sm" target="_blank"
+                                        href="{% url "control:event.settings.mail.preview.layout" event=request.event.slug organizer=request.event.organizer.slug %}?renderer={{ r.identifier }}">
+                                    {% trans "Preview" %}
+                                </a>
+                            </div>
                         </div>
-                    </div>
-                {% endfor %}
-            </div>
-        </fieldset>
-        <fieldset>
-            <legend>{% trans "E-mail content" %}</legend>
-            <div class="panel-group" id="questions_group">
-                {% blocktrans asvar title_placed_order %}Placed order{% endblocktrans %}
-                {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_placed" title=title_placed_order items="mail_text_order_placed,mail_send_order_placed_attendee,mail_text_order_placed_attendee" exclude="mail_send_order_placed_attendee" %}
+                    {% endfor %}
+                </div>
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "E-mail content" %}</legend>
+                <div class="panel-group" id="questions_group">
+                    {% blocktrans asvar title_placed_order %}Placed order{% endblocktrans %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_placed" title=title_placed_order items="mail_text_order_placed,mail_send_order_placed_attendee,mail_text_order_placed_attendee" exclude="mail_send_order_placed_attendee" %}
 
-                {% blocktrans asvar title_paid_order %}Paid order{% endblocktrans %}
-                {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_paid" title=title_paid_order items="mail_text_order_paid,mail_send_order_paid_attendee,mail_text_order_paid_attendee" exclude="mail_send_order_paid_attendee" %}
+                    {% blocktrans asvar title_paid_order %}Paid order{% endblocktrans %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_paid" title=title_paid_order items="mail_text_order_paid,mail_send_order_paid_attendee,mail_text_order_paid_attendee" exclude="mail_send_order_paid_attendee" %}
 
-                {% blocktrans asvar title_free_order %}Free order{% endblocktrans %}
-                {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_free" title=title_free_order items="mail_text_order_free,mail_send_order_free_attendee,mail_text_order_free_attendee" exclude="mail_send_order_free_attendee" %}
+                    {% blocktrans asvar title_free_order %}Free order{% endblocktrans %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_free" title=title_free_order items="mail_text_order_free,mail_send_order_free_attendee,mail_text_order_free_attendee" exclude="mail_send_order_free_attendee" %}
 
-                {% blocktrans asvar title_resend_link %}Resend link{% endblocktrans %}
-                {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="resend_link" title=title_resend_link items="mail_text_resend_link,mail_text_resend_all_links" %}
+                    {% blocktrans asvar title_resend_link %}Resend link{% endblocktrans %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="resend_link" title=title_resend_link items="mail_text_resend_link,mail_text_resend_all_links" %}
 
-                {% blocktrans asvar title_order_changed %}Order changed{% endblocktrans %}
-                {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_changed" title=title_order_changed items="mail_text_order_changed" %}
+                    {% blocktrans asvar title_order_changed %}Order changed{% endblocktrans %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_changed" title=title_order_changed items="mail_text_order_changed" %}
 
-                {% blocktrans asvar title_payment_reminder %}Payment reminder{% endblocktrans %}
-                {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_expirew" title=title_payment_reminder items="mail_days_order_expire_warning,mail_text_order_expire_warning" exclude="mail_days_order_expire_warning" %}
+                    {% blocktrans asvar title_payment_reminder %}Payment reminder{% endblocktrans %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_expirew" title=title_payment_reminder items="mail_days_order_expire_warning,mail_text_order_expire_warning" exclude="mail_days_order_expire_warning" %}
 
-                {% blocktrans asvar title_waiting_list_notification %}Waiting list notification{% endblocktrans %}
-                {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="waiting_list" title=title_waiting_list_notification items="mail_text_waiting_list" %}
+                    {% blocktrans asvar title_waiting_list_notification %}Waiting list notification{% endblocktrans %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="waiting_list" title=title_waiting_list_notification items="mail_text_waiting_list" %}
 
-                {% blocktrans asvar title_order_canceled %}Order canceled{% endblocktrans %}
-                {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_canceled" title=title_order_canceled items="mail_text_order_canceled" %}
+                    {% blocktrans asvar title_order_canceled %}Order canceled{% endblocktrans %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_canceled" title=title_order_canceled items="mail_text_order_canceled" %}
 
-                {% blocktrans asvar title_order_custom_mail %}Order custom mail{% endblocktrans %}
-                {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="custom_mail" title=title_order_custom_mail items="mail_text_order_custom_mail" %}
+                    {% blocktrans asvar title_order_custom_mail %}Order custom mail{% endblocktrans %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="custom_mail" title=title_order_custom_mail items="mail_text_order_custom_mail" %}
 
-                {% blocktrans asvar title_download_tickets_reminder %}Reminder to download tickets{% endblocktrans %}
-                {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_download_tickets_reminder items="mail_days_download_reminder,mail_text_download_reminder,mail_send_download_reminder_attendee,mail_text_download_reminder_attendee" exclude="mail_days_download_reminder,mail_send_download_reminder_attendee" %}
+                    {% blocktrans asvar title_download_tickets_reminder %}Reminder to download tickets{% endblocktrans %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_download_tickets_reminder items="mail_days_download_reminder,mail_text_download_reminder,mail_send_download_reminder_attendee,mail_text_download_reminder_attendee" exclude="mail_days_download_reminder,mail_send_download_reminder_attendee" %}
 
-                {% blocktrans asvar title_require_approval %}Order approval process{% endblocktrans %}
-                {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_require_approval  items="mail_text_order_placed_require_approval,mail_text_order_approved,mail_text_order_denied" %}
-            </div>
-        </fieldset>
-        <fieldset>
-            <legend>{% trans "SMTP settings" %}</legend>
-            {% bootstrap_field form.smtp_use_custom layout="control" %}
-            {% bootstrap_field form.smtp_host layout="control" %}
-            {% bootstrap_field form.smtp_port layout="control" %}
-            {% bootstrap_field form.smtp_username layout="control" %}
-            {% bootstrap_field form.smtp_password layout="control" %}
-            {% bootstrap_field form.smtp_use_tls layout="control" %}
-            {% bootstrap_field form.smtp_use_ssl layout="control" %}
-        </fieldset>
+                    {% blocktrans asvar title_require_approval %}Order approval process{% endblocktrans %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_require_approval  items="mail_text_order_placed_require_approval,mail_text_order_approved,mail_text_order_denied" %}
+                </div>
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "SMTP settings" %}</legend>
+                {% bootstrap_field form.smtp_use_custom layout="control" %}
+                {% bootstrap_field form.smtp_host layout="control" %}
+                {% bootstrap_field form.smtp_port layout="control" %}
+                {% bootstrap_field form.smtp_username layout="control" %}
+                {% bootstrap_field form.smtp_password layout="control" %}
+                {% bootstrap_field form.smtp_use_tls layout="control" %}
+                {% bootstrap_field form.smtp_use_ssl layout="control" %}
+            </fieldset>
+        </div>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}

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

@@ -5,60 +5,67 @@
     <h1>{% trans "Payment settings" %}</h1>
     <form action="" method="post" class="form-horizontal form-plugins">
         {% csrf_token %}
-        <fieldset>
-            <legend>{% trans "Payment providers" %}</legend>
-            <table class="table table-payment-providers">
-                <tbody>
-                {% for provider in providers %}
-                    <tr>
-                        <td>
-                            <strong>{{ provider.verbose_name }}</strong>
-                        </td>
-                        <td>
-                            {% if provider.show_enabled %}
-                                <span class="text-success">
+        <div class="tabbed-form">
+            <fieldset>
+                <legend>{% trans "Payment providers" %}</legend>
+                <table class="table table-payment-providers">
+                    <tbody>
+                    {% for provider in providers %}
+                        <tr>
+                            <td>
+                                <strong>{{ provider.verbose_name }}</strong>
+                            </td>
+                            <td>
+                                {% if provider.show_enabled %}
+                                    <span class="text-success">
                                     <span class="fa fa-check"></span>
                                     {% trans "Enabled" %}
                                 </span>
-                            {% else %}
-                                <span class="text-danger">
+                                {% else %}
+                                    <span class="text-danger">
                                     <span class="fa fa-times"></span>
                                     {% trans "Disabled" %}
                                 </span>
-                            {% endif %}
-                        </td>
-                        <td class="text-right">
-                            <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>
-                                {% trans "Settings" %}
-                            </a>
-                        </td>
-                    </tr>
-                {% empty %}
-                    <tr>
-                        <td colspan="3">
-                            {% url "control:event.settings.plugins" event=request.event.slug organizer=request.organizer.slug as plugin_settings_url %}
-                            {% blocktrans trimmed with plugin_settings_href='href="'|add:plugin_settings_url|add:'"'|safe %}
-                                There are no payment providers available. Please go to the <a {{ plugin_settings_href }}>plugin settings</a> and activate one or more payment plugins.
-                            {% endblocktrans %}
-                        </td>
-                    </tr>
-                {% endfor %}
-                </tbody>
-            </table>
-        </fieldset>
-        <fieldset>
-            <legend>{% trans "General payment settings" %}</legend>
-            {% bootstrap_form_errors form layout="control" %}
-            {% bootstrap_field form.payment_term_days layout="control" %}
-            {% bootstrap_field form.payment_term_last layout="control" %}
-            {% bootstrap_field form.payment_term_weekdays layout="control" %}
-            {% bootstrap_field form.payment_term_expire_automatically layout="control" %}
-            {% bootstrap_field form.payment_term_accept_late layout="control" %}
-            {% bootstrap_field form.tax_rate_default layout="control" %}
-            {% bootstrap_field form.payment_explanation layout="control" %}
-        </fieldset>
+                                {% endif %}
+                            </td>
+                            <td class="text-right">
+                                <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>
+                                    {% trans "Settings" %}
+                                </a>
+                            </td>
+                        </tr>
+                    {% empty %}
+                        <tr>
+                            <td colspan="3">
+                                {% url "control:event.settings.plugins" event=request.event.slug organizer=request.organizer.slug as plugin_settings_url %}
+                                {% blocktrans trimmed with plugin_settings_href='href="'|add:plugin_settings_url|add:'"'|safe %}
+                                    There are no payment providers available. Please go to the
+                                    <a {{ plugin_settings_href }}>plugin settings</a> and activate one or more payment plugins.
+                                {% endblocktrans %}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Deadlines" %}</legend>
+                {% bootstrap_form_errors form layout="control" %}
+                {% bootstrap_field form.payment_term_days layout="control" %}
+                {% bootstrap_field form.payment_term_last layout="control" %}
+                {% bootstrap_field form.payment_term_weekdays layout="control" %}
+                {% bootstrap_field form.payment_term_expire_automatically layout="control" %}
+                {% bootstrap_field form.payment_term_accept_late layout="control" %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Advanced" %}</legend>
+                {% bootstrap_form_errors form layout="control" %}
+                {% bootstrap_field form.tax_rate_default layout="control" %}
+                {% bootstrap_field form.payment_explanation layout="control" %}
+            </fieldset>
+        </div>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}

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

@@ -3,77 +3,69 @@
 {% load bootstrap3 %}
 {% block inside %}
     <h1>{% trans "Installed plugins" %}</h1>
-	<form action="" method="post" class="form-horizontal form-plugins">
-		{% csrf_token %}
-		<fieldset>
-			{% if "success" in request.GET %}
-				<div class="alert alert-success">
-					{% trans "Your changes have been saved." %}
-				</div>
-			{% endif %}
-            <div class="row row-plugins">
-                {% for plugin in plugins %}
-                    <div class="col-md-6 col-sm-12">
-                        <div class="panel panel-{% if plugin.app.compatibility_errors %}warning{% elif plugin.module in plugins_active %}success{% else %}default{% endif %}">
-                            <div class="panel-heading">
-                                <div class="row">
-                                    <div class="col-sm-8">
-                                        <h3 class="panel-title">{{ plugin.name }}</h3>
-                                    </div>
-                                    <div class="col-sm-4">
-                                        {% if plugin.app.compatibility_errors %}
-                                            <button class="btn disabled btn-block btn-default" disabled="disabled">{% trans "Incompatible" %}</button>
-                                        {% elif plugin.restricted and not staff_session %}
-                                            <button class="btn disabled btn-block btn-default" disabled="disabled">{% trans "Not available" %}</button>
-                                        {% elif plugin.module in plugins_active %}
-                                            <button class="btn btn-default btn-block" name="plugin:{{ plugin.module }}" value="disable">{% trans "Disable" %}</button>
-                                        {% else %}
-                                            <button class="btn btn-default btn-block" name="plugin:{{ plugin.module }}" value="enable">{% trans "Enable" %}</button>
-                                        {% endif %}
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="panel-body">
-                                {% if plugin.author %}
-                                    <p class="meta">{% blocktrans trimmed with v=plugin.version a=plugin.author %}
-                                        Version {{ v }} by <em>{{ a }}</em>
-                                    {% endblocktrans %}</p>
-                                {% else %}
-                                    <p class="meta">{% blocktrans trimmed with v=plugin.version a=plugin.author %}
-                                        Version {{ v }}
-                                    {% endblocktrans %}</p>
-                                {% endif %}
-                                <p>{{ plugin.description }}</p>
-                                {% if plugin.restricted and not request.user.is_staff %}
-                                    <div class="alert alert-warning">
-                                        {% trans "This plugin needs to be enabled by a system administrator for your event." %}
-                                    </div>
-                                {% endif %}
-                                {% if plugin.app.compatibility_errors %}
-                                    <div class="alert alert-warning">
-                                        {% trans "This plugin cannot be enabled for the following reasons:" %}
-                                        <ul>
-                                            {% for e in plugin.app.compatibility_errors %}
-                                                <li>{{ e }}</li>
-                                            {% endfor %}
-                                        </ul>
-                                    </div>
-                                {% endif %}
-                                {% if plugin.app.compatibility_warnings %}
-                                    <div class="alert alert-warning">
-                                        {% trans "This plugin reports the following problems:" %}
-                                        <ul>
-                                            {% for e in plugin.app.compatibility_warnings %}
-                                                <li>{{ e }}</li>
-                                            {% endfor %}
-                                        </ul>
-                                    </div>
-                                {% endif %}
-                            </div>
-                        </div>
-                    </div>
-                {% endfor %}
+    <form action="" method="post" class="form-horizontal form-plugins">
+        {% csrf_token %}
+        {% if "success" in request.GET %}
+            <div class="alert alert-success">
+                {% trans "Your changes have been saved." %}
             </div>
-		</fieldset>
-	</form>
+        {% endif %}
+        <div class="table-responsive">
+            <table class="table">
+                {% for plugin in plugins %}
+                    <tr class="{% if plugin.app.compatibility_errors %}warning{% elif plugin.module in plugins_active %}success{% else %}default{% endif %}">
+                        <td>
+                            <strong>{{ plugin.name }}</strong>
+                            {% if plugin.author %}
+                                <p class="meta text-muted">{% blocktrans trimmed with v=plugin.version a=plugin.author %}
+                                    Version {{ v }} by <em>{{ a }}</em>
+                                {% endblocktrans %}</p>
+                            {% else %}
+                                <p class="meta text-muted">{% blocktrans trimmed with v=plugin.version a=plugin.author %}
+                                    Version {{ v }}
+                                {% endblocktrans %}</p>
+                            {% endif %}
+                            <p>{{ plugin.description }}</p>
+                            {% if plugin.restricted and not request.user.is_staff %}
+                                <span class="text-muted">
+                                    {% trans "This plugin needs to be enabled by a system administrator for your event." %}
+                                </span>
+                            {% endif %}
+                            {% if plugin.app.compatibility_errors %}
+                                <div class="alert alert-warning">
+                                    {% trans "This plugin cannot be enabled for the following reasons:" %}
+                                    <ul>
+                                        {% for e in plugin.app.compatibility_errors %}
+                                            <li>{{ e }}</li>
+                                        {% endfor %}
+                                    </ul>
+                                </div>
+                            {% endif %}
+                            {% if plugin.app.compatibility_warnings %}
+                                <div class="alert alert-warning">
+                                    {% trans "This plugin reports the following problems:" %}
+                                    <ul>
+                                        {% for e in plugin.app.compatibility_warnings %}
+                                            <li>{{ e }}</li>
+                                        {% endfor %}
+                                    </ul>
+                                </div>
+                            {% endif %}
+                        </td>
+                        <td class="text-right">
+                            {% if plugin.app.compatibility_errors %}
+                                <button class="btn disabled btn-block btn-default" disabled="disabled">{% trans "Incompatible" %}</button>
+                            {% elif plugin.restricted and not staff_session %}
+                                <button class="btn disabled btn-block btn-default" disabled="disabled">{% trans "Not available" %}</button>
+                            {% elif plugin.module in plugins_active %}
+                                <button class="btn btn-default btn-block" name="plugin:{{ plugin.module }}" value="disable">{% trans "Disable" %}</button>
+                            {% else %}
+                                <button class="btn btn-default btn-block" name="plugin:{{ plugin.module }}" value="enable">{% trans "Enable" %}</button>
+                            {% endif %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </table>
+        </div>
+    </form>
 {% endblock %}

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

@@ -1,80 +1,119 @@
 {% extends "pretixcontrol/event/settings_base.html" %}
 {% load i18n %}
 {% load bootstrap3 %}
+{% load hierarkey_form %}
+{% block custom_header %}
+    {{ block.super }}
+    <link type="text/css" rel="stylesheet" href="{% url "control:pdf.css" %}">
+{% endblock %}
 {% block inside %}
     <h1>{% trans "General settings" %}</h1>
-    <form action="" method="post" class="form-horizontal">
+
+    <form action="" method="post" class="form-horizontal" enctype="multipart/form-data">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
-        <fieldset>
-            <legend>{% trans "General information" %}</legend>
-            {% bootstrap_field form.name layout="control" %}
-            {% bootstrap_field form.slug layout="control" %}
-            {% bootstrap_field form.date_from layout="control" %}
-            {% bootstrap_field form.date_to layout="control" %}
-            {% bootstrap_field form.location layout="control" %}
-            {% bootstrap_field form.date_admission layout="control" %}
-            {% bootstrap_field form.currency layout="control" %}
-            {% bootstrap_field form.is_public layout="control" %}
+        <div class="tabbed-form">
+            <fieldset>
+                <legend>{% trans "Basics" %}</legend>
+                {% bootstrap_field form.name layout="control" %}
+                {% bootstrap_field form.slug layout="control" %}
+                {% bootstrap_field form.date_from layout="control" %}
+                {% bootstrap_field form.date_to layout="control" %}
+                {% bootstrap_field form.location layout="control" %}
+                {% bootstrap_field form.date_admission layout="control" %}
+                {% bootstrap_field form.currency layout="control" %}
+                {% bootstrap_field sform.contact_mail layout="control" %}
+                {% bootstrap_field sform.imprint_url layout="control" %}
+                {% bootstrap_field form.is_public layout="control" %}
 
-            {% if meta_forms %}
-                <div class="form-group metadata-group">
-                    <label class="col-md-3 control-label">{% trans "Meta data" %}</label>
-                    <div class="col-md-9">
-                        {% for form in meta_forms %}
-                            <div class="row">
-                                <div class="col-md-4">
-                                    <label for="{{ form.value.id_for_label }}">
-                                        {{ form.property.name }}
-                                    </label>
+                {% if meta_forms %}
+                    <div class="form-group metadata-group">
+                        <label class="col-md-3 control-label">{% trans "Meta data" %}</label>
+                        <div class="col-md-9">
+                            {% for form in meta_forms %}
+                                <div class="row">
+                                    <div class="col-md-4">
+                                        <label for="{{ form.value.id_for_label }}">
+                                            {{ form.property.name }}
+                                        </label>
+                                    </div>
+                                    <div class="col-md-8">
+                                        {% bootstrap_form form layout="inline" %}
+                                    </div>
                                 </div>
-                                <div class="col-md-8">
-                                    {% bootstrap_form form layout="inline" %}
-                                </div>
-                            </div>
-                        {% endfor %}
+                            {% endfor %}
+                        </div>
                     </div>
-                </div>
-            {% endif %}
-        </fieldset>
-        <fieldset>
-            <legend>{% trans "Display settings" %}</legend>
-            {% bootstrap_field sform.locales layout="control" %}
-            {% bootstrap_field sform.locale layout="control" %}
-            {% bootstrap_field sform.timezone layout="control" %}
-            {% bootstrap_field sform.show_date_to layout="control" %}
-            {% bootstrap_field sform.show_times layout="control" %}
-            {% bootstrap_field sform.contact_mail layout="control" %}
-            {% bootstrap_field sform.imprint_url layout="control" %}
-            {% bootstrap_field sform.confirm_text layout="control" %}
-            {% bootstrap_field sform.show_quota_left layout="control" %}
-            {% bootstrap_field sform.display_net_prices layout="control" %}
-        </fieldset>
-        <fieldset>
-            <legend>{% trans "Timeline" %}</legend>
-            {% bootstrap_field form.presale_start layout="control" %}
-            {% bootstrap_field sform.presale_start_show_date layout="control" %}
-            {% bootstrap_field form.presale_end layout="control" %}
-            {% bootstrap_field sform.show_items_outside_presale_period layout="control" %}
-            {% bootstrap_field sform.last_order_modification_date layout="control" %}
-        </fieldset>
-        <fieldset>
-            <legend>{% trans "Orders" %}</legend>
-            {% bootstrap_field sform.reservation_time layout="control" %}
-            {% bootstrap_field sform.max_items_per_order layout="control" %}
-            {% bootstrap_field sform.attendee_names_asked layout="control" %}
-            {% bootstrap_field sform.attendee_names_required layout="control" %}
-            {% bootstrap_field sform.name_scheme layout="control" %}
-            {% bootstrap_field sform.order_email_asked_twice layout="control" %}
-            {% bootstrap_field sform.attendee_emails_asked layout="control" %}
-            {% bootstrap_field sform.attendee_emails_required layout="control" %}
-        </fieldset>
-        <fieldset>
-            <legend>{% trans "Waiting list" %}</legend>
-            {% bootstrap_field sform.waiting_list_enabled layout="control" %}
-            {% bootstrap_field sform.waiting_list_auto layout="control" %}
-            {% bootstrap_field sform.waiting_list_hours layout="control" %}
-        </fieldset>
+                {% endif %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Localization" %}</legend>
+                {% bootstrap_field sform.locales layout="control" %}
+                {% bootstrap_field sform.locale layout="control" %}
+                {% bootstrap_field sform.timezone layout="control" %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Attendee data" %}</legend>
+                {% bootstrap_field sform.attendee_names_asked layout="control" %}
+                {% bootstrap_field sform.attendee_names_required layout="control" %}
+                {% bootstrap_field sform.name_scheme layout="control" %}
+                {% bootstrap_field sform.name_scheme_titles layout="control" %}
+                {% bootstrap_field sform.order_email_asked_twice layout="control" %}
+                {% bootstrap_field sform.attendee_emails_asked layout="control" %}
+                {% bootstrap_field sform.attendee_emails_required layout="control" %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Texts" %}</legend>
+                {% bootstrap_field sform.frontpage_text layout="control" %}
+                {% bootstrap_field sform.presale_has_ended_text layout="control" %}
+                {% bootstrap_field sform.voucher_explanation_text layout="control" %}
+                {% bootstrap_field sform.confirm_text layout="control" %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Shop design" %}</legend>
+                {% bootstrap_field sform.logo_image layout="control" %}
+                {% url "control:organizer.edit" organizer=request.organizer.slug as org_url %}
+                {% propagated request.event org_url "primary_color" "primary_font" "theme_color_success" "theme_color_danger" %}
+                    {% bootstrap_field sform.primary_color layout="control" %}
+                    {% bootstrap_field sform.theme_color_success layout="control" %}
+                    {% bootstrap_field sform.theme_color_danger layout="control" %}
+                    {% bootstrap_field sform.primary_font layout="control" %}
+                {% endpropagated %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Timeline" %}</legend>
+                {% bootstrap_field form.presale_start layout="control" %}
+                {% bootstrap_field sform.presale_start_show_date layout="control" %}
+                {% bootstrap_field form.presale_end layout="control" %}
+                {% bootstrap_field sform.show_items_outside_presale_period layout="control" %}
+                {% bootstrap_field sform.last_order_modification_date layout="control" %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Display" %}</legend>
+                {% bootstrap_field sform.show_date_to layout="control" %}
+                {% bootstrap_field sform.show_times layout="control" %}
+                {% bootstrap_field sform.show_quota_left layout="control" %}
+                {% bootstrap_field sform.display_net_prices layout="control" %}
+                {% bootstrap_field sform.show_variations_expanded layout="control" %}
+                {% bootstrap_field sform.hide_sold_out layout="control" %}
+                {% bootstrap_field sform.meta_noindex layout="control" %}
+                {% if sform.frontpage_subevent_ordering %}
+                    {% bootstrap_field sform.frontpage_subevent_ordering layout="control" %}
+                {% endif %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Cart" %}</legend>
+                {% bootstrap_field sform.reservation_time layout="control" %}
+                {% bootstrap_field sform.max_items_per_order layout="control" %}
+                {% bootstrap_field sform.redirect_to_checkout_directly layout="control" %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Waiting list" %}</legend>
+                {% bootstrap_field sform.waiting_list_enabled layout="control" %}
+                {% bootstrap_field sform.waiting_list_auto layout="control" %}
+                {% bootstrap_field sform.waiting_list_hours layout="control" %}
+            </fieldset>
+        </div>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}

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

@@ -18,102 +18,93 @@
     <form action="" method="post" class="form-horizontal">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
-        {% bootstrap_field form.name layout="control" %}
-        {% bootstrap_field form.rate addon_after="%" layout="control" %}
-
-        <details class="panel panel-default"
-                {% if rule.eu_reverse_charge or rule.has_custom_rules or form.errors %}open{% endif %}>
-            <summary class="panel-heading">
-                <h4 class="panel-title">
-                    <strong>{% trans "Advanced settings" %}</strong>
-                    <i class="fa fa-angle-down collapse-indicator"></i>
-                </h4>
-            </summary>
-            <div id="advanced">
-                <div class="panel-body">
-                    <legend>{% trans "Advanced settings" %}</legend>
-                    <div class="alert alert-legal">
-                        {% blocktrans trimmed with docs="https://docs.pretix.eu/en/latest/user/events/taxes.html" %}
-                            These settings are intended for advanced users. See the
-                            <a href="{{ docs }}">documentation</a>
-                            for more information. Note that we are not responsible for the correct handling
-                            of taxes in your ticket shop. If in doubt, please contact a lawyer or tax consultant.
-                        {% endblocktrans %}
-                    </div>
-                    {% bootstrap_field form.price_includes_tax layout="control" %}
-                    {% bootstrap_field form.eu_reverse_charge layout="control" %}
-                    {% bootstrap_field form.home_country layout="control" %}
-                    <legend>{% trans "Custom taxation rules" %}</legend>
-                    <div class="alert alert-warning">
-                        {% blocktrans trimmed %}
-                            These settings are intended for professional users with very specific taxation situations.
-                            If you create any rule here, the reverse charge settings above will be ignored. The rules will be
-                            checked in order and once the first rule matches the order, it will be used and all further rules will
-                            be ignored. If no rule matches, tax will be charged.
-                        {% endblocktrans %}
-                        {% trans "All of these rules will only apply if an invoice address is set." %}
-                    </div>
-
-                    <div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}">
-                        {{ formset.management_form }}
-                        {% bootstrap_formset_errors formset %}
-                        <div data-formset-body>
-                            {% for form in formset %}
-                                {% bootstrap_form_errors form %}
-                                <div class="row" data-formset-form>
-                                    <div class="sr-only">
-                                        {{ form.id }}
-                                        {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
-                                    </div>
-                                    <div class="col-sm-4">
-                                        {% bootstrap_field form.country layout='inline' form_group_class="" %}
-                                    </div>
-                                    <div class="col-sm-3">
-                                        {% bootstrap_field form.address_type layout='inline' form_group_class="" %}
-                                    </div>
-                                    <div class="col-sm-3">
-                                        {% bootstrap_field form.action layout='inline' form_group_class="" %}
-                                    </div>
-                                    <div class="col-sm-2 text-right">
-                                        <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                            <i class="fa fa-trash"></i></button>
-                                    </div>
-                                </div>
-                            {% endfor %}
-                        </div>
-                        <script type="form-template" data-formset-empty-form>
-                            {% escapescript %}
-                                <div class="row" data-formset-form>
-                                    <div class="sr-only">
-                                        {{ form.id }}
-                                        {% bootstrap_field formset.empty_form.DELETE form_group_class="" layout="inline" %}
-                                    </div>
-                                    <div class="col-sm-4">
-                                        {% bootstrap_field formset.empty_form.country layout='inline' form_group_class="" %}
-                                    </div>
-                                    <div class="col-sm-3">
-                                        {% bootstrap_field formset.empty_form.address_type layout='inline' form_group_class="" %}
-                                    </div>
-                                    <div class="col-sm-3">
-                                        {% bootstrap_field formset.empty_form.action layout='inline' form_group_class="" %}
-                                    </div>
-                                    <div class="col-sm-2 text-right">
-                                        <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                            <i class="fa fa-trash"></i></button>
-                                    </div>
-                                </div>
-                            {% endescapescript %}
-                        </script>
-                        <p>
-                            <button type="button" class="btn btn-default" data-formset-add>
-                                <i class="fa fa-plus"></i> {% trans "Add a new rule" %}</button>
-                        </p>
-                    </div>
+        <div class="tabbed-form">
+            <fieldset>
+                <legend>{% trans "General" %}</legend>
+                {% bootstrap_field form.name layout="control" %}
+                {% bootstrap_field form.rate addon_after="%" layout="control" %}
+                {% bootstrap_field form.price_includes_tax layout="control" %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Advanced" %}</legend>
+                <div class="alert alert-legal">
+                    {% blocktrans trimmed with docs="https://docs.pretix.eu/en/latest/user/events/taxes.html" %}
+                        These settings are intended for advanced users. See the
+                        <a href="{{ docs }}">documentation</a>
+                        for more information. Note that we are not responsible for the correct handling
+                        of taxes in your ticket shop. If in doubt, please contact a lawyer or tax consultant.
+                    {% endblocktrans %}
+                </div>
+                {% bootstrap_field form.eu_reverse_charge layout="control" %}
+                {% bootstrap_field form.home_country layout="control" %}
+                <h3>{% trans "Custom taxation rules" %}</h3>
+                <div class="alert alert-warning">
+                    {% blocktrans trimmed %}
+                        These settings are intended for professional users with very specific taxation situations.
+                        If you create any rule here, the reverse charge settings above will be ignored. The rules will be
+                        checked in order and once the first rule matches the order, it will be used and all further rules will
+                        be ignored. If no rule matches, tax will be charged.
+                    {% endblocktrans %}
+                    {% trans "All of these rules will only apply if an invoice address is set." %}
                 </div>
-            </div>
-        </details>
-
 
+                <div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}">
+                    {{ formset.management_form }}
+                    {% bootstrap_formset_errors formset %}
+                    <div data-formset-body>
+                        {% for form in formset %}
+                            {% bootstrap_form_errors form %}
+                            <div class="row" data-formset-form>
+                                <div class="sr-only">
+                                    {{ form.id }}
+                                    {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
+                                </div>
+                                <div class="col-sm-4">
+                                    {% bootstrap_field form.country layout='inline' form_group_class="" %}
+                                </div>
+                                <div class="col-sm-3">
+                                    {% bootstrap_field form.address_type layout='inline' form_group_class="" %}
+                                </div>
+                                <div class="col-sm-3">
+                                    {% bootstrap_field form.action layout='inline' form_group_class="" %}
+                                </div>
+                                <div class="col-sm-2 text-right">
+                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
+                                        <i class="fa fa-trash"></i></button>
+                                </div>
+                            </div>
+                        {% endfor %}
+                    </div>
+                    <script type="form-template" data-formset-empty-form>
+                        {% escapescript %}
+                            <div class="row" data-formset-form>
+                                <div class="sr-only">
+                                    {{ form.id }}
+                                    {% bootstrap_field formset.empty_form.DELETE form_group_class="" layout="inline" %}
+                                </div>
+                                <div class="col-sm-4">
+                                    {% bootstrap_field formset.empty_form.country layout='inline' form_group_class="" %}
+                                </div>
+                                <div class="col-sm-3">
+                                    {% bootstrap_field formset.empty_form.address_type layout='inline' form_group_class="" %}
+                                </div>
+                                <div class="col-sm-3">
+                                    {% bootstrap_field formset.empty_form.action layout='inline' form_group_class="" %}
+                                </div>
+                                <div class="col-sm-2 text-right">
+                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
+                                        <i class="fa fa-trash"></i></button>
+                                </div>
+                            </div>
+                        {% endescapescript %}
+                    </script>
+                    <p>
+                        <button type="button" class="btn btn-default" data-formset-add>
+                            <i class="fa fa-plus"></i> {% trans "Add a new rule" %}</button>
+                    </p>
+                </div>
+            </fieldset>
+        </div>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}

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

@@ -5,48 +5,55 @@
     <form action="" method="post" class="form-horizontal" enctype="multipart/form-data">
         {% csrf_token %}
         <h1>{% trans "Ticket download" %}</h1>
-        <fieldset>
-            {% if request.event.settings.ticket_download and not any_enabled %}
-                <div class="alert alert-warning">
-                    {% blocktrans trimmed %}
-                        You activated ticket downloads but no output provider is enabled. Be sure to enable a plugin and
-                        activate an output provider.
-                    {% endblocktrans %}
-                </div>
-            {% endif %}
-            {% bootstrap_form_errors form %}
-            {% bootstrap_field form.ticket_download layout="control" %}
-            {% bootstrap_field form.ticket_download_date layout="control" %}
-            {% bootstrap_field form.ticket_download_addons layout="control" %}
-            {% bootstrap_field form.ticket_download_nonadm layout="control" %}
-            {% bootstrap_field form.ticket_download_pending layout="control" %}
-            {% for provider in providers %}
-                <div class="panel panel-default ticketoutput-panel">
-                    <div class="panel-heading">
-                        <a href="{% url "control:event.settings.tickets.preview" event=request.event.slug organizer=request.organizer.slug output=provider.identifier %}"
-                                class="btn btn-default btn-sm pull-right {% if not provider.preview_allowed %}disabled{% endif %}"
-                                target="_blank">
-                            {% trans "Preview" %}
-                        </a>
-                        <h3 class="panel-title">{{ provider.verbose_name }}</h3>
-                        <div class="clear"></div>
+        <div class="tabbed-form">
+            <fieldset>
+                <legend>{% trans "Download settings" %}</legend>
+                {% if request.event.settings.ticket_download and not any_enabled %}
+                    <div class="alert alert-warning">
+                        {% blocktrans trimmed %}
+                            You activated ticket downloads but no output provider is enabled. Be sure to enable a plugin and
+                            activate an output provider.
+                        {% endblocktrans %}
                     </div>
-                    <div class="panel-body">
-                        {% bootstrap_form provider.form layout='horizontal' %}
-                        {% with c=provider.settings_content %}
-                            {% if c %}{{ c|safe }}{% endif %}
-                        {% endwith %}
+                {% endif %}
+                {% bootstrap_form_errors form %}
+                {% bootstrap_field form.ticket_download layout="control" %}
+                {% bootstrap_field form.ticket_download_date layout="control" %}
+                {% bootstrap_field form.ticket_download_addons layout="control" %}
+                {% bootstrap_field form.ticket_download_nonadm layout="control" %}
+                {% bootstrap_field form.ticket_download_pending layout="control" %}
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Download formats" %}</legend>
+                {% for provider in providers %}
+                    <div class="panel panel-default ticketoutput-panel">
+                        <div class="panel-heading">
+                            <a href="{% url "control:event.settings.tickets.preview" event=request.event.slug organizer=request.organizer.slug output=provider.identifier %}"
+                                    class="btn btn-default btn-sm pull-right {% if not provider.preview_allowed %}disabled{% endif %}"
+                                    target="_blank">
+                                {% trans "Preview" %}
+                            </a>
+                            <h3 class="panel-title">{{ provider.verbose_name }}</h3>
+                            <div class="clear"></div>
+                        </div>
+                        <div class="panel-body">
+                            {% bootstrap_form provider.form layout='horizontal' %}
+                            {% with c=provider.settings_content %}
+                                {% if c %}{{ c|safe }}{% endif %}
+                            {% endwith %}
+                        </div>
                     </div>
-                </div>
-            {% empty %}
-                <div class="alert alert-warning">
-                    {% url "control:event.settings.plugins" event=request.event.slug organizer=request.organizer.slug as plugin_settings_url %}
-                    {% blocktrans trimmed with plugin_settings_href='href="'|add:plugin_settings_url|add:'"'|safe %}
-                        There are no ticket outputs available. Please go to the <a {{ plugin_settings_href }}>plugin settings</a> and activate one or more ticket output plugins.
-                    {% endblocktrans %}
-                </div>
-            {% endfor %}
-        </fieldset>
+                {% empty %}
+                    <div class="alert alert-warning">
+                        {% url "control:event.settings.plugins" event=request.event.slug organizer=request.organizer.slug as plugin_settings_url %}
+                        {% blocktrans trimmed with plugin_settings_href='href="'|add:plugin_settings_url|add:'"'|safe %}
+                            There are no ticket outputs available. Please go to the
+                            <a {{ plugin_settings_href }}>plugin settings</a> and activate one or more ticket output plugins.
+                        {% endblocktrans %}
+                    </div>
+                {% endfor %}
+            </fieldset>
+        </div>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}