Update django-oauth-toolkit requirement from ==2.3.* to ==3.1.*

Updates the requirements on [django-oauth-toolkit](https://github.com/django-oauth/django-oauth-toolkit) to permit the latest version.
- [Release notes](https://github.com/django-oauth/django-oauth-toolkit/releases)
- [Changelog](https://github.com/django-oauth/django-oauth-toolkit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/django-oauth/django-oauth-toolkit/compare/2.3.0...3.1.0)

---
updated-dependencies:
- dependency-name: django-oauth-toolkit
  dependency-version: 3.1.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.licenseheader

@@ -1,7 +1,7 @@
 This file is part of pretix (Community Edition).
 
-Copyright (C) 2014-2020  Raphael Michel and contributors
+Copyright (C) 2014-2020 Raphael Michel and contributors
-Copyright (C) 2020-today pretix GmbH and contributors
+Copyright (C) 2020-2021 rami.io 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.

doc/api/resources/checkin.rst

@@ -421,94 +421,3 @@ Annulment of a check-in
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
    :statuscode 404: The requested nonce does not exist.
-
-
-Check-in history
-----------------
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the check-in
-successful                            boolean                    Whether the check-in was successful
-error_reason                          string                     Category of reason why the check-in was unsuccessful. Currently
-                                                                 ``"canceled"``, ``"invalid"``, ``"unpaid"`` ``"product"``,
-                                                                 ``"rules"``, ``"revoked"``, ``"incomplete"``, ``"already_redeemed"``,
-                                                                 ``"ambiguous"``, ``"error"``, ``"blocked"``, ``"unapproved"``,
-                                                                 ``"invalid_time"``, ``"annulled"`` or ``null``
-error_explanation                     string                     Additional, human-readable reason for the check-in to be unsuccessful (or ``null``)
-position                              integer                    Internal ID of the order position (or ``null`` for unknown scans)
-datetime                              datetime                   Logical time when the check-in happened
-created                               datetime                   Time when the check-in appeared on the server
-list                                  integer                    Internal ID of the check-in list
-auto_checked_in                       boolean                    Whether the check-in was performed by the system automatically
-gate                                  integer                    Internal ID of the gate (or ``null``)
-device                                integer                    Internal ID of the device (or ``null``)
-device_id                             integer                    Organizer-internal ID of the device (or ``null``)
-type                                  string                     Type of check-in, currently ``"entry"`` or ``"exit"``
-===================================== ========================== =======================================================
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/checkins/
-
-   Returns a list of all check-in events within a given event.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/checkins/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "count": 1,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id": 1,
-            "successful": true,
-            "error_reason": null,
-            "error_explanation": null,
-            "position": 1234,
-            "datetime": "2017-12-25T12:45:23Z",
-            "created": "2017-12-25T12:45:23Z",
-            "list": 2,
-            "auto_checked_in": false,
-            "gate": null,
-            "device": null,
-            "device_id": null,
-            "type": "entry",
-          }
-        ]
-      }
-
-   :query integer page: The page number in case of a multi-page result set, default is 1
-   :query datetime created_since: Only return check-ins that have been created since the given date (inclusive).
-   :query datetime created_before: Only return check-ins that have been created before the given date (exclusive).
-   :query datetime datetime_since: Only return check-ins that have happened since the given date (inclusive).
-   :query datetime datetime_before: Only return check-ins that have happened before the given date (exclusive).
-   :query boolean successful: Only return check-ins that have (not) been successful.
-   :query boolean error_reason: Only return check-ins with a specific error reason.
-   :query integer list: Only return check-ins from a specific list.
-   :query string type: Only return check-ins of a specific type.
-   :query integer gate: Only return check-ins from a specific gate.
-   :query integer device: Only return check-ins from a specific device.
-   :query boolean auto_checked_in: Only return check-ins that are (not) auto-checked in.
-   :query string ordering: Manually set the ordering of results. Valid fields to be used are ``datetime``, ``created``,
-                           and ``id``.
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.

doc/api/resources/orders.rst

@@ -41,7 +41,6 @@ expires                               datetime                   The order will
 payment_date                          date                       **DEPRECATED AND INACCURATE** Date of payment receipt
 payment_provider                      string                     **DEPRECATED AND INACCURATE** Payment provider used for this order
 total                                 money (string)             Total value of this order
-tax_rounding_mode                     string                     Tax rounding mode, see :ref:`algorithms-rounding`
 comment                               string                     Internal comment on this order
 api_meta                              object                     Meta data for that order. Only available through API, no guarantees
                                                                  on the content structure. You can use this to save references to your system.
@@ -152,10 +151,6 @@ plugin_data                           object                     Additional data
 
    The ``invoice_address.transmission_type`` and ``invoice_address.transmission_info`` attributes have been added.
 
-.. versionchanged:: 2025.10
-
-   The ``tax_rounding_mode`` attribute has been added.
-
 .. _order-position-resource:
 
 Order position resource
@@ -363,7 +358,6 @@ List of all orders
             "payment_provider": "banktransfer",
             "fees": [],
             "total": "23.00",
-            "tax_rounding_mode": "line",
             "comment": "",
             "custom_followup_at": null,
             "checkin_attention": false,
@@ -608,7 +602,6 @@ Fetching individual orders
         "payment_provider": "banktransfer",
         "fees": [],
         "total": "23.00",
-        "tax_rounding_mode": "line",
         "comment": "",
         "api_meta": {},
         "custom_followup_at": null,
@@ -1018,7 +1011,6 @@ Creating orders
      provider will not be called to do anything about this (i.e. if you pass a bank account to a debit provider, *no*
      charge will be created), this is just informative in case you *handled the payment already*.
    * ``payment_date`` (optional) – Date and time of the completion of the payment.
-   * ``tax_rounding_mode`` (optional)
    * ``comment`` (optional)
    * ``custom_followup_at`` (optional)
    * ``checkin_attention`` (optional)
@@ -1038,8 +1030,8 @@ Creating orders
       * ``internal_reference``
       * ``vat_id``
       * ``vat_id_validated`` (optional) – If you need support for reverse charge (rarely the case), you need to check
-        yourself if the passed VAT ID is a valid EU VAT ID. In that case, set this to ``true``. Only valid VAT IDs will
+         yourself if the passed VAT ID is a valid EU VAT ID. In that case, set this to ``true``. Only valid VAT IDs will
-        trigger reverse charge taxation. Don't forget to set ``is_business`` as well!
+         trigger reverse charge taxation. Don't forget to set ``is_business`` as well!
      * ``transmission_type`` (optional, defaults to ``email``)
      * ``transmission_info`` (optional, see also :ref:`rest-transmission-types`)
 
@@ -1066,7 +1058,6 @@ Creating orders
       * ``valid_until`` (optional, if both ``valid_from`` and ``valid_until`` are **missing** (not ``null``) the availability will be computed from the given product)
       * ``requested_valid_from`` (optional, can be set **instead** of ``valid_from`` and ``valid_until`` to signal a user choice for the start time that may or may not be respected)
       * ``use_reusable_medium`` (optional, causes the new ticket to take over the given reusable medium, identified by its ID)
-      * ``discount`` (optional, only possible if ``price`` is set; attention: if this is set to not-``null`` on any position, automatic calculation of discounts will not run)
       * ``answers``
 
         * ``question``
@@ -2517,7 +2508,6 @@ Order payment endpoints
 
       {
         "amount": "23.00",
-        "comment": "Overpayment",
         "mark_canceled": false
       }
 

doc/development/algorithms/pricing.rst

@@ -178,124 +178,3 @@ Flowchart
 ---------
 
 .. image:: /images/cart_pricing.png
-
-
-.. _`algorithms-rounding`:
-
-Rounding of taxes
------------------
-
-pretix internally always stores taxes on a per-line level, like this:
-
- ========== ========== =========== ======= =============
-   Product   Tax rate   Net price     Tax   Gross price
- ========== ========== =========== ======= =============
-  Ticket A       19 %       84.03   15.97        100.00
-  Ticket B       19 %       84.03   15.97        100.00
-  Ticket C       19 %       84.03   15.97        100.00
-  Ticket D       19 %       84.03   15.97        100.00
-  Ticket E       19 %       84.03   15.97        100.00
-       Sum                 420.15   79.85        500.00
- ========== ========== =========== ======= =============
-
-Whether the net price is computed from the gross price or vice versa is configured on the tax rule and may differ for every line.
-
-The line-based computation has a few significant advantages:
-
-- We can report both net and gross prices for every individual ticket.
-
-- We can report both net and gross prices for every filter imaginable, such as the gross sum of all sales of Ticket A
-  or the net sum of all sales for a specific date in an event series. All numbers will be exact.
-
-- When splitting the order into two, both net price and gross price are split without any changes in rounding.
-
-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 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.
-
-However, calculating the tax rate from the net total has significant disadvantages:
-
-- It is impossible to guarantee a stable gross price this way, i.e. if you advertise a price of €100 per ticket to
-  consumers, they will be confused when they only need to pay €499.98 for 5 tickets.
-
-- Some prices are impossible, e.g. you cannot sell a ticket for a gross price of €99.99 at a 19% tax rate, since there
-  is no two-decimal net price that would be computed to a gross price of €99.99.
-
-- When splitting an order into two, the combined of the new orders is not guaranteed to be the same as the total of the
-  original order. Therefore, additional payments or refunds of very small amounts might be necessary.
-
-To allow organizers to make their own choices on this matter, pretix provides the following options:
-
-Compute taxes for every line individually
-"""""""""""""""""""""""""""""""""""""""""
-
-Algorithm identifier: ``line``
-
-This is our original algorithm where the tax value is rounded for every line individually.
-
-**This is our current default algorithm and we recommend it whenever you do not have different requirements** (see below).
-For the example above:
-
- ========== ========== =========== ======= =============
-   Product   Tax rate   Net price     Tax   Gross price
- ========== ========== =========== ======= =============
-  Ticket A       19 %       84.03   15.97        100.00
-  Ticket B       19 %       84.03   15.97        100.00
-  Ticket C       19 %       84.03   15.97        100.00
-  Ticket D       19 %       84.03   15.97        100.00
-  Ticket E       19 %       84.03   15.97        100.00
-       Sum                 420.15   79.85        500.00
- ========== ========== =========== ======= =============
-
-
-Compute taxes based on net total
-""""""""""""""""""""""""""""""""
-
-Algorithm identifier: ``sum_by_net``
-
-In this algorithm, the tax value and gross total are computed from the sum of the net prices. To accomplish this within
-our data model, the gross price and tax of some of the tickets will be changed by the minimum currency unit (e.g. €0.01).
-The net price of the tickets always stay the same.
-
-**This is the algorithm intended by EN 16931 invoices and our recommendation to use for e-invoicing when (primarily) business customers are involved.**
-
-The main downside is that it might be confusing when selling to consumers, since the amounts to be paid change in unexpected ways.
-For the example above, the customer expects to pay 5 times 100.00, but they are are in fact charged 499.98:
-
- ========== ========== =========== ============================== ==============================
-   Product   Tax rate   Net price                            Tax                    Gross price
- ========== ========== =========== ============================== ==============================
-  Ticket A       19 %       84.03   15.96 (incl. -0.01 rounding)   99.99 (incl. -0.01 rounding)
-  Ticket B       19 %       84.03   15.96 (incl. -0.01 rounding)   99.99 (incl. -0.01 rounding)
-  Ticket C       19 %       84.03                          15.97                         100.00
-  Ticket D       19 %       84.03                          15.97                         100.00
-  Ticket E       19 %       84.03                          15.97                         100.00
-       Sum                 420.15                          78.83                         499.98
- ========== ========== =========== ============================== ==============================
-
-Compute taxes based on net total with stable gross prices
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-Algorithm identifier: ``sum_by_net_keep_gross``
-
-In this algorithm, the tax value and gross total are computed from the sum of the net prices. However, the net prices
-of some of the tickets will be changed automatically by the minimum currency unit (e.g. €0.01) such that the resulting
-gross prices stay the same.
-
-**This is less confusing to consumers and the end result is still compliant to EN 16931, so we recommend this for e-invoicing when (primarily) consumers are involved.**
-
-The main downside is that it might be confusing when selling to business customers, since the prices of the identical tickets appear to be different.
-Full computation for the example above:
-
- ========== ========== ============================= ============================== =============
-   Product   Tax rate                     Net price                            Tax   Gross price
- ========== ========== ============================= ============================== =============
-  Ticket A       19 %   84.04 (incl. 0.01 rounding)   15.96 (incl. -0.01 rounding)        100.00
-  Ticket B       19 %   84.04 (incl. 0.01 rounding)   15.96 (incl. -0.01 rounding)        100.00
-  Ticket C       19 %                         84.03                          15.97        100.00
-  Ticket D       19 %                         84.03                          15.97        100.00
-  Ticket E       19 %                         84.03                          15.97        100.00
-       Sum                                   420.17                          79.83        500.00
- ========== ========== ============================= ============================== =============

doc/images/cart_pricing.puml

@@ -23,7 +23,6 @@ partition "For every cart position" {
     --> "Store as line_price (gross), tax_rate"
 }
 --> "Apply discount engine"
---> "Apply tax rounding"
 --> "Store as price (gross)"
 
 @enduml

pyproject.toml

@@ -48,7 +48,7 @@ dependencies = [
   "django-libsass==0.9",
   "django-localflavor==5.0",
   "django-markup",
-  "django-oauth-toolkit==2.3.*",
+  "django-oauth-toolkit==3.1.*",
   "django-otp==1.6.*",
   "django-phonenumber-field==7.3.*",
   "django-redis==6.0.*",
@@ -76,12 +76,12 @@ dependencies = [
   "phonenumberslite==9.0.*",
   "Pillow==11.3.*",
   "pretix-plugin-build",
-  "protobuf==6.33.*",
+  "protobuf==6.32.*",
   "psycopg2-binary",
   "pycountry",
   "pycparser==2.23",
   "pycryptodome==3.23.*",
-  "pypdf==6.1.*",
+  "pypdf==6.0.*",
   "python-bidi==0.6.*",  # Support for Arabic in reportlab
   "python-dateutil==2.9.*",
   "pytz",
@@ -91,8 +91,8 @@ dependencies = [
   "redis==6.4.*",
   "reportlab==4.4.*",
   "requests==2.32.*",
-  "sentry-sdk==2.43.*",
+  "sentry-sdk==2.38.*",
-  "sepaxml==2.7.*",
+  "sepaxml==2.6.*",
   "stripe==7.9.*",
   "text-unidecode==1.*",
   "tlds>=2020041600",
@@ -107,10 +107,10 @@ dependencies = [
 [project.optional-dependencies]
 memcached = ["pylibmc"]
 dev = [
-  "aiohttp==3.13.*",
+  "aiohttp==3.12.*",
   "coverage",
   "coveralls",
-  "fakeredis==2.32.*",
+  "fakeredis==2.31.*",
   "flake8==7.3.*",
   "freezegun",
   "isort==6.1.*",

src/manage.py

@@ -2,8 +2,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/__init__.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.
@@ -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__ = "2025.10.0.dev0"
+__version__ = "2025.9.0.dev0"

src/pretix/__main__.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/_base_settings.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/_build.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/_build_settings.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/__init__.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/apps.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/auth/__init__.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/auth/device.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/auth/devicesecurity.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/auth/permission.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/auth/session.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/auth/token.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/exception.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/filters.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/middleware.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/models.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/oauth.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/pagination.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/__init__.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/cart.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/checkin.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/discount.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/event.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.
@@ -829,7 +829,6 @@ class EventSettingsSerializer(SettingsSerializer):
         'invoice_eu_currencies',
         'invoice_logo_image',
         'invoice_renderer_highlight_order_code',
-        'tax_rounding',
         'cancel_allow_user',
         'cancel_allow_user_until',
         'cancel_allow_user_unpaid_keep',

src/pretix/api/serializers/exporters.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/fields.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/forms.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/i18n.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/item.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.
@@ -550,7 +550,7 @@ class QuestionSerializer(I18nAwareModelSerializer):
         if full_data.get('show_during_checkin') and full_data.get('type') in Question.SHOW_DURING_CHECKIN_UNSUPPORTED:
             raise ValidationError(_('This type of question cannot be shown during check-in.'))
 
-        Question.clean_items(event, full_data.get('items') or [])
+        Question.clean_items(event, full_data.get('items'))
         return data
 
     def validate_options(self, value):
@@ -566,7 +566,7 @@ class QuestionSerializer(I18nAwareModelSerializer):
     @transaction.atomic
     def create(self, validated_data):
         options_data = validated_data.pop('options') if 'options' in validated_data else []
-        items = validated_data.pop('items', [])
+        items = validated_data.pop('items')
 
         question = Question.objects.create(**validated_data)
         question.items.set(items)

src/pretix/api/serializers/media.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/order.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.
@@ -52,10 +52,9 @@ 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, Invoice, InvoiceAddress,
+    CachedFile, Checkin, Customer, Invoice, InvoiceAddress, InvoiceLine, Item,
-    InvoiceLine, Item, ItemVariation, Order, OrderPosition, Question,
+    ItemVariation, Order, OrderPosition, Question, QuestionAnswer,
-    QuestionAnswer, ReusableMedium, SalesChannel, Seat, SubEvent, TaxRule,
+    ReusableMedium, SalesChannel, Seat, SubEvent, TaxRule, Voucher,
-    Voucher,
 )
 from pretix.base.models.orders import (
     BlockedTicketSecret, CartPosition, OrderFee, OrderPayment, OrderRefund,
@@ -65,13 +64,10 @@ 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
 from pretix.base.services.pricing import (
-    apply_discounts, apply_rounding, get_line_price, get_listed_price,
+    apply_discounts, get_line_price, get_listed_price, is_included_for_free,
-    is_included_for_free,
 )
 from pretix.base.services.quotas import QuotaAvailability
-from pretix.base.settings import (
+from pretix.base.settings import COUNTRIES_WITH_STATE_IN_ADDRESS
-    COUNTRIES_WITH_STATE_IN_ADDRESS, ROUNDING_MODES,
-)
 from pretix.base.signals import register_ticket_outputs
 from pretix.helpers.countries import CachedCountries
 from pretix.multidomain.urlreverse import build_absolute_uri
@@ -329,18 +325,6 @@ class AnswerSerializer(I18nAwareModelSerializer):
         return data
 
 
-class InlineCheckinSerializer(I18nAwareModelSerializer):
-    device_id = serializers.SlugRelatedField(
-        source='device',
-        slug_field='device_id',
-        read_only=True,
-    )
-
-    class Meta:
-        model = Checkin
-        fields = ('id', 'datetime', 'list', 'auto_checked_in', 'gate', 'device', 'device_id', 'type')
-
-
 class CheckinSerializer(I18nAwareModelSerializer):
     device_id = serializers.SlugRelatedField(
         source='device',
@@ -350,10 +334,7 @@ class CheckinSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = Checkin
-        fields = (
+        fields = ('id', 'datetime', 'list', 'auto_checked_in', 'gate', 'device', 'device_id', 'type')
-            'id', 'successful', 'error_reason', 'error_explanation', 'position', 'datetime', 'list', 'created',
-            'auto_checked_in', 'gate', 'device', 'device_id', 'type'
-        )
 
 
 class PrintLogSerializer(serializers.ModelSerializer):
@@ -579,7 +560,7 @@ class OrderPositionPluginDataField(serializers.Field):
 
 
 class OrderPositionSerializer(I18nAwareModelSerializer):
-    checkins = InlineCheckinSerializer(many=True, read_only=True)
+    checkins = CheckinSerializer(many=True, read_only=True)
     print_logs = PrintLogSerializer(many=True, read_only=True)
     answers = AnswerSerializer(many=True)
     downloads = PositionDownloadsField(source='*', read_only=True)
@@ -852,15 +833,14 @@ class OrderSerializer(I18nAwareModelSerializer):
         list_serializer_class = OrderListSerializer
         fields = (
             'code', 'event', 'status', 'testmode', 'secret', 'email', 'phone', 'locale', 'datetime', 'expires', 'payment_date',
-            'payment_provider', 'fees', 'total', 'tax_rounding_mode', 'comment', 'custom_followup_at', 'invoice_address',
+            'payment_provider', 'fees', 'total', 'comment', 'custom_followup_at', 'invoice_address', 'positions', 'downloads',
-            'positions', 'downloads', 'checkin_attention', 'checkin_text', 'last_modified', 'payments', 'refunds',
+            'checkin_attention', 'checkin_text', 'last_modified', 'payments', 'refunds', 'require_approval', 'sales_channel',
-            'require_approval', 'sales_channel', 'url', 'customer', 'valid_if_pending', 'api_meta', 'cancellation_date',
+            'url', 'customer', 'valid_if_pending', 'api_meta', 'cancellation_date', 'plugin_data',
-            'plugin_data',
         )
         read_only_fields = (
             'code', 'status', 'testmode', 'secret', 'datetime', 'expires', 'payment_date',
-            'payment_provider', 'fees', 'total', 'tax_rounding_mode', 'positions', 'downloads', 'customer',
+            'payment_provider', 'fees', 'total', 'positions', 'downloads', 'customer',
-            'last_modified', 'payments', 'refunds', 'require_approval', 'sales_channel', 'cancellation_date',
+            'last_modified', 'payments', 'refunds', 'require_approval', 'sales_channel', 'cancellation_date'
         )
 
     def __init__(self, *args, **kwargs):
@@ -1025,7 +1005,7 @@ class OrderPositionCreateSerializer(I18nAwareModelSerializer):
         fields = ('positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts', 'attendee_email',
                   'company', 'street', 'zipcode', 'city', 'country', 'state', 'is_bundled',
                   'secret', 'addon_to', 'subevent', 'answers', 'seat', 'voucher', 'valid_from', 'valid_until',
-                  'requested_valid_from', 'use_reusable_medium', 'discount')
+                  'requested_valid_from', 'use_reusable_medium')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -1121,10 +1101,6 @@ class OrderPositionCreateSerializer(I18nAwareModelSerializer):
                     {'state': ['"{}" is not a known subdivision of the country "{}".'.format(data.get('state'), cc)]}
                 )
 
-        if data.get('price') is None and data.get('discount'):
-            raise ValidationError(
-                {'discount': ['You can only specify a discount if you do the price computation, but price is not set.']}
-            )
         return data
 
 
@@ -1179,13 +1155,11 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         queryset=SalesChannel.objects.none(),
         required=False,
     )
-    tax_rounding_mode = serializers.ChoiceField(choices=ROUNDING_MODES, allow_null=True, required=False,)
     locale = serializers.ChoiceField(choices=[], required=False, allow_null=True)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['positions'].child.fields['voucher'].queryset = self.context['event'].vouchers.all()
-        self.fields['positions'].child.fields['discount'].queryset = self.context['event'].discounts.all()
         self.fields['customer'].queryset = self.context['event'].organizer.customers.all()
         self.fields['expires'].required = False
         self.fields["sales_channel"].queryset = self.context["event"].organizer.sales_channels.all()
@@ -1196,7 +1170,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')
+                  'require_approval', 'valid_if_pending', 'expires', 'api_meta')
 
     def validate_payment_provider(self, pp):
         if pp is None:
@@ -1593,22 +1567,19 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                 pos.voucher_budget_use = max(listed_price - price_after_voucher, Decimal('0.00'))
 
         order_positions = [pos_data['__instance'] for pos_data in positions_data]
-        if not any([p.get("discount") for p in positions_data]):
+        discount_results = apply_discounts(
-            # If any discount is set by the client (i.e. pretixPOS), we do not recalculate but believe the client
+            self.context['event'],
-            # to avoid differences in end results.
+            order.sales_channel,
-            discount_results = apply_discounts(
+            [
-                self.context['event'],
+                (cp.item_id, cp.subevent_id, cp.subevent.date_from if cp.subevent_id else None, cp.price,
-                order.sales_channel,
+                 bool(cp.addon_to), cp.is_bundled, pos._voucher_discount)
-                [
+                for cp in order_positions
-                    (cp.item_id, cp.subevent_id, cp.subevent.date_from if cp.subevent_id else None, cp.price,
+            ]
-                     bool(cp.addon_to), cp.is_bundled, pos._voucher_discount)
+        )
-                    for cp in order_positions
+        for cp, (new_price, discount) in zip(order_positions, discount_results):
-                ]
+            if new_price != pos.price and pos._auto_generated_price:
-            )
+                pos.price = new_price
-            for cp, (new_price, discount) in zip(order_positions, discount_results):
+            pos.discount = discount
-                if new_price != pos.price and pos._auto_generated_price:
-                    pos.price = new_price
-                pos.discount = discount
 
         # Save instances
         for pos_data in positions_data:
@@ -1722,31 +1693,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                 else:
                     f.save()
 
-        rounding_mode = validated_data.get("tax_rounding_mode")
+        order.total += sum([f.value for f in fees])
-        if not rounding_mode:
-            if isinstance(self.context.get("auth"), Device):
-                # Safety fallback to avoid differences in tax reporting
-                brand = self.context.get("auth").software_brand or ""
-                if "pretixPOS" in brand or "pretixKIOSK" in brand:
-                    rounding_mode = "line"
-        if not rounding_mode:
-            rounding_mode = self.context["event"].settings.tax_rounding
-        changed = apply_rounding(
-            rounding_mode,
-            self.context["event"].currency,
-            [*pos_map.values(), *fees]
-        )
-        for line in changed:
-            if isinstance(line, OrderPosition):
-                line.save(update_fields=[
-                    "price", "price_includes_rounding_correction", "tax_value", "tax_value_includes_rounding_correction"
-                ])
-            elif isinstance(line, OrderFee):
-                line.save(update_fields=[
-                    "value", "value_includes_rounding_correction", "tax_value", "tax_value_includes_rounding_correction"
-                ])
-
-        order.total = sum([c.price for c in pos_map.values()]) + sum([f.value for f in fees])
         if simulate:
             order.fees = fees
             order.positions = pos_map.values()

src/pretix/api/serializers/orderchange.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/organizer.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/settings.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/shredders.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/voucher.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/waitinglist.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/serializers/webhooks.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/signals.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/urls.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.
@@ -92,7 +92,6 @@ event_router.register(r'taxrules', event.TaxRuleViewSet)
 event_router.register(r'seats', event.SeatViewSet)
 event_router.register(r'waitinglistentries', waitinglist.WaitingListViewSet)
 event_router.register(r'checkinlists', checkin.CheckinListViewSet)
-event_router.register(r'checkins', checkin.CheckinViewSet)
 event_router.register(r'cartpositions', cart.CartPositionViewSet)
 event_router.register(r'scheduled_exports', exporters.ScheduledEventExportViewSet)
 event_router.register(r'exporters', exporters.EventExportersViewSet, basename='exporters')

src/pretix/api/views/__init__.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/cart.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/checkin.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.
@@ -56,8 +56,7 @@ from pretix.api.serializers.checkin import (
 )
 from pretix.api.serializers.item import QuestionSerializer
 from pretix.api.serializers.order import (
-    CheckinListOrderPositionSerializer, CheckinSerializer,
+    CheckinListOrderPositionSerializer, FailedCheckinSerializer,
-    FailedCheckinSerializer,
 )
 from pretix.api.views import RichOrderingFilter
 from pretix.api.views.order import OrderPositionFilter
@@ -97,16 +96,6 @@ with scopes_disabled():
             )
             return queryset.filter(expr)
 
-    class CheckinFilter(FilterSet):
-        created_since = django_filters.IsoDateTimeFilter(field_name='created', lookup_expr='gte')
-        created_before = django_filters.IsoDateTimeFilter(field_name='created', lookup_expr='lt')
-        datetime_since = django_filters.IsoDateTimeFilter(field_name='datetime', lookup_expr='gte')
-        datetime_before = django_filters.IsoDateTimeFilter(field_name='datetime', lookup_expr='lt')
-
-        class Meta:
-            model = Checkin
-            fields = ['successful', 'error_reason', 'list', 'type', 'gate', 'device', 'auto_checked_in']
-
 
 class CheckinListViewSet(viewsets.ModelViewSet):
     serializer_class = CheckinListSerializer
@@ -1091,25 +1080,3 @@ class CheckinRPCAnnulView(views.APIView):
             checkin_annulled.send(ci.position.order.event, checkin=ci)
 
         return Response({"status": "ok"}, status=status.HTTP_200_OK)
-
-
-class CheckinViewSet(viewsets.ReadOnlyModelViewSet):
-    serializer_class = CheckinSerializer
-    queryset = Checkin.all.none()
-    filter_backends = (DjangoFilterBackend, RichOrderingFilter)
-    filterset_class = CheckinFilter
-    ordering = ('created', 'id')
-    ordering_fields = ('created', 'datetime', 'id',)
-    permission = 'can_view_orders'
-
-    def get_queryset(self):
-        qs = Checkin.all.filter().select_related(
-            "position",
-            "device",
-        )
-        return qs
-
-    def get_serializer_context(self):
-        ctx = super().get_serializer_context()
-        ctx['event'] = self.request.event
-        return ctx

src/pretix/api/views/device.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/discount.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/event.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/exporters.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/idempotency.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/item.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/media.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/oauth.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/order.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.
@@ -344,7 +344,6 @@ class EventOrderViewSet(OrderViewSetMixin, viewsets.ModelViewSet):
     def get_serializer_context(self):
         ctx = super().get_serializer_context()
         ctx['event'] = self.request.event
-        ctx['auth'] = self.request.auth
         ctx['pdf_data'] = self.request.query_params.get('pdf_data', 'false').lower() == 'true'
         return ctx
 
@@ -765,13 +764,7 @@ class EventOrderViewSet(OrderViewSetMixin, viewsets.ModelViewSet):
             ) and not order.invoices.last()
             invoice = None
             if gen_invoice:
-                try:
+                invoice = generate_invoice(order, trigger_pdf=True)
-                    invoice = generate_invoice(order, trigger_pdf=True)
-                except Exception as e:
-                    logger.exception("Could not generate invoice.")
-                    order.log_action("pretix.event.order.invoice.failed", data={
-                        "exception": str(e)
-                    })
 
             # Refresh serializer only after running signals
             prefetch_related_objects([order], self._positions_prefetch(request))
@@ -1670,9 +1663,6 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
         else:
             mark_refunded = request.data.get('mark_canceled', False)
 
-        if not isinstance(request.data.get("comment", ""), str):
-            return Response({'comment': 'Invalid type.'}, status=status.HTTP_400_BAD_REQUEST)
-
         if payment.state != OrderPayment.PAYMENT_STATE_CONFIRMED:
             return Response({'detail': 'Invalid state of payment.'}, status=status.HTTP_400_BAD_REQUEST)
 
@@ -1699,7 +1689,6 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
             amount=amount,
             provider=payment.provider,
             info='{}',
-            comment=request.data.get("comment"),
         )
         payment.order.log_action('pretix.event.order.refund.created', {
             'local_id': r.local_id,

src/pretix/api/views/organizer.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/shredders.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/upload.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/user.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/version.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/voucher.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/waitinglist.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/views/webhooks.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/api/webhooks.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.
@@ -439,12 +439,8 @@ def register_default_webhook_events(sender, **kwargs):
 def notify_webhooks(logentry_ids: list):
     if not isinstance(logentry_ids, list):
         logentry_ids = [logentry_ids]
-    qs = LogEntry.all.select_related(
+    qs = LogEntry.all.select_related('event', 'event__organizer', 'organizer').filter(id__in=logentry_ids)
-        'event', 'event__organizer', 'organizer'
+    _org, _at, webhooks = None, None, None
-    ).order_by(
-        'action_type', 'organizer_id', 'event_id',
-    ).filter(id__in=logentry_ids)
-    _org, _at, _ev, webhooks = None, None, None, None
     for logentry in qs:
         if not logentry.organizer:
             break  # We need to know the organizer
@@ -454,7 +450,7 @@ def notify_webhooks(logentry_ids: list):
         if not notification_type:
             break  # Ignore, no webhooks for this event type
 
-        if _org != logentry.organizer or _at != logentry.action_type or _ev != logentry.event_id or webhooks is None:
+        if _org != logentry.organizer or _at != logentry.action_type or webhooks is None:
             _org = logentry.organizer
             _at = logentry.action_type
 

src/pretix/base/__init__.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/addressvalidation.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/apps.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/auth.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/banlist.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/cache.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/channels.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/context.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/customersso/__init__.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/customersso/oidc.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/datasync/__init__.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/datasync/datasync.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.
@@ -391,7 +391,7 @@ class OutboundSyncProvider:
     def sync_order(self, order):
         if not self.should_sync_order(order):
             logger.debug("Skipping order %r", order)
-            return {}
+            return
 
         logger.debug("Syncing order %r", order)
         positions = list(

src/pretix/base/datasync/sourcefields.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/datasync/utils.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/decimal.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/email.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/exporter.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.
@@ -105,18 +105,6 @@ class BaseExporter:
         """
         return False
 
-    @property
-    def repeatable_read(self) -> bool:
-        """
-        If ``True``, this exporter will be run in a REPEATABLE READ transaction. This ensures consistent results for
-        all queries performed by the exporter, but creates a performance burden on the database server. We recommend to
-        disable this for exporters that take very long to run and do not rely on this behavior, such as export of lists
-        to CSV files.
-
-        Defaults to ``True`` for now, but default may change in future versions.
-        """
-        return True
-
     @property
     def identifier(self) -> str:
         """

src/pretix/base/exporters/__init__.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/exporters/answers.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/exporters/customers.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/exporters/dekodi.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/exporters/events.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/exporters/invoices.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.
@@ -125,7 +125,6 @@ class InvoiceExporter(InvoiceExporterMixin, BaseExporter):
     identifier = 'invoices'
     verbose_name = _('All invoices')
     description = _('Download all invoices created by the system as a ZIP file of PDF files.')
-    repeatable_read = False
 
     def render(self, form_data: dict, output_file=None):
         qs = self.invoices_queryset(form_data).filter(shredded=False)
@@ -181,7 +180,6 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
                     'includes two sheets, one with a line for every invoice, and one with a line for every position of '
                     'every invoice.')
     featured = True
-    repeatable_read = False
 
     @property
     def additional_form_fields(self):

src/pretix/base/exporters/items.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/exporters/json.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/exporters/mail.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/exporters/orderlist.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.
@@ -90,7 +90,6 @@ class OrderListExporter(MultiSheetListExporter):
                                'with a line for every order, one with a line for every order position, and one with '
                                'a line for every additional fee charged in an order.')
     featured = True
-    repeatable_read = False
 
     @cached_property
     def providers(self):
@@ -843,7 +842,6 @@ class TransactionListExporter(ListExporter):
     description = gettext_lazy('Download a spreadsheet of all substantial changes to orders, i.e. all changes to '
                                'products, prices or tax rates. The information is only accurate for changes made with '
                                'pretix versions released after October 2021.')
-    repeatable_read = False
 
     @cached_property
     def providers(self):
@@ -1022,7 +1020,6 @@ class PaymentListExporter(ListExporter):
     category = pgettext_lazy('export_category', 'Order data')
     description = gettext_lazy('Download a spreadsheet of all payments or refunds of every order.')
     featured = True
-    repeatable_read = False
 
     @property
     def additional_form_fields(self):
@@ -1162,7 +1159,7 @@ class QuotaListExporter(ListExporter):
         yield headers
 
         quotas = list(self.event.quotas.select_related('subevent'))
-        qa = QuotaAvailability(full_results=True, allow_repeatable_read=True)
+        qa = QuotaAvailability(full_results=True)
         qa.queue(*quotas)
         qa.compute()
 
@@ -1203,7 +1200,6 @@ class GiftcardTransactionListExporter(OrganizerLevelExportMixin, ListExporter):
     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
 
     @property
     def additional_form_fields(self):
@@ -1262,7 +1258,6 @@ class GiftcardRedemptionListExporter(ListExporter):
     verbose_name = gettext_lazy('Gift card redemptions')
     category = pgettext_lazy('export_category', 'Order data')
     description = gettext_lazy('Download a spreadsheet of all payments or refunds that involve gift cards.')
-    repeatable_read = False
 
     def iterate_list(self, form_data):
         payments = OrderPayment.objects.filter(

src/pretix/base/exporters/reusablemedia.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.
@@ -34,7 +34,6 @@ class ReusableMediaExporter(OrganizerLevelExportMixin, ListExporter):
     verbose_name = _('Reusable media')
     category = pgettext_lazy('export_category', 'Reusable media')
     description = _('Download a spread sheet with the data of all reusable medias on your account.')
-    repeatable_read = False
 
     def iterate_list(self, form_data):
         media = ReusableMedium.objects.filter(

src/pretix/base/exporters/waitinglist.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.
@@ -41,7 +41,6 @@ class WaitingListExporter(ListExporter):
     verbose_name = _('Waiting list')
     category = pgettext_lazy('export_category', 'Waiting list')
     description = _('Download a spread sheet with all your waiting list data.')
-    repeatable_read = False
 
     # map selected status to label and queryset-filter
     status_filters = [

src/pretix/base/forms/__init__.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.

src/pretix/base/forms/auth.py

@@ -1,8 +1,8 @@
 #
 # This file is part of pretix (Community Edition).
 #
-# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
+# Copyright (C) 2020-2021 rami.io 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.
@@ -214,38 +214,21 @@ class PasswordRecoverForm(forms.Form):
     error_messages = {
         'pw_mismatch': _("Please enter the same password twice"),
     }
-    email = forms.EmailField(
-        max_length=255,
-        disabled=True,
-        label=_("Your email address"),
-        widget=forms.EmailInput(
-            attrs={'autocomplete': 'username'},
-        ),
-    )
     password = forms.CharField(
         label=_('Password'),
-        widget=forms.PasswordInput(attrs={
+        widget=forms.PasswordInput,
-            'autocomplete': 'new-password',
-        }),
         max_length=4096,
         required=True
     )
     password_repeat = forms.CharField(
         label=_('Repeat password'),
-        widget=forms.PasswordInput(attrs={
+        widget=forms.PasswordInput,
-            'autocomplete': 'new-password',
-        }),
         max_length=4096,
     )
 
     def __init__(self, user_id=None, *args, **kwargs):
-        initial = kwargs.pop('initial', {})
+        self.user_id = user_id
-        try:
+        super().__init__(*args, **kwargs)
-            self.user = User.objects.get(id=user_id)
-            initial['email'] = self.user.email
-        except User.DoesNotExist:
-            self.user = None
-        super().__init__(*args, initial=initial, **kwargs)
 
     def clean(self):
         password1 = self.cleaned_data.get('password', '')
@@ -260,7 +243,11 @@ class PasswordRecoverForm(forms.Form):
 
     def clean_password(self):
         password1 = self.cleaned_data.get('password', '')
-        if validate_password(password1, user=self.user) is not None:
+        try:
+            user = User.objects.get(id=self.user_id)
+        except User.DoesNotExist:
+            user = None
+        if validate_password(password1, user=user) is not None:
             raise forms.ValidationError(_(password_validators_help_texts()), code='pw_invalid')
         return password1
 
@@ -320,10 +307,3 @@ class ReauthForm(forms.Form):
                 self.error_messages['inactive'],
                 code='inactive',
             )
-
-
-class ConfirmationCodeForm(forms.Form):
-    code = forms.IntegerField(
-        label=_('Confirmation code'),
-        widget=forms.NumberInput(attrs={'class': 'confirmation-code-input', 'inputmode': 'numeric', 'type': 'text'}),
-    )