factor out subevent.py

add SubEventSelectionWrapper and filtering by datetime
somewhat presentable MultiValueField without validation
2026-03-29 16:52:26 +00:00 · 2025-12-08 16:20:20 +01:00 · 2025-12-08 16:12:23 +01:00 · 2025-12-05 16:49:04 +01:00 · 2025-12-04 10:15:41 +01:00 · 2025-12-04 09:33:51 +01:00
531 changed files with 255264 additions and 349735 deletions
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -26,10 +26,10 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - uses: actions/checkout@v4
-      - name: Set up Python 3.13
+      - name: Set up Python 3.11
        uses: actions/setup-python@v5
        with:
-          python-version: 3.13
+          python-version: 3.11
      - uses: actions/cache@v4
        with:
          path: ~/.cache/pip
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -23,13 +23,13 @@ jobs:
    name: Tests
    strategy:
      matrix:
-        python-version: ["3.10", "3.11", "3.13"]
+        python-version: ["3.9", "3.10", "3.11"]
        database: [sqlite, postgres]
        exclude:
          - database: sqlite
-            python-version: "3.10"
+            python-version: "3.9"
          - database: sqlite
-            python-version: "3.11"
+            python-version: "3.10"
    services:
      postgres:
        image: postgres:15
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,16 +1,11 @@
 Contributing to pretix
 ======================

-Welcome to pretix, we are happy that you would like to contribute.
-Before you do so, please make sure to read the following documents:
+Hey there and welcome to pretix!

- [Contribution workflow](https://docs.pretix.eu/dev/development/contribution/general.html)
- [AI-assisted contribution policy](https://docs.pretix.eu/dev/development/contribution/ai.html)
- [Coding style and quality](https://docs.pretix.eu/dev/development/contribution/style.html)
- [Development setup](https://docs.pretix.eu/dev/development/setup.html)
- [Code of Conduct](https://docs.pretix.eu/dev/development/contribution/codeofconduct.html)
+* We've got a contributors guide in [our documentation](https://docs.pretix.eu/dev/development/contribution/) together with notes on the [development setup](https://docs.pretix.eu/dev/development/setup.html).

-Before we can accept your first PR we'll need you to sign [our **Contributor License Agreement** (CLA)](https://pretix.eu/about/en/cla).
-You can find more information about the how and why in our [License FAQ](https://docs.pretix.eu/trust/licensing/faq/) and in our [license change blog post](https://pretix.eu/about/en/blog/20210412-license/).
+* Please note that we have a [Code of Conduct](https://docs.pretix.eu/dev/development/contribution/codeofconduct.html) in place that applies to all project contributions, including issues, pull requests, etc.
+
+* Before we can accept a PR from you we'll need you to sign [our CLA](https://pretix.eu/about/en/cla). You can find more information about the how and why in our [License FAQ](https://docs.pretix.eu/trust/licensing/faq/) and in our [license change blog post](https://pretix.eu/about/en/blog/20210412-license/).

-**Before contributing new functionality, always open a discussion first.**
--- a/doc/_themes/pretix_theme/layout.html
+++ b/doc/_themes/pretix_theme/layout.html
@@ -6,14 +6,10 @@
 {%- else %}
  {%- set titlesuffix = "" %}
 {%- endif %}
-{%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %}
-
-{# Build sphinx_version_info tuple from sphinx_version string in pure Jinja #}
-{%- set (_ver_major, _ver_minor) = (sphinx_version.split('.') | list)[:2] | map('int') -%}
-{%- set sphinx_version_info = (_ver_major, _ver_minor, -1) -%}

 <!DOCTYPE html>
-<html class="writer-html5" lang="{{ lang_attr }}"{% if sphinx_version_info >= (7, 2) %} data-content_root="{{ content_root }}"{% endif %}>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
 <head>
  <meta charset="utf-8">
  {{ metatags }}
@@ -22,50 +18,59 @@
  <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
  {% endblock %}

-    {#- CSS #}
-    {%- for css_file in css_files %}
-    {%- if css_file|attr("filename") %}
-    {{ css_tag(css_file) }}
+
+  {#- CSS #}
+  {%- for css in css_files %}
+    {%- if css|attr("rel") %}
+      <link rel="{{ css.rel }}" href="{{ pathto(css.filename, 1) }}" type="text/css"{% if css.title is not none %} title="{{ css.title }}"{% endif %} />
    {%- else %}
-    <link rel="stylesheet" href="{{ pathto(css_file, 1)|escape }}" type="text/css" />
+      <link rel="stylesheet" href="{{ pathto(css, 1) }}" type="text/css" />
    {%- endif %}
-    {%- endfor %}
+  {%- endfor %}

-    {#- FAVICON #}
-    {%- if favicon_url %}
-    <link rel="shortcut icon" href="{{ favicon_url }}"/>
-    {%- endif %}
+  {%- for cssfile in extra_css_files %}
+    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
+  {%- endfor -%}

-    {#- CANONICAL URL (deprecated) #}
-    {%- if theme_canonical_url and not pageurl %}
+  {#- FAVICON
+      favicon_url is the only context var necessary since Sphinx 4.
+      In Sphinx<4, we use favicon but need to prepend path info.
+  #}
+  {%- set _favicon_url = favicon_url | default(pathto('_static/' + (favicon or ""), 1)) %}
+  {%- if favicon_url or favicon %}
+    <link rel="shortcut icon" href="{{ _favicon_url }}"/>
+  {%- endif %}
+
+  {#- CANONICAL URL (deprecated) #}
+  {%- if theme_canonical_url and not pageurl %}
    <link rel="canonical" href="{{ theme_canonical_url }}{{ pagename }}.html"/>
-    {%- endif -%}
+  {%- endif -%}

-    {#- CANONICAL URL #}
-    {%- if pageurl %}
+  {#- CANONICAL URL #}
+  {%- if pageurl %}
    <link rel="canonical" href="{{ pageurl|e }}" />
-    {%- endif -%}
+  {%- endif -%}

-    {#- JAVASCRIPTS #}
-    {%- block scripts %}
-    {%- if not embedded %}
-    {%- for scriptfile in script_files %}
-    {{ js_tag(scriptfile) }}
-    {%- endfor %}
+  {#- JAVASCRIPTS #}
+  {%- block scripts %}
+  <!--[if lt IE 9]>
+    <script src="{{ pathto('_static/js/html5shiv.min.js', 1) }}"></script>
+  <![endif]-->
+  {%- if not embedded %}
+  {# XXX Sphinx 1.8.0 made this an external js-file, quick fix until we refactor the template to inherert more blocks directly from sphinx #}
+      {%- for scriptfile in script_files %}
+        {{ js_tag(scriptfile) }}
+      {%- endfor %}
    <script src="{{ pathto('_static/js/theme.js', 1) }}"></script>

-    {%- if READTHEDOCS or DEBUG %}
-    <script src="{{ pathto('_static/js/versions.js', 1) }}"></script>
-    {%- endif %}
-
    {#- OPENSEARCH #}
    {%- if use_opensearch %}
    <link rel="search" type="application/opensearchdescription+xml"
          title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
          href="{{ pathto('_static/opensearch.xml', 1) }}"/>
    {%- endif %}
-    {%- endif %}
-    {%- endblock %}
+  {%- endif %}
+  {%- endblock %}

  {%- block linktags %}
    {%- if hasdoc('about') %}
@@ -118,23 +123,23 @@
          {% endblock %}
        </div>

-          {%- block navigation %}
-          {#- Translators: This is an ARIA section label for the main navigation menu -#}
-          <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="{{ _('Navigation menu') }}">
-              {%- block menu %}
-              {%- set toctree = toctree(maxdepth=theme_navigation_depth|int,
-              collapse=theme_collapse_navigation|tobool,
-              includehidden=theme_includehidden|tobool,
-              titles_only=theme_titles_only|tobool) %}
-              {%- if toctree %}
-              {{ toctree }}
-              {%- else %}
+        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+          {% block menu %}
+            {#
+              The singlehtml builder doesn't handle this toctree call when the
+              toctree is empty. Skip building this for now.
+            #}
+            {% if 'singlehtml' not in builder %}
+              {% set global_toc = toctree(maxdepth=theme_navigation_depth|int, collapse=theme_collapse_navigation, includehidden=True) %}
+            {% endif %}
+            {% if global_toc %}
+              {{ global_toc }}
+            {% else %}
              <!-- Local TOC -->
              <div class="local-toc">{{ toc }}</div>
-              {%- endif %}
-              {%- endblock %}
-          </div>
-          {%- endblock %}
+            {% endif %}
+          {% endblock %}
+        </div>

          {% if theme_display_version %}
              {%- set nav_version = version %}
@@ -153,42 +158,53 @@
    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">

      {# MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
-        <nav class="wy-nav-top" aria-label="{{ _('Mobile navigation menu') }}" {% if theme_style_nav_header_background %} style="background: {{theme_style_nav_header_background}}" {% endif %}>
-            {%- block mobile_nav %}
-            <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-            <a href="{{ pathto(master_doc) }}">{{ project }}</a>
-            {%- endblock %}
-        </nav>
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        {% block mobile_nav %}
+          <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+          <a href="{{ pathto('index') }}">{{ project }}</a>
+        {% endblock %}
+      </nav>

-        <div class="wy-nav-content">
-            {%- block content %}
-            {%- if theme_style_external_links|tobool %}
-            <div class="rst-content style-external-links">
-            {%- else %}
-            <div class="rst-content">
-            {%- endif %}
-            {% include "breadcrumbs.html" %}
-            <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-                {%- block document %}
-                <div itemprop="articleBody">
-                    {% block body %}{% endblock %}
-                </div>
-                {%- if self.comments()|trim %}
-                <div class="articleComments">
-                    {%- block comments %}{% endblock %}
-                </div>
-                {%- endif%}
-            </div>
-            {%- endblock %}
-            {% include "footer.html" %}
-        </div>
-        {%- endblock %}
+
+      {# PAGE CONTENT #}
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          {% include "breadcrumbs.html" %}
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody" class="section">
+            {% block body %}{% endblock %}
+           </div>
+           <div class="articleComments">
+            {% block comments %}{% endblock %}
+           </div>
+          </div>
+          {% include "footer.html" %}
        </div>
+      </div>
+
    </section>

  </div>
  {% include "versions.html" %}

+  {% if not embedded %}
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'{{ url_root }}',
+            VERSION:'{{ release|e }}',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
+            HAS_SOURCE:  {{ has_source|lower }},
+            SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
+        };
+    </script>
+    {%- for scriptfile in script_files %}
+      <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
+    {%- endfor %}
+
+  {% endif %}
+
  {# RTD hosts this file, so just load on non RTD builds #}
  {% if not READTHEDOCS %}
    <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
@@ -198,7 +214,7 @@
  {% if theme_sticky_navigation %}
  <script type="text/javascript">
      jQuery(function () {
-          SphinxRtdTheme.Navigation.enable({{ 'true' if theme_sticky_navigation|tobool else 'false' }});
+          SphinxRtdTheme.StickyNav.enable();
      });
  </script>
  {% endif %}
--- a/doc/_themes/pretix_theme/layout_old.html
+++ b/doc/_themes/pretix_theme/layout_old.html
@@ -1,86 +1,136 @@
-{# TEMPLATE VAR SETTINGS #}
+{#
+    basic/layout.html
+    ~~~~~~~~~~~~~~~~~
+
+    Master layout template for Sphinx themes.
+
+    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+#}
+{%- block doctype -%}
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+{%- endblock %}
+{%- set reldelim1 = reldelim1 is not defined and ' &raquo;' or reldelim1 %}
+{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
+{%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and
+                         (sidebars != []) %}
 {%- set url_root = pathto('', 1) %}
+{# XXX necessary? #}
 {%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
 {%- if not embedded and docstitle %}
  {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
 {%- else %}
  {%- set titlesuffix = "" %}
 {%- endif %}
-{%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %}

-{# Build sphinx_version_info tuple from sphinx_version string in pure Jinja #}
-{%- set (_ver_major, _ver_minor) = (sphinx_version.split('.') | list)[:2] | map('int') -%}
-{%- set sphinx_version_info = (_ver_major, _ver_minor, -1) -%}
+{%- macro relbar() %}
+    <div class="related">
+      <h3>{{ _('Navigation') }}</h3>
+      <ul>
+        {%- for rellink in rellinks %}
+        <li class="right" {% if loop.first %}style="margin-right: 10px"{% endif %}>
+          <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
+             {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
+          {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li>
+        {%- endfor %}
+        {%- block rootrellink %}
+        <li><a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a>{{ reldelim1 }}</li>
+        {%- endblock %}
+        {%- for parent in parents %}
+          <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li>
+        {%- endfor %}
+        {%- block relbaritems %} {% endblock %}
+      </ul>
+    </div>
+{%- endmacro %}

-<!DOCTYPE html>
-<html class="writer-html5" lang="{{ lang_attr }}"{% if sphinx_version_info >= (7, 2) %} data-content_root="{{ content_root }}"{% endif %}>
-<head>
-  <meta charset="utf-8" />
-  {%- if READTHEDOCS and not embedded %}
-  <meta name="readthedocs-addons-api-version" content="1">
-  {%- endif %}
-  {{- metatags }}
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  {%- block htmltitle %}
-  <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
-  {%- endblock -%}
+{%- macro sidebar() %}
+      {%- if render_sidebar %}
+      <div class="sphinxsidebar">
+        <div class="sphinxsidebarwrapper">
+          {%- block sidebarlogo %}
+          {%- if logo %}
+            <p class="logo"><a href="{{ pathto(master_doc) }}">
+              <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
+            </a></p>
+          {%- endif %}
+          {%- endblock %}
+          {%- if sidebars != None %}
+            {#- new style sidebar: explicitly include/exclude templates #}
+            {%- for sidebartemplate in sidebars %}
+            {%- include sidebartemplate %}
+            {%- endfor %}
+          {%- else %}
+            {#- old style sidebars: using blocks -- should be deprecated #}
+            {%- block sidebartoc %}
+            {%- include "localtoc.html" %}
+            {%- endblock %}
+            {%- block sidebarrel %}
+            {%- include "relations.html" %}
+            {%- endblock %}
+            {%- block sidebarsourcelink %}
+            {%- include "sourcelink.html" %}
+            {%- endblock %}
+            {%- if customsidebar %}
+            {%- include customsidebar %}
+            {%- endif %}
+            {%- block sidebarsearch %}
+            {%- include "searchbox.html" %}
+            {%- endblock %}
+          {%- endif %}
+        </div>
+      </div>
+      {%- endif %}
+{%- endmacro %}

-  {#- CSS #}
-  {%- for css_file in css_files %}
-    {%- if css_file|attr("filename") %}
-      {{ css_tag(css_file) }}
-    {%- else %}
-      <link rel="stylesheet" href="{{ pathto(css_file, 1)|escape }}" type="text/css" />
-    {%- endif %}
-  {%- endfor %}
-
-  {#
-      "extra_css_files" is an undocumented Read the Docs theme specific option.
-      There is no need to check for ``|attr("filename")`` here because it's always a string.
-      Note that this option should be removed in favor of regular ``html_css_files``:
-      https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-html_css_files
-  #}
-  {%- for css_file in extra_css_files %}
-    <link rel="stylesheet" href="{{ pathto(css_file, 1)|escape }}" type="text/css" />
-  {%- endfor -%}
-
-  {#- FAVICON #}
-  {%- if favicon_url %}
-    <link rel="shortcut icon" href="{{ favicon_url }}"/>
-  {%- endif %}
-
-  {#- CANONICAL URL (deprecated) #}
-  {%- if theme_canonical_url and not pageurl %}
-    <link rel="canonical" href="{{ theme_canonical_url }}{{ pagename }}.html"/>
-  {%- endif -%}
-
-  {#- CANONICAL URL #}
-  {%- if pageurl %}
-    <link rel="canonical" href="{{ pageurl|e }}" />
-  {%- endif -%}
-
-  {#- JAVASCRIPTS #}
-  {%- block scripts %}
-  {%- if not embedded %}
+{%- macro script() %}
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    '{{ url_root }}',
+        VERSION:     '{{ release|e }}',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
+        HAS_SOURCE:  {{ has_source|lower }},
+        SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
+      };
+    </script>
    {%- for scriptfile in script_files %}
-      {{ js_tag(scriptfile) }}
+    <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
    {%- endfor %}
-    <script src="{{ pathto('_static/js/theme.js', 1) }}"></script>
+{%- endmacro %}

-    {%- if READTHEDOCS or DEBUG %}
-    <script src="{{ pathto('_static/js/versions.js', 1) }}"></script>
-    {%- endif %}
+{%- macro css() %}
+    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
+    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
+    {%- for cssfile in css_files %}
+    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
+    {%- endfor %}
+{%- endmacro %}

-    {#- OPENSEARCH #}
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset={{ encoding }}" />
+    {{ metatags }}
+    {%- block htmltitle %}
+    <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
+    {%- endblock %}
+    {{ css() }}
+    {%- if not embedded %}
+    {{ script() }}
    {%- if use_opensearch %}
    <link rel="search" type="application/opensearchdescription+xml"
          title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
          href="{{ pathto('_static/opensearch.xml', 1) }}"/>
    {%- endif %}
-  {%- endif %}
-  {%- endblock %}
-
-  {%- block linktags %}
+    {%- if favicon %}
+    <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
+    {%- endif %}
+    {%- if theme_canonical_url %}
+    <link rel="canonical" href="{{ theme_canonical_url }}{{ pagename }}.html"/>
+    {%- endif %}
+    {%- endif %}
+{%- block linktags %}
    {%- if hasdoc('about') %}
    <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
    {%- endif %}
@@ -93,135 +143,67 @@
    {%- if hasdoc('copyright') %}
    <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
    {%- endif %}
+    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}" />
+    {%- if parents %}
+    <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}" />
+    {%- endif %}
    {%- if next %}
    <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}" />
    {%- endif %}
    {%- if prev %}
    <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
    {%- endif %}
-  {%- endblock %}
-  {%- block extrahead %} {% endblock %}
-</head>
+{%- endblock %}
+{%- block extrahead %} {% endblock %}
+  </head>
+  <body>
+{%- block header %}{% endblock %}

-<body class="wy-body-for-nav">
+{%- block relbar1 %}{{ relbar() }}{% endblock %}

-  {%- block extrabody %} {% endblock %}
-  <div class="wy-grid-for-nav">
-    {#- SIDE NAV, TOGGLES ON MOBILE #}
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search" {% if theme_style_nav_header_background %} style="background: {{theme_style_nav_header_background}}" {% endif %}>
-          {%- block sidebartitle %}
+{%- block content %}
+  {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}

-          {# the logo helper function was removed in Sphinx 6 and deprecated since Sphinx 4 #}
-          {# the master_doc variable was renamed to root_doc in Sphinx 4 (master_doc still exists in later Sphinx versions) #}
-          {%- set _logo_url = logo_url|default(pathto('_static/' + (logo or ""), 1)) %}
-          {%- set _root_doc = root_doc|default(master_doc) %}
-          <a href="{{ pathto(_root_doc) }}"{% if not theme_logo_only %} class="icon icon-home"{% endif %}>
-            {% if not theme_logo_only %}{{ project }}{% endif %}
-            {%- if logo or logo_url %}
-              <img src="{{ _logo_url }}" class="logo" alt="{{ _('Logo') }}"/>
-            {%- endif %}
-          </a>
-
-          {%- if READTHEDOCS or DEBUG %}
-            {%- if theme_version_selector or theme_language_selector %}
-              <div class="switch-menus">
-                <div class="version-switch"></div>
-                <div class="language-switch"></div>
-              </div>
-            {%- endif %}
-          {%- endif %}
-
-          {%- include "searchbox.html" %}
-
-          {%- endblock %}
-        </div>
-
-        {%- block navigation %}
-        {#- Translators: This is an ARIA section label for the main navigation menu -#}
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="{{ _('Navigation menu') }}">
-          {%- block menu %}
-            {%- set toctree = toctree(maxdepth=theme_navigation_depth|int,
-                                      collapse=theme_collapse_navigation|tobool,
-                                      includehidden=theme_includehidden|tobool,
-                                      titles_only=theme_titles_only|tobool) %}
-            {%- if toctree %}
-              {{ toctree }}
-            {%- else %}
-              <!-- Local TOC -->
-              <div class="local-toc">{{ toc }}</div>
-            {%- endif %}
-          {%- endblock %}
-        </div>
-        {%- endblock %}
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      {#- MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
-      {#- Translators: This is an ARIA section label for the navigation menu that is visible when viewing the page on mobile devices -#}
-      <nav class="wy-nav-top" aria-label="{{ _('Mobile navigation menu') }}" {% if theme_style_nav_header_background %} style="background: {{theme_style_nav_header_background}}" {% endif %}>
-        {%- block mobile_nav %}
-          <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-          <a href="{{ pathto(master_doc) }}">{{ project }}</a>
-        {%- endblock %}
-      </nav>
-
-      <div class="wy-nav-content">
-      {%- block content %}
-        {%- if theme_style_external_links|tobool %}
-        <div class="rst-content style-external-links">
-        {%- else %}
-        <div class="rst-content">
-        {%- endif %}
-          {% include "breadcrumbs.html" %}
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-          {%- block document %}
-           <div itemprop="articleBody">
-             {% block body %}{% endblock %}
-           </div>
-           {%- if self.comments()|trim %}
-             <div class="articleComments">
-               {%- block comments %}{% endblock %}
-             </div>
-           {%- endif%}
+    <div class="document">
+  {%- block document %}
+      <div class="documentwrapper">
+      {%- if render_sidebar %}
+        <div class="bodywrapper">
+      {%- endif %}
+          <div class="body">
+            {% block body %} {% endblock %}
          </div>
-          {%- endblock %}
-          {% include "footer.html" %}
+      {%- if render_sidebar %}
        </div>
-      {%- endblock %}
+      {%- endif %}
      </div>
-    </section>
-  </div>
-  {% include "versions.html" -%}
+  {%- endblock %}

-  <script>
-      jQuery(function () {
-          SphinxRtdTheme.Navigation.enable({{ 'true' if theme_sticky_navigation|tobool else 'false' }});
-      });
-  </script>
+  {%- block sidebar2 %}{{ sidebar() }}{% endblock %}
+      <div class="clearer"></div>
+    </div>
+{%- endblock %}

-  {#- Do not conflict with RTD insertion of analytics script #}
-  {%- if not READTHEDOCS %}
-    {%- if theme_analytics_id %}
-    <!-- Theme Analytics -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id={{ theme_analytics_id }}"></script>
-    <script>
-      window.dataLayer = window.dataLayer || [];
-      function gtag(){dataLayer.push(arguments);}
-      gtag('js', new Date());
-
-      gtag('config', '{{ theme_analytics_id }}', {
-          'anonymize_ip': {{ 'true' if theme_analytics_anonymize_ip|tobool else 'false' }},
-      });
-    </script>
+{%- block relbar2 %}{{ relbar() }}{% endblock %}

+{%- block footer %}
+    <div class="footer">
+    {%- if show_copyright %}
+      {%- if hasdoc('copyright') %}
+        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
+      {%- else %}
+        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
+      {%- endif %}
    {%- endif %}
-  {%- endif %}
+    {%- if last_updated %}
+      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
+    {%- endif %}
+    {%- if show_sphinx %}
+      {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
+    {%- endif %}
+    </div>
+    <p>asdf asdf asdf asdf 22</p>
+{%- endblock %}
+  </body>
+</html>

-  {%- block footer %} {% endblock %}
-
-</body>
-</html>
--- a/doc/api/deviceauth.rst
+++ b/doc/api/deviceauth.rst
@@ -39,7 +39,7 @@ as well as the type of underlying hardware. Example:
       "rsa_pubkey": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqh…nswIDAQAB\n-----END PUBLIC KEY-----\n"
   }

-The ``rsa_pubkey`` is optional any only required for certain features such as working with reusable
+The ``rsa_pubkey`` is optional any only required for certain fatures such as working with reusable
 media and NFC cryptography.

 Every initialization token can only be used once. On success, you will receive a response containing
@@ -197,11 +197,10 @@ Permissions & security profiles

 Device authentication is currently hardcoded to grant the following permissions:

-* Read event meta data and products etc.
-* Read and write orders
-* Read and write gift cards
-* Read and write reusable media
-* Read vouchers
+* View event meta data and products etc.
+* View orders
+* Change orders
+* Manage gift cards

 Devices cannot change events or products and cannot access vouchers.

@@ -209,6 +208,20 @@ Additionally, when creating a device through the user interface or API, a user c
 the device. These include an allow list of specific API calls that may be made by the device. pretix ships with security
 policies for official pretix apps like pretixSCAN and pretixPOS.

+Removing a device
+-----------------
+
+If you want implement a way to to deprovision a device in your software, you can call the ``revoke`` endpoint to
+invalidate your API key. There is no way to reverse this operation.
+
+.. sourcecode:: http
+
+   POST /api/v1/device/revoke HTTP/1.1
+   Host: pretix.eu
+   Authorization: Device 1kcsh572fonm3hawalrncam4l1gktr2rzx25a22l8g9hx108o9oi0rztpcvwnfnd
+
+This can also be done by the user through the web interface.
+
 Event selection
 ---------------

--- a/doc/api/fundamentals.rst
+++ b/doc/api/fundamentals.rst
@@ -117,7 +117,7 @@ List-level conditional fetching
 If modification checks are not possible with this granularity, you can instead check for the full list.
 In this case, the list of objects may contain a regular HTTP header ``Last-Modified`` with the date of the
 last modification to any item of that resource. You can then pass this date back in your next request in the
-``If-Modified-Since`` header. If any object has changed in the meantime, you will receive back a full list
+``If-Modified-Since`` header. If the any object has changed in the meantime, you will receive back a full list
 (if something it missing, this means the object has been deleted). If nothing happened, we'll send back a
 ``304 Not Modified`` return code.

--- a/doc/api/resources/devices.rst
+++ b/doc/api/resources/devices.rst
@@ -30,7 +30,7 @@ software_brand                        string                     Device software
 software_version                      string                     Device software version (read-only)
 created                               datetime                   Creation time
 initialized                           datetime                   Time of initialization (or ``null``)
-initialization_token                  string                     Token for initialization (field invisible without write permission)
+initialization_token                  string                     Token for initialization
 revoked                               boolean                    Whether this device no longer has access
 security_profile                      string                     The name of a supported security profile restricting API access
 ===================================== ========================== =======================================================
--- a/doc/api/resources/events.rst
+++ b/doc/api/resources/events.rst
@@ -65,6 +65,8 @@ Endpoints

   Returns a list of all events within a given organizer the authenticated user/token has access to.

+   Permission required: "Can change event settings"
+
   **Example request**:

   .. sourcecode:: http
@@ -159,6 +161,8 @@ Endpoints

   Returns information on one event, identified by its slug.

+   Permission required: "Can change event settings"
+
   **Example request**:

   .. sourcecode:: http
@@ -230,6 +234,8 @@ Endpoints
   Please note that events cannot be created as 'live' using this endpoint. Quotas and payment must be added to the
   event before sales can go live.

+   Permission required: "Can create events"
+
   **Example request**:

   .. sourcecode:: http
@@ -332,6 +338,8 @@ Endpoints
   Please note that you can only copy from events under the same organizer this way. Use the ``clone_from`` parameter
   when creating a new event for this instead.

+   Permission required: "Can create events"
+
   **Example request**:

   .. sourcecode:: http
@@ -425,6 +433,8 @@ Endpoints

   Updates an event

+   Permission required: "Can change event settings"
+
   **Example request**:

   .. sourcecode:: http
@@ -500,6 +510,8 @@ Endpoints

   Delete an event. Note that events with orders cannot be deleted to ensure data integrity.

+   Permission required: "Can change event settings"
+
   **Example request**:

   .. sourcecode:: http
@@ -549,6 +561,8 @@ organizer level.

   Get current values of event settings.

+   Permission required: "Can change event settings" (Exception: with device auth, *some* settings can always be *read*.)
+
   **Example request**:

   .. sourcecode:: http
@@ -601,8 +615,6 @@ organizer level.

   Updates event settings. Note that ``PUT`` is not allowed here, only ``PATCH``.

-   Permission "Can change event settings" is always required. Some keys require additional permissions.
-
    .. warning::

       Settings can be stored at different levels in pretix. If a value is not set on event level, a default setting
--- a/doc/api/resources/item_program_times.rst
+++ b/doc/api/resources/item_program_times.rst
@@ -46,28 +46,28 @@ Endpoints
      Vary: Accept
      Content-Type: application/json

-      {
-         "count": 3,
-         "next": null,
-         "previous": null,
-         "results": [
-            {
-               "id": 2,
-               "start": "2025-08-14T22:00:00Z",
-               "end": "2025-08-15T00:00:00Z"
-            },
-            {
-               "id": 3,
-               "start": "2025-08-12T22:00:00Z",
-               "end": "2025-08-13T22:00:00Z"
-            },
-            {
-               "id": 14,
-               "start": "2025-08-15T22:00:00Z",
-               "end": "2025-08-17T22:00:00Z"
-            }
-        ]
-      }
+   {
+      "count": 3,
+      "next": null,
+      "previous": null,
+      "results": [
+         {
+            "id": 2,
+            "start": "2025-08-14T22:00:00Z",
+            "end": "2025-08-15T00:00:00Z"
+         },
+         {
+            "id": 3,
+            "start": "2025-08-12T22:00:00Z",
+            "end": "2025-08-13T22:00:00Z"
+         },
+         {
+            "id": 14,
+            "start": "2025-08-15T22:00:00Z",
+            "end": "2025-08-17T22:00:00Z"
+         }
+      ]
+   }

   :param organizer: The ``slug`` field of the organizer to fetch
   :param event: The ``slug`` field of the event to fetch
--- a/doc/api/resources/orders.rst
+++ b/doc/api/resources/orders.rst
@@ -117,8 +117,6 @@ cancellation_date                     datetime                   Time of order c
                                                                 reliable for orders that have been cancelled,
                                                                 reactivated and cancelled again.
 plugin_data                           object                     Additional data added by plugins.
-use_gift_cards                        list of strings            List of unique gift card secrets that are used to pay
-                                                                 for this order.
 ===================================== ========================== =======================================================


@@ -158,10 +156,6 @@ use_gift_cards                        list of strings            List of unique

   The ``tax_rounding_mode`` attribute has been added.

-.. versionchanged:: 2026.03
-
-   The ``use_gift_cards`` attribute has been added.
-
 .. _order-position-resource:

 Order position resource
@@ -993,6 +987,8 @@ Creating orders

       * does not support file upload questions

+       * does not support redeeming gift cards
+
       * does not support or validate memberships


@@ -1099,14 +1095,6 @@ Creating orders
     whether these emails are enabled for certain sales channels. If set to ``null``, behavior will be controlled by pretix'
     settings based on the sales channels (added in pretix 4.7). Defaults to ``false``.
     Used to be ``send_mail`` before pretix 3.14.
-   * ``use_gift_cards`` (optional) The provided gift cards will be used to pay for this order. They will be debited and
-     all the necessary payment records for these transactions will be created. The gift cards will be used in sequence to
-     pay for the order. Processing of the gift cards stops as soon as the order is payed for. All gift card transactions
-     are listed under ``payments`` in the response.
-     This option can only be used with orders that are in the pending state.
-     The ``use_gift_cards`` attribute can not be combined with ``payment_info`` and ``payment_provider`` fields. If the
-     order isn't completely paid after its creation with ``use_gift_cards``, then a subsequent request to the payment
-     endpoint is needed.

   If you want to use add-on products, you need to set the ``positionid`` fields of all positions manually
   to incrementing integers starting with ``1``. Then, you can reference one of these
@@ -1731,56 +1719,6 @@ List of all order positions
   :statuscode 401: Authentication failure
   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.

-.. http:get:: /api/v1/organizers/(organizer)/orderpositions/
-
-   Returns a list of all order positions within all events of a given organizer (with sufficient access permissions).
-
-   The supported query parameters and output format of this endpoint are almost identical to those of the list endpoint
-   within an event.
-   The only changes are that responses also contain the ``event`` attribute in each result and that the 'pdf_data'
-   parameter is not supported.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/orderpositions/ 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
-      X-Page-Generated: 2017-12-01T10:00:00Z
-
-      {
-        "count": 1,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id:": 23442
-            "event": "sampleconf",
-            "order": "ABC12",
-            "positionid": 1,
-            "canceled": false,
-            "item": 1345,
-            ...
-          }
-        ]
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-
-
 Fetching individual positions
 -----------------------------

--- a/doc/api/resources/organizers.rst
+++ b/doc/api/resources/organizers.rst
@@ -110,6 +110,8 @@ Endpoints

   Updates an organizer. Currently only the ``plugins`` field may be updated.

+   Permission required: "Can change organizer settings"
+
   **Example request**:

   .. sourcecode:: http
@@ -170,6 +172,8 @@ information about the properties.

   Get current values of organizer settings.

+   Permission required: "Can change organizer settings"
+
   **Example request**:

   .. sourcecode:: http
--- a/doc/api/resources/reusablemedia.rst
+++ b/doc/api/resources/reusablemedia.rst
@@ -154,7 +154,7 @@ Endpoints
 .. http:post:: /api/v1/organizers/(organizer)/reusablemedia/lookup/

   Look up a new reusable medium by its identifier. In some cases, this might lead to the automatic creation of a new
-   medium behind the scenes, therefore this endpoint requires write permissions.
+   medium behind the scenes.

   This endpoint, and this endpoint only, might return media from a different organizer if there is a cross-acceptance
   agreement. In this case, only linked gift cards will be returned, no order position or customer records,
--- a/doc/api/resources/subevents.rst
+++ b/doc/api/resources/subevents.rst
@@ -154,6 +154,8 @@ Endpoints

   Creates a new subevent.

+   Permission required: "Can create events"
+
   **Example request**:

   .. sourcecode:: http
@@ -298,6 +300,8 @@ Endpoints
   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.

+   Permission required: "Can change event settings"
+
   **Example request**:

   .. sourcecode:: http
@@ -369,6 +373,8 @@ Endpoints

   Delete a sub-event. Note that events with orders cannot be deleted to ensure data integrity.

+   Permission required: "Can change event settings"
+
   **Example request**:

   .. sourcecode:: http
--- a/doc/api/resources/teams.rst
+++ b/doc/api/resources/teams.rst
@@ -24,58 +24,21 @@ all_events                            boolean                    Whether this te
 limit_events                          list                       List of event slugs this team has access to
 require_2fa                           boolean                    Whether members of this team are required to use
                                                                 two-factor authentication
-all_event_permissions                 bool                       Whether members of this team are granted all event-level
-                                                                 permissions, including future additions
-limit_event_permissions               list of strings            The event-level permissions team members are granted
-all_organizer_permissions             bool                       Whether members of this team are granted all organizer-level
-                                                                 permissions, including future additions
-all_organizer_permissions             list of strings            The organizer-level permissions team members are granted
-can_create_events                     boolean                    **DEPRECATED**. Legacy interface, use ``limit_organizer_permissions``.
-can_change_teams                      boolean                    **DEPRECATED**. Legacy interface, use ``limit_organizer_permissions``.
-can_change_organizer_settings         boolean                    **DEPRECATED**. Legacy interface, use ``limit_organizer_permissions``.
-can_manage_customers                  boolean                    **DEPRECATED**. Legacy interface, use ``limit_organizer_permissions``.
-can_manage_reusable_media             boolean                    **DEPRECATED**. Legacy interface, use ``limit_organizer_permissions``.
-can_manage_gift_cards                 boolean                    **DEPRECATED**. Legacy interface, use ``limit_organizer_permissions``.
-can_change_event_settings             boolean                    **DEPRECATED**. Legacy interface, use ``limit_event_permissions``.
-can_change_items                      boolean                    **DEPRECATED**. Legacy interface, use ``limit_event_permissions``.
-can_view_orders                       boolean                    **DEPRECATED**. Legacy interface, use ``limit_event_permissions``.
-can_change_orders                     boolean                    **DEPRECATED**. Legacy interface, use ``limit_event_permissions``.
-can_view_vouchers                     boolean                    **DEPRECATED**. Legacy interface, use ``limit_event_permissions``.
-can_change_vouchers                   boolean                    **DEPRECATED**. Legacy interface, use ``limit_event_permissions``.
-can_checkin_orders                    boolean                    **DEPRECATED**. Legacy interface, use ``limit_event_permissions``.
+can_create_events                     boolean
+can_change_teams                      boolean
+can_change_organizer_settings         boolean
+can_manage_customers                  boolean
+can_manage_reusable_media             boolean
+can_manage_gift_cards                 boolean
+can_change_event_settings             boolean
+can_change_items                      boolean
+can_view_orders                       boolean
+can_change_orders                     boolean
+can_view_vouchers                     boolean
+can_change_vouchers                   boolean
+can_checkin_orders                    boolean
 ===================================== ========================== =======================================================

-Possible values for ``limit_organizer_permissions`` defined in the core pretix system (plugins might add more)::
-
-    organizer.events:create
-    organizer.settings.general:write
-    organizer.teams:write
-    organizer.seatingplans:write
-    organizer.giftcards:read
-    organizer.giftcards:write
-    organizer.customers:read
-    organizer.customers:write
-    organizer.reusablemedia:read
-    organizer.reusablemedia:write
-    organizer.devices:read
-    organizer.devices:write
-    organizer.outgoingmails:read
-
-Possible values for ``limit_event_permissions`` defined in the core pretix system (plugins might add more)::
-
-    event.settings.general:write
-    event.settings.payment:write
-    event.settings.tax:write
-    event.settings.invoicing:write
-    event.subevents:write
-    event.items:write
-    event.orders:read
-    event.orders:write
-    event.orders:checkin
-    event.vouchers:read
-    event.vouchers:write
-    event:cancel
-
 Team member resource
 --------------------

@@ -158,10 +121,6 @@ Team endpoints
            "all_events": true,
            "limit_events": [],
            "require_2fa": true,
-            "all_event_permissions": true,
-            "limit_event_permissions": [],
-            "all_organizer_permissions": true,
-            "limit_organizer_permissions": [],
            "can_create_events": true,
            ...
          }
@@ -200,10 +159,6 @@ Team endpoints
        "all_events": true,
        "limit_events": [],
        "require_2fa": true,
-        "all_event_permissions": true,
-        "limit_event_permissions": [],
-        "all_organizer_permissions": true,
-        "limit_organizer_permissions": [],
        "can_create_events": true,
        ...
      }
@@ -232,10 +187,7 @@ Team endpoints
        "all_events": true,
        "limit_events": [],
        "require_2fa": true,
-        "all_event_permissions": true,
-        "limit_event_permissions": [],
-        "all_organizer_permissions": true,
-        "limit_organizer_permissions": [],
+        "can_create_events": true,
        ...
      }

@@ -253,10 +205,6 @@ Team endpoints
        "all_events": true,
        "limit_events": [],
        "require_2fa": true,
-        "all_event_permissions": true,
-        "limit_event_permissions": [],
-        "all_organizer_permissions": true,
-        "limit_organizer_permissions": [],
        "can_create_events": true,
        ...
      }
@@ -284,8 +232,7 @@ Team endpoints
      Content-Length: 94

      {
-        "all_organizer_permissions": false,
-        "limit_organizer_permissions": ["organizer.events:create"]
+        "can_create_events": true
      }

   **Example response**:
@@ -302,10 +249,6 @@ Team endpoints
        "all_events": true,
        "limit_events": [],
        "require_2fa": true,
-        "all_event_permissions": true,
-        "limit_event_permissions": [],
-        "all_organizer_permissions": false,
-        "limit_organizer_permissions": ["organizer.events:create"],
        "can_create_events": true,
        ...
      }
--- a/doc/api/resources/webhooks.rst
+++ b/doc/api/resources/webhooks.rst
@@ -60,9 +60,6 @@ The following values for ``action_types`` are valid with pretix core:
    * ``pretix.event.added``
    * ``pretix.event.changed``
    * ``pretix.event.deleted``
-    * ``pretix.giftcards.created``
-    * ``pretix.giftcards.modified``
-    * ``pretix.giftcards.transaction.*``
    * ``pretix.voucher.added``
    * ``pretix.voucher.changed``
    * ``pretix.voucher.deleted``
--- a/doc/development/algorithms/pricing.rst
+++ b/doc/development/algorithms/pricing.rst
@@ -211,7 +211,7 @@ The line-based computation has a few significant advantages:

 The main disadvantage is that the tax looks "wrong" when computed from the sum. Taking the sum of net prices (420.15)
 and multiplying it with the tax rate (19%) yields a tax amount of 79.83 (instead of 79.85) and a gross sum of 499.98
-(instead of 500.00). This becomes a problem when juristictions, data formats, or external systems expect this calculation
+(instead of 499.98). This becomes a problem when juristictions, data formats, or external systems expect this calculation
 to work on the level of the entire order. A prominent example is the EN 16931 standard for e-invoicing that
 does not allow the computation as created by pretix.

--- a/doc/development/api/customview.rst
+++ b/doc/development/api/customview.rst
@@ -55,12 +55,12 @@ your views:
    )

    class AdminView(EventPermissionRequiredMixin, View):
-        permission = 'event.orders:read'
+        permission = 'can_view_orders'

        ...


-    @event_permission_required('event.orders:read')
+    @event_permission_required('can_view_orders')
    def admin_view(request, organizer, event):
        ...

@@ -78,7 +78,7 @@ event-related views, there is also a signal that allows you to add the view to t
    @receiver(nav_event, dispatch_uid='friends_tickets_nav')
    def navbar_info(sender, request, **kwargs):
        url = resolve(request.path_info)
-        if not request.user.has_event_permission(request.organizer, request.event, 'event.vouchers:read'):
+        if not request.user.has_event_permission(request.organizer, request.event, 'can_change_vouchers'):
            return []
        return [{
            'label': _('My plugin view'),
@@ -118,7 +118,7 @@ for good integration. If you just want to display a form, you could do it like t

    class MySettingsView(EventSettingsViewMixin, EventSettingsFormView):
        model = Event
-        permission = 'event.settings.general:write'
+        permission = 'can_change_settings'
        form_class = MySettingsForm
        template_name = 'my_plugin/settings.html'

@@ -204,13 +204,13 @@ In case of ``orga_router`` and ``event_router``, permission checking is done for
 in the control panel. However, you need to make sure on your own only to return the correct subset of data! ``request
 .event`` and ``request.organizer`` are available as usual.

-To require a special permission like ``event.orders:read``, you do not need to inherit from a special ViewSet base
+To require a special permission like ``can_view_orders``, you do not need to inherit from a special ViewSet base
 class, you can just set the ``permission`` attribute on your viewset:

 .. code-block:: python

    class MyViewSet(ModelViewSet):
-        permission = 'event.orders:read'
+        permission = 'can_view_orders'
        ...

 If you want to check the permission only for some methods of your viewset, you have to do it yourself. Note here that
@@ -220,7 +220,7 @@ following:
 .. code-block:: python

    perm_holder = (request.auth if isinstance(request.auth, TeamAPIToken) else request.user)
-    if perm_holder.has_event_permission(request.event.organizer, request.event, 'event.orders:read'):
+    if perm_holder.has_event_permission(request.event.organizer, request.event, 'can_view_orders'):
        ...


--- a/doc/development/api/exporter.rst
+++ b/doc/development/api/exporter.rst
@@ -80,24 +80,8 @@ The exporter class

   .. autoattribute:: category

-   .. autoattribute:: feature
-
   .. autoattribute:: export_form_fields

-   .. autoattribute:: repeatable_read
-
   .. automethod:: render

      This is an abstract method, you **must** override this!
-
-   .. automethod:: available_for_user
-
-   .. automethod:: get_required_event_permission
-
-On organizer level, by default exporters are expected to handle on a *set of events* and the system will automatically
-add a form field that allows the selection of events, limited to events the user has correct permissions for. If this
-does not fit your organizer, because it is not related to events, you should **also** inherit from the following class:
-
-.. class:: pretix.base.exporter.OrganizerLevelExportMixin
-
-   .. automethod:: get_required_organizer_permission
--- a/doc/development/api/general.rst
+++ b/doc/development/api/general.rst
@@ -14,8 +14,7 @@ Core
   :members: periodic_task, event_live_issues, event_copy_data, email_filter, register_notification_types, notification,
      item_copy_data, register_sales_channel_types, register_global_settings, quota_availability, global_email_filter,
      register_ticket_secret_generators, gift_card_transaction_display,
-      register_text_placeholders, register_mail_placeholders, device_info_updated,
-      register_event_permission_groups, register_organizer_permission_groups
+      register_text_placeholders, register_mail_placeholders, device_info_updated

 Order events
 """"""""""""
--- a/doc/development/contribution/ai.rst
+++ b/doc/development/contribution/ai.rst
@@ -1,24 +0,0 @@
-.. _`aipolicy`:
-
-AI-assisted contribution policy
-===============================
-
-pretix is maintained by humans.
-Every discussion, issue, and pull request is read and reviewed by humans (and sometimes machines, too).
-We ask you to respect the time and effort put in by these humans by not sending low-effort, unqualified work, since it puts the burden of validation on the maintainer.
-
-Therefore, the pretix project has strict rules for AI usage:
-
- **All AI usage in any form must be disclosed.** You must state the tool you used (e.g. Claude Code, Cursor, Amp) along with the extent that the work was AI-assisted.
-
- **The human-in-the-loop must fully understand all code.** If you can't explain what your changes do and how they interact with the greater system without the aid of AI tools, do not contribute to this project.
-
- **Issues and discussions can use AI assistance but must have a full human-in-the-loop.** This means that any content generated with AI must have been reviewed and edited by a human before submission. AI is very good at being overly verbose and including noise that distracts from the main point. Humans must do their research and trim this down.
-
- **No AI-generated media is allowed (art, images, videos, audio, etc.).** Text and code are the only acceptable AI-generated content, per the other rules in this policy.
-
- **Bad AI drivers will be excluded from the project.** People who produce bad contributions that are clearly AI (slop) will be blocked from our organization without warning.
-
-This policy was inspired by the `ghostty project`_.
-
-.. _ghostty project: https://github.com/ghostty-org/ghostty/blob/main/AI_POLICY.md
--- a/doc/development/contribution/general.rst
+++ b/doc/development/contribution/general.rst
@@ -1,39 +1,23 @@
-Contribution workflow
-=====================
+General remarks
+===============

 You are interested in contributing to pretix? That is awesome!

 If you’re new to contributing to open source software, don’t be afraid. We’ll happily review your code and give you
-constructive and friendly feedback on your changes. Every contribution should go through the following steps.
+constructive and friendly feedback on your changes.

-Discussion & Design
-------------------
-
-pretix is a large and mature project with more of a decade of history and hopefully many more decades to come.
-Keeping pretix in good shape over long timeframes is first and foremost a fight against complexity.
-With every additional feature, complexity grows, and both features and complexity are hard to remove.
-
-Even if you are doing the initial work of the contribution, accepting the contribution is not free for us.
-Not only will we need to maintain the feature, but every feature adds cost to the maintenance of every other feature it interacts with, and every feature adds effort for users to understand how pretix works.
-Therefore, we must carefully select what features we add, based on how well they fit the system in general and of how much use they will be to our larger user base.
-
-We strongly ask you to **create a discussion on GitHub for every new feature idea** outlining the use case and the proposed implementation design.
-Pull requests without prior discussion will likely just be closed.
-
-For bug fixes and very minor changes, you can skip this step and open a PR right away.
-
-Development
-----------
-
-To develop your contribution, you'll need pretix running locally on your machine. Head over to :ref:`devsetup` to learn how to do this.
+First of all, you'll need pretix running locally on your machine. Head over to :ref:`devsetup` to learn how to do this.
 If you run into any problems on your way, please do not hesitate to ask us anytime!

-While developing, please have a look at our :ref:`aipolicy` and our guidelines on :ref:`codestyle`.
+Please note that we bound ourselves to a :ref:`coc` that applies to all communication around the project. You can be
+assured that we will not tolerate any form of harassment.

 Sending a patch
 ---------------

-Once you have a first draft of your changes, please `create a pull request`_ on our `GitHub repository`_.
+If you improved pretix in any way, we'd be very happy if you contribute it
+back to the main code base! The easiest way to do so is to `create a pull request`_
+on our `GitHub repository`_.

 We recommend that you create a feature branch for every issue you work on so the changes can
 be reviewed individually.
@@ -41,17 +25,14 @@ Please use the test suite to check whether your changes break any existing featu
 the code style checks to confirm you are consistent with pretix's coding style. You'll
 find instructions on this in the :ref:`checksandtests` section of the development setup guide.

-We automatically run the tests and the code style check on every pull request through GitHub Actions and we won’t
+We automatically run the tests and the code style check on every pull request on Travis CI and we won’t
 accept any pull requests without all tests passing. However, if you don't find out *why* they are not passing,
 just send the pull request and tell us – we'll be glad to help.

 If you add a new feature, please include appropriate documentation into your patch. If you fix a bug,
 please include a regression test, i.e. a test that fails without your changes and passes after applying your changes.

-Again: If you get stuck, do not hesitate to contact us through GitHub discussions.
-
-Please note that we bound ourselves to a :ref:`coc` that applies to all communication around the project. You can be
-assured that we will not tolerate any form of harassment.
+Again: If you get stuck, do not hesitate to contact any of us, or Raphael personally at mail@raphaelmichel.de.

 .. _create a pull request: https://help.github.com/articles/creating-a-pull-request/
 .. _GitHub repository: https://github.com/pretix/pretix
--- a/doc/development/contribution/index.rst
+++ b/doc/development/contribution/index.rst
@@ -6,5 +6,4 @@ Contributing to pretix

   general
   style
-   ai
   codeofconduct
--- a/doc/development/contribution/style.rst
+++ b/doc/development/contribution/style.rst
@@ -1,7 +1,5 @@
 .. spelling:word-list:: Rebase rebasing

-.. _`codestyle`:
-
 Coding style and quality
 ========================

@@ -30,6 +28,8 @@ Code
 Commits and Pull Requests
 -------------------------

+
+
 Most commits should start as pull requests, therefore this applies to the titles of pull requests as well since
 the pull request title will become the commit message on merge. We prefer merging with GitHub's "Squash and merge"
 feature if the PR contains multiple commits that do not carry value to keep. If there is value in keeping the
--- a/doc/development/implementation/logging.rst
+++ b/doc/development/implementation/logging.rst
@@ -196,7 +196,7 @@ A simple implementation could look like this:
 .. code-block:: python

    class MyNotificationType(NotificationType):
-        required_permission = "event.orders:read"
+        required_permission = "can_view_orders"
        action_type = "pretix.event.order.paid"
        verbose_name = _("Order has been paid")

--- a/doc/development/implementation/permissions.rst
+++ b/doc/development/implementation/permissions.rst
@@ -2,7 +2,7 @@ Permissions
 ===========

 pretix uses a fine-grained permission system to control who is allowed to control what parts of the system.
-The central concept here is the concept of *Teams*. You can read more on `configuring teams and permissions`_
+The central concept here is the concept of *Teams*. You can read more on `configuring teams and permissions <user-teams>`_
 and the :class:`pretix.base.models.Team` model in the respective parts of the documentation. The basic digest is:
 An organizer account can have any number of teams, and any number of users can be part of a team. A team can be
 assigned a set of permissions and connected to some or all of the events of the organizer.
@@ -25,8 +25,8 @@ permission level to access a view:


    class MyOrgaView(OrganizerPermissionRequiredMixin, View):
-        permission = 'organizer.settings.general:write'
-        # Only users with the permission ``organizer.settings.general:write`` on
+        permission = 'can_change_organizer_settings'
+        # Only users with the permission ``can_change_organizer_settings`` on
        # this organizer can access this


@@ -35,9 +35,9 @@ permission level to access a view:
        # Only users with *any* permission on this organizer can access this


-    @organizer_permission_required('organizer.settings.general:write')
+    @organizer_permission_required('can_change_organizer_settings')
    def my_orga_view(request, organizer, **kwargs):
-        # Only users with the permission ``organizer.settings.general:write`` on
+        # Only users with the permission ``can_change_organizer_settings`` on
        # this organizer can access this


@@ -56,8 +56,8 @@ Of course, the same is available on event level:


    class MyEventView(EventPermissionRequiredMixin, View):
-        permission = 'event.settings.general:write'
-        # Only users with the permission ``event.settings.general:write`` on
+        permission = 'can_change_event_settings'
+        # Only users with the permission ``can_change_event_settings`` on
        # this event can access this


@@ -65,16 +65,13 @@ Of course, the same is available on event level:
        permission = None
        # Only users with *any* permission on this event can access this

-    class MyThirdEventView(EventPermissionRequiredMixin, View):
-        permission = AnyPermissionOf('event.settings.payment:write', 'event.settings.general:write')
-        # Only users with at least one of the specified permissions on this event
-        # can access this

-    @event_permission_required('event.settings.general:write')
+    @event_permission_required('can_change_event_settings')
    def my_event_view(request, organizer, **kwargs):
-        # Only users with the permission ``event.settings.general:write`` on
+        # Only users with the permission ``can_change_event_settings`` on
        # this event can access this

+
    @event_permission_required()
    def my_other_event_view(request, organizer, **kwargs):
        # Only users with *any* permission on this event can access this
@@ -124,7 +121,7 @@ When creating your own ``viewset`` using Django REST framework, you just need to
 and pretix will check it automatically for you::

    class MyModelViewSet(viewsets.ReadOnlyModelViewSet):
-        permission = 'event.orders:read'
+        permission = 'can_view_orders'

 Checking permission in code
 ---------------------------
@@ -139,12 +136,12 @@ Return all users that are in any team that is connected to this event::

 Return all users that are in a team with a specific permission for this event::

-    >>> event.get_users_with_permission('event.orders:read')
+    >>> event.get_users_with_permission('can_change_event_settings')
    <QuerySet: …>

 Determine if a user has a certain permission for a specific event::

-    >>> user.has_event_permission(organizer, event, 'event.orders:read', request=request)
+    >>> user.has_event_permission(organizer, event, 'can_change_event_settings', request=request)
    True

 Determine if a user has any permission for a specific event::
@@ -156,27 +153,27 @@ In the two previous commands, the ``request`` argument is optional, but required

 The same method exists for organizer-level permissions::

-    >>> user.has_organizer_permission(organizer, 'event.orders:read', request=request)
+    >>> user.has_organizer_permission(organizer, 'can_change_event_settings', request=request)
    True

 Sometimes, it might be more useful to get the set of permissions at once::

    >>> user.get_event_permission_set(organizer, event)
-    {'event.settings.general:write', 'event.orders:read', 'event.orders:write'}
+    {'can_change_event_settings', 'can_view_orders', 'can_change_orders'}

    >>> user.get_organizer_permission_set(organizer, event)
-    {'organizer.settings.general:write', 'organizer.events:create'}
+    {'can_change_organizer_settings', 'can_create_events'}

 Within a view on the ``/control`` subpath, the results of these two methods are already available in the
 ``request.eventpermset`` and ``request.orgapermset`` properties. This makes it convenient to query them in templates::

-    {% if "event.orders:write" in request.eventpermset %}
+    {% if "can_change_orders" in request.eventpermset %}
        …
    {% endif %}

 You can also do the reverse to get any events a user has access to::

-    >>> user.get_events_with_permission('event.settings.general:write', request=request)
+    >>> user.get_events_with_permission('can_change_event_settings', request=request)
    <QuerySet: …>

    >>> user.get_events_with_any_permission(request=request)
@@ -198,53 +195,3 @@ staff mode is active. You can check if a user is in staff mode using their sessi
 Staff mode has a hard time limit and during staff mode, a middleware will log all requests made by that user. Later,
 the user is able to also save a message to comment on what they did in their administrative session. This feature is
 intended to help compliance with data protection rules as imposed e.g. by GDPR.
-
-Adding permissions
------------------
-
-Plugins can add permissions through the ``register_event_permission_groups`` and ``register_organizer_permission_groups``.
-We recommend to use this only for very significant permissions, as the system will become less usable with too many
-permission levels, also because the team page will show all permission options, even those of disabled plugins.
-
-To register your permissions, you need to register a **permission group** (often representing an area of functionality
-or a key model). Below that group, there are **actions**, which represent the actual permissions. Permissions will be
-generated as ``<group_name>:<action>``. Then, you need to define **options** which are the valid combinations of the
-actions that should be possible to select for a team. This two-step mechanism exists to provide a better user experience
-and avoid useless combinations like "write but not read".
-
-Example::
-
-    @receiver(register_event_permission_groups)
-    def register_plugin_event_permissions(sender, **kwargs):
-        return [
-            PermissionGroup(
-                name="pretix_myplugin.resource",
-                label=_("Resources"),
-                actions=["read", "write"],
-                options=[
-                    PermissionOption(actions=tuple(), label=_("No access")),
-                    PermissionOption(actions=("read",), label=_("View")),
-                    PermissionOption(actions=("read", "write"), label=_("View and change")),
-                ],
-                help_text=_("Some help text")
-            ),
-        ]
-
-
-    @receiver(register_organizer_permission_groups)
-    def register_plugin_organizer_permissions(sender, **kwargs):
-        return [
-            PermissionGroup(
-                name="pretix_myplugin.resource",
-                label=_("Resources"),
-                actions=["read", "write"],
-                options=[
-                    PermissionOption(actions=tuple(), label=_("No access")),
-                    PermissionOption(actions=("read",), label=_("View")),
-                    PermissionOption(actions=("read", "write"), label=_("View and change")),
-                ],
-                help_text=_("Some help text")
-            ),
-        ]
-
-.. _configuring teams and permissions: https://docs.pretix.eu/guides/teams/
--- a/doc/requirements.rtd.txt
+++ b/doc/requirements.rtd.txt
@@ -1,8 +1,9 @@
-sphinx==9.1.*
-sphinx-rtd-theme~=3.1.0
-sphinxcontrib-httpdomain~=2.0.0
-sphinxcontrib-images~=1.0.1
-sphinxcontrib-jquery~=4.1
-sphinxcontrib-spelling~=8.0.2
-sphinxemoji~=0.3.2
+sphinx==7.4.*
+jinja2==3.1.*
+sphinx-rtd-theme
+sphinxcontrib-httpdomain
+sphinxcontrib-images
+sphinxcontrib-jquery
+sphinxcontrib-spelling==8.*
+sphinxemoji
 pyenchant==3.3.*
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,9 +1,10 @@
 -e ../
-sphinx==9.1.*
-sphinx-rtd-theme~=3.1.0
-sphinxcontrib-httpdomain~=2.0.0
-sphinxcontrib-images~=1.0.1
-sphinxcontrib-jquery~=4.1
-sphinxcontrib-spelling~=8.0.2
-sphinxemoji~=0.3.2
+sphinx==7.4.*
+jinja2==3.1.*
+sphinx-rtd-theme
+sphinxcontrib-httpdomain
+sphinxcontrib-images
+sphinxcontrib-jquery
+sphinxcontrib-spelling==8.*
+sphinxemoji
 pyenchant==3.3.*
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ name = "pretix"
 dynamic = ["version"]
 description = "Reinventing presales, one ticket at a time"
 readme = "README.rst"
-requires-python = ">=3.10"
+requires-python = ">=3.9"
 license = {file = "LICENSE"}
 keywords = ["tickets", "web", "shop", "ecommerce"]
 authors = [
@@ -29,19 +29,19 @@ dependencies = [
  "arabic-reshaper==3.0.0",  # Support for Arabic in reportlab
  "babel",
  "BeautifulSoup4==4.14.*",
-  "bleach==6.3.*",
-  "celery==5.6.*",
+  "bleach==6.2.*",
+  "celery==5.5.*",
  "chardet==5.2.*",
  "cryptography>=44.0.0",
-  "css-inline==0.20.*",
+  "css-inline==0.18.*",
  "defusedcsv>=1.1.0",
  "dnspython==2.*",
  "Django[argon2]==4.2.*,>=4.2.26",
-  "django-bootstrap3==26.1",
-  "django-compressor==4.6.0",
-  "django-countries==8.2.*",
+  "django-bootstrap3==25.2",
+  "django-compressor==4.5.1",
+  "django-countries==7.6.*",
  "django-filter==25.1",
-  "django-formset-js-improved==0.5.0.5",
+  "django-formset-js-improved==0.5.0.4",
  "django-formtools==2.5.1",
  "django-hierarkey==2.0.*,>=2.0.1",
  "django-hijack==3.7.*",
@@ -50,22 +50,22 @@ dependencies = [
  "django-localflavor==5.0",
  "django-markup",
  "django-oauth-toolkit==2.3.*",
-  "django-otp==1.7.*",
-  "django-phonenumber-field==8.4.*",
+  "django-otp==1.6.*",
+  "django-phonenumber-field==7.3.*",
  "django-redis==6.0.*",
  "django-scopes==2.0.*",
-  "django-statici18n==2.7.*",
+  "django-statici18n==2.6.*",
  "djangorestframework==3.16.*",
-  "dnspython==2.8.*",
+  "dnspython==2.7.*",
  "drf_ujson2==1.7.*",
  "geoip2==5.*",
  "importlib_metadata==8.*",  # Polyfill, we can probably drop this once we require Python 3.10+
  "isoweek",
  "jsonschema",
-  "kombu==5.6.*",
+  "kombu==5.5.*",
  "libsass==0.23.*",
  "lxml",
-  "markdown==3.10.2",  # 3.3.5 requires importlib-metadata>=4.4, but django-bootstrap3 requires importlib-metadata<3.
+  "markdown==3.9",  # 3.3.5 requires importlib-metadata>=4.4, but django-bootstrap3 requires importlib-metadata<3.
  # We can upgrade markdown again once django-bootstrap3 upgrades or once we drop Python 3.6 and 3.7
  "mt-940==4.30.*",
  "oauthlib==3.3.*",
@@ -73,32 +73,33 @@ dependencies = [
  "packaging",
  "paypalrestsdk==1.13.*",
  "paypal-checkout-serversdk==1.0.*",
-  "PyJWT==2.12.*",
+  "PyJWT==2.10.*",
  "phonenumberslite==9.0.*",
-  "Pillow==12.1.*",
+  "Pillow==11.3.*",
  "pretix-plugin-build",
-  "protobuf==7.34.*",
+  "protobuf==6.33.*",
  "psycopg2-binary",
  "pycountry",
-  "pycparser==3.0",
+  "pycparser==2.23",
  "pycryptodome==3.23.*",
-  "pypdf==6.5.*",
+  "pypdf==6.4.*",
  "python-bidi==0.6.*",  # Support for Arabic in reportlab
  "python-dateutil==2.9.*",
  "pytz",
  "pytz-deprecation-shim==0.1.*",
  "pyuca",
  "qrcode==8.2",
-  "redis==7.1.*",
+  "redis==6.4.*",
  "reportlab==4.4.*",
  "requests==2.32.*",
-  "sentry-sdk==2.54.*",
+  "sentry-sdk==2.46.*",
  "sepaxml==2.7.*",
  "stripe==7.9.*",
  "text-unidecode==1.*",
  "tlds>=2020041600",
  "tqdm==4.*",
  "ua-parser==1.0.*",
+  "vat_moss_forked==2020.3.20.0.11.0",
  "vobject==0.9.*",
  "webauthn==2.7.*",
  "zeep==4.3.*"
@@ -110,10 +111,10 @@ dev = [
  "aiohttp==3.13.*",
  "coverage",
  "coveralls",
-  "fakeredis==2.34.*",
+  "fakeredis==2.32.*",
  "flake8==7.3.*",
  "freezegun",
-  "isort==8.0.*",
+  "isort==6.1.*",
  "pep8-naming==0.15.*",
  "potypo",
  "pytest-asyncio>=0.24",
@@ -123,7 +124,7 @@ dev = [
  "pytest-mock==3.15.*",
  "pytest-sugar",
  "pytest-xdist==3.8.*",
-  "pytest==9.0.*",
+  "pytest==8.4.*",
  "responses",
 ]

--- a/src/pretix/init.py
+++ b/src/pretix/init.py
@@ -19,4 +19,4 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-__version__ = "2026.3.0.dev0"
+__version__ = "2025.11.0.dev0"
--- a/src/pretix/api/auth/permission.py
+++ b/src/pretix/api/auth/permission.py
@@ -36,9 +36,7 @@ from rest_framework.permissions import SAFE_METHODS, BasePermission

 from pretix.api.models import OAuthAccessToken
 from pretix.base.models import Device, Event, User
-from pretix.base.models.auth import (
-    EventPermissionSet, OrganizerPermissionSet, SuperuserPermissionSet,
-)
+from pretix.base.models.auth import SuperuserPermissionSet
 from pretix.base.models.organizer import TeamAPIToken
 from pretix.helpers.security import (
    Session2FASetupRequired, SessionInvalid, SessionPasswordChangeRequired,
@@ -87,7 +85,7 @@ class EventPermission(BasePermission):
            if isinstance(perm_holder, User) and perm_holder.has_active_staff_session(request.session.session_key):
                request.eventpermset = SuperuserPermissionSet()
            else:
-                request.eventpermset = EventPermissionSet(perm_holder.get_event_permission_set(request.organizer, request.event))
+                request.eventpermset = perm_holder.get_event_permission_set(request.organizer, request.event)

            if isinstance(required_permission, (list, tuple)):
                if not any(p in request.eventpermset for p in required_permission):
@@ -102,7 +100,7 @@ class EventPermission(BasePermission):
            if isinstance(perm_holder, User) and perm_holder.has_active_staff_session(request.session.session_key):
                request.orgapermset = SuperuserPermissionSet()
            else:
-                request.orgapermset = OrganizerPermissionSet(perm_holder.get_organizer_permission_set(request.organizer))
+                request.orgapermset = perm_holder.get_organizer_permission_set(request.organizer)

            if isinstance(required_permission, (list, tuple)):
                if not any(p in request.eventpermset for p in required_permission):
@@ -126,12 +124,12 @@ class EventCRUDPermission(EventPermission):
    def has_permission(self, request, view):
        if not super(EventCRUDPermission, self).has_permission(request, view):
            return False
-        elif view.action == 'create' and 'organizer.events:create' not in request.orgapermset:
+        elif view.action == 'create' and 'can_create_events' not in request.orgapermset:
            return False
-        elif view.action == 'destroy' and 'event.settings.general:write' not in request.eventpermset:
+        elif view.action == 'destroy' and 'can_change_event_settings' not in request.eventpermset:
            return False
        elif view.action in ['update', 'partial_update'] \
-                and 'event.settings.general:write' not in request.eventpermset:
+                and 'can_change_event_settings' not in request.eventpermset:
            return False

        return True
--- a/src/pretix/api/serializers/event.py
+++ b/src/pretix/api/serializers/event.py
@@ -300,7 +300,7 @@ class EventSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
    def ignored_meta_properties(self):
        perm_holder = (self.context['request'].auth if isinstance(self.context['request'].auth, (Device, TeamAPIToken))
                       else self.context['request'].user)
-        if perm_holder.has_organizer_permission(self.context['request'].organizer, 'organizer.settings.general:write', request=self.context['request']):
+        if perm_holder.has_organizer_permission(self.context['request'].organizer, 'can_change_organizer_settings', request=self.context['request']):
            return []
        return [k for k, p in self.meta_properties.items() if p.protected]

@@ -445,7 +445,7 @@ class CloneEventSerializer(EventSerializer):
        date_admission = validated_data.pop('date_admission', None)
        new_event = super().create({**validated_data, 'plugins': None})

-        event = self.context['event']
+        event = Event.objects.filter(slug=self.context['event'], organizer=self.context['organizer'].pk).first()
        new_event.copy_data_from(event, skip_meta_data='meta_data' in validated_data)

        if plugins is not None:
@@ -561,7 +561,7 @@ class SubEventSerializer(I18nAwareModelSerializer):
    def ignored_meta_properties(self):
        perm_holder = (self.context['request'].auth if isinstance(self.context['request'].auth, (Device, TeamAPIToken))
                       else self.context['request'].user)
-        if perm_holder.has_organizer_permission(self.context['request'].organizer, 'organizer.settings.general:write', request=self.context['request']):
+        if perm_holder.has_organizer_permission(self.context['request'].organizer, 'can_change_organizer_settings', request=self.context['request']):
            return []
        return [k for k, p in self.meta_properties.items() if p.protected]

@@ -707,10 +707,7 @@ class TaxRuleSerializer(CountryFieldMixin, I18nAwareModelSerializer):


 class EventSettingsSerializer(SettingsSerializer):
-    default_write_permission = 'event.settings.general:write'
    default_fields = [
-        # These are readable for all users with access to the events, therefore secrets stored in the settings store
-        # should not be included!
        'imprint_url',
        'checkout_email_helptext',
        'presale_has_ended_text',
@@ -798,7 +795,6 @@ class EventSettingsSerializer(SettingsSerializer):
        'invoice_address_asked',
        'invoice_address_required',
        'invoice_address_vatid',
-        'invoice_address_vatid_required_countries',
        'invoice_address_company_required',
        'invoice_address_beneficiary',
        'invoice_address_custom_field',
@@ -809,7 +805,6 @@ class EventSettingsSerializer(SettingsSerializer):
        'invoice_reissue_after_modify',
        'invoice_include_free',
        'invoice_generate',
-        'invoice_generate_only_business',
        'invoice_period',
        'invoice_numbers_consecutive',
        'invoice_numbers_prefix',
@@ -948,7 +943,6 @@ class DeviceEventSettingsSerializer(EventSettingsSerializer):
        'invoice_address_asked',
        'invoice_address_required',
        'invoice_address_vatid',
-        'invoice_address_vatid_required_countries',
        'invoice_address_company_required',
        'invoice_address_beneficiary',
        'invoice_address_custom_field',
@@ -1083,16 +1077,16 @@ class SeatSerializer(I18nAwareModelSerializer):

    def prefetch_expanded_data(self, items, request, expand_fields):
        if 'orderposition' in expand_fields:
-            if 'event.orders:read' not in request.eventpermset:
-                raise PermissionDenied('event.orders:read permission required for expand=orderposition')
+            if 'can_view_orders' not in request.eventpermset:
+                raise PermissionDenied('can_view_orders permission required for expand=orderposition')
            prefetch_by_id(items, OrderPosition.objects.prefetch_related('order'), 'orderposition_id', 'orderposition')
        if 'cartposition' in expand_fields:
-            if 'event.orders:read' not in request.eventpermset:
-                raise PermissionDenied('event.orders:read permission required for expand=cartposition')
+            if 'can_view_orders' not in request.eventpermset:
+                raise PermissionDenied('can_view_orders permission required for expand=cartposition')
            prefetch_by_id(items, CartPosition.objects, 'cartposition_id', 'cartposition')
        if 'voucher' in expand_fields:
-            if 'event.vouchers:read' not in request.eventpermset:
-                raise PermissionDenied('event.vouchers:read permission required for expand=voucher')
+            if 'can_view_vouchers' not in request.eventpermset:
+                raise PermissionDenied('can_view_vouchers permission required for expand=voucher')
            prefetch_by_id(items, Voucher.objects, 'voucher_id', 'voucher')

    def __init__(self, instance, *args, **kwargs):
--- a/src/pretix/api/serializers/exporters.py
+++ b/src/pretix/api/serializers/exporters.py
@@ -27,9 +27,7 @@ from rest_framework.exceptions import ValidationError

 from pretix.api.serializers.forms import form_field_to_serializer_field
 from pretix.base.exporter import OrganizerLevelExportMixin
-from pretix.base.models import (
-    Event, ScheduledEventExport, ScheduledOrganizerExport,
-)
+from pretix.base.models import ScheduledEventExport, ScheduledOrganizerExport
 from pretix.base.timeframes import SerializerDateFrameField


@@ -56,29 +54,20 @@ class ExporterSerializer(serializers.Serializer):

 class JobRunSerializer(serializers.Serializer):
    def __init__(self, *args, **kwargs):
-        ex = self.ex = kwargs.pop('exporter')
+        ex = kwargs.pop('exporter')
+        events = kwargs.pop('events', None)
        super().__init__(*args, **kwargs)
-        if ex.is_multievent and not isinstance(ex, OrganizerLevelExportMixin):
-            self.fields["all_events"] = serializers.BooleanField(
-                required=False,
-            )
+        if events is not None and not isinstance(ex, OrganizerLevelExportMixin):
            self.fields["events"] = serializers.SlugRelatedField(
-                queryset=ex.events,
+                queryset=events,
                required=False,
-                allow_empty=True,
+                allow_empty=False,
                slug_field='slug',
                many=True
            )
        for k, v in ex.export_form_fields.items():
            self.fields[k] = form_field_to_serializer_field(v)

-    def to_representation(self, instance):
-        # Translate between events as a list of slugs (API) and list of ints (database)
-        if self.ex.is_multievent and not isinstance(self.ex, OrganizerLevelExportMixin) and "events" in instance and isinstance(instance["events"], list):
-            instance["events"] = [e for e in self.ex.events.filter(pk__in=instance["events"])]
-        instance = super().to_representation(instance)
-        return instance
-
    def to_internal_value(self, data):
        if isinstance(data, QueryDict):
            data = data.copy()
@@ -106,14 +95,6 @@ class JobRunSerializer(serializers.Serializer):
                data[fk] = f'{d_from.isoformat() if d_from else ""}/{d_to.isoformat() if d_to else ""}'

        data = super().to_internal_value(data)
-
-        # Translate between events as a list of slugs (API) and list of ints (database)
-        if self.ex.is_multievent and not isinstance(self.ex, OrganizerLevelExportMixin) and "events" in data and isinstance(data["events"], list):
-            if data["events"] and isinstance(data["events"][0], Event):
-                data["events"] = [e.pk for e in data["events"]]
-            elif data["events"] and isinstance(data["events"][0], str):
-                data["events"] = [e.pk for e in self.ex.events.filter(slug__in=data["events"]).only("pk")]
-
        return data

    def is_valid(self, raise_exception=False):
@@ -150,20 +131,13 @@ class ScheduledExportSerializer(serializers.ModelSerializer):
            exporter = self.context['exporters'].get(identifier)
            if exporter:
                try:
-                    attrs["export_form_data"] = JobRunSerializer(exporter=exporter).to_internal_value(attrs["export_form_data"])
+                    JobRunSerializer(exporter=exporter).to_internal_value(attrs["export_form_data"])
                except ValidationError as e:
                    raise ValidationError({"export_form_data": e.detail})
            else:
                raise ValidationError({"export_identifier": ["Unknown exporter."]})
        return attrs

-    def to_representation(self, instance):
-        repr = super().to_representation(instance)
-        exporter = self.context['exporters'].get(instance.export_identifier)
-        if exporter:
-            repr["export_form_data"] = JobRunSerializer(exporter=exporter).to_representation(repr["export_form_data"])
-        return repr
-
    def validate_mail_additional_recipients(self, value):
        d = value.replace(' ', '')
        if len(d.split(',')) > 25:
--- a/src/pretix/api/serializers/forms.py
+++ b/src/pretix/api/serializers/forms.py
@@ -65,9 +65,8 @@ def form_field_to_serializer_field(field):
        if isinstance(field, m_from):
            return m_to(
                required=field.required,
-                allow_null=not field.required and not isinstance(field, forms.BooleanField),
+                allow_null=not field.required,
                validators=field.validators,
-                initial=field.initial,
                **{kwarg: getattr(field, kwarg, None) for kwarg in m_kwargs}
            )

--- a/src/pretix/api/serializers/media.py
+++ b/src/pretix/api/serializers/media.py
@@ -24,7 +24,7 @@ from decimal import Decimal

 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
-from rest_framework.exceptions import PermissionDenied, ValidationError
+from rest_framework.exceptions import ValidationError

 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.api.serializers.order import OrderPositionSerializer
@@ -66,9 +66,6 @@ class ReusableMediaSerializer(I18nAwareModelSerializer):
        super().__init__(*args, **kwargs)

        if 'linked_giftcard' in self.context['request'].query_params.getlist('expand'):
-            if not self.context["can_read_giftcards"]:
-                raise PermissionDenied("No permission to access gift card details.")
-
            self.fields['linked_giftcard'] = NestedGiftCardSerializer(read_only=True, context=self.context)
            if 'linked_giftcard.owner_ticket' in self.context['request'].query_params.getlist('expand'):
                self.fields['linked_giftcard'].fields['owner_ticket'] = NestedOrderPositionSerializer(read_only=True, context=self.context)
@@ -80,8 +77,6 @@ class ReusableMediaSerializer(I18nAwareModelSerializer):
            )

        if 'linked_orderposition' in self.context['request'].query_params.getlist('expand'):
-            # No additional permission check performed, documented limitation of the permission system
-            # Would get to complex/unusable otherwise since the permission depends on the event
            self.fields['linked_orderposition'] = NestedOrderPositionSerializer(read_only=True)
        else:
            self.fields['linked_orderposition'] = serializers.PrimaryKeyRelatedField(
@@ -91,9 +86,6 @@ class ReusableMediaSerializer(I18nAwareModelSerializer):
            )

        if 'customer' in self.context['request'].query_params.getlist('expand'):
-            if not self.context["can_read_customers"]:
-                raise PermissionDenied("No permission to access customer details.")
-
            self.fields['customer'] = CustomerSerializer(read_only=True)
        else:
            self.fields['customer'] = serializers.SlugRelatedField(
--- a/src/pretix/api/serializers/order.py
+++ b/src/pretix/api/serializers/order.py
@@ -19,7 +19,6 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-import json
 import logging
 import os
 from collections import Counter, defaultdict
@@ -53,7 +52,7 @@ from pretix.base.decimal import round_decimal
 from pretix.base.i18n import language
 from pretix.base.invoicing.transmission import get_transmission_types
 from pretix.base.models import (
-    CachedFile, Checkin, Customer, Device, GiftCard, Invoice, InvoiceAddress,
+    CachedFile, Checkin, Customer, Device, Invoice, InvoiceAddress,
    InvoiceLine, Item, ItemVariation, Order, OrderPosition, Question,
    QuestionAnswer, ReusableMedium, SalesChannel, Seat, SubEvent, TaxRule,
    Voucher,
@@ -62,7 +61,6 @@ from pretix.base.models.orders import (
    BlockedTicketSecret, CartPosition, OrderFee, OrderPayment, OrderRefund,
    PrintLog, RevokedTicketSecret, Transaction,
 )
-from pretix.base.payment import GiftCardPayment, PaymentException
 from pretix.base.pdf import get_images, get_variables
 from pretix.base.services.cart import error_messages
 from pretix.base.services.locking import LOCK_TRUST_WINDOW, lock_objects
@@ -193,7 +191,7 @@ class InvoiceAddressSerializer(I18nAwareModelSerializer):
                                    {"transmission_info": {r: "This field is required for the selected type of invoice transmission."}}
                                )
                    break  # do not call else branch of for loop
-                elif t.is_exclusive(self.context["request"].event, data.get("country"), data.get("is_business")):
+                elif t.exclusive:
                    if t.is_available(self.context["request"].event, data.get("country"), data.get("is_business")):
                        raise ValidationError({
                            "transmission_type": "The transmission type '%s' must be used for this country or address type." % (
@@ -615,7 +613,7 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
            # /events/…/checkinlists/…/positions/
            # We're unable to check this on this level if we're on /checkinrpc/, in which case we rely on the view
            # layer to not set pdf_data=true in the first place.
-            request and hasattr(request, 'eventpermset') and 'event.orders:read' not in request.eventpermset
+            request and hasattr(request, 'eventpermset') and 'can_view_orders' not in request.eventpermset
        )
        if ('pdf_data' in self.context and not self.context['pdf_data']) or pdf_data_forbidden:
            self.fields.pop('pdf_data', None)
@@ -638,14 +636,6 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
        return entry


-class OrganizerOrderPositionSerializer(OrderPositionSerializer):
-    event = SlugRelatedField(slug_field='slug', read_only=True)
-
-    class Meta(OrderPositionSerializer.Meta):
-        fields = OrderPositionSerializer.Meta.fields + ('event',)
-        read_only_fields = OrderPositionSerializer.Meta.read_only_fields + ('event',)
-
-
 class RequireAttentionField(serializers.Field):
    def to_representation(self, instance: OrderPosition):
        return instance.require_checkin_attention
@@ -714,16 +704,6 @@ class CheckinListOrderPositionSerializer(OrderPositionSerializer):
        if 'answers.question' in self.context['expand']:
            self.fields['answers'].child.fields['question'] = QuestionSerializer(read_only=True)

-        if 'addons' in self.context['expand']:
-            # Experimental feature, undocumented on purpose for now in case we need to remove it again
-            # for performance reasons
-            subl = CheckinListOrderPositionSerializer(read_only=True, many=True, context={
-                **self.context,
-                'expand': [v for v in self.context['expand'] if v != 'addons'],
-                'pdf_data': False,
-            })
-            self.fields['addons'] = subl
-

 class OrderPaymentTypeField(serializers.Field):
    # TODO: Remove after pretix 2.2
@@ -1201,7 +1181,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
    )
    tax_rounding_mode = serializers.ChoiceField(choices=ROUNDING_MODES, allow_null=True, required=False,)
    locale = serializers.ChoiceField(choices=[], required=False, allow_null=True)
-    use_gift_cards = serializers.ListField(child=serializers.CharField(required=False), required=False)

    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
@@ -1217,7 +1196,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
        fields = ('code', 'status', 'testmode', 'email', 'phone', 'locale', 'payment_provider', 'fees', 'comment', 'sales_channel',
                  'invoice_address', 'positions', 'checkin_attention', 'checkin_text', 'payment_info', 'payment_date',
                  'consume_carts', 'force', 'send_email', 'simulate', 'customer', 'custom_followup_at',
-                  'require_approval', 'valid_if_pending', 'expires', 'api_meta', 'tax_rounding_mode', 'use_gift_cards')
+                  'require_approval', 'valid_if_pending', 'expires', 'api_meta', 'tax_rounding_mode')

    def validate_payment_provider(self, pp):
        if pp is None:
@@ -1226,18 +1205,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
            raise ValidationError('The given payment provider is not known.')
        return pp

-    def validate_payment_info(self, info):
-        if info:
-            try:
-                obj = json.loads(info)
-            except ValueError:
-                raise ValidationError('payment_info must be valid JSON.')
-
-            if not isinstance(obj, dict):
-                # only objects are allowed
-                raise ValidationError('payment_info must be a JSON object.')
-        return info
-
    def validate_expires(self, expires):
        if expires < now():
            raise ValidationError('Expiration date must be in the future.')
@@ -1312,14 +1279,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
        payment_date = validated_data.pop('payment_date', now())
        force = validated_data.pop('force', False)
        simulate = validated_data.pop('simulate', False)
-        gift_card_secrets = validated_data.pop('use_gift_cards') if 'use_gift_cards' in validated_data else []
-
-        if (payment_provider is not None or payment_info != '{}') and len(gift_card_secrets) > 0:
-            raise ValidationError({"use_gift_cards": ['The attribute use_gift_cards is not compatible with payment_provider or payment_info']})
-        if validated_data.get('status') != Order.STATUS_PENDING and len(gift_card_secrets) > 0:
-            raise ValidationError({"use_gift_cards": ['The attribute use_gift_cards is only supported for orders that are created as pending']})
-        if len(set(gift_card_secrets)) != len(gift_card_secrets):
-            raise ValidationError({"use_gift_cards": ['Multiple copies of the same gift card secret are not allowed']})

        if not validated_data.get("sales_channel"):
            validated_data["sales_channel"] = self.context['event'].organizer.sales_channels.get(identifier="web")
@@ -1642,7 +1601,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                order.sales_channel,
                [
                    (cp.item_id, cp.subevent_id, cp.subevent.date_from if cp.subevent_id else None, cp.price,
-                     cp.addon_to, cp.is_bundled, pos._voucher_discount)
+                     bool(cp.addon_to), cp.is_bundled, pos._voucher_discount)
                    for cp in order_positions
                ]
            )
@@ -1774,7 +1733,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
            rounding_mode = self.context["event"].settings.tax_rounding
        changed = apply_rounding(
            rounding_mode,
-            ia,
            self.context["event"].currency,
            [*pos_map.values(), *fees]
        )
@@ -1804,45 +1762,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
        if order.total != Decimal('0.00') and order.event.currency == "XXX":
            raise ValidationError('Paid products not supported without a valid currency.')

-        for gift_card_secret in gift_card_secrets:
-            try:
-                if order.status != Order.STATUS_PAID:
-                    gift_card_payment_provider = GiftCardPayment(event=order.event)
-
-                    gc = order.event.organizer.accepted_gift_cards.get(
-                        secret=gift_card_secret
-                    )
-
-                    payment = order.payments.create(
-                        amount=min(order.pending_sum, gc.value),
-                        provider=gift_card_payment_provider.identifier,
-                        info_data={
-                            'gift_card': gc.pk,
-                            'gift_card_secret': gc.secret,
-                            'retry': True
-                        },
-                        state=OrderPayment.PAYMENT_STATE_CREATED
-                    )
-                    gift_card_payment_provider.execute_payment(request=None, payment=payment, is_early_special_case=True)
-
-                    if order.pending_sum <= Decimal('0.00'):
-                        order.status = Order.STATUS_PAID
-
-            except PaymentException:
-                pass
-
-            except GiftCard.DoesNotExist as e:
-                payment = order.payments.create(
-                    amount=order.pending_sum,
-                    provider=GiftCardPayment.identifier,
-                    info_data={
-                        'gift_card_secret': gift_card_secret,
-                    },
-                    state=OrderPayment.PAYMENT_STATE_CREATED
-                )
-                payment.fail(info={**payment.info_data, 'error': str(e)},
-                             send_mail=False)
-
        if order.total == Decimal('0.00') and validated_data.get('status') != Order.STATUS_PAID and not validated_data.get('require_approval'):
            order.status = Order.STATUS_PAID
            order.save()
--- a/src/pretix/api/serializers/orderchange.py
+++ b/src/pretix/api/serializers/orderchange.py
@@ -33,7 +33,7 @@ from pretix.api.serializers.order import (
    OrderFeeCreateSerializer, OrderPositionCreateSerializer,
 )
 from pretix.base.models import ItemVariation, Order, OrderFee, OrderPosition
-from pretix.base.services.orders import OrderChangeManager, OrderError
+from pretix.base.services.orders import OrderError
 from pretix.base.settings import COUNTRIES_WITH_STATE_IN_ADDRESS

 logger = logging.getLogger(__name__)
@@ -82,11 +82,11 @@ class OrderPositionCreateForExistingOrderSerializer(OrderPositionCreateSerialize
        return data

    def create(self, validated_data):
-        ocm: OrderChangeManager = self.context['ocm']
+        ocm = self.context['ocm']
        check_quotas = self.context.get('check_quotas', True)

        try:
-            new_position = ocm.add_position(
+            ocm.add_position(
                item=validated_data['item'],
                variation=validated_data.get('variation'),
                price=validated_data.get('price'),
@@ -98,7 +98,7 @@ class OrderPositionCreateForExistingOrderSerializer(OrderPositionCreateSerialize
            )
            if self.context.get('commit', True):
                ocm.commit(check_quotas=check_quotas)
-                return new_position.position
+                return validated_data['order'].positions.order_by('-positionid').first()
            else:
                return OrderPosition()  # fake to appease DRF
        except OrderError as e:
@@ -131,7 +131,7 @@ class OrderFeeCreateForExistingOrderSerializer(OrderFeeCreateSerializer):
        return data

    def create(self, validated_data):
-        ocm: OrderChangeManager = self.context['ocm']
+        ocm = self.context['ocm']

        try:
            f = OrderFee(
@@ -146,7 +146,7 @@ class OrderFeeCreateForExistingOrderSerializer(OrderFeeCreateSerializer):
            ocm.add_fee(f)
            if self.context.get('commit', True):
                ocm.commit()
-                return f
+                return validated_data['order'].fees.order_by('-pk').first()
            else:
                return OrderFee()  # fake to appease DRF
        except OrderError as e:
@@ -310,7 +310,7 @@ class OrderPositionChangeSerializer(serializers.ModelSerializer):
        return data

    def update(self, instance, validated_data):
-        ocm: OrderChangeManager = self.context['ocm']
+        ocm = self.context['ocm']
        check_quotas = self.context.get('check_quotas', True)
        current_seat = {'seat_guid': instance.seat.seat_guid} if instance.seat else None
        item = validated_data.get('item', instance.item)
@@ -399,7 +399,7 @@ class OrderFeeChangeSerializer(serializers.ModelSerializer):
        )

    def update(self, instance, validated_data):
-        ocm: OrderChangeManager = self.context['ocm']
+        ocm = self.context['ocm']
        value = validated_data.get('value', instance.value)

        try:
--- a/src/pretix/api/serializers/organizer.py
+++ b/src/pretix/api/serializers/organizer.py
@@ -45,19 +45,12 @@ from pretix.base.models import (
    SalesChannel, SeatingPlan, Team, TeamAPIToken, TeamInvite, User,
 )
 from pretix.base.models.seating import SeatingPlanLayoutValidator
-from pretix.base.permissions import (
-    get_all_event_permission_groups, get_all_organizer_permission_groups,
-)
 from pretix.base.plugins import (
    PLUGIN_LEVEL_EVENT, PLUGIN_LEVEL_EVENT_ORGANIZER_HYBRID,
    PLUGIN_LEVEL_ORGANIZER,
 )
-from pretix.base.services.mail import mail
+from pretix.base.services.mail import SendMailException, mail
 from pretix.base.settings import validate_organizer_settings
-from pretix.helpers.permission_migration import (
-    OLD_TO_NEW_EVENT_COMPAT, OLD_TO_NEW_EVENT_MIGRATION,
-    OLD_TO_NEW_ORGANIZER_COMPAT, OLD_TO_NEW_ORGANIZER_MIGRATION,
-)
 from pretix.helpers.urls import build_absolute_uri as build_global_uri
 from pretix.multidomain.urlreverse import build_absolute_uri

@@ -313,128 +306,23 @@ class EventSlugField(serializers.SlugRelatedField):
        return self.context['organizer'].events.all()


-class PermissionMultipleChoiceField(serializers.MultipleChoiceField):
-    def to_internal_value(self, data):
-        return {
-            p: True for p in super().to_internal_value(data)
-        }
-
-    def to_representation(self, value):
-        return [p for p, v in value.items() if v]
-
-
 class TeamSerializer(serializers.ModelSerializer):
    limit_events = EventSlugField(slug_field='slug', many=True)
-    limit_event_permissions = PermissionMultipleChoiceField(choices=[], required=False, allow_null=False, allow_empty=True)
-    limit_organizer_permissions = PermissionMultipleChoiceField(choices=[], required=False, allow_null=False, allow_empty=True)
-
-    # Legacy fields, handled in to_representation and validate
-    can_change_event_settings = serializers.BooleanField(required=False, write_only=True)
-    can_change_items = serializers.BooleanField(required=False, write_only=True)
-    can_view_orders = serializers.BooleanField(required=False, write_only=True)
-    can_change_orders = serializers.BooleanField(required=False, write_only=True)
-    can_checkin_orders = serializers.BooleanField(required=False, write_only=True)
-    can_view_vouchers = serializers.BooleanField(required=False, write_only=True)
-    can_change_vouchers = serializers.BooleanField(required=False, write_only=True)
-    can_create_events = serializers.BooleanField(required=False, write_only=True)
-    can_change_organizer_settings = serializers.BooleanField(required=False, write_only=True)
-    can_change_teams = serializers.BooleanField(required=False, write_only=True)
-    can_manage_gift_cards = serializers.BooleanField(required=False, write_only=True)
-    can_manage_customers = serializers.BooleanField(required=False, write_only=True)
-    can_manage_reusable_media = serializers.BooleanField(required=False, write_only=True)

    class Meta:
        model = Team
        fields = (
-            'id', 'name', 'require_2fa', 'all_events', 'limit_events', 'all_event_permissions', 'limit_event_permissions',
-            'all_organizer_permissions', 'limit_organizer_permissions', 'can_change_event_settings',
-            'can_change_items', 'can_view_orders', 'can_change_orders', 'can_checkin_orders', 'can_view_vouchers',
-            'can_change_vouchers', 'can_create_events', 'can_change_organizer_settings', 'can_change_teams',
-            'can_manage_gift_cards', 'can_manage_customers', 'can_manage_reusable_media'
+            'id', 'name', 'require_2fa', 'all_events', 'limit_events', 'can_create_events', 'can_change_teams',
+            'can_change_organizer_settings', 'can_manage_gift_cards', 'can_change_event_settings',
+            'can_change_items', 'can_view_orders', 'can_change_orders', 'can_view_vouchers',
+            'can_change_vouchers', 'can_checkin_orders', 'can_manage_customers', 'can_manage_reusable_media'
        )

-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        event_perms_flattened = []
-        organizer_perms_flattened = []
-        for pg in get_all_event_permission_groups().values():
-            for action in pg.actions:
-                event_perms_flattened.append(f"{pg.name}:{action}")
-        for pg in get_all_organizer_permission_groups().values():
-            for action in pg.actions:
-                organizer_perms_flattened.append(f"{pg.name}:{action}")
-
-        self.fields['limit_event_permissions'].choices = [(p, p) for p in event_perms_flattened]
-        self.fields['limit_organizer_permissions'].choices = [(p, p) for p in organizer_perms_flattened]
-
-    def to_representation(self, instance):
-        r = super().to_representation(instance)
-        for old, new in OLD_TO_NEW_EVENT_COMPAT.items():
-            r[old] = instance.all_event_permissions or all(instance.limit_event_permissions.get(n) for n in new)
-        for old, new in OLD_TO_NEW_ORGANIZER_COMPAT.items():
-            r[old] = instance.all_organizer_permissions or all(instance.limit_organizer_permissions.get(n) for n in new)
-        return r
-
    def validate(self, data):
-        old_data_set = any(k.startswith("can_") for k in data)
-        new_data_set = any(k in data for k in [
-            "all_event_permissions", "limit_event_permissions", "all_organizer_permissions", "limit_organizer_permissions"
-        ])
-        if old_data_set and new_data_set:
-            raise ValidationError("You cannot set deprecated and current permission attributes at the same time.")
-
        full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
        full_data.update(data)
-
-        if new_data_set:
-            if full_data.get('limit_event_permissions') and full_data.get('all_event_permissions'):
-                raise ValidationError('Do not set both limit_event_permissions and all_event_permissions.')
-            if full_data.get('limit_organizer_permissions') and full_data.get('all_organizer_permissions'):
-                raise ValidationError('Do not set both limit_organizer_permissions and all_organizer_permissions.')
-
-        if old_data_set:
-            # Migrate with same logic as in migration 0297_pluggable_permissions
-            if all(full_data.get(k) is True for k in OLD_TO_NEW_EVENT_MIGRATION.keys() if k != "can_checkin_orders"):
-                data["all_event_permissions"] = True
-                data["limit_event_permissions"] = {}
-            else:
-                data["all_event_permissions"] = False
-                data["limit_event_permissions"] = {}
-                for k, v in OLD_TO_NEW_EVENT_MIGRATION.items():
-                    if full_data.get(k) is True:
-                        data["limit_event_permissions"].update({kk: True for kk in v})
-            if all(full_data.get(k) is True for k in OLD_TO_NEW_ORGANIZER_MIGRATION.keys() if k != "can_checkin_orders"):
-                data["all_organizer_permissions"] = True
-                data["limit_organizer_permissions"] = {}
-            else:
-                data["all_organizer_permissions"] = False
-                data["limit_organizer_permissions"] = {}
-                for k, v in OLD_TO_NEW_ORGANIZER_MIGRATION.items():
-                    if full_data.get(k) is True:
-                        data["limit_organizer_permissions"].update({kk: True for kk in v})
-
        if full_data.get('limit_events') and full_data.get('all_events'):
            raise ValidationError('Do not set both limit_events and all_events.')
-
-        full_data.update(data)
-        for pg in get_all_event_permission_groups().values():
-            requested = ",".join(sorted(
-                a for a in pg.actions if self.instance and full_data["limit_event_permissions"].get(f"{pg.name}:{a}")
-            ))
-            if requested not in (",".join(sorted(opt.actions)) for opt in pg.options):
-                possible = '\' or \''.join(','.join(opt.actions) for opt in pg.options)
-                raise ValidationError(f"For permission group {pg.name}, the valid combinations of actions are "
-                                      f"'{possible}' but you tried to set '{requested}'.")
-        for pg in get_all_organizer_permission_groups().values():
-            requested = ",".join(sorted(
-                a for a in pg.actions if self.instance and full_data["limit_organizer_permissions"].get(f"{pg.name}:{a}")
-            ))
-            if requested not in (",".join(sorted(opt.actions)) for opt in pg.options):
-                possible = '\' or \''.join(','.join(opt.actions) for opt in pg.options)
-                raise ValidationError(f"For permission group {pg.name}, the valid combinations of actions are "
-                                      f"'{possible}' but you tried to set '{requested}'.")
-
        return data


@@ -451,7 +339,7 @@ class DeviceSerializer(serializers.ModelSerializer):
    created = serializers.DateTimeField(read_only=True)
    revoked = serializers.BooleanField(read_only=True)
    initialized = serializers.DateTimeField(read_only=True)
-    initialization_token = serializers.CharField(read_only=True)
+    initialization_token = serializers.DateTimeField(read_only=True)
    security_profile = serializers.ChoiceField(choices=[], required=False, default="full")

    class Meta:
@@ -465,8 +353,6 @@ class DeviceSerializer(serializers.ModelSerializer):
    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
        self.fields['security_profile'].choices = [(k, v.verbose_name) for k, v in get_all_security_profiles().items()]
-        if not self.context['can_see_tokens']:
-            del self.fields['initialization_token']


 class TeamInviteSerializer(serializers.ModelSerializer):
@@ -477,22 +363,24 @@ class TeamInviteSerializer(serializers.ModelSerializer):
        )

    def _send_invite(self, instance):
-        mail(
-            instance.email,
-            _('Account invitation'),
-            'pretixcontrol/email/invitation.txt',
-            {
-                'instance': settings.PRETIX_INSTANCE_NAME,
-                'user': self,
-                'organizer': self.context['organizer'].name,
-                'team': instance.team.name,
-                'url': build_global_uri('control:auth.invite', kwargs={
-                    'token': instance.token
-                })
-            },
-            event=None,
-            locale=get_language_without_region()  # TODO: expose?
-        )
+        try:
+            mail(
+                instance.email,
+                _('pretix account invitation'),
+                'pretixcontrol/email/invitation.txt',
+                {
+                    'user': self,
+                    'organizer': self.context['organizer'].name,
+                    'team': instance.team.name,
+                    'url': build_global_uri('control:auth.invite', kwargs={
+                        'token': instance.token
+                    })
+                },
+                event=None,
+                locale=get_language_without_region()  # TODO: expose?
+            )
+        except SendMailException:
+            pass  # Already logged

    def create(self, validated_data):
        if 'email' in validated_data:
@@ -551,14 +439,10 @@ class TeamMemberSerializer(serializers.ModelSerializer):


 class OrganizerSettingsSerializer(SettingsSerializer):
-    default_write_permission = 'organizer.settings.general:write'
    default_fields = [
-        # These are readable for all users with access to the events, therefore secrets stored in the settings store
-        # should not be included!
        'customer_accounts',
        'customer_accounts_native',
        'customer_accounts_link_by_email',
-        'customer_accounts_require_login_for_order_access',
        'invoice_regenerate_allowed',
        'contact_mail',
        'imprint_url',
--- a/src/pretix/api/serializers/settings.py
+++ b/src/pretix/api/serializers/settings.py
@@ -37,8 +37,6 @@ logger = logging.getLogger(__name__)
 class SettingsSerializer(serializers.Serializer):
    default_fields = []
    readonly_fields = []
-    default_write_permission = 'organizer.settings.general:write'
-    write_permission_required = {}

    def __init__(self, *args, **kwargs):
        self.changed_data = []
@@ -60,17 +58,9 @@ class SettingsSerializer(serializers.Serializer):
            f._label = str(form_kwargs.get('label', fname))
            f._help_text = str(form_kwargs.get('help_text'))
            f.parent = self
-
-            self.write_permission_required[fname] = DEFAULTS[fname].get('write_permission', self.default_write_permission)
-
            self.fields[fname] = f

    def validate(self, attrs):
-        for k in attrs.keys():
-            p = self.write_permission_required.get(k, self.default_write_permission)
-            if p not in self.context["permissions"]:
-                raise ValidationError({k: f"Setting this field requires permission {p}"})
-
        return {k: v for k, v in attrs.items() if k not in self.readonly_fields}

    def update(self, instance: HierarkeyProxy, validated_data):
--- a/src/pretix/api/urls.py
+++ b/src/pretix/api/urls.py
@@ -67,7 +67,6 @@ orga_router.register(r'invoices', order.InvoiceViewSet)
 orga_router.register(r'scheduled_exports', exporters.ScheduledOrganizerExportViewSet)
 orga_router.register(r'exporters', exporters.OrganizerExportersViewSet, basename='exporters')
 orga_router.register(r'transactions', order.OrganizerTransactionViewSet)
-orga_router.register(r'orderpositions', order.OrganizerOrderPositionViewSet, basename='orderpositions')

 team_router = routers.DefaultRouter()
 team_router.register(r'members', organizer.TeamMemberViewSet)
@@ -84,7 +83,7 @@ event_router.register(r'discounts', discount.DiscountViewSet)
 event_router.register(r'quotas', item.QuotaViewSet)
 event_router.register(r'vouchers', voucher.VoucherViewSet)
 event_router.register(r'orders', order.EventOrderViewSet)
-event_router.register(r'orderpositions', order.EventOrderPositionViewSet)
+event_router.register(r'orderpositions', order.OrderPositionViewSet)
 event_router.register(r'transactions', order.TransactionViewSet)
 event_router.register(r'invoices', order.InvoiceViewSet)
 event_router.register(r'revokedsecrets', order.RevokedSecretViewSet, basename='revokedsecrets')
--- a/src/pretix/api/views/cart.py
+++ b/src/pretix/api/views/cart.py
@@ -52,8 +52,8 @@ class CartPositionViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnly
    ordering = ('datetime',)
    ordering_fields = ('datetime', 'cart_id')
    lookup_field = 'id'
-    permission = 'event.orders:read'
-    write_permission = 'event.orders:write'
+    permission = 'can_view_orders'
+    write_permission = 'can_change_orders'

    def get_queryset(self):
        return CartPosition.objects.filter(
--- a/src/pretix/api/views/checkin.py
+++ b/src/pretix/api/views/checkin.py
@@ -67,7 +67,6 @@ from pretix.base.models import (
    Question, ReusableMedium, RevokedTicketSecret, TeamAPIToken,
 )
 from pretix.base.models.orders import PrintLog
-from pretix.base.permissions import AnyPermissionOf
 from pretix.base.services.checkin import (
    CheckInError, RequiredQuestionsError, SQLLogic, perform_checkin,
 )
@@ -119,11 +118,11 @@ class CheckinListViewSet(viewsets.ModelViewSet):

    def _get_permission_name(self, request):
        if request.path.endswith('/failed_checkins/'):
-            return 'event.orders:checkin', 'event.orders:write'
+            return 'can_checkin_orders', 'can_change_orders'
        elif request.method in SAFE_METHODS:
-            return 'event.orders:read', 'event.orders:checkin',
+            return 'can_view_orders', 'can_checkin_orders',
        else:
-            return 'event.settings.general:write'
+            return 'can_change_event_settings'

    def get_queryset(self):
        qs = self.request.event.checkin_lists.prefetch_related(
@@ -189,15 +188,11 @@ class CheckinListViewSet(viewsets.ModelViewSet):
        clist = self.get_object()
        if serializer.validated_data.get('nonce'):
            if kwargs.get('position'):
-                prev = kwargs['position'].all_checkins.filter(
-                    nonce=serializer.validated_data['nonce'],
-                    successful=False
-                ).first()
+                prev = kwargs['position'].all_checkins.filter(nonce=serializer.validated_data['nonce']).first()
            else:
                prev = clist.checkins.filter(
                    nonce=serializer.validated_data['nonce'],
                    raw_barcode=serializer.validated_data['raw_barcode'],
-                    successful=False
                ).first()
            if prev:
                # Ignore because nonce is already handled
@@ -386,21 +381,15 @@ def _checkin_list_position_queryset(checkinlists, ignore_status=False, ignore_pr

    qs = qs.filter(reduce(operator.or_, lists_qs))

-    prefetch_related = [
-        Prefetch(
-            lookup='checkins',
-            queryset=Checkin.objects.filter(list_id__in=[cl.pk for cl in checkinlists]).select_related('device')
-        ),
-        Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
-        'answers', 'answers__options', 'answers__question',
-    ]
-    select_related = [
-        'item', 'variation', 'order', 'addon_to', 'order__invoice_address', 'order', 'seat'
-    ]
-
    if pdf_data:
        qs = qs.prefetch_related(
-            # Don't add to list, we don't want to propagate to addons
+            Prefetch(
+                lookup='checkins',
+                queryset=Checkin.objects.filter(list_id__in=[cl.pk for cl in checkinlists]).select_related('device')
+            ),
+            Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
+            'answers', 'answers__options', 'answers__question',
+            Prefetch('addons', OrderPosition.objects.select_related('item', 'variation')),
            Prefetch('order', Order.objects.select_related('invoice_address').prefetch_related(
                Prefetch(
                    'event',
@@ -415,39 +404,32 @@ def _checkin_list_position_queryset(checkinlists, ignore_status=False, ignore_pr
                    )
                )
            ))
+        ).select_related(
+            'item', 'variation', 'item__category', 'addon_to', 'order', 'order__invoice_address', 'seat'
        )
+    else:
+        qs = qs.prefetch_related(
+            Prefetch(
+                lookup='checkins',
+                queryset=Checkin.objects.filter(list_id__in=[cl.pk for cl in checkinlists]).select_related('device')
+            ),
+            Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
+            'answers', 'answers__options', 'answers__question',
+            Prefetch('addons', OrderPosition.objects.select_related('item', 'variation'))
+        ).select_related('item', 'variation', 'order', 'addon_to', 'order__invoice_address', 'order', 'seat')

    if expand and 'subevent' in expand:
-        prefetch_related += [
+        qs = qs.prefetch_related(
            'subevent', 'subevent__event', 'subevent__subeventitem_set', 'subevent__subeventitemvariation_set',
            'subevent__seat_category_mappings', 'subevent__meta_values'
-        ]
+        )

    if expand and 'item' in expand:
-        prefetch_related += [
-            'item', 'item__addons', 'item__bundles', 'item__meta_values',
-            'item__variations',
-        ]
-        select_related.append('item__tax_rule')
+        qs = qs.prefetch_related('item', 'item__addons', 'item__bundles', 'item__meta_values',
+                                 'item__variations').select_related('item__tax_rule')

    if expand and 'variation' in expand:
-        prefetch_related += [
-            'variation', 'variation__meta_values',
-        ]
-
-    if expand and 'addons' in expand:
-        prefetch_related += [
-            Prefetch('addons', OrderPosition.objects.prefetch_related(*prefetch_related).select_related(*select_related)),
-        ]
-    else:
-        prefetch_related += [
-            Prefetch('addons', OrderPosition.objects.select_related('item', 'variation'))
-        ]
-
-    if pdf_data:
-        select_related.remove("order")  # Don't need it twice on this queryset
-
-    qs = qs.prefetch_related(*prefetch_related).select_related(*select_related)
+        qs = qs.prefetch_related('variation', 'variation__meta_values')

    return qs

@@ -475,7 +457,7 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
            'event': op.order.event,
            'pdf_data': pdf_data and (
                user if user and user.is_authenticated else auth
-            ).has_event_permission(request.organizer, event, 'event.orders:read', request),
+            ).has_event_permission(request.organizer, event, 'can_view_orders', request),
        }

    common_checkin_args = dict(
@@ -840,8 +822,8 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
    }

    filterset_class = CheckinOrderPositionFilter
-    permission = AnyPermissionOf('event.orders:read', 'event.orders:checkin')
-    write_permission = AnyPermissionOf('event.orders:write', 'event.orders:checkin')
+    permission = ('can_view_orders', 'can_checkin_orders')
+    write_permission = ('can_change_orders', 'can_checkin_orders')

    def get_serializer_context(self):
        ctx = super().get_serializer_context()
@@ -872,7 +854,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
            expand=self.request.query_params.getlist('expand'),
        )

-        if 'pk' not in self.request.resolver_match.kwargs and 'event.orders:read' not in self.request.eventpermset \
+        if 'pk' not in self.request.resolver_match.kwargs and 'can_view_orders' not in self.request.eventpermset \
                and len(self.request.query_params.get('search', '')) < 3:
            qs = qs.none()

@@ -921,9 +903,9 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
 class CheckinRPCRedeemView(views.APIView):
    def post(self, request, *args, **kwargs):
        if isinstance(self.request.auth, (TeamAPIToken, Device)):
-            events = self.request.auth.get_events_with_permission(('event.orders:write', 'event.orders:checkin'))
+            events = self.request.auth.get_events_with_permission(('can_change_orders', 'can_checkin_orders'))
        elif self.request.user.is_authenticated:
-            events = self.request.user.get_events_with_permission(('event.orders:write', 'event.orders:checkin'), self.request).filter(
+            events = self.request.user.get_events_with_permission(('can_change_orders', 'can_checkin_orders'), self.request).filter(
                organizer=self.request.organizer
            )
        else:
@@ -984,16 +966,15 @@ class CheckinRPCSearchView(ListAPIView):
    def get_serializer_context(self):
        ctx = super().get_serializer_context()
        ctx['expand'] = self.request.query_params.getlist('expand')
-        ctx['organizer'] = self.request.organizer
        ctx['pdf_data'] = False
        return ctx

    @cached_property
    def lists(self):
        if isinstance(self.request.auth, (TeamAPIToken, Device)):
-            events = self.request.auth.get_events_with_permission(('event.orders:read', 'event.orders:checkin'))
+            events = self.request.auth.get_events_with_permission(('can_view_orders', 'can_checkin_orders'))
        elif self.request.user.is_authenticated:
-            events = self.request.user.get_events_with_permission(('event.orders:read', 'event.orders:checkin'), self.request).filter(
+            events = self.request.user.get_events_with_permission(('can_view_orders', 'can_checkin_orders'), self.request).filter(
                organizer=self.request.organizer
            )
        else:
@@ -1010,9 +991,9 @@ class CheckinRPCSearchView(ListAPIView):
    @cached_property
    def has_full_access_permission(self):
        if isinstance(self.request.auth, (TeamAPIToken, Device)):
-            events = self.request.auth.get_events_with_permission('event.orders:read')
+            events = self.request.auth.get_events_with_permission('can_view_orders')
        elif self.request.user.is_authenticated:
-            events = self.request.user.get_events_with_permission('event.orders:read', self.request).filter(
+            events = self.request.user.get_events_with_permission('can_view_orders', self.request).filter(
                organizer=self.request.organizer
            )
        else:
@@ -1039,9 +1020,9 @@ class CheckinRPCSearchView(ListAPIView):
 class CheckinRPCAnnulView(views.APIView):
    def post(self, request, *args, **kwargs):
        if isinstance(self.request.auth, (TeamAPIToken, Device)):
-            events = self.request.auth.get_events_with_permission(('event.orders:write', 'event.orders:checkin'))
+            events = self.request.auth.get_events_with_permission(('can_change_orders', 'can_checkin_orders'))
        elif self.request.user.is_authenticated:
-            events = self.request.user.get_events_with_permission(('event.orders:write', 'event.orders:checkin'), self.request).filter(
+            events = self.request.user.get_events_with_permission(('can_change_orders', 'can_checkin_orders'), self.request).filter(
                organizer=self.request.organizer
            )
        else:
@@ -1119,7 +1100,7 @@ class CheckinViewSet(viewsets.ReadOnlyModelViewSet):
    filterset_class = CheckinFilter
    ordering = ('created', 'id')
    ordering_fields = ('created', 'datetime', 'id',)
-    permission = 'event.orders:read'
+    permission = 'can_view_orders'

    def get_queryset(self):
        qs = Checkin.all.filter().select_related(
--- a/src/pretix/api/views/discount.py
+++ b/src/pretix/api/views/discount.py
@@ -57,7 +57,7 @@ class DiscountViewSet(ConditionalListView, viewsets.ModelViewSet):
    ordering_fields = ('id', 'position')
    ordering = ('position', 'id')
    permission = None
-    write_permission = 'event.items:write'
+    write_permission = 'can_change_items'

    def get_queryset(self):
        return self.request.event.discounts.prefetch_related(
--- a/src/pretix/api/views/event.py
+++ b/src/pretix/api/views/event.py
@@ -281,11 +281,6 @@ class EventViewSet(viewsets.ModelViewSet):
        new_event = serializer.save(organizer=self.request.organizer)

        if copy_from:
-            perm_holder = (self.request.auth if isinstance(self.request.auth, (Device, TeamAPIToken))
-                           else self.request.user)
-            if not copy_from.allow_copy_data(self.request.organizer, perm_holder):
-                raise PermissionDenied("Not sufficient permission on source event to copy")
-
            new_event.copy_data_from(copy_from, skip_meta_data='meta_data' in serializer.validated_data)

            if plugins is not None:
@@ -346,24 +341,15 @@ class CloneEventViewSet(viewsets.ModelViewSet):
    lookup_field = 'slug'
    lookup_url_kwarg = 'event'
    http_method_names = ['post']
-    write_permission = 'event.settings.general:write'
+    write_permission = 'can_create_events'

    def get_serializer_context(self):
        ctx = super().get_serializer_context()
-        ctx['event'] = Event.objects.get(slug=self.kwargs['event'], organizer=self.request.organizer)
+        ctx['event'] = self.kwargs['event']
        ctx['organizer'] = self.request.organizer
        return ctx

    def perform_create(self, serializer):
-        # Weird edge case: Requires settings permission on the event (to read) but also on the organizer (two write)
-        perm_holder = (self.request.auth if isinstance(self.request.auth, (Device, TeamAPIToken))
-                       else self.request.user)
-        if not perm_holder.has_organizer_permission(self.request.organizer, "organizer.events:create", request=self.request):
-            raise PermissionDenied("No permission to create events")
-
-        if not serializer.context['event'].allow_copy_data(self.request.organizer, perm_holder):
-            raise PermissionDenied("Not sufficient permission on source event to copy")
-
        serializer.save(organizer=self.request.organizer)

        serializer.instance.log_action(
@@ -440,7 +426,7 @@ with scopes_disabled():
 class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
    serializer_class = SubEventSerializer
    queryset = SubEvent.objects.none()
-    write_permission = 'event.subevents:write'
+    write_permission = 'can_change_event_settings'
    filter_backends = (DjangoFilterBackend, TotalOrderingFilter)
    ordering = ('date_from',)
    ordering_fields = ('id', 'date_from', 'last_modified')
@@ -560,7 +546,7 @@ class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
 class TaxRuleViewSet(ConditionalListView, viewsets.ModelViewSet):
    serializer_class = TaxRuleSerializer
    queryset = TaxRule.objects.none()
-    write_permission = 'event.settings.tax:write'
+    write_permission = 'can_change_event_settings'

    def get_queryset(self):
        return self.request.event.tax_rules.all()
@@ -603,7 +589,7 @@ class TaxRuleViewSet(ConditionalListView, viewsets.ModelViewSet):
 class ItemMetaPropertiesViewSet(viewsets.ModelViewSet):
    serializer_class = ItemMetaPropertiesSerializer
    queryset = ItemMetaProperty.objects.none()
-    write_permission = 'event.settings.general:write'
+    write_permission = 'can_change_event_settings'

    def get_queryset(self):
        qs = self.request.event.item_meta_properties.all()
@@ -650,18 +636,19 @@ class ItemMetaPropertiesViewSet(viewsets.ModelViewSet):

 class EventSettingsView(views.APIView):
    permission = None
-    write_permission = 'event.settings.general:write'
+    write_permission = 'can_change_event_settings'

    def get(self, request, *args, **kwargs):
        if isinstance(request.auth, Device):
            s = DeviceEventSettingsSerializer(instance=request.event.settings, event=request.event, context={
-                'request': request, 'permissions': request.eventpermset
+                'request': request
+            })
+        elif 'can_change_event_settings' in request.eventpermset:
+            s = EventSettingsSerializer(instance=request.event.settings, event=request.event, context={
+                'request': request
            })
        else:
-            s = EventSettingsSerializer(instance=request.event.settings, event=request.event, context={
-                'request': request, 'permissions': request.eventpermset,
-            })
-
+            raise PermissionDenied()
        if 'explain' in request.GET:
            return Response({
                fname: {
@@ -675,7 +662,7 @@ class EventSettingsView(views.APIView):

    def patch(self, request, *wargs, **kwargs):
        s = EventSettingsSerializer(instance=request.event.settings, data=request.data, partial=True,
-                                    event=request.event, context={'request': request, 'permissions': request.eventpermset})
+                                    event=request.event, context={'request': request})
        s.is_valid(raise_exception=True)
        with transaction.atomic():
            s.save()
@@ -687,7 +674,7 @@ class EventSettingsView(views.APIView):
                )
        s = EventSettingsSerializer(
            instance=request.event.settings, event=request.event, context={
-                'request': request, 'permissions': request.eventpermset
+                'request': request
            })
        return Response(s.data)

@@ -714,7 +701,7 @@ class SeatFilter(FilterSet):
 class SeatViewSet(ConditionalListView, viewsets.ModelViewSet):
    serializer_class = SeatSerializer
    queryset = Seat.objects.none()
-    write_permission = 'event.settings.general:write'
+    write_permission = 'can_change_event_settings'
    filter_backends = (DjangoFilterBackend, )
    filterset_class = SeatFilter

--- a/src/pretix/api/views/exporters.py
+++ b/src/pretix/api/views/exporters.py
@@ -40,12 +40,12 @@ from pretix.api.serializers.exporters import (
 )
 from pretix.base.exporter import OrganizerLevelExportMixin
 from pretix.base.models import (
-    CachedFile, Device, ScheduledEventExport, ScheduledOrganizerExport,
+    CachedFile, Device, Event, ScheduledEventExport, ScheduledOrganizerExport,
    TeamAPIToken,
 )
-from pretix.base.models.organizer import TeamQuerySet
-from pretix.base.services.export import (
-    export, init_event_exporters, init_organizer_exporters, multiexport,
+from pretix.base.services.export import export, multiexport
+from pretix.base.signals import (
+    register_data_exporters, register_multievent_data_exporters,
 )
 from pretix.helpers.http import ChunkBasedFileResponse

@@ -74,11 +74,6 @@ class ExportersMixin:
    @action(detail=True, methods=['GET'], url_name='download', url_path='download/(?P<asyncid>[^/]+)/(?P<cfid>[^/]+)')
    def download(self, *args, **kwargs):
        cf = get_object_or_404(CachedFile, id=kwargs['cfid'])
-        if not cf.allowed_for_session(self.request, "exporters-api"):
-            return Response(
-                {'status': 'failed', 'message': 'Unknown file ID or export failed'},
-                status=status.HTTP_410_GONE
-            )
        if cf.file:
            resp = ChunkBasedFileResponse(cf.file.file, content_type=cf.type)
            resp['Content-Disposition'] = 'attachment; filename="{}"'.format(cf.filename).encode("ascii", "ignore")
@@ -111,11 +106,10 @@ class ExportersMixin:
    @action(detail=True, methods=['POST'])
    def run(self, *args, **kwargs):
        instance = self.get_object()
-        serializer = JobRunSerializer(exporter=instance, data=self.request.data)
+        serializer = JobRunSerializer(exporter=instance, data=self.request.data, **self.get_serializer_kwargs())
        serializer.is_valid(raise_exception=True)

-        cf = CachedFile(web_download=True)
-        cf.bind_to_session(self.request, "exporters-api")
+        cf = CachedFile(web_download=False)
        cf.date = now()
        cf.expires = now() + timedelta(hours=24)
        cf.save()
@@ -136,34 +130,27 @@ class ExportersMixin:


 class EventExportersViewSet(ExportersMixin, viewsets.ViewSet):
-    permission = None
+    permission = 'can_view_orders'
+
+    def get_serializer_kwargs(self):
+        return {}

    @cached_property
    def exporters(self):
-        raw_exporters = list(init_event_exporters(
-            event=self.request.event,
-            user=self.request.user if self.request.user and self.request.user.is_authenticated else None,
-            token=self.request.auth if isinstance(self.request.auth, TeamAPIToken) else None,
-            device=self.request.auth if isinstance(self.request.auth, Device) else None,
-            request=self.request,
-        ))
        exporters = []
+        responses = register_data_exporters.send(self.request.event)
+        raw_exporters = [response(self.request.event, self.request.organizer) for r, response in responses if response]
+        raw_exporters = [
+            ex for ex in raw_exporters
+            if ex.available_for_user(self.request.user if self.request.user and self.request.user.is_authenticated else None)
+        ]
        for ex in sorted(raw_exporters, key=lambda ex: str(ex.verbose_name)):
            ex._serializer = JobRunSerializer(exporter=ex)
            exporters.append(ex)
        return exporters

    def do_export(self, cf, instance, data):
-        return export.apply_async(args=(
-            self.request.event.id,
-        ), kwargs={
-            'user': self.request.user.pk if self.request.user and self.request.user.is_authenticated else None,
-            'token': self.request.auth.pk if isinstance(self.request.auth, TeamAPIToken) else None,
-            'device': self.request.auth.pk if isinstance(self.request.auth, Device) else None,
-            'fileid': str(cf.id),
-            'provider': instance.identifier,
-            'form_data': data,
-        })
+        return export.apply_async(args=(self.request.event.id, str(cf.id), instance.identifier, data))


 class OrganizerExportersViewSet(ExportersMixin, viewsets.ViewSet):
@@ -171,23 +158,47 @@ class OrganizerExportersViewSet(ExportersMixin, viewsets.ViewSet):

    @cached_property
    def exporters(self):
-        raw_exporters = list(init_organizer_exporters(
-            organizer=self.request.organizer,
-            user=self.request.user if self.request.user and self.request.user.is_authenticated else None,
-            token=self.request.auth if isinstance(self.request.auth, TeamAPIToken) else None,
-            device=self.request.auth if isinstance(self.request.auth, Device) else None,
-            request=self.request,
-        ))
        exporters = []
+        if isinstance(self.request.auth, (Device, TeamAPIToken)):
+            perm_holder = self.request.auth
+        else:
+            perm_holder = self.request.user
+        events = perm_holder.get_events_with_permission('can_view_orders', request=self.request).filter(
+            organizer=self.request.organizer
+        )
+        responses = register_multievent_data_exporters.send(self.request.organizer)
+        raw_exporters = [
+            response(Event.objects.none() if issubclass(response, OrganizerLevelExportMixin) else events, self.request.organizer)
+            for r, response in responses
+            if response
+        ]
+        raw_exporters = [
+            ex for ex in raw_exporters
+            if (
+                not isinstance(ex, OrganizerLevelExportMixin) or
+                perm_holder.has_organizer_permission(self.request.organizer, ex.organizer_required_permission, self.request)
+            ) and ex.available_for_user(self.request.user if self.request.user and self.request.user.is_authenticated else None)
+        ]
        for ex in sorted(raw_exporters, key=lambda ex: str(ex.verbose_name)):
-            ex._serializer = JobRunSerializer(exporter=ex)
+            ex._serializer = JobRunSerializer(exporter=ex, events=events)
            exporters.append(ex)
        return exporters

+    def get_serializer_kwargs(self):
+        if isinstance(self.request.auth, (Device, TeamAPIToken)):
+            perm_holder = self.request.auth
+        else:
+            perm_holder = self.request.user
+        return {
+            'events': perm_holder.get_events_with_permission('can_view_orders', request=self.request).filter(
+                organizer=self.request.organizer
+            )
+        }
+
    def do_export(self, cf, instance, data):
        return multiexport.apply_async(kwargs={
            'organizer': self.request.organizer.id,
-            'user': self.request.user.id if self.request.user and self.request.user.is_authenticated else None,
+            'user': self.request.user.id if self.request.user.is_authenticated else None,
            'token': self.request.auth.pk if isinstance(self.request.auth, TeamAPIToken) else None,
            'device': self.request.auth.pk if isinstance(self.request.auth, Device) else None,
            'fileid': str(cf.id),
@@ -205,11 +216,11 @@ class ScheduledExportersViewSet(viewsets.ModelViewSet):
 class ScheduledEventExportViewSet(ScheduledExportersViewSet):
    serializer_class = ScheduledEventExportSerializer
    queryset = ScheduledEventExport.objects.none()
-    permission = None
+    permission = 'can_view_orders'

    def get_queryset(self):
        perm_holder = self.request.auth if isinstance(self.request.auth, (TeamAPIToken, Device)) else self.request.user
-        if not perm_holder.has_event_permission(self.request.organizer, self.request.event, 'event.settings.general:write',
+        if not perm_holder.has_event_permission(self.request.organizer, self.request.event, 'can_change_event_settings',
                                                request=self.request):
            if self.request.user.is_authenticated:
                qs = self.request.event.scheduled_exports.filter(owner=self.request.user)
@@ -241,28 +252,11 @@ class ScheduledEventExportViewSet(ScheduledExportersViewSet):

    @cached_property
    def exporters(self):
-        exporters = list(init_event_exporters(
-            event=self.request.event,
-            user=self.request.user if self.request.user and self.request.user.is_authenticated else None,
-            token=self.request.auth if isinstance(self.request.auth, TeamAPIToken) else None,
-            device=self.request.auth if isinstance(self.request.auth, Device) else None,
-            request=self.request,
-        ))
+        responses = register_data_exporters.send(self.request.event)
+        exporters = [response(self.request.event, self.request.organizer) for r, response in responses if response]
        return {e.identifier: e for e in exporters}

    def perform_update(self, serializer):
-        if not self.request.user.is_authenticated or self.request.user != serializer.instance.owner:
-            # This is to prevent a possible privilege escalation where user A creates a scheduled export and
-            # user B has settings permission (= they can see the export configuration), but not enough permission
-            # to run the export themselves. Without this check, user B could modify the export and add themselves
-            # as a recipient. Thereby, user B would gain access to data they can't have.
-            exporter = self.exporters.get(serializer.instance.export_identifier)
-            if not exporter:
-                raise PermissionDenied("No access to exporter.")
-            perm_holder = self.request.auth if isinstance(self.request.auth, (TeamAPIToken, Device)) else self.request.user
-            if not perm_holder.has_event_permission(self.request.organizer, self.request.event, exporter.get_required_event_permission()):
-                raise PermissionDenied("No permission to edit exports you could not run.")
-
        serializer.save(event=self.request.event)
        serializer.instance.compute_next_run()
        serializer.instance.error_counter = 0
@@ -291,7 +285,7 @@ class ScheduledOrganizerExportViewSet(ScheduledExportersViewSet):

    def get_queryset(self):
        perm_holder = self.request.auth if isinstance(self.request.auth, (TeamAPIToken, Device)) else self.request.user
-        if not perm_holder.has_organizer_permission(self.request.organizer, 'organizer.settings.general:write',
+        if not perm_holder.has_organizer_permission(self.request.organizer, 'can_change_organizer_settings',
                                                    request=self.request):
            if self.request.user.is_authenticated:
                qs = self.request.organizer.scheduled_exports.filter(owner=self.request.user)
@@ -321,55 +315,26 @@ class ScheduledOrganizerExportViewSet(ScheduledExportersViewSet):
        ctx['exporters'] = self.exporters
        return ctx

+    @cached_property
+    def events(self):
+        if isinstance(self.request.auth, (TeamAPIToken, Device)):
+            return self.request.auth.get_events_with_permission('can_view_orders')
+        elif self.request.user.is_authenticated:
+            return self.request.user.get_events_with_permission('can_view_orders', self.request).filter(
+                organizer=self.request.organizer
+            )
+
    @cached_property
    def exporters(self):
-        exporters = list(init_organizer_exporters(
-            organizer=self.request.organizer,
-            user=self.request.user if self.request.user and self.request.user.is_authenticated else None,
-            token=self.request.auth if isinstance(self.request.auth, TeamAPIToken) else None,
-            device=self.request.auth if isinstance(self.request.auth, Device) else None,
-            request=self.request,
-        ))
+        responses = register_multievent_data_exporters.send(self.request.organizer)
+        exporters = [
+            response(Event.objects.none() if issubclass(response, OrganizerLevelExportMixin) else self.events,
+                     self.request.organizer)
+            for r, response in responses if response
+        ]
        return {e.identifier: e for e in exporters}

    def perform_update(self, serializer):
-        if not self.request.user.is_authenticated or self.request.user != serializer.instance.owner:
-            # This is to prevent a possible privilege escalation where user A creates a scheduled export and
-            # user B has settings permission (= they can see the export configuration), but not enough permission
-            # to run the export themselves. Without this check, user B could modify the export and add themselves
-            # as a recipient. Thereby, user B would gain access to data they can't have.
-            exporter = self.exporters.get(serializer.instance.export_identifier)
-            if not exporter:
-                raise PermissionDenied("No access to exporter.")
-            perm_holder = (self.request.auth if isinstance(self.request.auth, (Device, TeamAPIToken))
-                           else self.request.user)
-            if isinstance(exporter, OrganizerLevelExportMixin):
-                if not perm_holder.has_organizer_permission(
-                        self.request.organizer, exporter.get_required_organizer_permission(), request=self.request,
-                ):
-                    raise PermissionDenied("No permission to edit exports you could not run.")
-            else:
-                if serializer.instance.export_form_data.get("all_events", False):
-                    if isinstance(self.request.auth, Device):
-                        if not self.request.auth.all_events:
-                            raise PermissionDenied("No permission to edit exports you could not run.")
-                    elif isinstance(self.request.auth, TeamAPIToken):
-                        if not self.request.auth.team.all_events:
-                            raise PermissionDenied("No permission to edit exports you could not run.")
-                    elif self.request.user.is_authenticated:
-                        if not self.request.user.teams.filter(
-                                TeamQuerySet.event_permission_q(exporter.get_required_event_permission()),
-                                all_events=True,
-                        ).exists():
-                            raise PermissionDenied("No permission to edit exports you could not run.")
-                else:
-                    events_selected = serializer.instance.export_form_data.get("events", [])
-                    events_permission = set(perm_holder.get_events_with_permission(
-                        exporter.get_required_event_permission(), request=self.request
-                    ).values_list("pk", flat=True))
-                    if not all(e in events_permission for e in events_selected):
-                        raise PermissionDenied("No permission to edit exports you could not run.")
-
        serializer.save(organizer=self.request.organizer)
        serializer.instance.compute_next_run()
        serializer.instance.error_counter = 0
--- a/src/pretix/api/views/item.py
+++ b/src/pretix/api/views/item.py
@@ -99,14 +99,14 @@ class ItemViewSet(ConditionalListView, viewsets.ModelViewSet):
    ordering = ('position', 'id')
    filterset_class = ItemFilter
    permission = None
-    write_permission = 'event.items:write'
+    write_permission = 'can_change_items'

    def get_queryset(self):
        return self.request.event.items.select_related('tax_rule').prefetch_related(
            'variations', 'addons', 'bundles', 'meta_values', 'meta_values__property',
            'variations__meta_values', 'variations__meta_values__property',
            'require_membership_types', 'variations__require_membership_types',
-            'limit_sales_channels', 'variations__limit_sales_channels', 'program_times'
+            'limit_sales_channels', 'variations__limit_sales_channels',
        ).all()

    def perform_create(self, serializer):
@@ -163,7 +163,7 @@ class ItemVariationViewSet(viewsets.ModelViewSet):
    ordering_fields = ('id', 'position')
    ordering = ('id',)
    permission = None
-    write_permission = 'event.items:write'
+    write_permission = 'can_change_items'

    @cached_property
    def item(self):
@@ -234,7 +234,7 @@ class ItemBundleViewSet(viewsets.ModelViewSet):
    ordering_fields = ('id',)
    ordering = ('id',)
    permission = None
-    write_permission = 'event.items:write'
+    write_permission = 'can_change_items'

    @cached_property
    def item(self):
@@ -286,7 +286,7 @@ class ItemProgramTimeViewSet(viewsets.ModelViewSet):
    ordering_fields = ('id',)
    ordering = ('id',)
    permission = None
-    write_permission = 'event.items:write'
+    write_permission = 'can_change_items'

    @cached_property
    def item(self):
@@ -339,7 +339,7 @@ class ItemAddOnViewSet(viewsets.ModelViewSet):
    ordering_fields = ('id', 'position')
    ordering = ('id',)
    permission = None
-    write_permission = 'event.items:write'
+    write_permission = 'can_change_items'

    @cached_property
    def item(self):
@@ -398,7 +398,7 @@ class ItemCategoryViewSet(ConditionalListView, viewsets.ModelViewSet):
    ordering_fields = ('id', 'position')
    ordering = ('position', 'id')
    permission = None
-    write_permission = 'event.items:write'
+    write_permission = 'can_change_items'

    def get_queryset(self):
        return self.request.event.categories.all()
@@ -453,7 +453,7 @@ class QuestionViewSet(ConditionalListView, viewsets.ModelViewSet):
    ordering_fields = ('id', 'position')
    ordering = ('position', 'id')
    permission = None
-    write_permission = 'event.items:write'
+    write_permission = 'can_change_items'

    def get_queryset(self):
        return self.request.event.questions.prefetch_related('options').all()
@@ -497,7 +497,7 @@ class QuestionOptionViewSet(viewsets.ModelViewSet):
    ordering_fields = ('id', 'position')
    ordering = ('position',)
    permission = None
-    write_permission = 'event.items:write'
+    write_permission = 'can_change_items'

    def get_queryset(self):
        q = get_object_or_404(Question, pk=self.kwargs['question'], event=self.request.event)
@@ -564,10 +564,10 @@ class QuotaViewSet(ConditionalListView, viewsets.ModelViewSet):
    ordering_fields = ('id', 'size')
    ordering = ('id',)
    permission = None
-    write_permission = 'event.items:write'
+    write_permission = 'can_change_items'

    def get_queryset(self):
-        return self.request.event.quotas.select_related('subevent').prefetch_related('items', 'variations').all()
+        return self.request.event.quotas.all()

    def list(self, request, *args, **kwargs):
        queryset = self.filter_queryset(self.get_queryset()).distinct()
--- a/src/pretix/api/views/media.py
+++ b/src/pretix/api/views/media.py
@@ -62,8 +62,8 @@ with scopes_disabled():
 class ReusableMediaViewSet(viewsets.ModelViewSet):
    serializer_class = ReusableMediaSerializer
    queryset = ReusableMedium.objects.none()
-    permission = 'organizer.reusablemedia:read'
-    write_permission = 'organizer.reusablemedia:write'
+    permission = 'can_manage_reusable_media'
+    write_permission = 'can_manage_reusable_media'
    filter_backends = (DjangoFilterBackend, OrderingFilter)
    ordering = ('-updated', '-id')
    ordering_fields = ('created', 'updated', 'identifier', 'type', 'id')
@@ -95,8 +95,6 @@ class ReusableMediaViewSet(viewsets.ModelViewSet):
    def get_serializer_context(self):
        ctx = super().get_serializer_context()
        ctx['organizer'] = self.request.organizer
-        ctx['can_read_giftcards'] = 'organizer.giftcards:read' in self.request.orgapermset
-        ctx['can_read_customers'] = 'organizer.customers:read' in self.request.orgapermset
        return ctx

    @transaction.atomic()
--- a/src/pretix/api/views/order.py
+++ b/src/pretix/api/views/order.py
@@ -57,10 +57,9 @@ from pretix.api.serializers.order import (
    BlockedTicketSecretSerializer, InvoiceSerializer, OrderCreateSerializer,
    OrderPaymentCreateSerializer, OrderPaymentSerializer,
    OrderPositionSerializer, OrderRefundCreateSerializer,
-    OrderRefundSerializer, OrderSerializer, OrganizerOrderPositionSerializer,
-    OrganizerTransactionSerializer, PriceCalcSerializer, PrintLogSerializer,
-    RevokedTicketSecretSerializer, SimulatedOrderSerializer,
-    TransactionSerializer,
+    OrderRefundSerializer, OrderSerializer, OrganizerTransactionSerializer,
+    PriceCalcSerializer, PrintLogSerializer, RevokedTicketSecretSerializer,
+    SimulatedOrderSerializer, TransactionSerializer,
 )
 from pretix.api.serializers.orderchange import (
    BlockNameSerializer, OrderChangeOperationSerializer,
@@ -91,6 +90,7 @@ from pretix.base.services.invoices import (
    generate_cancellation, generate_invoice, invoice_pdf, invoice_qualified,
    regenerate_invoice, transmit_invoice,
 )
+from pretix.base.services.mail import SendMailException
 from pretix.base.services.orders import (
    OrderChangeManager, OrderError, _order_placed_email,
    _order_placed_email_attendee, approve_order, cancel_order, deny_order,
@@ -317,7 +317,7 @@ class OrderViewSetMixin:

 class OrganizerOrderViewSet(OrderViewSetMixin, viewsets.ReadOnlyModelViewSet):
    def get_base_queryset(self):
-        perm = "event.orders:read" if self.request.method in SAFE_METHODS else "event.orders:write"
+        perm = "can_view_orders" if self.request.method in SAFE_METHODS else "can_change_orders"
        if isinstance(self.request.auth, (TeamAPIToken, Device)):
            return Order.objects.filter(
                event__organizer=self.request.organizer,
@@ -338,8 +338,8 @@ class OrganizerOrderViewSet(OrderViewSetMixin, viewsets.ReadOnlyModelViewSet):


 class EventOrderViewSet(OrderViewSetMixin, viewsets.ModelViewSet):
-    permission = 'event.orders:read'
-    write_permission = 'event.orders:write'
+    permission = 'can_view_orders'
+    write_permission = 'can_change_orders'

    def get_serializer_context(self):
        ctx = super().get_serializer_context()
@@ -439,6 +439,8 @@ class EventOrderViewSet(OrderViewSetMixin, viewsets.ModelViewSet):
                return Response({'detail': str(e)}, status=status.HTTP_400_BAD_REQUEST)
            except PaymentException as e:
                return Response({'detail': str(e)}, status=status.HTTP_400_BAD_REQUEST)
+            except SendMailException:
+                pass

            return self.retrieve(request, [], **kwargs)
        return Response(
@@ -632,7 +634,10 @@ class EventOrderViewSet(OrderViewSetMixin, viewsets.ModelViewSet):
        order = self.get_object()
        if not order.email:
            return Response({'detail': 'There is no email address associated with this order.'}, status=status.HTTP_400_BAD_REQUEST)
-        order.resend_link(user=self.request.user, auth=self.request.auth)
+        try:
+            order.resend_link(user=self.request.user, auth=self.request.auth)
+        except SendMailException:
+            return Response({'detail': _('There was an error sending the mail. Please try again later.')}, status=status.HTTP_503_SERVICE_UNAVAILABLE)

        return Response(
            status=status.HTTP_204_NO_CONTENT
@@ -1066,12 +1071,15 @@ with scopes_disabled():
            }


-class OrderPositionViewSetMixin:
+class OrderPositionViewSet(viewsets.ModelViewSet):
+    serializer_class = OrderPositionSerializer
    queryset = OrderPosition.all.none()
    filter_backends = (DjangoFilterBackend, RichOrderingFilter)
    ordering = ('order__datetime', 'positionid')
    ordering_fields = ('order__code', 'order__datetime', 'positionid', 'attendee_name', 'order__status',)
    filterset_class = OrderPositionFilter
+    permission = 'can_view_orders'
+    write_permission = 'can_change_orders'
    ordering_custom = {
        'attendee_name': {
            '_order': F('display_name').asc(nulls_first=True),
@@ -1085,7 +1093,8 @@ class OrderPositionViewSetMixin:

    def get_serializer_context(self):
        ctx = super().get_serializer_context()
-        ctx['pdf_data'] = False
+        ctx['event'] = self.request.event
+        ctx['pdf_data'] = self.request.query_params.get('pdf_data', 'false').lower() == 'true'
        ctx['check_quotas'] = self.request.query_params.get('check_quotas', 'true').lower() == 'true'
        return ctx

@@ -1094,8 +1103,9 @@ class OrderPositionViewSetMixin:
            qs = OrderPosition.all
        else:
            qs = OrderPosition.objects
-        qs = qs.filter(order__event__organizer=self.request.organizer)
-        if self.request.query_params.get('pdf_data', 'false').lower() == 'true' and getattr(self.request, 'event', None):
+
+        qs = qs.filter(order__event=self.request.event)
+        if self.request.query_params.get('pdf_data', 'false').lower() == 'true':
            prefetch_related_objects([self.request.organizer], 'meta_properties')
            prefetch_related_objects(
                [self.request.event],
@@ -1150,9 +1160,9 @@ class OrderPositionViewSetMixin:
            qs = qs.prefetch_related(
                Prefetch('checkins', queryset=Checkin.objects.select_related("device")),
                Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
-                'answers', 'answers__options', 'answers__question', 'order__event', 'order__event__organizer'
+                'answers', 'answers__options', 'answers__question',
            ).select_related(
-                'item', 'order', 'seat'
+                'item', 'order', 'order__event', 'order__event__organizer', 'seat'
            )
        return qs

@@ -1164,49 +1174,6 @@ class OrderPositionViewSetMixin:
                return prov
        raise NotFound('Unknown output provider.')

-
-class OrganizerOrderPositionViewSet(OrderPositionViewSetMixin, viewsets.ReadOnlyModelViewSet):
-    serializer_class = OrganizerOrderPositionSerializer
-    permission = None
-    write_permission = None
-
-    def get_queryset(self):
-        qs = super().get_queryset()
-
-        perm = "event.orders:read" if self.request.method in SAFE_METHODS else "event.orders:write"
-
-        if isinstance(self.request.auth, (TeamAPIToken, Device)):
-            auth_obj = self.request.auth
-        elif self.request.user.is_authenticated:
-            auth_obj = self.request.user
-        else:
-            raise PermissionDenied("Unknown authentication scheme")
-
-        qs = qs.filter(
-            order__event__in=auth_obj.get_events_with_permission(perm, request=self.request).filter(
-                organizer=self.request.organizer
-            )
-        )
-
-        return qs
-
-
-class EventOrderPositionViewSet(OrderPositionViewSetMixin, viewsets.ModelViewSet):
-    serializer_class = OrderPositionSerializer
-    permission = 'event.orders:read'
-    write_permission = 'event.orders:write'
-
-    def get_serializer_context(self):
-        ctx = super().get_serializer_context()
-        ctx['event'] = self.request.event
-        ctx['pdf_data'] = self.request.query_params.get('pdf_data', 'false').lower() == 'true'
-        return ctx
-
-    def get_queryset(self):
-        qs = super().get_queryset()
-        qs = qs.filter(order__event=self.request.event)
-        return qs
-
    @action(detail=True, methods=['POST'], url_name='price_calc')
    def price_calc(self, request, *args, **kwargs):
        """
@@ -1613,8 +1580,8 @@ class EventOrderPositionViewSet(OrderPositionViewSetMixin, viewsets.ModelViewSet
 class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
    serializer_class = OrderPaymentSerializer
    queryset = OrderPayment.objects.none()
-    permission = 'event.orders:read'
-    write_permission = 'event.orders:write'
+    permission = 'can_view_orders'
+    write_permission = 'can_change_orders'
    lookup_field = 'local_id'

    def get_serializer_context(self):
@@ -1649,6 +1616,8 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
                    )
                except Quota.QuotaExceededException:
                    pass
+                except SendMailException:
+                    pass

            serializer = OrderPaymentSerializer(r, context=serializer.context)

@@ -1686,6 +1655,8 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
            return Response({'detail': str(e)}, status=status.HTTP_400_BAD_REQUEST)
        except PaymentException as e:
            return Response({'detail': str(e)}, status=status.HTTP_400_BAD_REQUEST)
+        except SendMailException:
+            pass
        return self.retrieve(request, [], **kwargs)

    @action(detail=True, methods=['POST'])
@@ -1786,8 +1757,8 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
 class RefundViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
    serializer_class = OrderRefundSerializer
    queryset = OrderRefund.objects.none()
-    permission = 'event.orders:read'
-    write_permission = 'event.orders:write'
+    permission = 'can_view_orders'
+    write_permission = 'can_change_orders'
    lookup_field = 'local_id'

    def get_queryset(self):
@@ -1944,18 +1915,13 @@ class InvoiceViewSet(viewsets.ReadOnlyModelViewSet):
    ordering = ('nr',)
    ordering_fields = ('nr', 'date')
    filterset_class = InvoiceFilter
+    permission = 'can_view_orders'
    lookup_url_kwarg = 'number'
    lookup_field = 'nr'
-
-    def _get_permission_name(self, request):
-        if 'event' in request.resolver_match.kwargs:
-            if request.method not in SAFE_METHODS:
-                return "event.orders:write"
-            return "event.orders:read"
-        return None  # org-level is handled by event__in check
+    write_permission = 'can_change_orders'

    def get_queryset(self):
-        perm = "event.orders:read" if self.request.method in SAFE_METHODS else "event.orders:write"
+        perm = "can_view_orders" if self.request.method in SAFE_METHODS else "can_change_orders"
        if getattr(self.request, 'event', None):
            qs = self.request.event.invoices
        elif isinstance(self.request.auth, (TeamAPIToken, Device)):
@@ -2065,7 +2031,7 @@ class InvoiceViewSet(viewsets.ReadOnlyModelViewSet):
        else:
            order = Order.objects.select_for_update(of=OF_SELF).get(pk=inv.order_id)
            c = generate_cancellation(inv)
-            if invoice_qualified(order):
+            if inv.order.status != Order.STATUS_CANCELED:
                inv = generate_invoice(order)
            else:
                inv = c
@@ -2096,8 +2062,8 @@ class RevokedSecretViewSet(viewsets.ReadOnlyModelViewSet):
    ordering = ('-created',)
    ordering_fields = ('created', 'secret')
    filterset_class = RevokedSecretFilter
-    permission = 'event.orders:read'
-    write_permission = 'event.orders:write'
+    permission = 'can_view_orders'
+    write_permission = 'can_change_orders'

    def get_queryset(self):
        return RevokedTicketSecret.objects.filter(event=self.request.event)
@@ -2118,8 +2084,8 @@ class BlockedSecretViewSet(viewsets.ReadOnlyModelViewSet):
    filter_backends = (DjangoFilterBackend, TotalOrderingFilter)
    ordering = ('-updated', '-pk')
    filterset_class = BlockedSecretFilter
-    permission = 'event.orders:read'
-    write_permission = 'event.orders:write'
+    permission = 'can_view_orders'
+    write_permission = 'can_change_orders'

    def get_queryset(self):
        return BlockedTicketSecret.objects.filter(event=self.request.event)
@@ -2154,7 +2120,7 @@ class TransactionViewSet(viewsets.ReadOnlyModelViewSet):
    ordering = ('datetime', 'pk')
    ordering_fields = ('datetime', 'created', 'id',)
    filterset_class = TransactionFilter
-    permission = 'event.orders:read'
+    permission = 'can_view_orders'

    def get_queryset(self):
        return Transaction.objects.filter(order__event=self.request.event).select_related("order")
@@ -2171,11 +2137,11 @@ class OrganizerTransactionViewSet(TransactionViewSet):

        if isinstance(self.request.auth, (TeamAPIToken, Device)):
            qs = qs.filter(
-                order__event__in=self.request.auth.get_events_with_permission("event.orders:read"),
+                order__event__in=self.request.auth.get_events_with_permission("can_view_orders"),
            )
        elif self.request.user.is_authenticated:
            qs = qs.filter(
-                order__event__in=self.request.user.get_events_with_permission("event.orders:read", request=self.request)
+                order__event__in=self.request.user.get_events_with_permission("can_view_orders", request=self.request)
            )
        else:
            raise PermissionDenied("Unknown authentication scheme")
--- a/src/pretix/api/views/organizer.py
+++ b/src/pretix/api/views/organizer.py
@@ -70,7 +70,7 @@ class OrganizerViewSet(mixins.UpdateModelMixin, viewsets.ReadOnlyModelViewSet):
    filter_backends = (TotalOrderingFilter,)
    ordering = ('slug',)
    ordering_fields = ('name', 'slug')
-    write_permission = "organizer.settings.general:write"
+    write_permission = "can_change_organizer_settings"

    def get_queryset(self):
        if self.request.user.is_authenticated:
@@ -154,8 +154,8 @@ class OrganizerViewSet(mixins.UpdateModelMixin, viewsets.ReadOnlyModelViewSet):
 class SeatingPlanViewSet(viewsets.ModelViewSet):
    serializer_class = SeatingPlanSerializer
    queryset = SeatingPlan.objects.none()
-    permission = None
-    write_permission = 'organizer.seatingplans:write'
+    permission = 'can_change_organizer_settings'
+    write_permission = 'can_change_organizer_settings'

    def get_queryset(self):
        return self.request.organizer.seating_plans.order_by('name')
@@ -221,8 +221,8 @@ with scopes_disabled():
 class GiftCardViewSet(viewsets.ModelViewSet):
    serializer_class = GiftCardSerializer
    queryset = GiftCard.objects.none()
-    permission = 'organizer.giftcards:read'
-    write_permission = 'organizer.giftcards:write'
+    permission = 'can_manage_gift_cards'
+    write_permission = 'can_manage_gift_cards'
    filter_backends = (DjangoFilterBackend,)
    filterset_class = GiftCardFilter

@@ -249,24 +249,12 @@ class GiftCardViewSet(viewsets.ModelViewSet):
    def perform_create(self, serializer):
        value = serializer.validated_data.pop('value')
        inst = serializer.save(issuer=self.request.organizer)
-        inst.log_action(
-            action='pretix.giftcards.created',
-            user=self.request.user,
-            auth=self.request.auth,
-        )
        inst.transactions.create(value=value, acceptor=self.request.organizer)
        inst.log_action(
-            action='pretix.giftcards.transaction.manual',
+            'pretix.giftcards.transaction.manual',
            user=self.request.user,
            auth=self.request.auth,
-            data=merge_dicts(
-                self.request.data,
-                {
-                    'id': inst.pk,
-                    'acceptor_id': self.request.organizer.id,
-                    'acceptor_slug': self.request.organizer.slug
-                }
-            )
+            data=merge_dicts(self.request.data, {'id': inst.pk})
        )

    @transaction.atomic()
@@ -281,7 +269,7 @@ class GiftCardViewSet(viewsets.ModelViewSet):
            inst = serializer.save(secret=serializer.instance.secret, currency=serializer.instance.currency,
                                   testmode=serializer.instance.testmode)
            inst.log_action(
-                action='pretix.giftcards.modified',
+                'pretix.giftcards.modified',
                user=self.request.user,
                auth=self.request.auth,
                data=self.request.data,
@@ -294,14 +282,10 @@ class GiftCardViewSet(viewsets.ModelViewSet):
            diff = value - old_value
            inst.transactions.create(value=diff, acceptor=self.request.organizer)
            inst.log_action(
-                action='pretix.giftcards.transaction.manual',
+                'pretix.giftcards.transaction.manual',
                user=self.request.user,
                auth=self.request.auth,
-                data={
-                    'value': diff,
-                    'acceptor_id': self.request.organizer.id,
-                    'acceptor_slug': self.request.organizer.slug
-                }
+                data={'value': diff}
            )

        return inst
@@ -325,15 +309,10 @@ class GiftCardViewSet(viewsets.ModelViewSet):
            }, status=status.HTTP_409_CONFLICT)
        gc.transactions.create(value=value, text=text, info=info, acceptor=self.request.organizer)
        gc.log_action(
-            action='pretix.giftcards.transaction.manual',
+            'pretix.giftcards.transaction.manual',
            user=self.request.user,
            auth=self.request.auth,
-            data={
-                'value': value,
-                'text': text,
-                'acceptor_id': self.request.organizer.id,
-                'acceptor_slug': self.request.organizer.slug
-            }
+            data={'value': value, 'text': text}
        )
        return Response(GiftCardSerializer(gc, context=self.get_serializer_context()).data, status=status.HTTP_200_OK)

@@ -344,8 +323,8 @@ class GiftCardViewSet(viewsets.ModelViewSet):
 class GiftCardTransactionViewSet(viewsets.ReadOnlyModelViewSet):
    serializer_class = GiftCardTransactionSerializer
    queryset = GiftCardTransaction.objects.none()
-    permission = 'organizer.giftcards:read'
-    write_permission = 'organizer.giftcards:write'
+    permission = 'can_manage_gift_cards'
+    write_permission = 'can_manage_gift_cards'

    @cached_property
    def giftcard(self):
@@ -362,8 +341,8 @@ class GiftCardTransactionViewSet(viewsets.ReadOnlyModelViewSet):
 class TeamViewSet(viewsets.ModelViewSet):
    serializer_class = TeamSerializer
    queryset = Team.objects.none()
-    permission = 'organizer.teams:write'
-    write_permission = 'organizer.teams:write'
+    permission = 'can_change_teams'
+    write_permission = 'can_change_teams'

    def get_queryset(self):
        return self.request.organizer.teams.order_by('pk')
@@ -402,8 +381,8 @@ class TeamViewSet(viewsets.ModelViewSet):
 class TeamMemberViewSet(DestroyModelMixin, viewsets.ReadOnlyModelViewSet):
    serializer_class = TeamMemberSerializer
    queryset = User.objects.none()
-    permission = 'organizer.teams:write'
-    write_permission = 'organizer.teams:write'
+    permission = 'can_change_teams'
+    write_permission = 'can_change_teams'

    @cached_property
    def team(self):
@@ -431,8 +410,8 @@ class TeamMemberViewSet(DestroyModelMixin, viewsets.ReadOnlyModelViewSet):
 class TeamInviteViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnlyModelViewSet):
    serializer_class = TeamInviteSerializer
    queryset = TeamInvite.objects.none()
-    permission = 'organizer.teams:write'
-    write_permission = 'organizer.teams:write'
+    permission = 'can_change_teams'
+    write_permission = 'can_change_teams'

    @cached_property
    def team(self):
@@ -468,8 +447,8 @@ class TeamInviteViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnlyMo
 class TeamAPITokenViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnlyModelViewSet):
    serializer_class = TeamAPITokenSerializer
    queryset = TeamAPIToken.objects.none()
-    permission = 'organizer.teams:write'
-    write_permission = 'organizer.teams:write'
+    permission = 'can_change_teams'
+    write_permission = 'can_change_teams'

    @cached_property
    def team(self):
@@ -532,8 +511,8 @@ class DeviceViewSet(mixins.CreateModelMixin,
                    GenericViewSet):
    serializer_class = DeviceSerializer
    queryset = Device.objects.none()
-    permission = 'organizer.devices:read'
-    write_permission = 'organizer.devices:write'
+    permission = 'can_change_organizer_settings'
+    write_permission = 'can_change_organizer_settings'
    lookup_field = 'device_id'

    def get_queryset(self):
@@ -542,9 +521,6 @@ class DeviceViewSet(mixins.CreateModelMixin,
    def get_serializer_context(self):
        ctx = super().get_serializer_context()
        ctx['organizer'] = self.request.organizer
-        ctx['can_see_tokens'] = (
-            self.request.user if self.request.user and self.request.user.is_authenticated else self.request.auth
-        ).has_organizer_permission(self.request.organizer, 'organizer.devices:write', request=self.request)
        return ctx

    @transaction.atomic()
@@ -571,11 +547,11 @@ class DeviceViewSet(mixins.CreateModelMixin,

 class OrganizerSettingsView(views.APIView):
    permission = None
-    write_permission = 'organizer.settings.general:write'
+    write_permission = 'can_change_organizer_settings'

    def get(self, request, *args, **kwargs):
        s = OrganizerSettingsSerializer(instance=request.organizer.settings, organizer=request.organizer, context={
-            'request': request, 'permissions': request.orgapermset
+            'request': request
        })
        if 'explain' in request.GET:
            return Response({
@@ -592,7 +568,7 @@ class OrganizerSettingsView(views.APIView):
        s = OrganizerSettingsSerializer(
            instance=request.organizer.settings, data=request.data, partial=True,
            organizer=request.organizer, context={
-                'request': request, 'permissions': request.orgapermset
+                'request': request
            }
        )
        s.is_valid(raise_exception=True)
@@ -604,7 +580,7 @@ class OrganizerSettingsView(views.APIView):
                }
            )
        s = OrganizerSettingsSerializer(instance=request.organizer.settings, organizer=request.organizer, context={
-            'request': request, 'permissions': request.orgapermset
+            'request': request
        })
        return Response(s.data)

@@ -621,8 +597,7 @@ with scopes_disabled():
 class CustomerViewSet(viewsets.ModelViewSet):
    serializer_class = CustomerSerializer
    queryset = Customer.objects.none()
-    permission = 'organizer.customers:read'
-    write_permission = 'organizer.customers:write'
+    permission = 'can_manage_customers'
    lookup_field = 'identifier'
    filter_backends = (DjangoFilterBackend,)
    filterset_class = CustomerFilter
@@ -682,7 +657,7 @@ class CustomerViewSet(viewsets.ModelViewSet):
 class MembershipTypeViewSet(viewsets.ModelViewSet):
    serializer_class = MembershipTypeSerializer
    queryset = MembershipType.objects.none()
-    permission = 'organizer.settings.general:write'
+    permission = 'can_change_organizer_settings'

    def get_queryset(self):
        qs = self.request.organizer.membership_types.all()
@@ -739,15 +714,14 @@ with scopes_disabled():
 class MembershipViewSet(viewsets.ModelViewSet):
    serializer_class = MembershipSerializer
    queryset = Membership.objects.none()
-    permission = 'organizer.customers:read'
-    write_permission = 'organizer.customers:write'
+    permission = 'can_manage_customers'
    filter_backends = (DjangoFilterBackend,)
    filterset_class = MembershipFilter

    def get_queryset(self):
        return Membership.objects.filter(
            customer__organizer=self.request.organizer
-        ).select_related('customer')
+        )

    def get_serializer_context(self):
        ctx = super().get_serializer_context()
@@ -790,8 +764,8 @@ with scopes_disabled():
 class SalesChannelViewSet(viewsets.ModelViewSet):
    serializer_class = SalesChannelSerializer
    queryset = SalesChannel.objects.none()
-    permission = 'organizer.settings.general:write'
-    write_permission = 'organizer.settings.general:write'
+    permission = 'can_change_organizer_settings'
+    write_permission = 'can_change_organizer_settings'
    filter_backends = (DjangoFilterBackend,)
    filterset_class = SalesChannelFilter
    lookup_field = 'identifier'
--- a/src/pretix/api/views/shredders.py
+++ b/src/pretix/api/views/shredders.py
@@ -204,7 +204,7 @@ class ShreddersMixin:


 class EventShreddersViewSet(ShreddersMixin, viewsets.ViewSet):
-    permission = 'event.orders:write'
+    permission = 'can_change_orders'

    def get_serializer_kwargs(self):
        return {}
--- a/src/pretix/api/views/voucher.py
+++ b/src/pretix/api/views/voucher.py
@@ -19,7 +19,6 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-
 from django.db import transaction
 from django.db.models import F, Q
 from django.utils.timezone import now
@@ -62,16 +61,11 @@ class VoucherViewSet(viewsets.ModelViewSet):
    ordering = ('id',)
    ordering_fields = ('id', 'code', 'max_usages', 'valid_until', 'value')
    filterset_class = VoucherFilter
-    permission = 'event.vouchers:read'
-    write_permission = 'event.vouchers:write'
+    permission = 'can_view_vouchers'
+    write_permission = 'can_change_vouchers'

-    @scopes_disabled()  # we have an event check here, and we can save some performance on subqueries
    def get_queryset(self):
-        return Voucher.annotate_budget_used(
-            self.request.event.vouchers
-        ).select_related(
-            'item', 'quota', 'seat', 'variation'
-        )
+        return self.request.event.vouchers.select_related('seat').all()

    @transaction.atomic()
    def create(self, request, *args, **kwargs):
--- a/src/pretix/api/views/waitinglist.py
+++ b/src/pretix/api/views/waitinglist.py
@@ -51,8 +51,8 @@ class WaitingListViewSet(viewsets.ModelViewSet):
    ordering = ('created', 'pk',)
    ordering_fields = ('id', 'created', 'email', 'item')
    filterset_class = WaitingListFilter
-    permission = 'event.orders:read'
-    write_permission = 'event.orders:write'
+    permission = 'can_view_orders'
+    write_permission = 'can_change_orders'

    def get_queryset(self):
        return self.request.event.waitinglistentries.all()
--- a/src/pretix/api/views/webhooks.py
+++ b/src/pretix/api/views/webhooks.py
@@ -35,8 +35,8 @@ class WebhookFilter(FilterSet):
 class WebHookViewSet(viewsets.ModelViewSet):
    serializer_class = WebHookSerializer
    queryset = WebHook.objects.none()
-    permission = 'organizer.settings.general:write'
-    write_permission = 'organizer.settings.general:write'
+    permission = 'can_change_organizer_settings'
+    write_permission = 'can_change_organizer_settings'
    filter_backends = (DjangoFilterBackend,)
    filterset_class = WebhookFilter

--- a/src/pretix/api/webhooks.py
+++ b/src/pretix/api/webhooks.py
@@ -174,38 +174,6 @@ class ParametrizedEventWebhookEvent(ParametrizedWebhookEvent):
        }


-class ParametrizedGiftcardWebhookEvent(ParametrizedWebhookEvent):
-    def build_payload(self, logentry: LogEntry):
-        giftcard = logentry.content_object
-        if not giftcard:
-            return None
-
-        return {
-            'notification_id': logentry.pk,
-            'issuer_id': logentry.organizer_id,
-            'issuer_slug': logentry.organizer.slug,
-            'giftcard': giftcard.pk,
-            'action': logentry.action_type,
-        }
-
-
-class ParametrizedGiftcardTransactionWebhookEvent(ParametrizedWebhookEvent):
-    def build_payload(self, logentry: LogEntry):
-        giftcard = logentry.content_object
-        if not giftcard:
-            return None
-
-        return {
-            'notification_id': logentry.pk,
-            'issuer_id': logentry.organizer_id,
-            'issuer_slug': logentry.organizer.slug,
-            'acceptor_id': logentry.parsed_data.get('acceptor_id'),
-            'acceptor_slug': logentry.parsed_data.get('acceptor_slug'),
-            'giftcard': giftcard.pk,
-            'action': logentry.action_type,
-        }
-
-
 class ParametrizedVoucherWebhookEvent(ParametrizedWebhookEvent):

    def build_payload(self, logentry: LogEntry):
@@ -465,18 +433,6 @@ def register_default_webhook_events(sender, **kwargs):
            'pretix.customer.anonymized',
            _('Customer account anonymized'),
        ),
-        ParametrizedGiftcardWebhookEvent(
-            'pretix.giftcards.created',
-            _('Gift card added'),
-        ),
-        ParametrizedGiftcardWebhookEvent(
-            'pretix.giftcards.modified',
-            _('Gift card modified'),
-        ),
-        ParametrizedGiftcardTransactionWebhookEvent(
-            'pretix.giftcards.transaction.*',
-            _('Gift card used in transaction'),
-        )
    )


--- a/src/pretix/base/auth.py
+++ b/src/pretix/base/auth.py
@@ -224,7 +224,7 @@ class HistoryPasswordValidator:
        ).delete()


-def has_event_access_permission(request, permission='event.settings.general:write'):
+def has_event_access_permission(request, permission='can_change_event_settings'):
    return (
        request.user.is_authenticated and
        request.user.has_event_permission(request.organizer, request.event, permission, request=request)
--- a/src/pretix/base/datasync/datasync.py
+++ b/src/pretix/base/datasync/datasync.py
@@ -90,7 +90,6 @@ StaticMapping = namedtuple('StaticMapping', ('id', 'pretix_model', 'external_obj

 class OutboundSyncProvider:
    max_attempts = 5
-    list_field_joiner = ","  # set to None to keep native lists in properties

    def __init__(self, event):
        self.event = event
@@ -216,10 +215,7 @@ class OutboundSyncProvider:

            try:
                mapped_objects = self.sync_order(sq.order)
-                actions_taken = [res and res.sync_info.get("action", "") for res_list in mapped_objects.values() for res in res_list]
-                should_write_logentry = any(action not in (None, "nothing_to_do") for action in actions_taken)
-                logger.info('Synced order %s to %s, actions: %r, log: %r', sq.order.code, sq.sync_provider, actions_taken, should_write_logentry)
-                if should_write_logentry:
+                if not all(all(not res or res.sync_info.get("action", "") == "nothing_to_do" for res in res_list) for res_list in mapped_objects.values()):
                    sq.order.log_action("pretix.event.order.data_sync.success", {
                        "provider": self.identifier,
                        "objects": {
@@ -240,7 +236,7 @@ class OutboundSyncProvider:
                    sq.set_sync_error("exceeded", e.messages, e.full_message)
                else:
                    logger.info(
-                        f"Could not sync order {sq.order.code} to {sq.sync_provider} "
+                        f"Could not sync order {sq.order.code} to {type(self).__name__} "
                        f"(transient error, attempt #{sq.failed_attempts}, next {sq.not_before})",
                        exc_info=True,
                    )
@@ -285,8 +281,7 @@ class OutboundSyncProvider:
                            'Please update value mapping for field "{field_name}" - option "{val}" not assigned'
                        ).format(field_name=key, val=val)])

-            if self.list_field_joiner:
-                val = self.list_field_joiner.join(val)
+            val = ",".join(val)
        return val

    def get_properties(self, inputs: dict, property_mappings: List[dict]):
--- a/src/pretix/base/datasync/utils.py
+++ b/src/pretix/base/datasync/utils.py
@@ -71,20 +71,15 @@ def assign_properties(
    return out


-def _add_to_list(out, field_name, current_value, new_item_input, list_sep):
+def _add_to_list(out, field_name, current_value, new_item, list_sep):
+    new_item = str(new_item)
    if list_sep is not None:
-        new_items = str(new_item_input).split(list_sep)
+        new_item = new_item.replace(list_sep, "")
        current_value = current_value.split(list_sep) if current_value else []
-    else:
-        new_items = [str(new_item_input)]
-        if not isinstance(current_value, (list, tuple)):
-            current_value = [str(current_value)]
-
-    new_list = list(current_value)
-    for new_item in new_items:
-        if new_item not in current_value:
-            new_list.append(new_item)
-    if new_list != current_value:
+    elif not isinstance(current_value, (list, tuple)):
+        current_value = [str(current_value)]
+    if new_item not in current_value:
+        new_list = current_value + [new_item]
        if list_sep is not None:
            new_list = list_sep.join(new_list)
        out[field_name] = new_list
--- a/src/pretix/base/email.py
+++ b/src/pretix/base/email.py
@@ -39,7 +39,7 @@ from pretix.base.templatetags.rich_text import (
    DEFAULT_CALLBACKS, EMAIL_RE, URL_RE, abslink_callback,
    markdown_compile_email, truelink_callback,
 )
-from pretix.helpers.format import FormattedString, SafeFormatter, format_map
+from pretix.helpers.format import SafeFormatter, format_map

 from pretix.base.services.placeholders import (  # noqa
    get_available_placeholders, PlaceholderContext
@@ -141,7 +141,6 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
        return markdown_compile_email(plaintext, context=context)

    def render(self, plain_body: str, plain_signature: str, subject: str, order, position, context) -> str:
-        apply_format_map = not isinstance(plain_body, FormattedString)
        body_md = self.compile_markdown(plain_body, context)
        if context:
            linker = bleach.Linker(
@@ -150,13 +149,12 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
                callbacks=DEFAULT_CALLBACKS + [truelink_callback, abslink_callback],
                parse_email=True
            )
-            if apply_format_map:
-                body_md = format_map(
-                    body_md,
-                    context=context,
-                    mode=SafeFormatter.MODE_RICH_TO_HTML,
-                    linkifier=linker
-                )
+            body_md = format_map(
+                body_md,
+                context=context,
+                mode=SafeFormatter.MODE_RICH_TO_HTML,
+                linkifier=linker
+            )
        htmlctx = {
            'site': settings.PRETIX_INSTANCE_NAME,
            'site_url': settings.SITE_URL,
--- a/src/pretix/base/exporter.py
+++ b/src/pretix/base/exporter.py
@@ -73,9 +73,6 @@ class BaseExporter:
            self.events = Event.objects.filter(pk=event.pk)
            self.timezone = event.timezone

-        if hasattr(self, 'organizer_required_permission'):
-            raise TypeError("Deprecated attribute organizer_required_permission no longer supported.")
-
    def __str__(self):
        return self.identifier

@@ -179,30 +176,15 @@ class BaseExporter:
        """
        return True

-    @classmethod
-    def get_required_event_permission(cls) -> str:
-        """
-        The permission level required to use this exporter for events. For multi-event-exports, this will be used
-        to limit the selection of events. Will be ignored if the ``OrganizerLevelExportMixin`` mixin is used.
-        The default implementation returns ``"event.orders:read"``.
-        """
-        return 'event.orders:read'
-

 class OrganizerLevelExportMixin:
-    @classmethod
-    def get_required_event_permission(cls):
-        raise TypeError("required_event_permission may not be called on OrganizerLevelExportMixin")
-
-    @classmethod
-    def get_required_organizer_permission(cls) -> str:
+    @property
+    def organizer_required_permission(self) -> str:
        """
-        The permission level required to use this exporter. Must be set for organizer-level exports. Set to `None` to
-        allow everyone with any access to the organizer.
-
-        ``get_required_event_permission`` will be ignored on this class.
+        The permission level required to use this exporter. Only useful for organizer-level exports,
+        not for event-level exports.
        """
-        raise NotImplementedError()
+        return 'can_view_orders'


 class ListExporter(BaseExporter):
--- a/src/pretix/base/exporters/customers.py
+++ b/src/pretix/base/exporters/customers.py
@@ -47,13 +47,10 @@ from ..signals import register_multievent_data_exporters
 class CustomerListExporter(OrganizerLevelExportMixin, ListExporter):
    identifier = 'customerlist'
    verbose_name = gettext_lazy('Customer accounts')
+    organizer_required_permission = 'can_manage_customers'
    category = pgettext_lazy('export_category', 'Customer accounts')
    description = gettext_lazy('Download a spreadsheet of all currently registered customer accounts.')

-    @classmethod
-    def get_required_organizer_permission(cls) -> str:
-        return 'organizer.customers:write'
-
    @property
    def additional_form_fields(self):
        return OrderedDict(
--- a/src/pretix/base/exporters/orderlist.py
+++ b/src/pretix/base/exporters/orderlist.py
@@ -39,8 +39,8 @@ from zoneinfo import ZoneInfo
 from django import forms
 from django.conf import settings
 from django.db.models import (
-    Case, CharField, Count, DateTimeField, Exists, F, IntegerField, Max, Min,
-    OuterRef, Q, Subquery, Sum, When,
+    Case, CharField, Count, DateTimeField, F, IntegerField, Max, Min, OuterRef,
+    Q, Subquery, Sum, When,
 )
 from django.db.models.functions import Coalesce
 from django.dispatch import receiver
@@ -144,18 +144,6 @@ class OrderListExporter(MultiSheetListExporter):
        d = OrderedDict(d)
        if not self.is_multievent and not self.event.has_subevents:
            del d['event_date_range']
-        if not self.is_multievent:
-            d["items"] = forms.ModelMultipleChoiceField(
-                label=_("Products"),
-                queryset=self.event.items.all(),
-                widget=forms.CheckboxSelectMultiple(
-                    attrs={"class": "scrolling-multiple-choice"}
-                ),
-                help_text=_("If none are selected, all products are included. Orders are included if they contain "
-                            "at least one position of this product. The order totals etc. still include all products "
-                            "contained in the order."),
-                required=False,
-            )
        return d

    def _get_all_payment_methods(self, qs):
@@ -261,17 +249,9 @@ class OrderListExporter(MultiSheetListExporter):
            pcnt=Subquery(s, output_field=IntegerField())
        ).select_related('invoice_address', 'customer')

-        if form_data.get('items'):
-            qs = qs.filter(
-                Exists(OrderPosition.all.filter(
-                    order=OuterRef('pk'),
-                    item__in=form_data["items"]
-                ))
-            )
-
        qs = self._date_filter(qs, form_data, rel='')

-        if form_data.get('paid_only'):
+        if form_data['paid_only']:
            qs = qs.filter(status=Order.STATUS_PAID)
        return qs

@@ -315,9 +295,8 @@ class OrderListExporter(MultiSheetListExporter):
            for id, vn in payment_methods:
                headers.append(_('Paid by {method}').format(method=vn))

-        if self.event_object_cache:
-            # get meta_data labels from first cached event if any
-            headers += next(iter(self.event_object_cache.values())).meta_data.keys()
+        # get meta_data labels from first cached event
+        headers += next(iter(self.event_object_cache.values())).meta_data.keys()
        yield headers

        full_fee_sum_cache = {
@@ -385,7 +364,7 @@ class OrderListExporter(MultiSheetListExporter):
                    order.invoice_address.city,
                    order.invoice_address.country if order.invoice_address.country else
                    order.invoice_address.country_old,
-                    order.invoice_address.state_for_address,
+                    order.invoice_address.state,
                    order.invoice_address.custom_field,
                    order.invoice_address.vat_id,
                ]
@@ -458,17 +437,9 @@ class OrderListExporter(MultiSheetListExporter):
        ).annotate(
            payment_providers=Subquery(p_providers, output_field=CharField()),
        ).select_related('order', 'order__invoice_address', 'order__customer', 'tax_rule')
-        if form_data.get('paid_only'):
+        if form_data['paid_only']:
            qs = qs.filter(order__status=Order.STATUS_PAID, canceled=False)

-        if form_data.get('items'):
-            qs = qs.filter(
-                Exists(OrderPosition.all.filter(
-                    order=OuterRef('order'),
-                    item__in=form_data["items"]
-                ))
-            )
-
        qs = self._date_filter(qs, form_data, rel='order__')
        return qs

@@ -504,9 +475,8 @@ class OrderListExporter(MultiSheetListExporter):
        headers.append(_('External customer ID'))
        headers.append(_('Payment providers'))

-        if self.event_object_cache:
-            # get meta_data labels from first cached event if any
-            headers += next(iter(self.event_object_cache.values())).meta_data.keys()
+        # get meta_data labels from first cached event
+        headers += next(iter(self.event_object_cache.values())).meta_data.keys()
        yield headers

        yield self.ProgressSetTotal(total=qs.count())
@@ -545,7 +515,7 @@ class OrderListExporter(MultiSheetListExporter):
                    order.invoice_address.city,
                    order.invoice_address.country if order.invoice_address.country else
                    order.invoice_address.country_old,
-                    order.invoice_address.state_for_address,
+                    order.invoice_address.state,
                    order.invoice_address.vat_id,
                ]
            except InvoiceAddress.DoesNotExist:
@@ -562,14 +532,9 @@ class OrderListExporter(MultiSheetListExporter):
        qs = OrderPosition.all.filter(
            order__event__in=self.events,
        )
-        if form_data.get('paid_only'):
+        if form_data['paid_only']:
            qs = qs.filter(order__status=Order.STATUS_PAID, canceled=False)

-        if form_data.get('items'):
-            qs = qs.filter(
-                item__in=form_data["items"]
-            )
-
        qs = self._date_filter(qs, form_data, rel='order__')
        return qs

@@ -652,8 +617,6 @@ class OrderListExporter(MultiSheetListExporter):
            _('Country'),
            pgettext('address', 'State'),
            _('Voucher'),
-            _('Voucher budget usage'),
-            _('Voucher tag'),
            _('Pseudonymization ID'),
            _('Ticket secret'),
            _('Seat ID'),
@@ -709,9 +672,9 @@ class OrderListExporter(MultiSheetListExporter):
            _('Position order link')
        ]

+        # get meta_data labels from first cached event
+        meta_data_labels = next(iter(self.event_object_cache.values())).meta_data.keys()
        if has_subevents:
-            # get meta_data labels from first cached event
-            meta_data_labels = next(iter(self.event_object_cache.values())).meta_data.keys()
            headers += meta_data_labels
        yield headers

@@ -769,10 +732,8 @@ class OrderListExporter(MultiSheetListExporter):
                    op.zipcode or '',
                    op.city or '',
                    op.country if op.country else '',
-                    op.state_for_address or '',
+                    op.state or '',
                    op.voucher.code if op.voucher else '',
-                    op.voucher_budget_use if op.voucher_budget_use else '',
-                    op.voucher.tag if op.voucher else '',
                    op.pseudonymization_id,
                    op.secret,
                ]
@@ -836,7 +797,7 @@ class OrderListExporter(MultiSheetListExporter):
                        order.invoice_address.city,
                        order.invoice_address.country if order.invoice_address.country else
                        order.invoice_address.country_old,
-                        order.invoice_address.state_for_address,
+                        order.invoice_address.state,
                        order.invoice_address.vat_id,
                    ]
                except InvoiceAddress.DoesNotExist:
@@ -1239,14 +1200,11 @@ class QuotaListExporter(ListExporter):
 class GiftcardTransactionListExporter(OrganizerLevelExportMixin, ListExporter):
    identifier = 'giftcardtransactionlist'
    verbose_name = gettext_lazy('Gift card transactions')
+    organizer_required_permission = 'can_manage_gift_cards'
    category = pgettext_lazy('export_category', 'Gift cards')
    description = gettext_lazy('Download a spreadsheet of all gift card transactions.')
    repeatable_read = False

-    @classmethod
-    def get_required_organizer_permission(cls) -> str:
-        return 'organizer.giftcards:read'
-
    @property
    def additional_form_fields(self):
        d = [
@@ -1349,13 +1307,10 @@ class GiftcardRedemptionListExporter(ListExporter):
 class GiftcardListExporter(OrganizerLevelExportMixin, ListExporter):
    identifier = 'giftcardlist'
    verbose_name = gettext_lazy('Gift cards')
+    organizer_required_permission = 'can_manage_gift_cards'
    category = pgettext_lazy('export_category', 'Gift cards')
    description = gettext_lazy('Download a spreadsheet of all gift cards including their current value.')

-    @classmethod
-    def get_required_organizer_permission(cls) -> str:
-        return 'organizer.giftcards:read'
-
    @property
    def additional_form_fields(self):
        return OrderedDict(
--- a/src/pretix/base/exporters/reusablemedia.py
+++ b/src/pretix/base/exporters/reusablemedia.py
@@ -36,10 +36,6 @@ class ReusableMediaExporter(OrganizerLevelExportMixin, ListExporter):
    description = _('Download a spread sheet with the data of all reusable medias on your account.')
    repeatable_read = False

-    @classmethod
-    def get_required_organizer_permission(cls) -> str:
-        return "organizer.reusablemedia:read"
-
    def iterate_list(self, form_data):
        media = ReusableMedium.objects.filter(
            organizer=self.organizer,
--- a/src/pretix/base/forms/questions.py
+++ b/src/pretix/base/forms/questions.py
@@ -66,10 +66,8 @@ from geoip2.errors import AddressNotFoundError
 from phonenumber_field.formfields import PhoneNumberField
 from phonenumber_field.phonenumber import PhoneNumber
 from phonenumber_field.widgets import PhoneNumberPrefixWidget
-from phonenumbers import (
-    COUNTRY_CODE_TO_REGION_CODE, REGION_CODE_FOR_NON_GEO_ENTITY,
-    NumberParseException, national_significant_number,
-)
+from phonenumbers import NumberParseException, national_significant_number
+from phonenumbers.data import _COUNTRY_CODE_TO_REGION_CODE
 from PIL import ImageOps

 from pretix.base.forms.widgets import (
@@ -85,7 +83,7 @@ from pretix.base.invoicing.transmission import (
 from pretix.base.models import InvoiceAddress, Item, Question, QuestionOption
 from pretix.base.models.tax import ask_for_vat_id
 from pretix.base.services.tax import (
-    VATIDFinalError, VATIDTemporaryError, normalize_vat_id, validate_vat_id,
+    VATIDFinalError, VATIDTemporaryError, validate_vat_id,
 )
 from pretix.base.settings import (
    COUNTRIES_WITH_STATE_IN_ADDRESS, COUNTRY_STATE_LABEL,
@@ -307,9 +305,7 @@ class WrappedPhonePrefixSelect(Select):
        choices = [("", "---------")]

        if initial:
-            for prefix, values in COUNTRY_CODE_TO_REGION_CODE.items():
-                if all(v == REGION_CODE_FOR_NON_GEO_ENTITY for v in values):
-                    continue
+            for prefix, values in _COUNTRY_CODE_TO_REGION_CODE.items():
                if initial in values:
                    self.initial = "+%d" % prefix
                    break
@@ -441,9 +437,7 @@ def guess_phone_prefix_from_request(request, event):


 def get_phone_prefix(country):
-    if country == REGION_CODE_FOR_NON_GEO_ENTITY:
-        return None
-    for prefix, values in COUNTRY_CODE_TO_REGION_CODE.items():
+    for prefix, values in _COUNTRY_CODE_TO_REGION_CODE.items():
        if country in values:
            return prefix
    return None
@@ -890,18 +884,18 @@ class BaseQuestionsForm(forms.Form):
                if not help_text:
                    if q.valid_date_min and q.valid_date_max:
                        help_text = format_lazy(
-                            _('Please enter a date between {min} and {max}.'),
+                            'Please enter a date between {min} and {max}.',
                            min=date_format(q.valid_date_min, "SHORT_DATE_FORMAT"),
                            max=date_format(q.valid_date_max, "SHORT_DATE_FORMAT"),
                        )
                    elif q.valid_date_min:
                        help_text = format_lazy(
-                            _('Please enter a date no earlier than {min}.'),
+                            'Please enter a date no earlier than {min}.',
                            min=date_format(q.valid_date_min, "SHORT_DATE_FORMAT"),
                        )
                    elif q.valid_date_max:
                        help_text = format_lazy(
-                            _('Please enter a date no later than {max}.'),
+                            'Please enter a date no later than {max}.',
                            max=date_format(q.valid_date_max, "SHORT_DATE_FORMAT"),
                        )
                if initial and initial.answer:
@@ -939,18 +933,18 @@ class BaseQuestionsForm(forms.Form):
                if not help_text:
                    if q.valid_datetime_min and q.valid_datetime_max:
                        help_text = format_lazy(
-                            _('Please enter a date and time between {min} and {max}.'),
+                            'Please enter a date and time between {min} and {max}.',
                            min=date_format(q.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
                            max=date_format(q.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
                        )
                    elif q.valid_datetime_min:
                        help_text = format_lazy(
-                            _('Please enter a date and time no earlier than {min}.'),
+                            'Please enter a date and time no earlier than {min}.',
                            min=date_format(q.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
                        )
                    elif q.valid_datetime_max:
                        help_text = format_lazy(
-                            _('Please enter a date and time no later than {max}.'),
+                            'Please enter a date and time no later than {max}.',
                            max=date_format(q.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
                        )

@@ -1171,11 +1165,13 @@ class BaseInvoiceAddressForm(forms.ModelForm):
            self.fields['vat_id'].help_text = '<br/>'.join([
                str(_('Optional, but depending on the country you reside in we might need to charge you '
                      'additional taxes if you do not enter it.')),
+                str(_('If you are registered in Switzerland, you can enter your UID instead.')),
            ])
        else:
            self.fields['vat_id'].help_text = '<br/>'.join([
                str(_('Optional, but it might be required for you to claim tax benefits on your invoice '
                      'depending on your and the seller’s country of residence.')),
+                str(_('If you are registered in Switzerland, you can enter your UID instead.')),
            ])

        transmission_type_choices = [
@@ -1362,24 +1358,13 @@ class BaseInvoiceAddressForm(forms.ModelForm):
                                            "transmission method.")}
                )

-        vat_id_applicable = (
-            'vat_id' in self.fields and
-            data.get('is_business') and
-            ask_for_vat_id(data.get('country'))
-        )
-        vat_id_required = vat_id_applicable and str(data.get('country')) in self.event.settings.invoice_address_vatid_required_countries
-        if vat_id_required and not data.get('vat_id'):
-            raise ValidationError({
-                "vat_id": _("This field is required.")
-            })
-
        if self.validate_vat_id and self.instance.vat_id_validated and 'vat_id' not in self.changed_data:
-            pass  # Skip re-validation if it is validated
-        elif self.validate_vat_id and vat_id_applicable:
+            pass
+        elif self.validate_vat_id and data.get('is_business') and ask_for_vat_id(data.get('country')) and data.get('vat_id'):
            try:
                normalized_id = validate_vat_id(data.get('vat_id'), str(data.get('country')))
                self.instance.vat_id_validated = True
-                self.instance.vat_id = data['vat_id'] = normalized_id
+                self.instance.vat_id = normalized_id
            except VATIDFinalError as e:
                if self.all_optional:
                    self.instance.vat_id_validated = False
@@ -1387,9 +1372,6 @@ class BaseInvoiceAddressForm(forms.ModelForm):
                else:
                    raise ValidationError({"vat_id": e.message})
            except VATIDTemporaryError as e:
-                # We couldn't check it online, but we can still normalize it
-                normalized_id = normalize_vat_id(data.get('vat_id'), str(data.get('country')))
-                self.instance.vat_id = data['vat_id'] = normalized_id
                self.instance.vat_id_validated = False
                if self.request and self.vat_warning:
                    messages.warning(self.request, e.message)
@@ -1415,10 +1397,9 @@ class BaseInvoiceAddressForm(forms.ModelForm):
                    if not data.get(r):
                        raise ValidationError({r: _("This field is required for the selected type of invoice transmission.")})

-                transmission_type.validate_invoice_address_data(data)
                self.instance.transmission_type = transmission_type.identifier
                self.instance.transmission_info = transmission_type.form_data_to_transmission_info(data)
-            elif transmission_type.is_exclusive(self.event, data.get("country"), data.get("is_business")):
+            elif transmission_type.exclusive:
                if transmission_type.is_available(self.event, data.get("country"), data.get("is_business")):
                    raise ValidationError({
                        "transmission_type": "The transmission type '%s' must be used for this country or address type." % (
--- a/src/pretix/base/forms/widgets.py
+++ b/src/pretix/base/forms/widgets.py
@@ -42,8 +42,6 @@ from django.utils.html import escape
 from django.utils.timezone import get_current_timezone, now
 from django.utils.translation import gettext_lazy as _

-from pretix.helpers.format import PlainHtmlAlternativeString
-

 def replace_arabic_numbers(inp):
    if not isinstance(inp, str):
@@ -63,18 +61,11 @@ def replace_arabic_numbers(inp):
    return inp.translate(table)


-def format_placeholder_help_text(placeholder_name, sample_value):
-    if isinstance(sample_value, PlainHtmlAlternativeString):
-        sample_value = sample_value.plain
-    title = (_("Sample: %s") % sample_value) if sample_value else ""
-    return ('<button type="button" class="content-placeholder" title="%s">{%s}</button>' % (escape(title), escape(placeholder_name)))
-
-
 def format_placeholders_help_text(placeholders, event=None):
    placeholders = [(k, v.render_sample(event) if event else v) for k, v in placeholders.items()]
    placeholders.sort(key=lambda x: x[0])
    phs = [
-        format_placeholder_help_text(k, v)
+        '<button type="button" class="content-placeholder" title="%s">{%s}</button>' % (escape(_("Sample: %s") % v) if v else "", escape(k))
        for k, v in placeholders
    ]
    return _('Available placeholders: {list}').format(
--- a/src/pretix/base/i18n.py
+++ b/src/pretix/base/i18n.py
@@ -34,13 +34,14 @@

 from contextlib import contextmanager

-from asgiref.local import Local
 from babel import localedata
 from django.conf import settings
 from django.utils import translation
 from django.utils.formats import date_format, number_format
 from django.utils.translation import gettext

+from pretix.base.templatetags.money import money_filter
+
 from i18nfield.fields import (  # noqa
    I18nCharField, I18nTextarea, I18nTextField, I18nTextInput,
 )
@@ -50,9 +51,6 @@ from i18nfield.strings import LazyI18nString  # noqa
 from i18nfield.utils import I18nJSONEncoder  # noqa


-_active_region = Local()
-
-
 class LazyDate:
    def __init__(self, value):
        self.value = value
@@ -88,8 +86,6 @@ class LazyCurrencyNumber:
        return self.__str__()

    def __str__(self):
-        from pretix.base.templatetags.money import money_filter
-
        return money_filter(self.value, self.currency)


@@ -109,41 +105,14 @@ ALLOWED_LANGUAGES = dict(settings.LANGUAGES)


 def get_babel_locale():
-    # Babel, and therefore also django-phonenumberfield, do not support our custom locales such das de_Informal
-    # Also, this returns best-effort region information for number formatting etc
-    current_language = translation.get_language()
-    current_region = getattr(_active_region, "value", None)
-
-    # Babel only accepts locales that exist on the system. We try combinations in the following order:
-    # language-languageversion-region
-    # language-region
-    # language-languageversion
-    # language
-    # fallback to system default
-    # fallback to english
-
-    try_locales = []
-    if current_language:
-        if "-" in current_language:
-            lng_parts = current_language.split("-")
-            if current_region:
-                try_locales.append(f"{lng_parts[0]}_{lng_parts[1].title()}_{current_region.upper()}")
-                try_locales.append(f"{lng_parts[0]}_{current_region.upper()}")
-            try_locales.append(f"{lng_parts[0]}_{lng_parts[1].upper()}")
-            try_locales.append(f"{lng_parts[0]}_{lng_parts[1].title()}")
-            try_locales.append(f"{lng_parts[0]}")
-        else:
-            if current_region:
-                try_locales.append(f"{current_language}_{current_region.upper()}")
-            try_locales.append(f"{current_language}")
-
-    try_locales.append(settings.LANGUAGE_CODE)
-
-    for locale in try_locales:
-        if localedata.exists(locale):
-            return localedata.normalize_locale(locale)
-
-    return "en"
+    babel_locale = 'en'
+    # Babel, and therefore django-phonenumberfield, do not support our custom locales such das de_Informal
+    if translation.get_language():
+        if localedata.exists(translation.get_language()):
+            babel_locale = translation.get_language()
+        elif localedata.exists(translation.get_language()[:2]):
+            babel_locale = translation.get_language()[:2]
+    return babel_locale


 def get_language_without_region(lng=None):
@@ -163,10 +132,6 @@ def get_language_without_region(lng=None):
    return lng


-def set_region(region):
-    _active_region.value = region
-
-
@contextmanager
 def language(lng, region=None):
    """
@@ -178,18 +143,15 @@ def language(lng, region=None):
    formatting. If you pass a ``lng`` that already contains a region, e.g. ``pt-br``, the ``region``
    attribute will be ignored.
    """
-    lng_before = translation.get_language()
-    region_before = getattr(_active_region, "value", None)
+    _lng = translation.get_language()
    lng = lng or settings.LANGUAGE_CODE
    if '-' not in lng and region:
        lng += '-' + region.lower()
    translation.activate(lng)
-    _active_region.value = region
    try:
        yield
    finally:
-        translation.activate(lng_before)
-        _active_region.value = region_before
+        translation.activate(_lng)


 class LazyLocaleException(Exception):
--- a/src/pretix/base/invoicing/email.py
+++ b/src/pretix/base/invoicing/email.py
@@ -33,7 +33,8 @@ from pretix.base.invoicing.transmission import (
    transmission_types,
 )
 from pretix.base.models import Invoice, InvoiceAddress
-from pretix.base.services.mail import mail
+from pretix.base.services.mail import SendMailException, mail, render_mail
+from pretix.helpers.format import format_map


@transmission_types.new()
@@ -132,26 +133,41 @@ class EmailTransmissionProvider(TransmissionProvider):
            template = invoice.order.event.settings.get('mail_text_order_invoice', as_type=LazyI18nString)
            subject = invoice.order.event.settings.get('mail_subject_order_invoice', as_type=LazyI18nString)

-            # Do not set to completed because that is done by the email sending task
-            outgoing_mail = mail(
-                [recipient],
-                subject,
-                template,
-                context=context,
-                event=invoice.order.event,
-                locale=invoice.order.locale,
-                order=invoice.order,
-                invoices=[invoice],
-                attach_tickets=False,
-                auto_email=True,
-                attach_ical=False,
-                plain_text_only=True,
-                no_order_links=True,
-            )
-            if outgoing_mail:
+            try:
+                # Do not set to completed because that is done by the email sending task
+                subject = format_map(subject, context)
+                email_content = render_mail(template, context)
+                mail(
+                    [recipient],
+                    subject,
+                    template,
+                    context=context,
+                    event=invoice.order.event,
+                    locale=invoice.order.locale,
+                    order=invoice.order,
+                    invoices=[invoice],
+                    attach_tickets=False,
+                    auto_email=True,
+                    attach_ical=False,
+                    plain_text_only=True,
+                    no_order_links=True,
+                )
+            except SendMailException:
+                raise
+            else:
                invoice.order.log_action(
                    'pretix.event.order.email.invoice',
                    user=None,
                    auth=None,
-                    data=outgoing_mail.log_data()
+                    data={
+                        'subject': subject,
+                        'message': email_content,
+                        'position': None,
+                        'recipient': recipient,
+                        'invoices': [invoice.pk],
+                        'attach_tickets': False,
+                        'attach_ical': False,
+                        'attach_other_files': [],
+                        'attach_cached_files': [],
+                    }
                )
--- a/src/pretix/base/invoicing/national.py
+++ b/src/pretix/base/invoicing/national.py
@@ -36,11 +36,9 @@ class ItalianSdITransmissionType(TransmissionType):
    identifier = "it_sdi"
    verbose_name = pgettext_lazy("italian_invoice", "Italian Exchange System (SdI)")
    public_name = pgettext_lazy("italian_invoice", "Exchange System (SdI)")
+    exclusive = True
    enforce_transmission = True

-    def is_exclusive(self, event, country: Country, is_business: bool) -> bool:
-        return str(country) == "IT"
-
    def is_available(self, event, country: Country, is_business: bool):
        return str(country) == "IT" and super().is_available(event, country, is_business)

--- a/src/pretix/base/invoicing/pdf.py
+++ b/src/pretix/base/invoicing/pdf.py
@@ -32,6 +32,7 @@ from itertools import groupby
 from typing import Tuple

 import bleach
+import vat_moss.exchange_rates
 from bidi import get_display
 from django.contrib.staticfiles import finders
 from django.db.models import Sum
@@ -46,6 +47,7 @@ from reportlab.lib.styles import ParagraphStyle, StyleSheet1
 from reportlab.lib.units import mm
 from reportlab.pdfbase import pdfmetrics
 from reportlab.pdfbase.pdfmetrics import stringWidth
+from reportlab.pdfbase.ttfonts import TTFont
 from reportlab.pdfgen.canvas import Canvas
 from reportlab.platypus import (
    BaseDocTemplate, Flowable, Frame, KeepTogether, NextPageTemplate,
@@ -58,8 +60,7 @@ from pretix.base.services.currencies import SOURCE_NAMES
 from pretix.base.signals import register_invoice_renderers
 from pretix.base.templatetags.money import money_filter
 from pretix.helpers.reportlab import (
-    FontFallbackParagraph, ThumbnailingImageReader, register_ttf_font_if_new,
-    reshaper,
+    FontFallbackParagraph, ThumbnailingImageReader, reshaper,
 )
 from pretix.presale.style import get_fonts

@@ -148,10 +149,6 @@ class NumberedCanvas(Canvas):
        self.restoreState()


-class InvoiceNotReadyException(Exception):
-    pass
-
-
 class BaseInvoiceRenderer:
    """
    This is the base class for all invoice renderers.
@@ -238,25 +235,25 @@ class BaseReportlabInvoiceRenderer(BaseInvoiceRenderer):
        """
        Register fonts with reportlab. By default, this registers the OpenSans font family
        """
-        register_ttf_font_if_new('OpenSans', finders.find('fonts/OpenSans-Regular.ttf'))
-        register_ttf_font_if_new('OpenSansIt', finders.find('fonts/OpenSans-Italic.ttf'))
-        register_ttf_font_if_new('OpenSansBd', finders.find('fonts/OpenSans-Bold.ttf'))
-        register_ttf_font_if_new('OpenSansBI', finders.find('fonts/OpenSans-BoldItalic.ttf'))
+        pdfmetrics.registerFont(TTFont('OpenSans', finders.find('fonts/OpenSans-Regular.ttf')))
+        pdfmetrics.registerFont(TTFont('OpenSansIt', finders.find('fonts/OpenSans-Italic.ttf')))
+        pdfmetrics.registerFont(TTFont('OpenSansBd', finders.find('fonts/OpenSans-Bold.ttf')))
+        pdfmetrics.registerFont(TTFont('OpenSansBI', finders.find('fonts/OpenSans-BoldItalic.ttf')))
        pdfmetrics.registerFontFamily('OpenSans', normal='OpenSans', bold='OpenSansBd',
                                      italic='OpenSansIt', boldItalic='OpenSansBI')

        for family, styles in get_fonts(event=self.event, pdf_support_required=True).items():
-            register_ttf_font_if_new(family, finders.find(styles['regular']['truetype']))
+            pdfmetrics.registerFont(TTFont(family, finders.find(styles['regular']['truetype'])))
            if family == self.event.settings.invoice_renderer_font:
                self.font_regular = family
                if 'bold' in styles:
                    self.font_bold = family + ' B'
            if 'italic' in styles:
-                register_ttf_font_if_new(family + ' I', finders.find(styles['italic']['truetype']))
+                pdfmetrics.registerFont(TTFont(family + ' I', finders.find(styles['italic']['truetype'])))
            if 'bold' in styles:
-                register_ttf_font_if_new(family + ' B', finders.find(styles['bold']['truetype']))
+                pdfmetrics.registerFont(TTFont(family + ' B', finders.find(styles['bold']['truetype'])))
            if 'bolditalic' in styles:
-                register_ttf_font_if_new(family + ' B I', finders.find(styles['bolditalic']['truetype']))
+                pdfmetrics.registerFont(TTFont(family + ' B I', finders.find(styles['bolditalic']['truetype'])))

    def _normalize(self, text):
        # reportlab does not support unicode combination characters
@@ -1062,7 +1059,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):

        def fmt(val):
            try:
-                return money_filter(val, self.invoice.foreign_currency_display)
+                return vat_moss.exchange_rates.format(val, self.invoice.foreign_currency_display)
            except ValueError:
                return localize(val) + ' ' + self.invoice.foreign_currency_display

--- a/src/pretix/base/invoicing/peppol.py
+++ b/src/pretix/base/invoicing/peppol.py
@@ -64,7 +64,7 @@ class PeppolIdValidator:
        "0020": "[0-9]{9}",
        "0201": "[0-9a-zA-Z]{6}",
        "0204": "[0-9]{2,12}(-[0-9A-Z]{0,30})?-[0-9]{2}",
-        "0208": "[01][0-9]{9}",
+        "0208": "0[0-9]{9}",
        "0209": ".*",
        "0210": "[A-Z0-9]+",
        "0211": "IT[0-9]{11}",
@@ -73,9 +73,6 @@ class PeppolIdValidator:
        "0205": "[A-Z0-9]+",
        "0221": "T[0-9]{13}",
        "0230": ".*",
-        "0244": "[0-9]{13}",
-        "0245": "[0-9]{10}",
-        "0246": "DE[0-9]{9}(-[0-9]{5})?(\\.[0-9A-Z]{1,8})?",
        "9901": ".*",
        "9902": "[1-9][0-9]{7}",
        "9904": "DK[0-9]{8}",
@@ -123,6 +120,7 @@ class PeppolIdValidator:
        "9951": ".*",
        "9952": ".*",
        "9953": ".*",
+        "9954": ".*",
        "9956": "0[0-9]{9}",
        "9957": ".*",
        "9959": ".*",
@@ -179,12 +177,6 @@ class PeppolTransmissionType(TransmissionType):
    def is_available(self, event, country: Country, is_business: bool):
        return is_business and super().is_available(event, country, is_business)

-    def is_exclusive(self, event, country: Country, is_business: bool) -> bool:
-        if is_business and str(country) == "BE" and event and event.settings.invoice_address_from_country == "BE":
-            # Peppol is required to be used for intra-Belgian B2B invoices
-            return True
-        return False
-
    @property
    def invoice_address_form_fields(self) -> dict:
        return {
@@ -204,12 +196,6 @@ class PeppolTransmissionType(TransmissionType):
        }
        return base | {"transmission_peppol_participant_id"}

-    def validate_invoice_address_data(self, address_data: dict):
-        # Special case Belgium: If a Belgian business ID is used as Peppol ID, it should match the VAT ID
-        if address_data.get("transmission_peppol_participant_id").startswith("0208:") and address_data.get("vat_id"):
-            if address_data["vat_id"].removeprefix("BE") != address_data["transmission_peppol_participant_id"].removeprefix("0208:"):
-                raise ValidationError({"transmission_peppol_participant_id": _("The Peppol participant ID does not match your VAT ID.")})
-
    def pdf_watermark(self) -> str:
        return pgettext("peppol_invoice", "Visual copy")

--- a/src/pretix/base/invoicing/transmission.py
+++ b/src/pretix/base/invoicing/transmission.py
@@ -21,10 +21,9 @@
 #
 from typing import Optional

-from django.utils.translation import gettext_lazy as _
 from django_countries.fields import Country

-from pretix.base.models import Invoice
+from pretix.base.models import Invoice, InvoiceAddress
 from pretix.base.signals import EventPluginRegistry, Registry


@@ -59,6 +58,15 @@ class TransmissionType:
        """
        return 100

+    @property
+    def exclusive(self) -> bool:
+        """
+        If a transmission type is exclusive, no other type can be chosen if this type is
+        available. Use e.g. if a certain transmission type is legally required in a certain
+        jurisdiction.
+        """
+        return False
+
    @property
    def enforce_transmission(self) -> bool:
        """
@@ -74,22 +82,13 @@ class TransmissionType:
            for provider, _ in providers
        )

-    def is_exclusive(self, event, country: Country, is_business: bool) -> bool:
-        """
-        If a transmission type is exclusive, no other type can be chosen if this type is
-        available. Use e.g. if a certain transmission type is legally required in a certain
-        jurisdiction. Event can be None in organizer-level contexts. Exclusiveness has no effect if
-        the type is not available.
-        """
-        return False
-
    def invoice_address_form_fields_required(self, country: Country, is_business: bool):
        return set()

    def invoice_address_form_fields_visible(self, country: Country, is_business: bool) -> set:
        return set(self.invoice_address_form_fields.keys())

-    def validate_invoice_address_data(self, address_data: dict):
+    def validate_address(self, ia: InvoiceAddress):
        pass

    @property
@@ -107,22 +106,6 @@ class TransmissionType:
    def transmission_info_to_form_data(self, transmission_info: dict) -> dict:
        return transmission_info

-    def describe_info(self, transmission_info: dict, country: Country, is_business: bool):
-        form_data = self.transmission_info_to_form_data(transmission_info)
-        data = []
-        visible_field_keys = self.invoice_address_form_fields_visible(country, is_business)
-        for k, f in self.invoice_address_form_fields.items():
-            if k not in visible_field_keys:
-                continue
-            v = form_data.get(k)
-            if v is True:
-                v = _("Yes")
-            elif v is False:
-                v = _("No")
-            if v:
-                data.append((f.label, v))
-        return data
-
    def pdf_watermark(self) -> Optional[str]:
        """
        Return a watermark that should be rendered across the PDF file.
--- a/src/pretix/base/metrics.py
+++ b/src/pretix/base/metrics.py
@@ -294,28 +294,14 @@ def metric_values():
        channel = app.broker_connection().channel()
        if hasattr(channel, 'client') and channel.client is not None:
            client = channel.client
-            priority_steps = settings.CELERY_BROKER_TRANSPORT_OPTIONS.get("priority_steps", [0])
-            sep = settings.CELERY_BROKER_TRANSPORT_OPTIONS.get("sep", ":")
-
            for q in settings.CELERY_TASK_QUEUES:
-                queue_lengths = []
-                queue_delays = []
-                for prio in priority_steps:
-                    if prio:
-                        qname = f"{q.name}{sep}{prio}"
-                    else:
-                        qname = q.name
-                    queue_length = client.llen(qname)
-                    queue_lengths.append(queue_length)
-                    oldest_queue_item = client.lindex(qname, -1)
-                    if oldest_queue_item:
-                        ldata = json.loads(oldest_queue_item)
-                        oldest_item_age = time.time() - ldata.get('created', 0)
-                        queue_delays.append(oldest_item_age)
-
-                metrics['pretix_celery_tasks_queued_count']['{queue="%s"}' % q.name] = sum(queue_lengths)
-                if queue_delays:
-                    metrics['pretix_celery_tasks_queued_age_seconds']['{queue="%s"}' % q.name] = max(queue_delays)
+                llen = client.llen(q.name)
+                lfirst = client.lindex(q.name, -1)
+                metrics['pretix_celery_tasks_queued_count']['{queue="%s"}' % q.name] = llen
+                if lfirst:
+                    ldata = json.loads(lfirst)
+                    dt = time.time() - ldata.get('created', 0)
+                    metrics['pretix_celery_tasks_queued_age_seconds']['{queue="%s"}' % q.name] = dt
                else:
                    metrics['pretix_celery_tasks_queued_age_seconds']['{queue="%s"}' % q.name] = 0

--- a/src/pretix/base/middleware.py
+++ b/src/pretix/base/middleware.py
@@ -35,7 +35,7 @@ from django.utils.translation.trans_real import (
    parse_accept_lang_header,
 )

-from pretix.base.i18n import get_language_without_region, set_region
+from pretix.base.i18n import get_language_without_region
 from pretix.base.settings import global_settings_object
 from pretix.multidomain.urlreverse import (
    get_event_domain, get_organizer_domain,
@@ -92,14 +92,10 @@ class LocaleMiddleware(MiddlewareMixin):
                )
                if '-' not in language and settings_holder.settings.region:
                    language += '-' + settings_holder.settings.region
-                if settings_holder.settings.region:
-                    set_region(settings_holder.settings.region)
        else:
            gs = global_settings_object(request)
            if '-' not in language and gs.settings.region:
                language += '-' + gs.settings.region
-            if gs.settings.region:
-                set_region(gs.settings.region)

        translation.activate(language)
        request.LANGUAGE_CODE = get_language_without_region()
--- a/src/pretix/base/migrations/0297_outgoingmail.py
+++ b/src/pretix/base/migrations/0297_outgoingmail.py
@@ -1,120 +0,0 @@
-# Generated by Django 4.2.26 on 2026-01-22 13:44
-import uuid
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-import pretix.base.models.mail
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("pretixbase", "0296_invoice_invoice_from_state"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="OutgoingMail",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True, primary_key=True, serialize=False
-                    ),
-                ),
-                ("guid", models.UUIDField(db_index=True, default=uuid.uuid4)),
-                ("status", models.CharField(default="queued", max_length=200)),
-                ("created", models.DateTimeField(auto_now_add=True)),
-                ("sent", models.DateTimeField(blank=True, null=True)),
-                ("inflight_since", models.DateTimeField(blank=True, null=True)),
-                ("retry_after", models.DateTimeField(blank=True, null=True)),
-                ("error", models.TextField(null=True)),
-                ("error_detail", models.TextField(null=True)),
-                ("sensitive", models.BooleanField(default=False)),
-                ("subject", models.TextField()),
-                ("body_plain", models.TextField()),
-                ("body_html", models.TextField(null=True)),
-                ("sender", models.CharField(max_length=500)),
-                ("headers", models.JSONField(default=dict)),
-                ("to", models.JSONField(default=list)),
-                ("cc", models.JSONField(default=list)),
-                ("bcc", models.JSONField(default=list)),
-                ("recipient_count", models.IntegerField()),
-                ("should_attach_tickets", models.BooleanField(default=False)),
-                ("should_attach_ical", models.BooleanField(default=False)),
-                ("should_attach_other_files", models.JSONField(default=list)),
-                ("actual_attachments", models.JSONField(default=list)),
-                (
-                    "customer",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=pretix.base.models.mail.CASCADE_IF_QUEUED,
-                        related_name="outgoing_mails",
-                        to="pretixbase.customer",
-                    ),
-                ),
-                (
-                    "event",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=pretix.base.models.mail.CASCADE_IF_QUEUED,
-                        related_name="outgoing_mails",
-                        to="pretixbase.event",
-                    ),
-                ),
-                (
-                    "order",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=pretix.base.models.mail.CASCADE_IF_QUEUED,
-                        related_name="outgoing_mails",
-                        to="pretixbase.order",
-                    ),
-                ),
-                (
-                    "orderposition",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=pretix.base.models.mail.CASCADE_IF_QUEUED,
-                        related_name="outgoing_mails",
-                        to="pretixbase.orderposition",
-                    ),
-                ),
-                (
-                    "organizer",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="outgoing_mails",
-                        to="pretixbase.organizer",
-                    ),
-                ),
-                (
-                    "should_attach_cached_files",
-                    models.ManyToManyField(
-                        related_name="outgoing_mails", to="pretixbase.cachedfile"
-                    ),
-                ),
-                (
-                    "should_attach_invoices",
-                    models.ManyToManyField(
-                        related_name="outgoing_mails", to="pretixbase.invoice"
-                    ),
-                ),
-                (
-                    "user",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="outgoing_mails",
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-            ],
-            options={
-                "ordering": ("-created",),
-            },
-        ),
-    ]
--- a/src/pretix/base/migrations/0298_pluggable_permissions.py
+++ b/src/pretix/base/migrations/0298_pluggable_permissions.py
@@ -1,137 +0,0 @@
-from django.db import migrations, models
-
-from pretix.helpers.permission_migration import (
-    OLD_TO_NEW_EVENT_MIGRATION, OLD_TO_NEW_ORGANIZER_MIGRATION,
-)
-
-
-def migrate_teams_forward(apps, schema_editor):
-    Team = apps.get_model("pretixbase", "Team")
-
-    for team in Team.objects.iterator():
-        if all(getattr(team, k) for k in OLD_TO_NEW_EVENT_MIGRATION.keys() if k != "can_checkin_orders"):
-            team.all_event_permissions = True
-            team.limit_event_permissions = {}
-        else:
-            team.all_event_permissions = False
-            for k, v in OLD_TO_NEW_EVENT_MIGRATION.items():
-                if getattr(team, k):
-                    team.limit_event_permissions.update({kk: True for kk in v})
-
-            # Prevent combinations that were possible previously but no longer make sense
-            if team.limit_event_permissions.get("event.orders:checkin") and team.limit_event_permissions.get("event.orders:write"):
-                team.limit_event_permissions.pop("event.orders:checkin")
-            if team.limit_event_permissions.get("event.orders:write") and not team.limit_event_permissions.get("event.orders:read"):
-                team.limit_event_permissions.pop("event.orders:write")
-            if team.limit_event_permissions.get("event.vouchers:write") and not team.limit_event_permissions.get("event.vouchers:read"):
-                team.limit_event_permissions.pop("event.vouchers:write")
-
-        if all(getattr(team, k) for k in OLD_TO_NEW_ORGANIZER_MIGRATION.keys()):
-            team.all_organizer_permissions = True
-            team.limit_organizer_permissions = {}
-        else:
-            team.all_organizer_permissions = False
-            for k, v in OLD_TO_NEW_ORGANIZER_MIGRATION.items():
-                if getattr(team, k):
-                    team.limit_organizer_permissions.update({kk: True for kk in v})
-
-        team.save(update_fields=[
-            "all_event_permissions", "limit_event_permissions", "all_organizer_permissions", "limit_organizer_permissions"
-        ])
-
-
-def migrate_teams_backward(apps, schema_editor):
-    Team = apps.get_model("pretixbase", "Team")
-
-    for team in Team.objects.iterator():
-        for k, v in OLD_TO_NEW_EVENT_MIGRATION.items():
-            setattr(team, k, team.all_event_permissions or all(team.limit_event_permissions.get(kk) for kk in v))
-        for k, v in OLD_TO_NEW_ORGANIZER_MIGRATION.items():
-            setattr(team, k, team.all_organizer_permissions or all(team.limit_organizer_permissions.get(kk) for kk in v))
-        team.save()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("pretixbase", "0297_outgoingmail"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="team",
-            name="all_event_permissions",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name="team",
-            name="all_organizer_permissions",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name="team",
-            name="limit_event_permissions",
-            field=models.JSONField(default=dict),
-        ),
-        migrations.AddField(
-            model_name="team",
-            name="limit_organizer_permissions",
-            field=models.JSONField(default=dict),
-        ),
-        migrations.RunPython(
-            migrate_teams_forward,
-            migrate_teams_backward,
-        ),
-        migrations.RemoveField(
-            model_name="team",
-            name="can_change_event_settings",
-        ),
-        migrations.RemoveField(
-            model_name="team",
-            name="can_change_items",
-        ),
-        migrations.RemoveField(
-            model_name="team",
-            name="can_change_orders",
-        ),
-        migrations.RemoveField(
-            model_name="team",
-            name="can_change_organizer_settings",
-        ),
-        migrations.RemoveField(
-            model_name="team",
-            name="can_change_teams",
-        ),
-        migrations.RemoveField(
-            model_name="team",
-            name="can_change_vouchers",
-        ),
-        migrations.RemoveField(
-            model_name="team",
-            name="can_checkin_orders",
-        ),
-        migrations.RemoveField(
-            model_name="team",
-            name="can_create_events",
-        ),
-        migrations.RemoveField(
-            model_name="team",
-            name="can_manage_customers",
-        ),
-        migrations.RemoveField(
-            model_name="team",
-            name="can_manage_gift_cards",
-        ),
-        migrations.RemoveField(
-            model_name="team",
-            name="can_manage_reusable_media",
-        ),
-        migrations.RemoveField(
-            model_name="team",
-            name="can_view_orders",
-        ),
-        migrations.RemoveField(
-            model_name="team",
-            name="can_view_vouchers",
-        ),
-    ]
--- a/src/pretix/base/modelimport.py
+++ b/src/pretix/base/modelimport.py
@@ -47,19 +47,6 @@ class DataImportError(LazyLocaleException):
        super().__init__(msg)


-def rename_duplicates(values):
-    used = set()
-    had_duplicates = False
-    for i, value in enumerate(values):
-        c = 0
-        while values[i] in used:
-            c += 1
-            values[i] = f'{value}__{c}'
-            had_duplicates = True
-        used.add(values[i])
-    return had_duplicates
-
-
 def parse_csv(file, length=None, mode="strict", charset=None):
    file.seek(0)
    data = file.read(length)
@@ -83,7 +70,6 @@ def parse_csv(file, length=None, mode="strict", charset=None):
        return None

    reader = csv.DictReader(io.StringIO(data), dialect=dialect)
-    reader._had_duplicates = rename_duplicates(reader.fieldnames)
    return reader


--- a/src/pretix/base/modelimport_vouchers.py
+++ b/src/pretix/base/modelimport_vouchers.py
@@ -132,7 +132,7 @@ class AllowIgnoreQuotaColumn(BooleanColumnMixin, ImportColumn):

 class PriceModeColumn(ImportColumn):
    identifier = 'price_mode'
-    verbose_name = gettext_lazy('Price effect')
+    verbose_name = gettext_lazy('Price mode')
    default_value = None
    initial = 'static:none'

@@ -147,7 +147,7 @@ class PriceModeColumn(ImportColumn):
        elif value in reverse:
            return reverse[value]
        else:
-            raise ValidationError(_("Could not parse {value} as a price effect, use one of {options}.").format(
+            raise ValidationError(_("Could not parse {value} as a price mode, use one of {options}.").format(
                value=value, options=', '.join(d.keys())
            ))

@@ -162,7 +162,7 @@ class ValueColumn(DecimalColumnMixin, ImportColumn):
    def clean(self, value, previous_values):
        value = super().clean(value, previous_values)
        if value and previous_values.get("price_mode") == "none":
-            raise ValidationError(_("It is pointless to set a value without a price effect."))
+            raise ValidationError(_("It is pointless to set a value without a price mode."))
        return value

    def assign(self, value, obj: Voucher, **kwargs):
--- a/src/pretix/base/models/init.py
+++ b/src/pretix/base/models/init.py
@@ -41,7 +41,6 @@ from .items import (
    itempicture_upload_to,
 )
 from .log import LogEntry
-from .mail import OutgoingMail
 from .media import ReusableMedium
 from .memberships import Membership, MembershipType
 from .notifications import NotificationSetting
--- a/src/pretix/base/models/auth.py
+++ b/src/pretix/base/models/auth.py
@@ -49,11 +49,11 @@ from django.core.exceptions import BadRequest, PermissionDenied
 from django.db import IntegrityError, models, transaction
 from django.db.models import Q
 from django.utils.crypto import get_random_string, salted_hmac
-from django.utils.functional import cached_property
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 from django_otp.models import Device
 from django_scopes import scopes_disabled
+from webauthn.helpers.structs import PublicKeyCredentialDescriptor

 from pretix.base.i18n import language
 from pretix.helpers.urls import build_absolute_uri
@@ -213,28 +213,6 @@ class SuperuserPermissionSet:
        return True


-class EventPermissionSet(set):
-    def __contains__(self, item):
-        from pretix.base.permissions import assert_valid_event_permission
-
-        if super().__contains__(item):
-            return True
-
-        assert_valid_event_permission(item, allow_tuple=False)
-        return False
-
-
-class OrganizerPermissionSet(set):
-    def __contains__(self, item):
-        from pretix.base.permissions import assert_valid_organizer_permission
-
-        if super().__contains__(item):
-            return True
-
-        assert_valid_organizer_permission(item, allow_tuple=False)
-        return False
-
-
 class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
    """
    This is the user model used by pretix for authentication.
@@ -357,25 +335,27 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
            return self.email

    def send_security_notice(self, messages, email=None):
-        from pretix.base.services.mail import mail
+        from pretix.base.services.mail import SendMailException, mail

-        with language(self.locale):
-            msg = '- ' + '\n- '.join(str(m) for m in messages)
+        try:
+            with language(self.locale):
+                msg = '- ' + '\n- '.join(str(m) for m in messages)

-        mail(
-            email or self.email,
-            _('Account information changed'),
-            'pretixcontrol/email/security_notice.txt',
-            {
-                'user': self,
-                'messages': msg,
-                'url': build_absolute_uri('control:user.settings'),
-                'instance': settings.PRETIX_INSTANCE_NAME,
-            },
-            event=None,
-            user=self,
-            locale=self.locale
-        )
+            mail(
+                email or self.email,
+                _('Account information changed'),
+                'pretixcontrol/email/security_notice.txt',
+                {
+                    'user': self,
+                    'messages': msg,
+                    'url': build_absolute_uri('control:user.settings')
+                },
+                event=None,
+                user=self,
+                locale=self.locale
+            )
+        except SendMailException:
+            pass  # Already logged

    def send_confirmation_code(self, session, reason, email=None, state=None):
        """
@@ -415,7 +395,6 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
                'user': self,
                'reason': msg,
                'code': code,
-                'instance': settings.PRETIX_INSTANCE_NAME,
            },
            event=None,
            user=self,
@@ -455,7 +434,6 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
        mail(
            self.email, _('Password recovery'), 'pretixcontrol/email/forgot.txt',
            {
-                'instance': settings.PRETIX_INSTANCE_NAME,
                'user': self,
                'url': (build_absolute_uri('control:auth.forgot.recover')
                        + '?id=%d&token=%s' % (self.id, default_token_generator.make_token(self)))
@@ -495,7 +473,7 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
        :return: set
        """
        teams = self._get_teams_for_event(organizer, event)
-        sets = [t.event_permission_set() for t in teams]
+        sets = [t.permission_set() for t in teams]
        if sets:
            return set.union(*sets)
        else:
@@ -509,7 +487,7 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
        :return: set
        """
        teams = self._get_teams_for_organizer(organizer)
-        sets = [t.organizer_permission_set() for t in teams]
+        sets = [t.permission_set() for t in teams]
        if sets:
            return set.union(*sets)
        else:
@@ -524,7 +502,7 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):

        :param organizer: The organizer of the event
        :param event: The event to check
-        :param perm_name: The permission, e.g. ``event.orders:read``
+        :param perm_name: The permission, e.g. ``can_change_teams``
        :param request: The current request (optional)
        :param session_key: The current session key (optional)
        :return: bool
@@ -536,8 +514,8 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
        if teams:
            self._teamcache['e{}'.format(event.pk)] = teams
            if isinstance(perm_name, (tuple, list)):
-                return any([any(team.has_event_permission(p) for team in teams) for p in perm_name])
-            if not perm_name or any([team.has_event_permission(perm_name) for team in teams]):
+                return any([any(team.has_permission(p) for team in teams) for p in perm_name])
+            if not perm_name or any([team.has_permission(perm_name) for team in teams]):
                return True
        return False

@@ -547,7 +525,7 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
        to the organizer ``organizer``.

        :param organizer: The organizer to check
-        :param perm_name: The permission, e.g. ``organizer.events:create``
+        :param perm_name: The permission, e.g. ``can_change_teams``
        :param request: The current request (optional). Required to detect staff sessions properly.
        :return: bool
        """
@@ -556,8 +534,8 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
        teams = self._get_teams_for_organizer(organizer)
        if teams:
            if isinstance(perm_name, (tuple, list)):
-                return any([any(team.has_organizer_permission(p) for team in teams) for p in perm_name])
-            if not perm_name or any([team.has_organizer_permission(perm_name) for team in teams]):
+                return any([any(team.has_permission(p) for team in teams) for p in perm_name])
+            if not perm_name or any([team.has_permission(perm_name) for team in teams]):
                return True
        return False

@@ -588,15 +566,14 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
        :return: Iterable of Events
        """
        from .event import Event
-        from .organizer import TeamQuerySet

        if request and self.has_active_staff_session(request.session.session_key):
            return Event.objects.all()

        if isinstance(permission, (tuple, list)):
-            q = reduce(operator.or_, [TeamQuerySet.event_permission_q(p) for p in permission])
+            q = reduce(operator.or_, [Q(**{p: True}) for p in permission])
        else:
-            q = TeamQuerySet.event_permission_q(permission)
+            q = Q(**{permission: True})

        return Event.objects.filter(
            Q(organizer_id__in=self.teams.filter(q, all_events=True).values_list('organizer', flat=True))
@@ -629,13 +606,14 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
        :return: Iterable of Organizers
        """
        from .event import Organizer
-        from .organizer import TeamQuerySet

        if request and self.has_active_staff_session(request.session.session_key):
            return Organizer.objects.all()

+        kwargs = {permission: True}
+
        return Organizer.objects.filter(
-            id__in=self.teams.filter(TeamQuerySet.organizer_permission_q(permission)).values_list('organizer', flat=True)
+            id__in=self.teams.filter(**kwargs).values_list('organizer', flat=True)
        )

    def has_active_staff_session(self, session_key=None):
@@ -690,11 +668,6 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
        self.session_token = generate_session_token()
        self.save(update_fields=['session_token'])

-    @cached_property
-    @scopes_disabled()
-    def is_in_any_teams(self):
-        return self.teams.exists()
-

 class UserKnownLoginSource(models.Model):
    user = models.ForeignKey('User', on_delete=models.CASCADE, related_name="known_login_sources")
@@ -735,8 +708,6 @@ class U2FDevice(Device):

    @property
    def webauthndevice(self):
-        from webauthn.helpers.structs import PublicKeyCredentialDescriptor
-
        d = json.loads(self.json_data)
        return PublicKeyCredentialDescriptor(websafe_decode(d['keyHandle']))

@@ -766,8 +737,6 @@ class WebAuthnDevice(Device):

    @property
    def webauthndevice(self):
-        from webauthn.helpers.structs import PublicKeyCredentialDescriptor
-
        return PublicKeyCredentialDescriptor(websafe_decode(self.credential_id))

    @property
--- a/src/pretix/base/models/base.py
+++ b/src/pretix/base/models/base.py
@@ -59,37 +59,6 @@ class CachedFile(models.Model):
    web_download = models.BooleanField(default=True)  # allow web download, True for backwards compatibility in plugins
    session_key = models.TextField(null=True, blank=True)  # only allow download in this session

-    def session_key_for_request(self, request, salt=None):
-        from ...api.models import OAuthAccessToken, OAuthApplication
-        from .devices import Device
-        from .organizer import TeamAPIToken
-
-        if hasattr(request, "auth") and isinstance(request.auth, OAuthAccessToken):
-            k = f'app:{request.auth.application.pk}'
-        elif hasattr(request, "auth") and isinstance(request.auth, OAuthApplication):
-            k = f'app:{request.auth.pk}'
-        elif hasattr(request, "auth") and isinstance(request.auth, TeamAPIToken):
-            k = f'token:{request.auth.pk}'
-        elif hasattr(request, "auth") and isinstance(request.auth, Device):
-            k = f'device:{request.auth.pk}'
-        elif request.session.session_key:
-            k = request.session.session_key
-        else:
-            raise ValueError("No auth method found to bind to")
-
-        if salt:
-            k = f"{k}!{salt}"
-        return k
-
-    def allowed_for_session(self, request, salt=None):
-        return (
-            not self.session_key or
-            self.session_key_for_request(request, salt) == self.session_key
-        )
-
-    def bind_to_session(self, request, salt=None):
-        self.session_key = self.session_key_for_request(request, salt)
-

@receiver(post_delete, sender=CachedFile)
 def cached_file_delete(sender, instance, **kwargs):
@@ -130,8 +99,6 @@ class LoggingMixin:
            organizer_id = self.event.organizer_id
        elif hasattr(self, 'organizer_id'):
            organizer_id = self.organizer_id
-        elif hasattr(self, 'issuer_id'):
-            organizer_id = self.issuer_id

        if user and not user.is_authenticated:
            user = None
--- a/src/pretix/base/models/customers.py
+++ b/src/pretix/base/models/customers.py
@@ -40,7 +40,6 @@ from i18nfield.fields import I18nCharField
 from phonenumber_field.modelfields import PhoneNumberField

 from pretix.base.banlist import banned
-from pretix.base.i18n import language
 from pretix.base.models.base import LoggedModel
 from pretix.base.models.fields import MultiStringField
 from pretix.base.models.giftcards import GiftCardTransaction
@@ -165,28 +164,6 @@ class Customer(LoggedModel):
        self.attendee_profiles.all().delete()
        self.invoice_addresses.all().delete()

-    def send_security_notice(self, message, email=None):
-        from pretix.base.services.mail import SendMailException, mail
-        from pretix.multidomain.urlreverse import build_absolute_uri
-
-        try:
-            with language(self.locale):
-                mail(
-                    email or self.email,
-                    self.organizer.settings.mail_subject_customer_security_notice,
-                    self.organizer.settings.mail_text_customer_security_notice,
-                    {
-                        **self.get_email_context(),
-                        'message': str(message),
-                        'url': build_absolute_uri(self.organizer, 'presale:organizer.customer.index')
-                    },
-                    customer=self,
-                    organizer=self.organizer,
-                    locale=self.locale
-                )
-        except SendMailException:
-            pass  # Already logged
-
    @scopes_disabled()
    def assign_identifier(self):
        charset = list('ABCDEFGHJKLMNPQRSTUVWXYZ23456789')
@@ -316,7 +293,6 @@ class Customer(LoggedModel):
            locale=self.locale,
            customer=self,
            organizer=self.organizer,
-            sensitive=True,
        )

    def usable_gift_cards(self, used_cards=[]):
@@ -373,7 +349,7 @@ class AttendeeProfile(models.Model):
    def state_name(self):
        sd = pycountry.subdivisions.get(code='{}-{}'.format(self.country, self.state))
        if sd:
-            return _(sd.name)
+            return sd.name
        return self.state

    @property
--- a/src/pretix/base/models/datasync.py
+++ b/src/pretix/base/models/datasync.py
@@ -86,7 +86,7 @@ class OrderSyncQueue(models.Model):

    def set_sync_error(self, failure_mode, messages, full_message):
        logger.exception(
-            f"Could not sync order {self.order.code} to {self.sync_provider} ({failure_mode})"
+            f"Could not sync order {self.order.code} to {type(self).__name__} ({failure_mode})"
        )
        self.order.log_action(f"pretix.event.order.data_sync.failed.{failure_mode}", {
            "provider": self.sync_provider,
--- a/src/pretix/base/models/devices.py
+++ b/src/pretix/base/models/devices.py
@@ -29,9 +29,6 @@ from django.utils.translation import gettext_lazy as _
 from django_scopes import ScopedManager, scopes_disabled

 from pretix.base.models import LoggedModel
-from pretix.base.permissions import (
-    AnyPermissionOf, assert_valid_event_permission,
-)


@scopes_disabled()
@@ -192,19 +189,13 @@ class Device(LoggedModel):
                kwargs['update_fields'] = {'device_id'}.union(kwargs['update_fields'])
        super().save(*args, **kwargs)

-    def _event_permission_set(self) -> set:
+    def permission_set(self) -> set:
        return {
-            'event.orders:read',
-            'event.orders:write',
-            'event.vouchers:read',
-        }
-
-    def _organizer_permission_set(self) -> set:
-        return {
-            'organizer.giftcards:read',
-            'organizer.giftcards:write',
-            'organizer.reusablemedia:read',
-            'organizer.reusablemedia:write',
+            'can_view_orders',
+            'can_change_orders',
+            'can_view_vouchers',
+            'can_manage_gift_cards',
+            'can_manage_reusable_media',
        }

    def get_event_permission_set(self, organizer, event) -> set:
@@ -218,7 +209,7 @@ class Device(LoggedModel):
        has_event_access = (self.all_events and organizer == self.organizer) or (
            event in self.limit_events.all()
        )
-        return self._event_permission_set() if has_event_access else set()
+        return self.permission_set() if has_event_access else set()

    def get_organizer_permission_set(self, organizer) -> set:
        """
@@ -227,7 +218,7 @@ class Device(LoggedModel):
        :param organizer: The organizer of the event
        :return: set of permissions
        """
-        return self._organizer_permission_set() if self.organizer == organizer else set()
+        return self.permission_set() if self.organizer == organizer else set()

    def has_event_permission(self, organizer, event, perm_name=None, request=None) -> bool:
        """
@@ -236,7 +227,7 @@ class Device(LoggedModel):

        :param organizer: The organizer of the event
        :param event: The event to check
-        :param perm_name: The permission, e.g. ``event.orders:read``
+        :param perm_name: The permission, e.g. ``can_change_teams``
        :param request: This parameter is ignored and only defined for compatibility reasons.
        :return: bool
        """
@@ -244,8 +235,8 @@ class Device(LoggedModel):
            event in self.limit_events.all()
        )
        if isinstance(perm_name, (tuple, list)):
-            return has_event_access and any(p in self._event_permission_set() for p in perm_name)
-        return has_event_access and (not perm_name or perm_name in self._event_permission_set())
+            return has_event_access and any(p in self.permission_set() for p in perm_name)
+        return has_event_access and (not perm_name or perm_name in self.permission_set())

    def has_organizer_permission(self, organizer, perm_name=None, request=None):
        """
@@ -253,13 +244,13 @@ class Device(LoggedModel):
        to the organizer ``organizer``.

        :param organizer: The organizer to check
-        :param perm_name: The permission, e.g. ``organizer.events:create``
+        :param perm_name: The permission, e.g. ``can_change_teams``
        :param request: This parameter is ignored and only defined for compatibility reasons.
        :return: bool
        """
        if isinstance(perm_name, (tuple, list)):
-            return organizer == self.organizer and any(p in self._organizer_permission_set() for p in perm_name)
-        return organizer == self.organizer and (not perm_name or perm_name in self._organizer_permission_set())
+            return organizer == self.organizer and any(p in self.permission_set() for p in perm_name)
+        return organizer == self.organizer and (not perm_name or perm_name in self.permission_set())

    def get_events_with_any_permission(self):
        """
@@ -279,10 +270,9 @@ class Device(LoggedModel):
        :param request: Ignored, for compatibility with User model
        :return: Iterable of Events
        """
-        assert_valid_event_permission(permission)
        if (
-            isinstance(permission, (AnyPermissionOf, list, tuple)) and any(p in self._event_permission_set() for p in permission)
-        ) or (isinstance(permission, str) and permission in self._event_permission_set()):
+                isinstance(permission, (list, tuple)) and any(p in self.permission_set() for p in permission)
+        ) or (isinstance(permission, str) and permission in self.permission_set()):
            return self.get_events_with_any_permission()
        else:
            return self.organizer.events.none()
--- a/src/pretix/base/models/discount.py
+++ b/src/pretix/base/models/discount.py
@@ -37,7 +37,7 @@ from pretix.base.decimal import round_decimal
 from pretix.base.models.base import LoggedModel

 PositionInfo = namedtuple('PositionInfo',
-                          ['item_id', 'subevent_id', 'subevent_date_from', 'line_price_gross', 'addon_to',
+                          ['item_id', 'subevent_id', 'subevent_date_from', 'line_price_gross', 'is_addon_to',
                           'voucher_discount'])


@@ -279,42 +279,6 @@ class Discount(LoggedModel):
            for idx in condition_idx_group:
                collect_potential_discounts[idx] = [(self, inf, -1, subevent_id)]

-    def _addon_idx(self, positions, idx):
-        """
-        If we have the following cart:
-
-        - Main product
-          - 10x Addon product 5€
-        - Main product
-          - 10x Addon product 5€
-
-        And we have a discount rule that grants "every 10th product is free", people tend to expect
-
-        - Main product
-          - 9x Addon product 5€
-          - 1x Addon product free
-        - Main product
-          - 9x Addon product 5€
-          - 1x Addon product free
-
-        And get confused if they get
-
-        - Main product
-          - 8x Addon product 5€
-          - 2x Addon product free
-        - Main product
-          - 10x Addon product 5€
-
-        Even if the result is the same. Therefore, we sort positions in the cart not only by price, but also by their
-        relative index within their addon group. This is only a heuristic and there are *still* scenarios where the more
-        unexpected version happens, e.g. if prices are different. We need to accept this as long as discounts work on
-        cart level and not on addon-group level, but this simple sorting reduces the number of support issues by making
-        the weird case less likely.
-        """
-        if not positions[idx].addon_to:
-            return 0
-        return len([1 for i, p in positions.items() if i < idx and p.addon_to == positions[idx].addon_to])
-
    def _apply_min_count(self, positions, condition_idx_group, benefit_idx_group, result, collect_potential_discounts, subevent_id):
        if len(condition_idx_group) < self.condition_min_count:
            return
@@ -324,8 +288,8 @@ class Discount(LoggedModel):

        if self.benefit_only_apply_to_cheapest_n_matches:
            # sort by line_price
-            condition_idx_group = sorted(condition_idx_group, key=lambda idx: (positions[idx].line_price_gross, self._addon_idx(positions, idx), -idx))
-            benefit_idx_group = sorted(benefit_idx_group, key=lambda idx: (positions[idx].line_price_gross, self._addon_idx(positions, idx), -idx))
+            condition_idx_group = sorted(condition_idx_group, key=lambda idx: (positions[idx].line_price_gross, -idx))
+            benefit_idx_group = sorted(benefit_idx_group, key=lambda idx: (positions[idx].line_price_gross, -idx))

            # Prevent over-consuming of items, i.e. if our discount is "buy 2, get 1 free", we only
            # want to match multiples of 3
@@ -470,7 +434,7 @@ class Discount(LoggedModel):
            for idx, p in positions.items():
                subevent_to_idx[p.subevent_id].append(idx)
            for v in subevent_to_idx.values():
-                v.sort(key=lambda idx: (positions[idx].line_price_gross, self._addon_idx(positions, idx)))
+                v.sort(key=lambda idx: positions[idx].line_price_gross)
            subevent_order = sorted(list(subevent_to_idx.keys()), key=lambda s: len(subevent_to_idx[s]), reverse=True)

            # Build groups of exactly condition_min_count distinct subevents
@@ -494,7 +458,7 @@ class Discount(LoggedModel):

                # Sort the list by prices, then pick one. For "buy 2 get 1 free" we apply a "pick 1 from the start
                # and 2 from the end" scheme to optimize price distribution among groups
-                candidates = sorted(candidates, key=lambda idx: (positions[idx].line_price_gross, self._addon_idx(positions, idx)))
+                candidates = sorted(candidates, key=lambda idx: positions[idx].line_price_gross)
                if len(current_group) < (self.benefit_only_apply_to_cheapest_n_matches or 0):
                    candidate = candidates[0]
                else:
--- a/src/pretix/base/models/event.py
+++ b/src/pretix/base/models/event.py
@@ -843,33 +843,6 @@ class Event(EventMixin, LoggedModel):
            time(hour=23, minute=59, second=59)
        ), tz)

-    def allow_copy_data(self, new_organizer, auth) -> bool:
-        """
-        Returns whether it is allowed to copy the event to the target organizer. Auth can be TeamAPIToken or User.
-        """
-        from ..permissions import get_all_event_permissions
-        from .auth import User
-
-        if self.organizer == new_organizer:
-            # Copying in the same organizer is always okay with any read access, we just need to ensure it does not
-            # grant more permissions than I had before, but that is handled by the view logic
-            return auth.has_event_permission(self.organizer, self, None)
-
-        if isinstance(auth, User):
-            # Cross-organizer copying requires almost full permission of source to prevent settings extraction
-            required_permissions = get_all_event_permissions() - {
-                # We do not require these, as this data is not copied
-                "event.orders:read", "event.orders:write", "event.vouchers:read", "event.vouchers:write",
-                "event.subevents:write",
-            }
-            given_permission = auth.get_event_permission_set(self.organizer, self)
-            return all(p in given_permission for p in required_permissions if ":" in p)
-
-        else:
-            # Tokens or devices can never copy between organizers, as they are organizer-bound. Kept for future
-            # compatibility and easier calling
-            return False
-
    def copy_data_from(self, other, skip_meta_data=False):
        from ..signals import event_copy_data
        from . import (
@@ -1413,13 +1386,14 @@ class Event(EventMixin, LoggedModel):
        from .auth import User

        if permission:
-            qs = Team.objects.with_event_permission(permission)
+            kwargs = {permission: True}
        else:
-            qs = Team.objects.all()
+            kwargs = {}

-        team_with_perm = qs.filter(
+        team_with_perm = Team.objects.filter(
            members__pk=OuterRef('pk'),
            organizer=self.organizer,
+            **kwargs
        ).filter(
            Q(all_events=True) | Q(limit_events__pk=self.pk)
        )
--- a/src/pretix/base/models/items.py
+++ b/src/pretix/base/models/items.py
@@ -594,11 +594,10 @@ class Item(LoggedModel):
        on_delete=models.SET_NULL,
        verbose_name=_("Only show after sellout of"),
        help_text=_("If you select a product here, this product will only be shown when that product is "
-                    "no longer available. This will happen either because the other product has sold out or because "
-                    "the time is outside of the sales window for the other product. If combined with the option "
-                    "to hide sold-out products, this allows you to swap out products for more expensive ones once "
-                    "the cheaper option is sold out. There might be a short period in which both products are visible "
-                    "while all tickets of the referenced product are reserved, but not yet sold.")
+                    "sold out. If combined with the option to hide sold-out products, this allows you to "
+                    "swap out products for more expensive ones once the cheaper option is sold out. There might "
+                    "be a short period in which both products are visible while all tickets of the referenced "
+                    "product are reserved, but not yet sold.")
    )
    hidden_if_item_available_mode = models.CharField(
        choices=UNAVAIL_MODES,
--- a/src/pretix/base/models/log.py
+++ b/src/pretix/base/models/log.py
@@ -141,9 +141,8 @@ class LogEntry(models.Model):

        log_entry_type, meta = log_entry_types.get(action_type=self.action_type)
        if log_entry_type:
-            sender = self.event if self.event else self.organizer
            link_info = log_entry_type.get_object_link_info(self)
-            if is_app_active(sender, meta['plugin']):
+            if is_app_active(self.event, meta['plugin']):
                return make_link(link_info, log_entry_type.object_link_wrapper)
            else:
                return make_link(link_info, log_entry_type.object_link_wrapper, is_active=False,
--- a/src/pretix/base/models/mail.py
+++ b/src/pretix/base/models/mail.py
@@ -1,239 +0,0 @@
-#
-# This file is part of pretix (Community Edition).
-#
-# Copyright (C) 2014-2020  Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
-# Public License as published by the Free Software Foundation in version 3 of the License.
-#
-# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
-# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
-# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
-# this file, see <https://pretix.eu/about/en/license>.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
-# <https://www.gnu.org/licenses/>.
-#
-import uuid
-
-from django.core.mail import get_connection
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-from django_scopes import scope, scopes_disabled
-
-
-def CASCADE_IF_QUEUED(collector, field, sub_objs, using):
-    # If the email is still queued and the thing it is related to vanishes, the email can vanish as well
-    cascade_objs = [
-        o for o in sub_objs if o.status == OutgoingMail.STATUS_QUEUED
-    ]
-    if cascade_objs:
-        models.CASCADE(collector, field, cascade_objs, using)
-
-    # In all other cases, set to NULL to keep the email on record
-    models.SET_NULL(collector, field, [o for o in sub_objs if o not in cascade_objs], using)
-
-
-class OutgoingMail(models.Model):
-    STATUS_QUEUED = "queued"
-    STATUS_WITHHELD = "withheld"
-    STATUS_INFLIGHT = "inflight"
-    STATUS_AWAITING_RETRY = "awaiting_retry"
-    STATUS_FAILED = "failed"
-    STATUS_SENT = "sent"
-    STATUS_BOUNCED = "bounced"
-    STATUS_ABORTED = "aborted"
-    STATUS_CHOICES = (
-        (STATUS_QUEUED, _("queued")),
-        (STATUS_INFLIGHT, _("being sent")),
-        (STATUS_AWAITING_RETRY, _("awaiting retry")),
-        (STATUS_WITHHELD, _("withheld")),  # for plugin use
-        (STATUS_FAILED, _("failed")),
-        (STATUS_ABORTED, _("aborted")),
-        (STATUS_SENT, _("sent")),
-        (STATUS_BOUNCED, _("bounced")),  # for plugin use
-    )
-    STATUS_LIST_ABORTABLE = {
-        STATUS_QUEUED,
-        STATUS_WITHHELD,
-        STATUS_AWAITING_RETRY,
-    }
-    STATUS_LIST_RETRYABLE = {
-        STATUS_FAILED,
-        STATUS_WITHHELD,
-    }
-
-    # The GUID is a globally unique ID for the email added to a header of the email for later tracing
-    # in bug reports etc. We could theoretically also use this as a basis for the Message-ID header, but
-    # we currently don't since we are unsure if some intermediary SMTP servers have opinions on setting
-    # their own Message-ID headers.
-    guid = models.UUIDField(db_index=True, default=uuid.uuid4)
-
-    status = models.CharField(max_length=200, choices=STATUS_CHOICES, default=STATUS_QUEUED)
-    created = models.DateTimeField(auto_now_add=True)
-
-    # sent will be the time the email was sent or the email failed
-    sent = models.DateTimeField(null=True, blank=True)
-
-    inflight_since = models.DateTimeField(null=True, blank=True)
-    retry_after = models.DateTimeField(null=True, blank=True)
-
-    error = models.TextField(null=True, blank=True)
-    error_detail = models.TextField(null=True, blank=True)
-
-    # There is a conflict here between the different purposes of the model. As a system administrator,
-    # one wants *all* emails to be persisted as long as possible to debug issues. This means that if
-    # e.g. the event or order is deleted, we want SET_NULL behavior. However, in that case, the email
-    # would be an "orphan" forever and there's no way to remove the personal information.
-    # We try to find a middle-ground with the following behaviour:
-    # - The email is always deleted if the entire organizer or user is deleted
-    # - The email is always deleted if it has not yet been sent
-    # - The email is kept in all other cases
-    # This is only an acceptable trade-off since emails are stored for a short period only, and because
-    # orders and customers are never deleted during normal operation. If we ever make this a long-term
-    # storage / email archive, we'd need to find another way to make sure personal information is removed
-    # if personal information of orders etc is removed.
-    organizer = models.ForeignKey(
-        'pretixbase.Organizer',
-        on_delete=models.CASCADE,
-        related_name='outgoing_mails',
-        null=True, blank=True,
-    )
-    event = models.ForeignKey(
-        'pretixbase.Event',
-        on_delete=CASCADE_IF_QUEUED,
-        related_name='outgoing_mails',
-        null=True, blank=True,
-    )
-    order = models.ForeignKey(
-        'pretixbase.Order',
-        on_delete=CASCADE_IF_QUEUED,
-        related_name='outgoing_mails',
-        null=True, blank=True,
-    )
-    orderposition = models.ForeignKey(
-        'pretixbase.OrderPosition',
-        on_delete=CASCADE_IF_QUEUED,
-        related_name='outgoing_mails',
-        null=True, blank=True,
-    )
-    customer = models.ForeignKey(
-        'pretixbase.Customer',
-        on_delete=CASCADE_IF_QUEUED,
-        related_name='outgoing_mails',
-        null=True, blank=True,
-    )
-    user = models.ForeignKey(
-        'pretixbase.User',
-        on_delete=models.CASCADE,
-        related_name='outgoing_mails',
-        null=True, blank=True,
-    )
-
-    sensitive = models.BooleanField(default=False)
-    subject = models.TextField()
-    body_plain = models.TextField()
-    body_html = models.TextField(null=True)
-    sender = models.CharField(max_length=500)
-    headers = models.JSONField(default=dict)
-    to = models.JSONField(default=list)
-    cc = models.JSONField(default=list)
-    bcc = models.JSONField(default=list)
-    recipient_count = models.IntegerField()
-
-    # We don't store the actual invoices, tickets or calendar invites, so if the email is re-sent at a later time, a
-    # newer version of the files might be used. We accept that risk to save on storage and also because the new
-    # version might actually be more useful.
-    should_attach_invoices = models.ManyToManyField(
-        'pretixbase.Invoice',
-        related_name='outgoing_mails'
-    )
-    should_attach_tickets = models.BooleanField(default=False)
-    should_attach_ical = models.BooleanField(default=False)
-
-    # clean_cached_files makes sure not to delete these as long as the email is in a retryable state
-    should_attach_cached_files = models.ManyToManyField(
-        'pretixbase.CachedFile',
-        related_name='outgoing_mails',
-    )
-
-    # This is used to send files stored in settings. In most cases, these aren't short-lived and should still be there
-    # if the email is sent. Otherwise, they will be skipped. We accept that risk.
-    should_attach_other_files = models.JSONField(default=list)
-
-    # [{name, type size}] of the attachments we actually setn
-    actual_attachments = models.JSONField(default=list)
-
-    class Meta:
-        ordering = ('-created',)
-
-    def get_mail_backend(self):
-        if self.event:
-            return self.event.get_mail_backend()
-        elif self.organizer:
-            return self.organizer.get_mail_backend()
-        else:
-            return get_connection(fail_silently=False)
-
-    def scope_manager(self):
-        if self.organizer:
-            return scope(organizer=self.organizer)  # noqa
-        else:
-            return scopes_disabled()  # noqa
-
-    @property
-    def is_failed(self):
-        return self.status in (
-            OutgoingMail.STATUS_FAILED,
-            OutgoingMail.STATUS_AWAITING_RETRY,
-            OutgoingMail.STATUS_BOUNCED,
-        )
-
-    def save(self, *args, **kwargs):
-        if self.orderposition_id and not self.order_id:
-            self.order = self.orderposition.order
-        if self.order_id and not self.event_id:
-            self.event = self.order.event
-        if self.event_id and not self.organizer_id:
-            self.organizer = self.event.organizer
-        if self.customer_id and not self.organizer_id:
-            self.organizer = self.customer.organizer
-        self.recipient_count = len(self.to) + len(self.cc) + len(self.bcc)
-        super().save(*args, **kwargs)
-
-    def log_parameters(self):
-        if self.order:
-            error_log_action_type = 'pretix.event.order.email.error'
-            log_target = self.order
-        elif self.customer:
-            error_log_action_type = 'pretix.customer.email.error'
-            log_target = self.customer
-        elif self.user:
-            error_log_action_type = 'pretix.user.email.error'
-            log_target = self.user
-        else:
-            error_log_action_type = 'pretix.email.error'
-            log_target = None
-        return log_target, error_log_action_type
-
-    def log_data(self):
-        return {
-            "subject": self.subject,
-            "message": self.body_plain,
-            "to": self.to,
-            "cc": self.cc,
-            "bcc": self.bcc,
-
-            "invoices": [i.pk for i in self.should_attach_invoices.all()],
-            "attach_tickets": self.should_attach_tickets,
-            "attach_ical": self.should_attach_ical,
-            "attach_other_files": self.should_attach_other_files,
-            "attach_cached_files": [cf.filename for cf in self.should_attach_cached_files.all()],
-
-            "position": self.orderposition.positionid if self.orderposition else None,
-        }
--- a/src/pretix/base/models/orders.py
+++ b/src/pretix/base/models/orders.py
@@ -87,6 +87,7 @@ from pretix.base.timemachine import time_machine_now

 from ...helpers import OF_SELF
 from ...helpers.countries import CachedCountries, FastCountryField
+from ...helpers.format import format_map
 from ...helpers.names import build_name
 from ...testutils.middleware import debugflags_var
 from ._transactions import (
@@ -1166,7 +1167,9 @@ class Order(LockModel, LoggedModel):
                         only be attached for this position and child positions, the link will only point to the
                         position and the attendee email will be used if available.
        """
-        from pretix.base.services.mail import mail
+        from pretix.base.services.mail import (
+            SendMailException, mail, render_mail,
+        )

        if not self.email and not (position and position.attendee_email):
            return
@@ -1176,19 +1179,34 @@ class Order(LockModel, LoggedModel):
            if position and position.attendee_email:
                recipient = position.attendee_email

-            outgoing_mail = mail(
-                recipient, subject, template, context,
-                self.event, self.locale, self, headers=headers, sender=sender,
-                invoices=invoices, attach_tickets=attach_tickets,
-                position=position, auto_email=auto_email, attach_ical=attach_ical,
-                attach_other_files=attach_other_files, attach_cached_files=attach_cached_files,
-            )
-            if outgoing_mail:
+            try:
+                email_content = render_mail(template, context)
+                subject = format_map(subject, context)
+                mail(
+                    recipient, subject, template, context,
+                    self.event, self.locale, self, headers=headers, sender=sender,
+                    invoices=invoices, attach_tickets=attach_tickets,
+                    position=position, auto_email=auto_email, attach_ical=attach_ical,
+                    attach_other_files=attach_other_files, attach_cached_files=attach_cached_files,
+                )
+            except SendMailException:
+                raise
+            else:
                self.log_action(
                    log_entry_type,
                    user=user,
                    auth=auth,
-                    data=outgoing_mail.log_data(),
+                    data={
+                        'subject': subject,
+                        'message': email_content,
+                        'position': position.positionid if position else None,
+                        'recipient': recipient,
+                        'invoices': [i.pk for i in invoices] if invoices else [],
+                        'attach_tickets': attach_tickets,
+                        'attach_ical': attach_ical,
+                        'attach_other_files': attach_other_files,
+                        'attach_cached_files': [cf.filename for cf in attach_cached_files] if attach_cached_files else [],
+                    }
                )

    def resend_link(self, user=None, auth=None):
@@ -1657,7 +1675,7 @@ class AbstractPosition(RoundingCorrectionMixin, models.Model):
    def state_name(self):
        sd = pycountry.subdivisions.get(code='{}-{}'.format(self.country, self.state))
        if sd:
-            return _(sd.name)
+            return sd.name
        return self.state

    @property
@@ -2006,30 +2024,40 @@ class OrderPayment(models.Model):
            transmit_invoice.apply_async(args=(self.order.event_id, invoice.pk, False))

    def _send_paid_mail_attendee(self, position, user):
+        from pretix.base.services.mail import SendMailException
+
        with language(self.order.locale, self.order.event.settings.region):
            email_template = self.order.event.settings.mail_text_order_paid_attendee
            email_subject = self.order.event.settings.mail_subject_order_paid_attendee
            email_context = get_email_context(event=self.order.event, order=self.order, position=position)
-            position.send_mail(
-                email_subject, email_template, email_context,
-                'pretix.event.order.email.order_paid', user,
-                invoices=[],
-                attach_tickets=True,
-                attach_ical=self.order.event.settings.mail_attach_ical
-            )
+            try:
+                position.send_mail(
+                    email_subject, email_template, email_context,
+                    'pretix.event.order.email.order_paid', user,
+                    invoices=[],
+                    attach_tickets=True,
+                    attach_ical=self.order.event.settings.mail_attach_ical
+                )
+            except SendMailException:
+                logger.exception('Order paid email could not be sent')

    def _send_paid_mail(self, invoice, user, mail_text):
+        from pretix.base.services.mail import SendMailException
+
        with language(self.order.locale, self.order.event.settings.region):
            email_template = self.order.event.settings.mail_text_order_paid
            email_subject = self.order.event.settings.mail_subject_order_paid
            email_context = get_email_context(event=self.order.event, order=self.order, payment_info=mail_text)
-            self.order.send_mail(
-                email_subject, email_template, email_context,
-                'pretix.event.order.email.order_paid', user,
-                invoices=[invoice] if invoice else [],
-                attach_tickets=True,
-                attach_ical=self.order.event.settings.mail_attach_ical
-            )
+            try:
+                self.order.send_mail(
+                    email_subject, email_template, email_context,
+                    'pretix.event.order.email.order_paid', user,
+                    invoices=[invoice] if invoice else [],
+                    attach_tickets=True,
+                    attach_ical=self.order.event.settings.mail_attach_ical
+                )
+            except SendMailException:
+                logger.exception('Order paid email could not be sent')

    @property
    def refunded_amount(self):
@@ -2887,28 +2915,44 @@ class OrderPosition(AbstractPosition):
        :param attach_tickets: Attach tickets of this order, if they are existing and ready to download
        :param attach_ical: Attach relevant ICS files
        """
-        from pretix.base.services.mail import mail
+        from pretix.base.services.mail import (
+            SendMailException, mail, render_mail,
+        )

        if not self.attendee_email:
            return

        with language(self.order.locale, self.order.event.settings.region):
            recipient = self.attendee_email
-            outgoing_mail = mail(
-                recipient, subject, template, context,
-                self.event, self.order.locale, order=self.order, headers=headers, sender=sender,
-                position=self,
-                invoices=invoices,
-                attach_tickets=attach_tickets,
-                attach_ical=attach_ical,
-                attach_other_files=attach_other_files,
-            )
-            if outgoing_mail:
+            try:
+                email_content = render_mail(template, context)
+                subject = format_map(subject, context)
+                mail(
+                    recipient, subject, template, context,
+                    self.event, self.order.locale, order=self.order, headers=headers, sender=sender,
+                    position=self,
+                    invoices=invoices,
+                    attach_tickets=attach_tickets,
+                    attach_ical=attach_ical,
+                    attach_other_files=attach_other_files,
+                )
+            except SendMailException:
+                raise
+            else:
                self.order.log_action(
                    log_entry_type,
                    user=user,
                    auth=auth,
-                    data=outgoing_mail.log_data(),
+                    data={
+                        'subject': subject,
+                        'message': email_content,
+                        'recipient': recipient,
+                        'invoices': [i.pk for i in invoices] if invoices else [],
+                        'attach_tickets': attach_tickets,
+                        'attach_ical': attach_ical,
+                        'attach_other_files': attach_other_files,
+                        'attach_cached_files': [],
+                    }
                )

    def resend_link(self, user=None, auth=None):
@@ -3436,7 +3480,7 @@ class InvoiceAddress(models.Model):
    def state_name(self):
        sd = pycountry.subdivisions.get(code='{}-{}'.format(self.country, self.state))
        if sd:
-            return _(sd.name)
+            return sd.name
        return self.state

    @property
@@ -3485,10 +3529,18 @@ class InvoiceAddress(models.Model):
    def describe_transmission(self):
        from pretix.base.invoicing.transmission import transmission_types
        data = []
+
        t, __ = transmission_types.get(identifier=self.transmission_type)
        data.append((_("Transmission type"), t.public_name))
-        if self.transmission_info:
-            data += t.describe_info(self.transmission_info, self.country, self.is_business)
+        form_data = t.transmission_info_to_form_data(self.transmission_info or {})
+        for k, f in t.invoice_address_form_fields.items():
+            v = form_data.get(k)
+            if v is True:
+                v = _("Yes")
+            elif v is False:
+                v = _("No")
+            if v:
+                data.append((f.label, v))
        return data


--- a/src/pretix/base/models/organizer.py
+++ b/src/pretix/base/models/organizer.py
@@ -31,10 +31,9 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
-import operator
+
 import string
 from datetime import date, datetime, time
-from functools import reduce

 import pytz_deprecation_shim
 from django.conf import settings
@@ -54,10 +53,6 @@ from i18nfield.strings import LazyI18nString
 from pretix.base.models.base import LoggedModel
 from pretix.base.validators import OrganizerSlugBanlistValidator

-from ...helpers.permission_migration import (
-    OLD_TO_NEW_EVENT_COMPAT, OLD_TO_NEW_ORGANIZER_COMPAT,
-    LegacyPermissionProperty,
-)
 from ..settings import settings_hierarkey
 from .auth import User

@@ -314,38 +309,6 @@ def generate_api_token():
    return get_random_string(length=64, allowed_chars=string.ascii_lowercase + string.digits)


-class TeamQuerySet(models.QuerySet):
-    @classmethod
-    def event_permission_q(cls, perm_name):
-        from ..permissions import assert_valid_event_permission
-
-        if perm_name.startswith('can_') and perm_name in OLD_TO_NEW_EVENT_COMPAT:  # legacy
-            return reduce(operator.and_, [cls.event_permission_q(p) for p in OLD_TO_NEW_EVENT_COMPAT[perm_name]])
-        assert_valid_event_permission(perm_name, allow_legacy=False)
-        return (
-            Q(all_event_permissions=True) |
-            Q(**{f'limit_event_permissions__{perm_name}': True})
-        )
-
-    @classmethod
-    def organizer_permission_q(cls, perm_name):
-        from ..permissions import assert_valid_organizer_permission
-
-        if perm_name.startswith('can_') and perm_name in OLD_TO_NEW_ORGANIZER_COMPAT:  # legacy
-            return reduce(operator.and_, [cls.organizer_permission_q(p) for p in OLD_TO_NEW_ORGANIZER_COMPAT[perm_name]])
-        assert_valid_organizer_permission(perm_name, allow_legacy=False)
-        return (
-            Q(all_organizer_permissions=True) |
-            Q(**{f'limit_organizer_permissions__{perm_name}': True})
-        )
-
-    def with_event_permission(self, perm_name):
-        return self.filter(self.event_permission_q(perm_name))
-
-    def with_organizer_permission(self, perm_name):
-        return self.filter(self.organizer_permission_q(perm_name))
-
-
 class Team(LoggedModel):
    """
    A team is a collection of people given certain access rights to one or more events of an organizer.
@@ -358,10 +321,36 @@ class Team(LoggedModel):
    :param all_events: Whether this team has access to all events of this organizer
    :type all_events: bool
    :param limit_events: A set of events this team has access to. Irrelevant if ``all_events`` is ``True``.
+    :param can_create_events: Whether or not the members can create new events with this organizer account.
+    :type can_create_events: bool
+    :param can_change_teams: If ``True``, the members can change the teams of this organizer account.
+    :type can_change_teams: bool
+    :param can_manage_customers: If ``True``, the members can view and change organizer-level customer accounts.
+    :type can_manage_customers: bool
+    :param can_manage_reusable_media: If ``True``, the members can view and change organizer-level reusable media.
+    :type can_manage_reusable_media: bool
+    :param can_change_organizer_settings: If ``True``, the members can change the settings of this organizer account.
+    :type can_change_organizer_settings: bool
+    :param can_change_event_settings: If ``True``, the members can change the settings of the associated events.
+    :type can_change_event_settings: bool
+    :param can_change_items: If ``True``, the members can change and add items and related objects for the associated events.
+    :type can_change_items: bool
+    :param can_view_orders: If ``True``, the members can inspect details of all orders of the associated events.
+    :type can_view_orders: bool
+    :param can_change_orders: If ``True``, the members can change details of orders of the associated events.
+    :type can_change_orders: bool
+    :param can_checkin_orders: If ``True``, the members can perform check-in related actions.
+    :type can_checkin_orders: bool
+    :param can_view_vouchers: If ``True``, the members can inspect details of all vouchers of the associated events.
+    :type can_view_vouchers: bool
+    :param can_change_vouchers: If ``True``, the members can change and create vouchers for the associated events.
+    :type can_change_vouchers: bool
    """
    organizer = models.ForeignKey(Organizer, related_name="teams", on_delete=models.CASCADE)
    name = models.CharField(max_length=190, verbose_name=_("Team name"))
    members = models.ManyToManyField(User, related_name="teams", verbose_name=_("Team members"))
+    all_events = models.BooleanField(default=False, verbose_name=_("All events (including newly created ones)"))
+    limit_events = models.ManyToManyField('Event', verbose_name=_("Limit to events"), blank=True)
    require_2fa = models.BooleanField(
        default=False, verbose_name=_("Require all members of this team to use two-factor authentication"),
        help_text=_("If you turn this on, all members of the team will be required to either set up two-factor "
@@ -369,33 +358,62 @@ class Team(LoggedModel):
                    "all users.")
    )

-    # Scope
-    all_events = models.BooleanField(default=False, verbose_name=_("All events (including newly created ones)"))
-    limit_events = models.ManyToManyField('Event', verbose_name=_("Limit to events"), blank=True)
-
-    # Permissions
-    # We store them as {key: True} instead of [key] because otherwise not all lookups we need are supported on SQLite
-    all_event_permissions = models.BooleanField(default=False, verbose_name=_("All event permissions"))
-    limit_event_permissions = models.JSONField(default=dict, verbose_name=_("Event permissions"))
-    all_organizer_permissions = models.BooleanField(default=False, verbose_name=_("All organizer permissions"))
-    limit_organizer_permissions = models.JSONField(default=dict, verbose_name=_("Organizer permissions"))
-
-    # Legacy lookups for plugin compatibility
-    can_change_event_settings = LegacyPermissionProperty()
-    can_change_items = LegacyPermissionProperty()
-    can_view_orders = LegacyPermissionProperty()
-    can_change_orders = LegacyPermissionProperty()
-    can_checkin_orders = LegacyPermissionProperty()
-    can_view_vouchers = LegacyPermissionProperty()
-    can_change_vouchers = LegacyPermissionProperty()
-    can_create_events = LegacyPermissionProperty()
-    can_change_organizer_settings = LegacyPermissionProperty()
-    can_change_teams = LegacyPermissionProperty()
-    can_manage_gift_cards = LegacyPermissionProperty()
-    can_manage_customers = LegacyPermissionProperty()
-    can_manage_reusable_media = LegacyPermissionProperty()
-
-    objects = TeamQuerySet.as_manager()
+    can_create_events = models.BooleanField(
+        default=False,
+        verbose_name=_("Can create events"),
+    )
+    can_change_teams = models.BooleanField(
+        default=False,
+        verbose_name=_("Can change teams and permissions"),
+    )
+    can_change_organizer_settings = models.BooleanField(
+        default=False,
+        verbose_name=_("Can change organizer settings"),
+        help_text=_('Someone with this setting can get access to most data of all of your events, i.e. via privacy '
+                    'reports, so be careful who you add to this team!')
+    )
+    can_manage_customers = models.BooleanField(
+        default=False,
+        verbose_name=_("Can manage customer accounts")
+    )
+    can_manage_reusable_media = models.BooleanField(
+        default=False,
+        verbose_name=_("Can manage reusable media")
+    )
+    can_manage_gift_cards = models.BooleanField(
+        default=False,
+        verbose_name=_("Can manage gift cards")
+    )
+    can_change_event_settings = models.BooleanField(
+        default=False,
+        verbose_name=_("Can change event settings")
+    )
+    can_change_items = models.BooleanField(
+        default=False,
+        verbose_name=_("Can change product settings")
+    )
+    can_view_orders = models.BooleanField(
+        default=False,
+        verbose_name=_("Can view orders")
+    )
+    can_change_orders = models.BooleanField(
+        default=False,
+        verbose_name=_("Can change orders")
+    )
+    can_checkin_orders = models.BooleanField(
+        default=False,
+        verbose_name=_("Can perform check-ins"),
+        help_text=_('This includes searching for attendees, which can be used to obtain personal information about '
+                    'attendees. Users with "can change orders" can also perform check-ins.')
+    )
+    can_view_vouchers = models.BooleanField(
+        default=False,
+        verbose_name=_("Can view vouchers")
+    )
+    can_change_vouchers = models.BooleanField(
+        default=False,
+        verbose_name=_("Can change vouchers")
+    )

    def __str__(self) -> str:
        return _("%(name)s on %(object)s") % {
@@ -403,62 +421,21 @@ class Team(LoggedModel):
            'object': str(self.organizer),
        }

-    def event_permission_set(self, include_legacy=True) -> set:
-        from ..permissions import get_all_event_permission_groups
-
-        result = set()
-        for pg in get_all_event_permission_groups().values():
-            for action in pg.actions:
-                if self.all_event_permissions or self.limit_event_permissions.get(f"{pg.name}:{action}"):
-                    result.add(f"{pg.name}:{action}")
-
-        if include_legacy:
-            # Add legacy permissions as well for plugin compatibility
-            for k, v in OLD_TO_NEW_EVENT_COMPAT.items():
-                if self.all_event_permissions or all(self.limit_event_permissions.get(kk) for kk in v):
-                    result.add(k)
-
-            if "can_change_event_settings" in result:
-                result.add("can_change_settings")
-
-        return result
-
-    def organizer_permission_set(self, include_legacy=True) -> set:
-        from ..permissions import get_all_organizer_permission_groups
-
-        result = set()
-        for pg in get_all_organizer_permission_groups().values():
-            for action in pg.actions:
-                if self.all_organizer_permissions or self.limit_organizer_permissions.get(f"{pg.name}:{action}"):
-                    result.add(f"{pg.name}:{action}")
-
-        if include_legacy:
-            # Add legacy permissions as well for plugin compatibility
-            for k, v in OLD_TO_NEW_ORGANIZER_COMPAT.items():
-                if self.all_organizer_permissions or all(self.limit_organizer_permissions.get(kk) for kk in v):
-                    result.add(k)
-
-        return result
+    def permission_set(self) -> set:
+        attribs = dir(self)
+        return {
+            a for a in attribs if a.startswith('can_') and self.has_permission(a)
+        }

    @property
-    def can_change_settings(self):  # Legacy compatibility
+    def can_change_settings(self):  # Legacy compatiblilty
        return self.can_change_event_settings

-    def has_event_permission(self, perm_name):
-        from ..permissions import assert_valid_event_permission
-
-        if perm_name.startswith('can_') and hasattr(self, perm_name):  # legacy
+    def has_permission(self, perm_name):
+        try:
            return getattr(self, perm_name)
-        assert_valid_event_permission(perm_name, allow_legacy=False)
-        return self.all_event_permissions or self.limit_event_permissions.get(perm_name, False)
-
-    def has_organizer_permission(self, perm_name):
-        from ..permissions import assert_valid_organizer_permission
-
-        if perm_name.startswith('can_') and hasattr(self, perm_name):  # legacy
-            return getattr(self, perm_name)
-        assert_valid_organizer_permission(perm_name, allow_legacy=False)
-        return self.all_organizer_permissions or self.limit_organizer_permissions.get(perm_name, False)
+        except AttributeError:
+            raise ValueError('Invalid required permission: %s' % perm_name)

    def permission_for_event(self, event):
        if self.all_events:
@@ -470,19 +447,6 @@ class Team(LoggedModel):
    def active_tokens(self):
        return self.tokens.filter(active=True)

-    def save(self, **kwargs):
-        if not isinstance(self.limit_event_permissions, dict):
-            raise TypeError("Permissions must be a dictionary")
-        if not isinstance(self.limit_organizer_permissions, dict):
-            raise TypeError("Permissions must be a dictionary")
-        for k in self.limit_event_permissions.values():
-            if k is not True:
-                raise TypeError("Permissions must only contain True values")
-        for k in self.limit_organizer_permissions.values():
-            if k is not True:
-                raise TypeError("Permissions must only contain True values")
-        return super().save(**kwargs)
-
    class Meta:
        verbose_name = _("Team")
        verbose_name_plural = _("Teams")
@@ -539,7 +503,7 @@ class TeamAPIToken(models.Model):
        has_event_access = (self.team.all_events and organizer == self.team.organizer) or (
            event in self.team.limit_events.all()
        )
-        return self.team.event_permission_set() if has_event_access else set()
+        return self.team.permission_set() if has_event_access else set()

    def get_organizer_permission_set(self, organizer) -> set:
        """
@@ -548,7 +512,7 @@ class TeamAPIToken(models.Model):
        :param organizer: The organizer of the event
        :return: set of permissions
        """
-        return self.team.organizer_permission_set() if self.team.organizer == organizer else set()
+        return self.team.permission_set() if self.team.organizer == organizer else set()

    def has_event_permission(self, organizer, event, perm_name=None, request=None) -> bool:
        """
@@ -557,7 +521,7 @@ class TeamAPIToken(models.Model):

        :param organizer: The organizer of the event
        :param event: The event to check
-        :param perm_name: The permission, e.g. ``event.orders:read``
+        :param perm_name: The permission, e.g. ``can_change_teams``
        :param request: This parameter is ignored and only defined for compatibility reasons.
        :return: bool
        """
@@ -565,8 +529,8 @@ class TeamAPIToken(models.Model):
            event in self.team.limit_events.all()
        )
        if isinstance(perm_name, (tuple, list)):
-            return has_event_access and any(self.team.has_event_permission(p) for p in perm_name)
-        return has_event_access and (not perm_name or self.team.has_event_permission(perm_name))
+            return has_event_access and any(self.team.has_permission(p) for p in perm_name)
+        return has_event_access and (not perm_name or self.team.has_permission(perm_name))

    def has_organizer_permission(self, organizer, perm_name=None, request=None):
        """
@@ -574,13 +538,13 @@ class TeamAPIToken(models.Model):
        to the organizer ``organizer``.

        :param organizer: The organizer to check
-        :param perm_name: The permission, e.g. ``organizer.events:create``
+        :param perm_name: The permission, e.g. ``can_change_teams``
        :param request: This parameter is ignored and only defined for compatibility reasons.
        :return: bool
        """
        if isinstance(perm_name, (tuple, list)):
-            return organizer == self.team.organizer and any(self.team.has_organizer_permission(p) for p in perm_name)
-        return organizer == self.team.organizer and (not perm_name or self.team.has_organizer_permission(perm_name))
+            return organizer == self.team.organizer and any(self.team.has_permission(p) for p in perm_name)
+        return organizer == self.team.organizer and (not perm_name or self.team.has_permission(perm_name))

    def get_events_with_any_permission(self):
        """
@@ -600,11 +564,9 @@ class TeamAPIToken(models.Model):
        :param request: Ignored, for compatibility with User model
        :return: Iterable of Events
        """
-        from pretix.base.permissions import AnyPermissionOf
-
        if (
-            isinstance(permission, (AnyPermissionOf, list, tuple)) and any(self.team.has_event_permission(p) for p in permission)
-        ) or (isinstance(permission, str) and self.team.has_event_permission(permission)):
+                isinstance(permission, (list, tuple)) and any(getattr(self.team, p, False) for p in permission)
+        ) or (isinstance(permission, str) and getattr(self.team, permission, False)):
            return self.get_events_with_any_permission()
        else:
            return self.team.organizer.events.none()
--- a/src/pretix/base/models/seating.py
+++ b/src/pretix/base/models/seating.py
@@ -22,6 +22,7 @@
 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
@@ -37,8 +38,6 @@ from pretix.base.models import Event, Item, LoggedModel, Organizer, SubEvent
@deconstructible
 class SeatingPlanLayoutValidator:
    def __call__(self, value):
-        import jsonschema
-
        if not isinstance(value, dict):
            try:
                val = json.loads(value)
--- a/src/pretix/base/models/tax.py
+++ b/src/pretix/base/models/tax.py
@@ -23,6 +23,7 @@ import json
 from decimal import Decimal
 from typing import Optional

+import jsonschema
 from django.contrib.staticfiles import finders
 from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
@@ -297,8 +298,6 @@ def cc_to_vat_prefix(country_code):
@deconstructible
 class CustomRulesValidator:
    def __call__(self, value):
-        import jsonschema
-
        if not isinstance(value, dict):
            try:
                val = json.loads(value)
--- a/src/pretix/base/models/vouchers.py
+++ b/src/pretix/base/models/vouchers.py
@@ -239,7 +239,7 @@ class Voucher(LoggedModel):
        )
    )
    price_mode = models.CharField(
-        verbose_name=_("Price effect"),
+        verbose_name=_("Price mode"),
        max_length=100,
        choices=PRICE_MODES,
        default='none'
@@ -623,7 +623,7 @@ class Voucher(LoggedModel):
        return max(1, self.min_usages - self.redeemed)

    @classmethod
-    def annotate_budget_used(cls, qs):
+    def annotate_budget_used_orders(cls, qs):
        opq = OrderPosition.objects.filter(
            voucher_id=OuterRef('pk'),
            voucher_budget_use__isnull=False,
@@ -632,7 +632,7 @@ class Voucher(LoggedModel):
                Order.STATUS_PENDING
            ]
        ).order_by().values('voucher_id').annotate(s=Sum('voucher_budget_use')).values('s')
-        return qs.annotate(budget_used=Coalesce(Subquery(opq, output_field=models.DecimalField(max_digits=13, decimal_places=2)), Decimal('0.00')))
+        return qs.annotate(budget_used_orders=Coalesce(Subquery(opq, output_field=models.DecimalField(max_digits=13, decimal_places=2)), Decimal('0.00')))

    def budget_used(self):
        ops = OrderPosition.objects.filter(
--- a/src/pretix/base/models/waitinglist.py
+++ b/src/pretix/base/models/waitinglist.py
@@ -34,9 +34,9 @@ from phonenumber_field.modelfields import PhoneNumberField
 from pretix.base.email import get_email_context
 from pretix.base.i18n import language
 from pretix.base.models import User, Voucher
-from pretix.base.services.mail import mail
-from pretix.helpers import OF_SELF
+from pretix.base.services.mail import SendMailException, mail, render_mail

+from ...helpers.format import format_map
 from ...helpers.names import build_name
 from .base import LoggedModel
 from .event import Event, SubEvent
@@ -158,7 +158,6 @@ class WaitingListEntry(LoggedModel):
        if availability[1] is None or availability[1] < 1:
            raise WaitingListException(_('This product is currently not available.'))

-        event = self.event
        ev = self.subevent or self.event
        if ev.seat_category_mappings.filter(product=self.item).exists():
            # Generally, we advertise the waiting list to be based on quotas only. This makes it dangerous
@@ -180,56 +179,50 @@ class WaitingListEntry(LoggedModel):
                block_quota=True,
                item_id=self.item_id,
                subevent_id=self.subevent_id,
-                waitinglistentries__isnull=False,
-                seat__isnull=True
+                waitinglistentries__isnull=False
            ).aggregate(free=Sum(F('max_usages') - F('redeemed')))['free'] or 0
            free_seats = num_free_seats_for_product - num_valid_vouchers_for_product
-            if free_seats < 1:
+            if not free_seats:
                raise WaitingListException(_('No seat with this product is currently available.'))

+        if self.voucher:
+            raise WaitingListException(_('A voucher has already been sent to this person.'))
        if '@' not in self.email:
            raise WaitingListException(_('This entry is anonymized and can no longer be used.'))

        with transaction.atomic():
-            locked_wle = WaitingListEntry.objects.select_for_update(of=OF_SELF).get(pk=self.pk)
-            locked_wle.event = event
-            if locked_wle.voucher:
-                raise WaitingListException(_('A voucher has already been sent to this person.'))
-            e = locked_wle.email
-            if locked_wle.name:
-                e += ' / ' + locked_wle.name
+            e = self.email
+            if self.name:
+                e += ' / ' + self.name
            v = Voucher.objects.create(
-                event=locked_wle.event,
+                event=self.event,
                max_usages=1,
-                valid_until=now() + timedelta(hours=locked_wle.event.settings.waiting_list_hours),
-                item=locked_wle.item,
-                variation=locked_wle.variation,
+                valid_until=now() + timedelta(hours=self.event.settings.waiting_list_hours),
+                item=self.item,
+                variation=self.variation,
                tag='waiting-list',
                comment=_('Automatically created from waiting list entry for {email}').format(
                    email=e
                ),
                block_quota=True,
-                subevent=locked_wle.subevent,
+                subevent=self.subevent,
            )
            v.log_action('pretix.voucher.added', {
-                'item': locked_wle.item.pk,
-                'variation': locked_wle.variation.pk if locked_wle.variation else None,
+                'item': self.item.pk,
+                'variation': self.variation.pk if self.variation else None,
                'tag': 'waiting-list',
                'block_quota': True,
                'valid_until': v.valid_until.isoformat(),
                'max_usages': 1,
-                'subevent': locked_wle.subevent.pk if locked_wle.subevent else None,
+                'subevent': self.subevent.pk if self.subevent else None,
                'source': 'waitinglist',
            }, user=user, auth=auth)
            v.log_action('pretix.voucher.added.waitinglist', {
-                'email': locked_wle.email,
-                'waitinglistentry': locked_wle.pk,
+                'email': self.email,
+                'waitinglistentry': self.pk,
            }, user=user, auth=auth)
-            locked_wle.voucher = v
-            locked_wle.save()
-
-        self.refresh_from_db()
-        self.event = event
+            self.voucher = v
+            self.save()

        with language(self.locale, self.event.settings.region):
            self.send_mail(
@@ -272,22 +265,33 @@ class WaitingListEntry(LoggedModel):
        with language(self.locale, self.event.settings.region):
            recipient = self.email

-            outgoing_mail = mail(
-                recipient, subject, template, context,
-                self.event,
-                self.locale,
-                headers=headers,
-                sender=sender,
-                auto_email=auto_email,
-                attach_other_files=attach_other_files,
-                attach_cached_files=attach_cached_files,
-            )
-            if outgoing_mail:
+            try:
+                email_content = render_mail(template, context)
+                subject = format_map(subject, context)
+                mail(
+                    recipient, subject, template, context,
+                    self.event,
+                    self.locale,
+                    headers=headers,
+                    sender=sender,
+                    auto_email=auto_email,
+                    attach_other_files=attach_other_files,
+                    attach_cached_files=attach_cached_files,
+                )
+            except SendMailException:
+                raise
+            else:
                self.log_action(
                    log_entry_type,
                    user=user,
                    auth=auth,
-                    data=outgoing_mail.log_data(),
+                    data={
+                        'subject': subject,
+                        'message': email_content,
+                        'recipient': recipient,
+                        'attach_other_files': attach_other_files,
+                        'attach_cached_files': [cf.filename for cf in attach_cached_files] if attach_cached_files else [],
+                    }
                )

    @staticmethod
--- a/src/pretix/base/notifications.py
+++ b/src/pretix/base/notifications.py
@@ -151,7 +151,7 @@ def get_all_notification_types(event=None):


 class ParametrizedOrderNotificationType(NotificationType):
-    required_permission = "event.orders:read"
+    required_permission = "can_view_orders"

    def __init__(self, event, action_type, verbose_name, title):
        self._action_type = action_type
--- a/src/pretix/base/payment.py
+++ b/src/pretix/base/payment.py
@@ -1231,8 +1231,8 @@ class ManualPayment(BasePaymentProvider):
    def is_allowed(self, request: HttpRequest, total: Decimal=None):
        return 'pretix.plugins.manualpayment' in self.event.plugins and super().is_allowed(request, total)

-    def order_change_allowed(self, order: Order, request=None):
-        return 'pretix.plugins.manualpayment' in self.event.plugins and super().order_change_allowed(order, request)
+    def order_change_allowed(self, order: Order):
+        return 'pretix.plugins.manualpayment' in self.event.plugins and super().order_change_allowed(order)

    @property
    def public_name(self):
@@ -1295,7 +1295,6 @@ class ManualPayment(BasePaymentProvider):

    def format_map(self, order, payment):
        return {
-            # Possible placeholder injection, we should make sure to never include user-controlled variables here
            'order': order.code,
            'amount': payment.amount,
            'currency': self.event.currency,
@@ -1526,26 +1525,16 @@ class GiftCardPayment(BasePaymentProvider):
    def payment_control_render(self, request, payment) -> str:
        from .models import GiftCard

-        if any(key in payment.info_data for key in ('gift_card', 'error')):
+        if 'gift_card' in payment.info_data:
+            gc = GiftCard.objects.get(pk=payment.info_data.get('gift_card'))
            template = get_template('pretixcontrol/giftcards/payment.html')
+
            ctx = {
                'request': request,
                'event': self.event,
-                **({'error': payment.info_data[
-                    'error']} if 'error' in payment.info_data else {}),
-                **({'gift_card_secret': payment.info_data[
-                    'gift_card_secret']} if 'gift_card_secret' in payment.info_data else {})
+                'gc': gc,
            }
-
-            try:
-                gc = GiftCard.objects.get(pk=payment.info_data.get('gift_card'))
-                ctx = {
-                    'gc': gc,
-                }
-            except GiftCard.DoesNotExist:
-                pass
-            finally:
-                return template.render(ctx)
+            return template.render(ctx)

    def payment_control_render_short(self, payment: OrderPayment) -> str:
        d = payment.info_data
@@ -1560,16 +1549,12 @@ class GiftCardPayment(BasePaymentProvider):
        try:
            gc = GiftCard.objects.get(pk=payment.info_data.get('gift_card'))
        except GiftCard.DoesNotExist:
-            return {
-                **({'error': payment.info_data[
-                    'error']} if 'error' in payment.info_data else {})
-            }
+            return {}
        return {
            'gift_card': {
                'id': gc.pk,
                'secret': gc.secret,
-                'organizer': gc.issuer.slug,
-                ** ({'error': payment.info_data['error']} if 'error' in payment.info_data else {})
+                'organizer': gc.issuer.slug
            }
        }

@@ -1641,8 +1626,6 @@ class GiftCardPayment(BasePaymentProvider):
                    raise PaymentException(_("This gift card does not support this currency."))
                if not gc.accepted_by(self.event.organizer):
                    raise PaymentException(_("This gift card is not accepted by this event organizer."))
-                if gc.value <= Decimal("0.00"):
-                    raise PaymentException(_("All credit on this gift card has been used."))
                if payment.amount > gc.value:
                    raise PaymentException(_("This gift card was used in the meantime. Please try again."))
                if gc.testmode and not payment.order.testmode:
@@ -1663,16 +1646,8 @@ class GiftCardPayment(BasePaymentProvider):
                    'transaction_id': trans.pk,
                }
                payment.confirm(send_mail=not is_early_special_case, generate_invoice=not is_early_special_case)
-                gc.log_action(
-                    action='pretix.giftcards.transaction.payment',
-                    data={
-                        'value': trans.value,
-                        'acceptor_id': self.event.organizer.id,
-                        'acceptor_slug': self.event.organizer.slug
-                    }
-                )
        except PaymentException as e:
-            payment.fail(info={**payment.info_data, 'error': str(e)}, send_mail=not is_early_special_case)
+            payment.fail(info={'error': str(e)})
            raise e

    def payment_is_valid_session(self, request: HttpRequest) -> bool:
@@ -1695,15 +1670,6 @@ class GiftCardPayment(BasePaymentProvider):
            'transaction_id': trans.pk,
        }
        refund.done()
-        gc.log_action(
-            action='pretix.giftcards.transaction.refund',
-            data={
-                'value': refund.amount,
-                'acceptor_id': self.event.organizer.id,
-                'acceptor_slug': self.event.organizer.slug,
-                'text': refund.comment,
-            }
-        )


@receiver(register_payment_providers, dispatch_uid="payment_free")
--- a/src/pretix/base/pdf.py
+++ b/src/pretix/base/pdf.py
@@ -47,6 +47,7 @@ from collections import OrderedDict, defaultdict
 from functools import partial
 from io import BytesIO

+import jsonschema
 import pypdf
 import pypdf.generic
 import reportlab.rl_config
@@ -71,7 +72,9 @@ from reportlab.lib.colors import Color
 from reportlab.lib.enums import TA_CENTER, TA_LEFT, TA_RIGHT
 from reportlab.lib.styles import ParagraphStyle
 from reportlab.lib.units import mm
+from reportlab.pdfbase import pdfmetrics
 from reportlab.pdfbase.pdfmetrics import getAscentDescent
+from reportlab.pdfbase.ttfonts import TTFont
 from reportlab.pdfgen.canvas import Canvas
 from reportlab.platypus import Paragraph

@@ -82,9 +85,7 @@ from pretix.base.signals import layout_image_variables, layout_text_variables
 from pretix.base.templatetags.money import money_filter
 from pretix.base.templatetags.phone_format import phone_format
 from pretix.helpers.daterange import datetimerange
-from pretix.helpers.reportlab import (
-    ThumbnailingImageReader, register_ttf_font_if_new, reshaper,
-)
+from pretix.helpers.reportlab import ThumbnailingImageReader, reshaper
 from pretix.presale.style import get_fonts

 logger = logging.getLogger(__name__)
@@ -794,19 +795,19 @@ class Renderer:
    def _register_fonts(cls, event: Event = None):
        if hasattr(cls, '_fonts_registered'):
            return
-        register_ttf_font_if_new('Open Sans', finders.find('fonts/OpenSans-Regular.ttf'))
-        register_ttf_font_if_new('Open Sans I', finders.find('fonts/OpenSans-Italic.ttf'))
-        register_ttf_font_if_new('Open Sans B', finders.find('fonts/OpenSans-Bold.ttf'))
-        register_ttf_font_if_new('Open Sans B I', finders.find('fonts/OpenSans-BoldItalic.ttf'))
+        pdfmetrics.registerFont(TTFont('Open Sans', finders.find('fonts/OpenSans-Regular.ttf')))
+        pdfmetrics.registerFont(TTFont('Open Sans I', finders.find('fonts/OpenSans-Italic.ttf')))
+        pdfmetrics.registerFont(TTFont('Open Sans B', finders.find('fonts/OpenSans-Bold.ttf')))
+        pdfmetrics.registerFont(TTFont('Open Sans B I', finders.find('fonts/OpenSans-BoldItalic.ttf')))

        for family, styles in get_fonts(event, pdf_support_required=True).items():
-            register_ttf_font_if_new(family, finders.find(styles['regular']['truetype']))
+            pdfmetrics.registerFont(TTFont(family, finders.find(styles['regular']['truetype'])))
            if 'italic' in styles:
-                register_ttf_font_if_new(family + ' I', finders.find(styles['italic']['truetype']))
+                pdfmetrics.registerFont(TTFont(family + ' I', finders.find(styles['italic']['truetype'])))
            if 'bold' in styles:
-                register_ttf_font_if_new(family + ' B', finders.find(styles['bold']['truetype']))
+                pdfmetrics.registerFont(TTFont(family + ' B', finders.find(styles['bold']['truetype'])))
            if 'bolditalic' in styles:
-                register_ttf_font_if_new(family + ' B I', finders.find(styles['bolditalic']['truetype']))
+                pdfmetrics.registerFont(TTFont(family + ' B I', finders.find(styles['bolditalic']['truetype'])))

        cls._fonts_registered = True

@@ -1310,8 +1311,6 @@ def _correct_page_media_box(page: pypdf.PageObject):
@deconstructible
 class PdfLayoutValidator:
    def __call__(self, value):
-        import jsonschema
-
        if not isinstance(value, dict):
            try:
                val = json.loads(value)
--- a/src/pretix/base/permissions.py
+++ b/src/pretix/base/permissions.py
@@ -1,334 +0,0 @@
-#
-# This file is part of pretix (Community Edition).
-#
-# Copyright (C) 2014-2020  Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
-# Public License as published by the Free Software Foundation in version 3 of the License.
-#
-# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
-# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
-# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
-# this file, see <https://pretix.eu/about/en/license>.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
-# <https://www.gnu.org/licenses/>.
-#
-import functools
-import logging
-import warnings
-from collections import OrderedDict
-from typing import Callable, Dict, List, NamedTuple, Set, Tuple
-
-from django.apps import apps
-from django.dispatch import receiver
-from django.utils.functional import Promise
-from django.utils.translation import gettext_lazy as _, pgettext_lazy
-
-from pretix.base.signals import (
-    register_event_permission_groups, register_organizer_permission_groups,
-)
-
-logger = logging.getLogger(__name__)
-
-
-def cache_until_change(input_value: Callable):
-    def decorator(func):
-        old_input_value = None
-        cached_result = None
-
-        @functools.wraps(func)
-        def wrapper():
-            nonlocal cached_result, old_input_value
-            if cached_result is None or old_input_value != input_value():
-                cached_result = func()
-                old_input_value = input_value()
-            return cached_result
-        return wrapper
-    return decorator
-
-
-class PermissionOption(NamedTuple):
-    actions: Tuple[str, ...]
-    label: str | Promise
-    help_text: str | Promise = None
-
-
-class PermissionGroup(NamedTuple):
-    name: str
-    label: str | Promise
-    actions: List[str]
-    options: List[PermissionOption]
-    help_text: str | Promise = None
-
-
-@cache_until_change(input_value=lambda: apps.ready)
-def get_all_event_permission_groups() -> Dict[str, PermissionGroup]:
-    types = OrderedDict()
-    for recv, ret in register_event_permission_groups.send(None):
-        if isinstance(ret, (list, tuple)):
-            for r in ret:
-                types[r.name] = r
-        else:
-            types[ret.name] = ret
-    return types
-
-
-@cache_until_change(input_value=lambda: apps.ready)
-def get_all_organizer_permission_groups() -> Dict[str, PermissionGroup]:
-    types = OrderedDict()
-    for recv, ret in register_organizer_permission_groups.send(None):
-        if isinstance(ret, (list, tuple)):
-            for r in ret:
-                types[r.name] = r
-        else:
-            types[ret.name] = ret
-    return types
-
-
-@cache_until_change(input_value=lambda: apps.ready)
-def get_all_event_permissions() -> Set[str]:
-    from pretix.helpers.permission_migration import OLD_TO_NEW_EVENT_COMPAT
-
-    res = set(OLD_TO_NEW_EVENT_COMPAT.keys())
-    for pg in get_all_event_permission_groups().values():
-        for a in pg.actions:
-            res.add(f"{pg.name}:{a}")
-    return res
-
-
-@cache_until_change(input_value=lambda: apps.ready)
-def get_all_organizer_permissions() -> Set[str]:
-    from pretix.helpers.permission_migration import OLD_TO_NEW_ORGANIZER_COMPAT
-
-    res = set(OLD_TO_NEW_ORGANIZER_COMPAT.keys())
-    for pg in get_all_organizer_permission_groups().values():
-        for a in pg.actions:
-            res.add(f"{pg.name}:{a}")
-
-    return res
-
-
-def assert_valid_event_permission(permission, allow_legacy=True, allow_tuple=True):
-    if not apps.ready:
-        # can't really check yet
-        return
-    if allow_legacy and permission == "can_change_settings":
-        permission = "can_change_event_settings"
-    if permission is None:
-        return
-    if isinstance(permission, (AnyPermissionOf, list, tuple)) and allow_tuple:
-        for p in permission:
-            assert_valid_event_permission(p)
-        return
-    if not allow_legacy and ':' not in permission:
-        raise ValueError(f"Not allowed to use legacy permission '{permission}'")
-    all_permissions = get_all_event_permissions()
-    if permission not in all_permissions:
-        # Warning *and* exception because warning is silently caught when used in if statements in Django templates
-        warnings.warn(f"Use of undefined permission '{permission}'")
-        raise Exception(f"Undefined permission '{permission}'")
-
-
-def assert_valid_organizer_permission(permission, allow_legacy=True, allow_tuple=True):
-    if not apps.ready:
-        # can't really check yet
-        return
-    if permission is None:
-        return
-    if isinstance(permission, (AnyPermissionOf, list, tuple)) and allow_tuple:
-        for p in permission:
-            assert_valid_organizer_permission(p)
-        return
-    if not allow_legacy and ':' not in permission:
-        raise ValueError(f"Not allowed to use legacy permission '{permission}'")
-    all_permissions = get_all_organizer_permissions()
-    if permission not in all_permissions:
-        # Warning *and* exception because warning is silently caught when used in if statements in Django templates
-        warnings.warn(f"Use of undefined permission '{permission}'")
-        raise Exception(f"Undefined permission '{permission}'")
-
-
-class AnyPermissionOf(list):
-    def __init__(self, *items):
-        super().__init__(items)
-
-
-OPTS_ALL_READ = [
-    PermissionOption(actions=tuple(), label=pgettext_lazy("permission_level", "View")),
-    PermissionOption(actions=("write",), label=pgettext_lazy("permission_level", "View and change")),
-]
-OPTS_ALL_READ_SETTINGS_API = [
-    PermissionOption(actions=tuple(), label=pgettext_lazy("permission_level", "View"),
-                     help_text=_("API only")),
-    PermissionOption(actions=("write",), label=pgettext_lazy("permission_level", "View and change")),
-]
-OPTS_ALL_READ_SETTINGS_PARENT = [
-    PermissionOption(actions=tuple(), label=pgettext_lazy("permission_level", "View"),
-                     help_text=_("Menu item will only show up if the user has permission for general settings.")),
-    PermissionOption(actions=("write",), label=pgettext_lazy("permission_level", "View and change")),
-]
-OPTS_READ_WRITE = [
-    PermissionOption(actions=tuple(), label=pgettext_lazy("permission_level", "No access")),
-    PermissionOption(actions=("read",), label=pgettext_lazy("permission_level", "View")),
-    PermissionOption(actions=("read", "write"), label=pgettext_lazy("permission_level", "View and change")),
-]
-
-
-@receiver(register_event_permission_groups, dispatch_uid="base_register_default_event_permissions")
-def register_default_event_permissions(sender, **kwargs):
-    return [
-        PermissionGroup(
-            name="event.settings.general",
-            label=_("General settings"),
-            actions=["write"],
-            options=OPTS_ALL_READ_SETTINGS_API,
-            help_text=_(
-                "This includes access to all settings not listed explicitly below, including plugin settings."
-            ),
-        ),
-        PermissionGroup(
-            name="event.settings.payment",
-            label=_("Payment settings"),
-            actions=["write"],
-            options=OPTS_ALL_READ_SETTINGS_PARENT,
-        ),
-        PermissionGroup(
-            name="event.settings.tax",
-            label=_("Tax settings"),
-            actions=["write"],
-            options=OPTS_ALL_READ_SETTINGS_PARENT,
-        ),
-        PermissionGroup(
-            name="event.settings.invoicing",
-            label=_("Invoicing settings"),
-            actions=["write"],
-            options=OPTS_ALL_READ_SETTINGS_PARENT,
-        ),
-        PermissionGroup(
-            name="event.subevents",
-            label=_("Event series dates"),
-            actions=["write"],
-            options=OPTS_ALL_READ,
-        ),
-        PermissionGroup(
-            name="event.items",
-            label=_("Products, quotas and questions"),
-            actions=["write"],
-            options=OPTS_ALL_READ,
-            help_text=_("Also includes related objects like categories or discounts."),
-        ),
-        PermissionGroup(
-            name="event.orders",
-            label=_("Orders"),
-            actions=["read", "write", "checkin"],
-            options=[
-                PermissionOption(actions=tuple(), label=pgettext_lazy("permission_level", "No access")),
-                PermissionOption(actions=("checkin",), label=pgettext_lazy("permission_level", "Only check-in")),
-                PermissionOption(actions=("read",), label=pgettext_lazy("permission_level", "View all")),
-                PermissionOption(actions=("read", "checkin"), label=pgettext_lazy("permission_level", "View all and check-in")),
-                PermissionOption(actions=("read", "write"), label=pgettext_lazy("permission_level", "View all and change"),
-                                 help_text=_("Includes the ability to cancel and refund individual orders.")),
-            ],
-            help_text=_("Also includes related objects like the waiting list."),
-        ),
-        PermissionGroup(
-            name="event.vouchers",
-            label=_("Vouchers"),
-            actions=["read", "write"],
-            options=OPTS_READ_WRITE,
-        ),
-        PermissionGroup(
-            name="event",
-            label=_("Full event or date cancellation"),
-            actions=["cancel"],
-            options=[
-                # If we ever add more actions, we need a new UI idea here
-                PermissionOption(actions=tuple(), label=pgettext_lazy("permission_level", "Not allowed")),
-                PermissionOption(actions=("cancel",), label=pgettext_lazy("permission_level", "Allowed")),
-            ],
-            help_text="",
-        ),
-    ]
-
-
-@receiver(register_organizer_permission_groups, dispatch_uid="base_register_default_organizer_permissions")
-def register_default_organizer_permissions(sender, **kwargs):
-    return [
-        PermissionGroup(
-            name="organizer.events",
-            label=_("Events"),
-            actions=["create"],
-            options=[
-                PermissionOption(actions=tuple(), label=pgettext_lazy("permission_level", "Access existing events")),
-                PermissionOption(actions=("create",), label=pgettext_lazy("permission_level", "Access existing and create new events")),
-            ],
-            help_text=_("The level of access to events is determined in detail by the settings below."),
-        ),
-        PermissionGroup(
-            name="organizer.settings.general",
-            label=_("Settings"),
-            actions=["write"],
-            options=OPTS_ALL_READ_SETTINGS_API,
-            help_text=_("This includes access to all organizer-level functionality not listed explicitly below, including plugin settings."),
-        ),
-        PermissionGroup(
-            name="organizer.teams",
-            label=_("Teams"),
-            actions=["write"],
-            options=[
-                PermissionOption(actions=tuple(), label=pgettext_lazy("permission_level", "No access")),
-                PermissionOption(actions=("write",), label=pgettext_lazy("permission_level", "View and change"),
-                                 help_text=_("Includes the ability to give someone (including oneself) additional permissions.")),
-            ],
-        ),
-        PermissionGroup(
-            name="organizer.giftcards",
-            label=_("Gift cards"),
-            actions=["read", "write"],
-            options=OPTS_READ_WRITE,
-        ),
-        PermissionGroup(
-            name="organizer.customers",
-            label=_("Customers"),
-            actions=["read", "write"],
-            options=OPTS_READ_WRITE,
-        ),
-        PermissionGroup(
-            name="organizer.reusablemedia",
-            label=_("Reusable media"),
-            actions=["read", "write"],
-            options=OPTS_READ_WRITE,
-        ),
-        PermissionGroup(
-            name="organizer.devices",
-            label=_("Devices"),
-            actions=["read", "write"],
-            options=[
-                PermissionOption(actions=tuple(), label=pgettext_lazy("permission_level", "No access")),
-                PermissionOption(actions=("read",), label=pgettext_lazy("permission_level", "View")),
-                PermissionOption(actions=("read", "write"), label=pgettext_lazy("permission_level", "View and change"),
-                                 help_text=_("Includes the ability to give access to events and data oneself does not have access to.")),
-            ],
-        ),
-        PermissionGroup(
-            name="organizer.seatingplans",
-            label=_("Seating plans"),
-            actions=["write"],
-            options=OPTS_ALL_READ,
-        ),
-        PermissionGroup(
-            name="organizer.outgoingmails",
-            label=_("Outgoing emails"),
-            actions=["read"],
-            options=[
-                PermissionOption(actions=tuple(), label=pgettext_lazy("permission_level", "No access")),
-                PermissionOption(actions=("read",), label=pgettext_lazy("permission_level", "View")),
-            ],
-        ),
-    ]
--- a/src/pretix/base/plugins.py
+++ b/src/pretix/base/plugins.py
@@ -65,7 +65,7 @@ def get_all_plugins(*, event=None, organizer=None) -> List[type]:
            if app.name in settings.PRETIX_PLUGINS_EXCLUDE:
                continue

-            level = getattr(meta, "level", PLUGIN_LEVEL_EVENT)
+            level = getattr(app, "level", PLUGIN_LEVEL_EVENT)
            if level == PLUGIN_LEVEL_EVENT:
                if event and hasattr(app, 'is_available'):
                    if not app.is_available(event):
--- a/src/pretix/base/services/cancelevent.py
+++ b/src/pretix/base/services/cancelevent.py
@@ -36,7 +36,7 @@ from pretix.base.models import (
    SubEvent, TaxRule, User, WaitingListEntry,
 )
 from pretix.base.services.locking import LockTimeoutException
-from pretix.base.services.mail import mail
+from pretix.base.services.mail import SendMailException, mail
 from pretix.base.services.orders import (
    OrderChangeManager, OrderError, _cancel_order, _try_auto_refund,
 )
@@ -45,6 +45,7 @@ from pretix.base.services.tax import split_fee_for_taxes
 from pretix.base.templatetags.money import money_filter
 from pretix.celery_app import app
 from pretix.helpers import OF_SELF
+from pretix.helpers.format import format_map

 logger = logging.getLogger(__name__)

@@ -52,14 +53,17 @@ logger = logging.getLogger(__name__)
 def _send_wle_mail(wle: WaitingListEntry, subject: LazyI18nString, message: LazyI18nString, subevent: SubEvent):
    with language(wle.locale, wle.event.settings.region):
        email_context = get_email_context(event_or_subevent=subevent or wle.event, event=wle.event)
-        mail(
-            wle.email,
-            str(subject),
-            message,
-            email_context,
-            wle.event,
-            locale=wle.locale
-        )
+        try:
+            mail(
+                wle.email,
+                format_map(subject, email_context),
+                message,
+                email_context,
+                wle.event,
+                locale=wle.locale
+            )
+        except SendMailException:
+            logger.exception('Waiting list canceled email could not be sent')


 def _send_mail(order: Order, subject: LazyI18nString, message: LazyI18nString, subevent: SubEvent,
@@ -72,28 +76,36 @@ def _send_mail(order: Order, subject: LazyI18nString, message: LazyI18nString, s

        email_context = get_email_context(event_or_subevent=subevent or order.event, refund_amount=refund_amount,
                                          order=order, position_or_address=ia, event=order.event)
-        order.send_mail(
-            subject, message, email_context,
-            'pretix.event.order.email.event_canceled',
-            user,
-        )
+        real_subject = format_map(subject, email_context)
+        try:
+            order.send_mail(
+                real_subject, message, email_context,
+                'pretix.event.order.email.event_canceled',
+                user,
+            )
+        except SendMailException:
+            logger.exception('Order canceled email could not be sent')

        for p in positions:
            if subevent and p.subevent_id != subevent.id:
                continue

            if p.addon_to_id is None and p.attendee_email and p.attendee_email != order.email:
+                real_subject = format_map(subject, email_context)
                email_context = get_email_context(event_or_subevent=p.subevent or order.event,
                                                  event=order.event,
                                                  refund_amount=refund_amount,
                                                  position_or_address=p,
                                                  order=order, position=p)
-                order.send_mail(
-                    subject, message, email_context,
-                    'pretix.event.order.email.event_canceled',
-                    position=p,
-                    user=user
-                )
+                try:
+                    order.send_mail(
+                        real_subject, message, email_context,
+                        'pretix.event.order.email.event_canceled',
+                        position=p,
+                        user=user
+                    )
+                except SendMailException:
+                    logger.exception('Order canceled email could not be sent to attendee')


@app.task(base=ProfiledEventTask, bind=True, max_retries=5, default_retry_delay=1, throws=(OrderError,))
--- a/src/pretix/base/services/cart.py
+++ b/src/pretix/base/services/cart.py
@@ -97,10 +97,6 @@ class CartError(Exception):
        super().__init__(msg)


-class CartPositionError(CartError):
-    pass
-
-
 error_messages = {
    'busy': gettext_lazy(
        'We were not able to process your request completely as the '
@@ -110,9 +106,6 @@ error_messages = {
    'unknown_position': gettext_lazy('Unknown cart position.'),
    'subevent_required': pgettext_lazy('subevent', 'No date was specified.'),
    'not_for_sale': gettext_lazy('You selected a product which is not available for sale.'),
-    'positions_removed': gettext_lazy(
-        'Some products can no longer be purchased and have been removed from your cart for the following reason: %s'
-    ),
    'unavailable': gettext_lazy(
        'Some of the products you selected are no longer available. '
        'Please see below for details.'
@@ -265,139 +258,6 @@ def _get_voucher_availability(event, voucher_use_diff, now_dt, exclude_position_
    return vouchers_ok, _voucher_depend_on_cart


-def _check_position_constraints(
-    event: Event, item: Item, variation: ItemVariation, voucher: Voucher, subevent: SubEvent,
-    seat: Seat, sales_channel: SalesChannel, already_in_cart: bool, cart_is_expired: bool, real_now_dt: datetime,
-    item_requires_seat: bool, is_addon: bool, is_bundled: bool,
-):
-    """
-    Checks if a cart position with the given constraints can still be sold. This checks configuration and time-based
-    constraints of item, subevent, and voucher.
-
-    It does NOT
-    - check if quota/voucher/seat are still available
-    - check prices
-    - check memberships
-    - perform any checks that go beyond the single line (like item.max_per_order)
-    """
-    time_machine_now_dt = time_machine_now(real_now_dt)
-    # Item or variation disabled
-    # Item disabled or unavailable by time
-    if not item.is_available(time_machine_now_dt) or (variation and not variation.is_available(time_machine_now_dt)):
-        raise CartPositionError(error_messages['unavailable'])
-
-    # Invalid media policy for online sale
-    if item.media_policy in (Item.MEDIA_POLICY_NEW, Item.MEDIA_POLICY_REUSE_OR_NEW):
-        mt = MEDIA_TYPES[item.media_type]
-        if not mt.medium_created_by_server:
-            raise CartPositionError(error_messages['media_usage_not_implemented'])
-    elif item.media_policy == Item.MEDIA_POLICY_REUSE:
-        raise CartPositionError(error_messages['media_usage_not_implemented'])
-
-    # Item removed from sales channel
-    if not item.all_sales_channels:
-        if sales_channel.identifier not in (s.identifier for s in item.limit_sales_channels.all()):
-            raise CartPositionError(error_messages['unavailable'])
-
-    # Variation removed from sales channel
-    if variation and not variation.all_sales_channels:
-        if sales_channel.identifier not in (s.identifier for s in variation.limit_sales_channels.all()):
-            raise CartPositionError(error_messages['unavailable'])
-
-    # Item disabled or unavailable by time in subevent
-    if subevent and item.pk in subevent.item_overrides and not subevent.item_overrides[item.pk].is_available(time_machine_now_dt):
-        raise CartPositionError(error_messages['not_for_sale'])
-
-    # Variation disabled or unavailable by time in subevent
-    if subevent and variation and variation.pk in subevent.var_overrides and \
-            not subevent.var_overrides[variation.pk].is_available(time_machine_now_dt):
-        raise CartPositionError(error_messages['not_for_sale'])
-
-    # Item requires a variation (should never happen)
-    if item.has_variations and not variation:
-        raise CartPositionError(error_messages['not_for_sale'])
-
-    # Variation belongs to wrong item (should never happen)
-    if variation and variation.item_id != item.pk:
-        raise CartPositionError(error_messages['not_for_sale'])
-
-    # Voucher does not apply to product
-    if voucher and not voucher.applies_to(item, variation):
-        raise CartPositionError(error_messages['voucher_invalid_item'])
-
-    # Voucher does not apply to seat
-    if voucher and voucher.seat and voucher.seat != seat:
-        raise CartPositionError(error_messages['voucher_invalid_seat'])
-
-    # Voucher does not apply to subevent
-    if voucher and voucher.subevent_id and voucher.subevent_id != subevent.pk:
-        raise CartPositionError(error_messages['voucher_invalid_subevent'])
-
-    # Voucher expired
-    # (checked using real_now_dt as vouchers influence quota calculations)
-    if voucher and voucher.valid_until and voucher.valid_until < real_now_dt:
-        raise CartPositionError(error_messages['voucher_expired'])
-
-    # Subevent has been disabled
-    if subevent and not subevent.active:
-        raise CartPositionError(error_messages['inactive_subevent'])
-
-    # Subevent sale not started
-    if subevent and subevent.effective_presale_start and time_machine_now_dt < subevent.effective_presale_start:
-        raise CartPositionError(error_messages['not_started'])
-
-    # Subevent sale has ended
-    if subevent and subevent.presale_has_ended:
-        raise CartPositionError(error_messages['ended'])
-
-    # Payment for subevent no longer possible
-    if subevent:
-        tlv = event.settings.get('payment_term_last', as_type=RelativeDateWrapper)
-        if tlv:
-            term_last = make_aware(datetime.combine(
-                tlv.datetime(subevent).date(),
-                time(hour=23, minute=59, second=59)
-            ), event.timezone)
-            if term_last < time_machine_now_dt:
-                raise CartPositionError(error_messages['payment_ended'])
-
-    # Seat required but no seat given
-    if item_requires_seat and not seat:
-        raise CartPositionError(error_messages['seat_invalid'])
-
-    # Seat given but no seat required
-    if seat and not item_requires_seat:
-        raise CartPositionError(error_messages['seat_forbidden'])
-
-    # Item requires to be add-on but is top-level position
-    if item.category and item.category.is_addon and not is_addon:
-        raise CartPositionError(error_messages['addon_only'])
-
-    # Item requires bundling but is top-level position
-    if item.require_bundling and not is_bundled:
-        raise CartPositionError(error_messages['bundled_only'])
-
-    # Seat for wrong product
-    if seat and seat.product != item:
-        raise CartPositionError(error_messages['seat_invalid'])
-
-    # Seat blocked
-    if seat and seat.blocked and sales_channel.identifier not in event.settings.seating_allow_blocked_seats_for_channel:
-        raise CartPositionError(error_messages['seat_invalid'])
-
-    # Item requires voucher but no voucher given
-    if item.require_voucher and voucher is None and not is_bundled:
-        raise CartPositionError(error_messages['voucher_required'])
-
-    # Item or variation is hidden without voucher but no voucher is given
-    if (
-        (item.hide_without_voucher or (variation and variation.hide_without_voucher)) and
-        (voucher is None or not voucher.show_hidden_items) and
-        not is_bundled
-    ):
-        raise CartPositionError(error_messages['voucher_required'])
-
-
 class CartManager:
    AddOperation = namedtuple('AddOperation', ('count', 'item', 'variation', 'voucher', 'quotas',
                                               'addon_to', 'subevent', 'bundled', 'seat', 'listed_price',
@@ -434,7 +294,6 @@ class CartManager:
        self._widget_data = widget_data or {}
        self._sales_channel = sales_channel
        self.num_extended_positions = 0
-        self.price_change_for_extended = False

        if reservation_time:
            self._reservation_time = reservation_time
@@ -562,14 +421,14 @@ class CartManager:
            if cartsize > limit:
                raise CartError(error_messages['max_items'] % limit)

-    def _check_item_constraints(self, op):
+    def _check_item_constraints(self, op, current_ops=[]):
        if isinstance(op, (self.AddOperation, self.ExtendOperation)):
            if not (
                (isinstance(op, self.AddOperation) and op.addon_to == 'FAKE') or
                (isinstance(op, self.ExtendOperation) and op.position.is_bundled)
            ):
                if op.item.require_voucher and op.voucher is None:
-                    if getattr(op, 'voucher_ignored', False):  # todo??
+                    if getattr(op, 'voucher_ignored', False):
                        raise CartError(error_messages['voucher_redeemed'])
                    raise CartError(error_messages['voucher_required'])

@@ -581,39 +440,88 @@ class CartManager:
                        raise CartError(error_messages['voucher_redeemed'])
                    raise CartError(error_messages['voucher_required'])

-            if op.seat and op.count > 1:
+            if not op.item.is_available() or (op.variation and not op.variation.is_available()):
+                raise CartError(error_messages['unavailable'])
+
+            if op.item.media_policy in (Item.MEDIA_POLICY_NEW, Item.MEDIA_POLICY_REUSE_OR_NEW):
+                mt = MEDIA_TYPES[op.item.media_type]
+                if not mt.medium_created_by_server:
+                    raise CartError(error_messages['media_usage_not_implemented'])
+            elif op.item.media_policy == Item.MEDIA_POLICY_REUSE:
+                raise CartError(error_messages['media_usage_not_implemented'])
+
+            if not op.item.all_sales_channels:
+                if self._sales_channel.identifier not in (s.identifier for s in op.item.limit_sales_channels.all()):
+                    raise CartError(error_messages['unavailable'])
+
+            if op.variation and not op.variation.all_sales_channels:
+                if self._sales_channel.identifier not in (s.identifier for s in op.variation.limit_sales_channels.all()):
+                    raise CartError(error_messages['unavailable'])
+
+            if op.subevent and op.item.pk in op.subevent.item_overrides and not op.subevent.item_overrides[op.item.pk].is_available():
+                raise CartError(error_messages['not_for_sale'])
+
+            if op.subevent and op.variation and op.variation.pk in op.subevent.var_overrides and \
+                    not op.subevent.var_overrides[op.variation.pk].is_available():
+                raise CartError(error_messages['not_for_sale'])
+
+            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'])
+
+            if op.voucher and op.voucher.seat and op.voucher.seat != op.seat:
+                raise CartError(error_messages['voucher_invalid_seat'])
+
+            if op.voucher and op.voucher.subevent_id and op.voucher.subevent_id != op.subevent.pk:
+                raise CartError(error_messages['voucher_invalid_subevent'])
+
+            if op.subevent and not op.subevent.active:
+                raise CartError(error_messages['inactive_subevent'])
+
+            if op.subevent and op.subevent.presale_start and time_machine_now(self.real_now_dt) < op.subevent.presale_start:
+                raise CartError(error_messages['not_started'])
+
+            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 and
+                        self._sales_channel.identifier not in self.event.settings.seating_allow_blocked_seats_for_channel
+                    )
+                )
+            ):
+                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 isinstance(op, self.AddOperation):
-                is_addon = op.addon_to
-                is_bundled = op.addon_to == "FAKE"
-            else:
-                is_addon = op.position.addon_to
-                is_bundled = op.position.is_bundled
+            if op.subevent:
+                tlv = self.event.settings.get('payment_term_last', as_type=RelativeDateWrapper)
+                if tlv:
+                    term_last = make_aware(datetime.combine(
+                        tlv.datetime(op.subevent).date(),
+                        time(hour=23, minute=59, second=59)
+                    ), self.event.timezone)
+                    if term_last < time_machine_now(self.real_now_dt):
+                        raise CartError(error_messages['payment_ended'])

-            try:
-                _check_position_constraints(
-                    event=self.event,
-                    item=op.item,
-                    variation=op.variation,
-                    voucher=op.voucher,
-                    subevent=op.subevent,
-                    seat=op.seat,
-                    sales_channel=self._sales_channel,
-                    already_in_cart=isinstance(op, self.ExtendOperation),
-                    cart_is_expired=isinstance(op, self.ExtendOperation),
-                    real_now_dt=self.real_now_dt,
-                    item_requires_seat=self._is_seated(op.item, op.subevent),
-                    is_addon=is_addon,
-                    is_bundled=is_bundled,
-                )
-                # Quota, seat, and voucher availability is checked for in perform_operations
-                # Price changes are checked for in extend_expired_positions
-            except CartPositionError as e:
-                if e.args[0] == error_messages['voucher_required'] and getattr(op, 'voucher_ignored', False):
-                    # This is the case where someone clicks +1 on a voucher-only item with a fully redeemed voucher:
-                    raise CartPositionError(error_messages['voucher_redeemed'])
-                raise
+        if isinstance(op, self.AddOperation):
+            if op.item.category and op.item.category.is_addon and not (op.addon_to and op.addon_to != 'FAKE'):
+                raise CartError(error_messages['addon_only'])
+
+            if op.item.require_bundling and not op.addon_to == 'FAKE':
+                raise CartError(error_messages['bundled_only'])

    def _get_price(self, item: Item, variation: Optional[ItemVariation],
                   voucher: Optional[Voucher], custom_price: Optional[Decimal],
@@ -633,7 +541,7 @@ class CartManager:
            else:
                raise e

-    def _extend_expired_positions(self):
+    def extend_expired_positions(self):
        requires_seat = Exists(
            SeatCategoryMapping.objects.filter(
                Q(product=OuterRef('item'))
@@ -696,14 +604,10 @@ class CartManager:
                quotas=quotas, subevent=cp.subevent, seat=cp.seat, listed_price=listed_price,
                price_after_voucher=price_after_voucher,
            )
-            try:
-                self._check_item_constraints(op)
-            except CartPositionError as e:
-                self._operations.append(self.RemoveOperation(position=cp))
-                err = error_messages['positions_removed'] % str(e)
+            self._check_item_constraints(op)

            if cp.voucher:
-                self._voucher_use_diff[cp.voucher] += 1
+                self._voucher_use_diff[cp.voucher] += 2

            self._operations.append(op)
        return err
@@ -893,7 +797,7 @@ class CartManager:
                    custom_price_input_is_net=False,
                    voucher_ignored=False,
                )
-                self._check_item_constraints(bop)
+                self._check_item_constraints(bop, operations)
                bundled.append(bop)

            listed_price = get_listed_price(item, variation, subevent)
@@ -932,7 +836,7 @@ class CartManager:
                custom_price_input_is_net=self.event.settings.display_net_prices,
                voucher_ignored=voucher_ignored,
            )
-            self._check_item_constraints(op)
+            self._check_item_constraints(op, operations)
            operations.append(op)

        self._quota_diff.update(quota_diff)
@@ -1071,7 +975,7 @@ class CartManager:
                    custom_price_input_is_net=self.event.settings.display_net_prices,
                    voucher_ignored=False,
                )
-                self._check_item_constraints(op)
+                self._check_item_constraints(op, operations)
                operations.append(op)

        # Check constraints on the add-on combinations
@@ -1268,9 +1172,7 @@ class CartManager:
                op.position.delete()

            elif isinstance(op, (self.AddOperation, self.ExtendOperation)):
-                if isinstance(op, self.ExtendOperation) and (op.position.pk in deleted_positions or not op.position.pk):
-                    continue  # Already deleted in other operation
-                # Create a CartPosition for as many items as we can
+                # Create a CartPosition for as much items as we can
                requested_count = quota_available_count = voucher_available_count = op.count

                if op.seat:
@@ -1441,8 +1343,6 @@ class CartManager:
                        addons.delete()
                        op.position.delete()
                    elif available_count == 1:
-                        if op.price_after_voucher != op.position.price_after_voucher:
-                            self.price_change_for_extended = True
                        op.position.expires = self._expiry
                        op.position.max_extend = self._max_expiry_extend
                        op.position.listed_price = op.listed_price
@@ -1461,11 +1361,6 @@ class CartManager:
                        deleted_positions.add(op.position.pk)
                        addons.delete()
                        op.position.delete()
-                        if op.position.is_bundled:
-                            deleted_positions |= {a.pk for a in op.position.addon_to.addons.all()}
-                            deleted_positions.add(op.position.addon_to.pk)
-                            op.position.addon_to.addons.all().delete()
-                            op.position.addon_to.delete()
                    else:
                        raise AssertionError("ExtendOperation cannot affect more than one item")
            elif isinstance(op, self.VoucherOperation):
@@ -1529,7 +1424,7 @@ class CartManager:
            self._sales_channel.identifier,
            [
                (cp.item_id, cp.subevent_id, cp.subevent.date_from if cp.subevent_id else None, cp.line_price_gross,
-                 cp.addon_to, cp.is_bundled, cp.listed_price - cp.price_after_voucher)
+                 bool(cp.addon_to), cp.is_bundled, cp.listed_price - cp.price_after_voucher)
                for cp in positions
            ]
        )
@@ -1544,24 +1439,15 @@ class CartManager:

        return diff

-    def _remove_parents_if_bundles_are_removed(self):
-        removed_positions = {op.position.pk for op in self._operations if isinstance(op, self.RemoveOperation)}
-        for op in self._operations:
-            if isinstance(op, self.RemoveOperation):
-                if op.position.is_bundled and op.position.addon_to_id not in removed_positions:
-                    self._operations.append(self.RemoveOperation(position=op.position.addon_to))
-                    removed_positions.add(op.position.addon_to_id)
-
    def commit(self):
        self._check_presale_dates()
        self._check_max_cart_size()

        err = self._delete_out_of_timeframe()
-        err = self._extend_expired_positions() or err
+        err = self.extend_expired_positions() or err
        err = err or self._check_min_per_voucher()

        self._extend_expiry_of_valid_existing_positions()
-        self._remove_parents_if_bundles_are_removed()
        err = self._perform_operations() or err
        self.recompute_final_prices_and_taxes()

@@ -1640,7 +1526,7 @@ def get_fees(event, request, _total_ignored_=None, invoice_address=None, payment
        if fee.tax_rule and not fee.tax_rule.pk:
            fee.tax_rule = None  # TODO: deprecate

-    apply_rounding(event.settings.tax_rounding, invoice_address, event.currency, [*positions, *fees])
+    apply_rounding(event.settings.tax_rounding, event.currency, [*positions, *fees])
    total = sum([c.price for c in positions]) + sum([f.value for f in fees])

    if total != 0 and payments:
@@ -1680,7 +1566,7 @@ def get_fees(event, request, _total_ignored_=None, invoice_address=None, payment
                fees.append(pf)

                # Re-apply rounding as grand total has changed
-                apply_rounding(event.settings.tax_rounding, invoice_address, event.currency, [*positions, *fees])
+                apply_rounding(event.settings.tax_rounding, event.currency, [*positions, *fees])
                total = sum([c.price for c in positions]) + sum([f.value for f in fees])

                # Re-calculate to_pay as grand total has changed
@@ -1817,12 +1703,7 @@ def extend_cart_reservation(self, event: Event, cart_id: str=None, locale='en',
            try:
                cm = CartManager(event=event, cart_id=cart_id, sales_channel=sales_channel)
                cm.commit()
-                return {
-                    "success": cm.num_extended_positions,
-                    "expiry": cm._expiry,
-                    "max_expiry_extend": cm._max_expiry_extend,
-                    "price_changed": cm.price_change_for_extended,
-                }
+                return {"success": cm.num_extended_positions, "expiry": cm._expiry, "max_expiry_extend": cm._max_expiry_extend}
            except LockTimeoutException:
                self.retry()
        except (MaxRetriesExceededError, LockTimeoutException):
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lukas Bockstaller	e076f4bbd9	factor out subevent.py	2025-12-08 16:20:20 +01:00
Lukas Bockstaller	1a2ee155bd	add SubEventSelectionWrapper and filtering by datetime	2025-12-08 16:12:23 +01:00
Lukas Bockstaller	9743d7ae52	somewhat presentable MultiValueField without validation	2025-12-05 16:49:04 +01:00
Lukas Bockstaller	07f38819a6	uses propper form validation	2025-12-04 10:15:41 +01:00
Lukas Bockstaller	b4dd2145ff	move form out of views.py	2025-12-04 09:33:51 +01:00
Lukas Bockstaller	1c26036976	fix linting and formatting	2025-12-04 09:16:02 +01:00
Lukas Bockstaller	a53fc2d256	implements ListExporter for QuestionAnswers	2025-12-03 16:32:09 +01:00
Lukas Bockstaller	8d24696ce3	move QuestionMixin	2025-12-03 16:32:01 +01:00
Lukas Bockstaller	a14c545883	pull out orderPositionQuerySet	2025-12-03 16:31:53 +01:00
Lukas Bockstaller	10829aa2a5	add dummy exporter	2025-12-03 16:31:45 +01:00
Lukas Bockstaller	f645b5a2d9	replace manual form with QuestionFilterForm	2025-12-03 16:31:37 +01:00