Fix conditional display of cross_selling_match_products

Badge export: Allow to filter and sort by order date (Z#23168742) (#4588 )
Translations: Update Swedish
2024-10-31 14:46:28 +01:00 · 2024-10-31 14:42:44 +01:00 · 2024-10-31 13:02:34 +01:00 · 2024-10-31 13:02:34 +01:00 · 2024-10-31 12:59:28 +01:00 · 2024-10-29 17:31:51 +01:00
97 changed files with 31353 additions and 27786 deletions
@@ -37,7 +37,7 @@ jobs:
          POSTGRES_PASSWORD: postgres
          POSTGRES_DB: pretix
        options: >-
-          --health-cmd pg_isready
+          --health-cmd "pg_isready -U postgres -d pretix"
          --health-interval 10s
          --health-timeout 5s
          --health-retries 5
@@ -70,13 +70,13 @@ jobs:
        run: make all compress
      - name: Run tests
        working-directory: ./src
-        run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test -n 3 -p no:sugar --cov=./ --cov-report=xml --reruns 3 tests --maxfail=100
+        run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test -n 3 -p no:sugar --cov=./ --cov-report=xml tests --maxfail=100
      - name: Run concurrency tests
        working-directory: ./src
-        run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test tests/concurrency_tests/ --reruns 0 --reuse-db
+        run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test tests/concurrency_tests/ --reuse-db
        if: matrix.database == 'postgres'
      - name: Upload coverage
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v4
        with:
          file: src/coverage.xml
          token: ${{ secrets.CODECOV_TOKEN }}
@@ -10,7 +10,7 @@ tests:
        - cd src
        - python manage.py check
        - make all compress
-        - PRETIX_CONFIG_FILE=tests/ci_sqlite.cfg py.test --reruns 3 -n 3 tests --maxfail=100
+        - PRETIX_CONFIG_FILE=tests/ci_sqlite.cfg py.test -n 3 tests --maxfail=100
    except:
        - pypi
 pypi:
@@ -71,7 +71,7 @@ Endpoints
            "mode": "placed",
            "all_sales_channels": false,
            "limit_sales_channels": ["web"],
-            "all_products": False,
+            "all_products": false,
            "limit_products": [2, 3],
            "limit_variations": [456],
            "all_payment_methods": true,
@@ -113,7 +113,7 @@ Endpoints
        "mode": "placed",
        "all_sales_channels": false,
        "limit_sales_channels": ["web"],
-        "all_products": False,
+        "all_products": false,
        "limit_products": [2, 3],
        "limit_variations": [456],
        "all_payment_methods": true,
@@ -146,7 +146,7 @@ Endpoints
        "mode": "placed",
        "all_sales_channels": false,
        "limit_sales_channels": ["web"],
-        "all_products": False,
+        "all_products": false,
        "limit_products": [2, 3],
        "limit_variations": [456],
        "all_payment_methods": true,
@@ -167,7 +167,7 @@ Endpoints
        "mode": "placed",
        "all_sales_channels": false,
        "limit_sales_channels": ["web"],
-        "all_products": False,
+        "all_products": false,
        "limit_products": [2, 3],
        "limit_variations": [456],
        "all_payment_methods": true,
@@ -216,7 +216,7 @@ Endpoints
        "mode": "placed",
        "all_sales_channels": false,
        "limit_sales_channels": ["web"],
-        "all_products": False,
+        "all_products": false,
        "limit_products": [2, 3],
        "limit_variations": [456],
        "all_payment_methods": true,
@@ -206,6 +206,17 @@ checkins                              list of objects            List of **succe
 ├ device                              integer                    Internal ID of the device. Can be ``null``. **Deprecated**, since this ID is not otherwise used in the API and is therefore not very useful.
 ├ device_id                           integer                    Attribute ``device_id`` of the device. Can be ``null``.
 └ auto_checked_in                     boolean                    Indicates if this check-in been performed automatically by the system
+print_logs                            list of objects            List of print jobs recorded e.g. by the pretix apps
+├ id                                  integer                    Internal ID of the print job
+├ successful                          boolean                    Whether the print job successfully resulted in a print.
+                                                                 This is not expected to be 100 % reliable information (since
+                                                                 printer feedback is never perfect) and there is no guarantee
+                                                                 that unsuccessful jobs will be logged.
+├ device_id                           integer                    Attribute ``device_id`` of the device that recorded the print. Can be ``null``.
+├ datetime                            datetime                   Time of printing
+├ source                              string                     Source of print job, e.g. name of the app used.
+├ type                                string                     Type of print (currently ``badge``, ``ticket``, ``certificate``, or ``other``)
+└ info                                object                     Additional data with client-dependent structure.
 downloads                             list of objects            List of ticket download options
 ├ output                              string                     Ticket output provider (e.g. ``pdf``, ``passbook``)
 └ url                                 string                     Download URL
@@ -233,6 +244,10 @@ pdf_data                              object                     Data object req

   The attributes ``blocked``, ``valid_from`` and ``valid_until`` have been added.

+.. versionchanged:: 2024.9
+
+   The attribute ``print_logs`` has been added.
+
 .. _order-payment-resource:

 Order payment resource
@@ -399,10 +414,21 @@ List of all orders
                    "type": "entry",
                    "gate": null,
                    "device": 2,
+                    "device_id": 1,
                    "datetime": "2017-12-25T12:45:23Z",
                    "auto_checked_in": false
                  }
                ],
+                "print_logs": [
+                  {
+                    "id": 1,
+                    "type": "badge",
+                    "datetime": "2017-12-25T12:45:23Z",
+                    "device_id": 1,
+                    "source": "pretixSCAN",
+                    "info": {}
+                  }
+                ],
                "answers": [
                  {
                    "question": 12,
@@ -626,10 +652,22 @@ Fetching individual orders
                "type": "entry",
                "gate": null,
                "device": 2,
+                "device_id": 1,
                "datetime": "2017-12-25T12:45:23Z",
                "auto_checked_in": false
              }
            ],
+            "print_logs": [
+              {
+                "id": 1,
+                "type": "badge",
+                "successful": true,
+                "datetime": "2017-12-25T12:45:23Z",
+                "device_id": 1,
+                "source": "pretixSCAN",
+                "info": {}
+              }
+            ],
            "answers": [
              {
                "question": 12,
@@ -977,8 +1015,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
-       trigger reverse charge taxation. Don't forget to set ``is_business`` as well!
+         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!

   * ``positions``

@@ -1581,10 +1619,22 @@ List of all order positions
                "type": "entry",
                "gate": null,
                "device": 2,
+                "device_id": 1,
                "datetime": "2017-12-25T12:45:23Z",
                "auto_checked_in": false
              }
            ],
+            "print_logs": [
+              {
+                "id": 1,
+                "type": "badge",
+                "successful": true,
+                "datetime": "2017-12-25T12:45:23Z",
+                "device_id": 1,
+                "source": "pretixSCAN",
+                "info": {}
+              }
+            ],
            "answers": [
              {
                "question": 12,
@@ -1695,10 +1745,22 @@ Fetching individual positions
            "type": "entry",
            "gate": null,
            "device": 2,
+            "device_id": 1,
            "datetime": "2017-12-25T12:45:23Z",
            "auto_checked_in": false
          }
        ],
+        "print_logs": [
+          {
+            "id": 1,
+            "type": "badge",
+            "successful": true,
+            "datetime": "2017-12-25T12:45:23Z",
+            "device_id": 1,
+            "source": "pretixSCAN",
+            "info": {}
+          }
+        ],
        "answers": [
          {
            "question": 12,
@@ -1795,6 +1857,10 @@ Manipulating individual positions

   The endpoints to manage blocks have been added.

+.. versionchanged:: 2024.9
+
+   The API now supports logging ticket and badge prints.
+
 .. http:patch:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/(id)/

   Updates specific fields on an order position. Currently, only the following fields are supported:
@@ -2054,6 +2120,59 @@ Manipulating individual positions
   :statuscode 401: Authentication failure
   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to update this order position.

+.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/(id)/printlog/
+
+   Creates a print log, stating that this ticket has been printed.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      POST /api/v1/organizers/bigevents/events/sampleconf/orderpositions/23442/printlog/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+
+     {
+       "datetime": "2024-09-19T13:37:00+02:00",
+       "source": "pretixPOS",
+       "type": "badge",
+       "info": {
+         "cashier": 1234
+       }
+     }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 201 Created
+      Vary: Accept
+      Content-Type: application/pdf
+
+     {
+       "id": 1234,
+       "device_id": null,
+       "datetime": "2024-09-19T13:37:00+02:00",
+       "source": "pretixPOS",
+       "type": "badge",
+       "info": {
+         "cashier": 1234
+       }
+     }
+
+   :param organizer: The ``slug`` field of the organizer to create a log for
+   :param event: The ``slug`` field of the event to create a log for
+   :param id: The ``id`` field of the order position to create a log for
+   :statuscode 201: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource
+                    **or** downloads are not available for this order position at this time. The response content will
+                    contain more details.
+   :statuscode 404: The requested order position or download provider does not exist.
+   :statuscode 409: The file is not yet ready and will now be prepared. Retry the request after waiting for a few
+                    seconds.
+
 Changing order contents
 -----------------------

@@ -313,7 +313,7 @@ Endpoints for event exports
   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.

 Endpoints for organizer exports
---------------------------
+-------------------------------

 .. http:get:: /api/v1/organizers/(organizer)/scheduled_exports/

@@ -553,4 +553,4 @@ Endpoints for organizer exports
   :statuscode 403: The requested organizer does not exist **or** you have no permission to delete this resource.


-.. _RFC 5545: https://datatracker.ietf.org/doc/html/rfc5545#section-3.8.5.3
+.. _RFC 5545: https://datatracker.ietf.org/doc/html/rfc5545#section-3.8.5.3
@@ -1,4 +1,4 @@
-.. _`rest-reusablemedia`:
+.. _`rest-seats`:

 Seats
 =====
@@ -17,6 +17,7 @@ First, you need to declare that you are using non-essential cookies by respondin
 signal:

 .. automodule:: pretix.presale.signals
+   :no-index:
   :members: register_cookie_providers

 You are expected to return a list of ``CookieProvider`` objects instantiated from the following class:
@@ -22,12 +22,14 @@ Order events
 There are multiple signals that will be sent out in the ordering cycle:

 .. automodule:: pretix.base.signals
+   :no-index:
   :members: validate_cart, validate_cart_addons, validate_order, order_valid_if_pending, order_fee_calculation, order_paid, order_placed, order_canceled, order_reactivated, order_expired, order_modified, order_changed, order_approved, order_denied, order_fee_type_name, allow_ticket_download, order_split, order_gracefully_delete, invoice_line_text

 Check-ins
 """""""""

 .. automodule:: pretix.base.signals
+   :no-index:
   :members: checkin_created


@@ -39,18 +41,21 @@ Frontend


 .. automodule:: pretix.presale.signals
+   :no-index:
   :members: order_info, order_info_top, order_meta_from_request, order_api_meta_from_request

 Request flow
 """"""""""""

 .. automodule:: pretix.presale.signals
+   :no-index:
   :members: process_request, process_response

 Vouchers
 """"""""

 .. automodule:: pretix.presale.signals
+   :no-index:
   :members: voucher_redeem_info

 Backend
@@ -62,24 +67,28 @@ Backend
             item_formsets, order_search_filter_q, order_search_forms

 .. automodule:: pretix.base.signals
+   :no-index:
   :members: logentry_display, logentry_object_link, requiredaction_display, timeline_events, orderposition_blocked_display, customer_created, customer_signed_in

 Vouchers
 """"""""

 .. automodule:: pretix.control.signals
+   :no-index:
   :members: item_forms, voucher_form_class, voucher_form_html, voucher_form_validation

 Dashboards
 """"""""""

 .. automodule:: pretix.control.signals
+   :no-index:
   :members: event_dashboard_widgets, user_dashboard_widgets, event_dashboard_top

 Ticket designs
 """"""""""""""

 .. automodule:: pretix.base.signals
+   :no-index:
   :members: layout_text_variables, layout_image_variables

 .. automodule:: pretix.plugins.ticketoutputpdf.signals
@@ -89,4 +98,5 @@ API
 ---

 .. automodule:: pretix.base.signals
+   :no-index:
   :members: validate_event_settings, api_event_settings_fields
@@ -60,6 +60,7 @@ that we'll provide in this plugin:
 Similar signals exist for other objects:

 .. automodule:: pretix.base.signals
+   :no-index:
   :members: voucher_import_columns


@@ -84,8 +84,6 @@ convenient to you:

   .. automethod:: _register_fonts

-   .. automethod:: _register_event_fonts
-
   .. automethod:: _on_first_page

   .. automethod:: _on_other_page
@@ -86,7 +86,10 @@ Signals
 -------

 .. automodule:: pretix.base.signals
+   :no-index:
   :members: register_text_placeholders
+
 .. automodule:: pretix.base.signals
+   :no-index:
   :members: register_mail_placeholders

@@ -1,5 +1,5 @@
 KulturPass
-=========
+==========

 .. note::

@@ -158,7 +158,7 @@ expects and - more importantly - supports.
    for a sample configuration in an academic context.

    Note, that you can have multiple attributes with the same ``friendlyName``
-    but different ``name``s. This is often used in systems, where the same
+    but different ``name`` value. This is often used in systems, where the same
    information (for example a persons name) is saved in different fields -
    for example because one institution is returning SAML 1.0 and other
    institutions are returning SAML 2.0 style attributes. Typically, this only
@@ -43,7 +43,7 @@ dependencies = [
  "django-formset-js-improved==0.5.0.3",
  "django-formtools==2.5.1",
  "django-hierarkey==1.2.*",
-  "django-hijack==3.6.*",
+  "django-hijack==3.7.*",
  "django-i18nfield==1.9.*,>=1.9.4",
  "django-libsass==0.9",
  "django-localflavor==4.0",
@@ -74,14 +74,14 @@ dependencies = [
  "paypal-checkout-serversdk==1.0.*",
  "PyJWT==2.9.*",
  "phonenumberslite==8.13.*",
-  "Pillow==10.4.*",
+  "Pillow==11.0.*",
  "pretix-plugin-build",
  "protobuf==5.28.*",
  "psycopg2-binary",
  "pycountry",
  "pycparser==2.22",
  "pycryptodome==3.21.*",
-  "pypdf==5.0.*",
+  "pypdf==5.1.*",
  "python-bidi==0.6.*",  # Support for Arabic in reportlab
  "python-dateutil==2.9.*",
  "pytz",
@@ -117,12 +117,11 @@ dev = [
  "isort==5.13.*",
  "pep8-naming==0.14.*",
  "potypo",
-  "pytest-asyncio",
+  "pytest-asyncio>=0.24",
  "pytest-cache",
  "pytest-cov",
  "pytest-django==4.*",
  "pytest-mock==3.14.*",
-  "pytest-rerunfailures==14.*",
  "pytest-sugar",
  "pytest-xdist==3.6.*",
  "pytest==8.3.*",
@@ -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__ = "2024.10.0.dev0"
+__version__ = "2024.11.0.dev0"
@@ -77,6 +77,7 @@ class PretixScanSecurityProfile(AllowListSecurityProfile):
        ('GET', 'api-v1:blockedsecrets-list'),
        ('GET', 'api-v1:order-list'),
        ('GET', 'api-v1:orderposition-pdf_image'),
+        ('POST', 'api-v1:orderposition-printlog'),
        ('GET', 'api-v1:event.settings'),
        ('POST', 'api-v1:upload'),
        ('POST', 'api-v1:checkinrpc.redeem'),
@@ -112,6 +113,7 @@ class PretixScanNoSyncNoSearchSecurityProfile(AllowListSecurityProfile):
        ('GET', 'api-v1:revokedsecrets-list'),
        ('GET', 'api-v1:blockedsecrets-list'),
        ('GET', 'api-v1:orderposition-pdf_image'),
+        ('POST', 'api-v1:orderposition-printlog'),
        ('GET', 'api-v1:event.settings'),
        ('POST', 'api-v1:upload'),
        ('POST', 'api-v1:checkinrpc.redeem'),
@@ -147,6 +149,7 @@ class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
        ('GET', 'api-v1:revokedsecrets-list'),
        ('GET', 'api-v1:blockedsecrets-list'),
        ('GET', 'api-v1:orderposition-pdf_image'),
+        ('POST', 'api-v1:orderposition-printlog'),
        ('GET', 'api-v1:event.settings'),
        ('POST', 'api-v1:upload'),
        ('POST', 'api-v1:checkinrpc.redeem'),
@@ -188,6 +191,7 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
        ('GET', 'api-v1:orderposition-list'),
        ('GET', 'api-v1:orderposition-answer'),
        ('GET', 'api-v1:orderposition-pdf_image'),
+        ('POST', 'api-v1:orderposition-printlog'),
        ('POST', 'api-v1:order-mark-canceled'),
        ('POST', 'api-v1:orderpayment-list'),
        ('POST', 'api-v1:orderrefund-list'),
@@ -55,7 +55,7 @@ from pretix.base.models import (
 )
 from pretix.base.models.orders import (
    BlockedTicketSecret, CartPosition, OrderFee, OrderPayment, OrderRefund,
-    RevokedTicketSecret,
+    PrintLog, RevokedTicketSecret,
 )
 from pretix.base.pdf import get_images, get_variables
 from pretix.base.services.cart import error_messages
@@ -284,6 +284,26 @@ class CheckinSerializer(I18nAwareModelSerializer):
        fields = ('id', 'datetime', 'list', 'auto_checked_in', 'gate', 'device', 'device_id', 'type')


+class PrintLogSerializer(serializers.ModelSerializer):
+    device_id = serializers.SlugRelatedField(
+        source='device',
+        slug_field='device_id',
+        read_only=True,
+    )
+
+    class Meta:
+        model = PrintLog
+        fields = (
+            "id",
+            "successful",
+            "datetime",
+            "source",
+            "type",
+            "device_id",
+            "info",
+        )
+
+
 class FailedCheckinSerializer(I18nAwareModelSerializer):
    error_reason = serializers.ChoiceField(choices=Checkin.REASONS, required=True, allow_null=False)
    raw_barcode = serializers.CharField(required=True, allow_null=False)
@@ -476,6 +496,7 @@ class OrderPositionListSerializer(serializers.ListSerializer):

 class OrderPositionSerializer(I18nAwareModelSerializer):
    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)
    order = serializers.SlugRelatedField(slug_field='code', read_only=True)
@@ -490,7 +511,7 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
        fields = ('id', 'order', 'positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
                  'company', 'street', 'zipcode', 'city', 'country', 'state', 'discount',
                  'attendee_email', 'voucher', 'tax_rate', 'tax_value', 'secret', 'addon_to', 'subevent', 'checkins',
-                  'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat', 'canceled',
+                  'print_logs', 'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat', 'canceled',
                  'valid_from', 'valid_until', 'blocked', 'voucher_budget_use')
        read_only_fields = (
            'id', 'order', 'positionid', 'item', 'variation', 'price', 'voucher', 'tax_rate', 'tax_value', 'secret',
@@ -577,9 +598,9 @@ class CheckinListOrderPositionSerializer(OrderPositionSerializer):
        fields = ('id', 'order', 'positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
                  'company', 'street', 'zipcode', 'city', 'country', 'state',
                  'attendee_email', 'voucher', 'tax_rate', 'tax_value', 'secret', 'addon_to', 'subevent', 'checkins',
-                  'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat', 'require_attention',
-                  'order__status', 'order__valid_if_pending', 'order__require_approval', 'valid_from', 'valid_until',
-                  'blocked')
+                  'print_logs', 'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat',
+                  'require_attention', 'order__status', 'order__valid_if_pending', 'order__require_approval',
+                  'valid_from', 'valid_until', 'blocked')

    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
@@ -1494,6 +1515,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                pos.answers = answers
                pos.pseudonymization_id = "PREVIEW"
                pos.checkins = []
+                pos.print_logs = []
                pos_map[pos.positionid] = pos
            else:
                if pos.voucher:
@@ -62,6 +62,7 @@ from pretix.base.models import (
    CachedFile, Checkin, CheckinList, Device, Event, Order, OrderPosition,
    Question, ReusableMedium, RevokedTicketSecret, TeamAPIToken,
 )
+from pretix.base.models.orders import PrintLog
 from pretix.base.services.checkin import (
    CheckInError, RequiredQuestionsError, SQLLogic, perform_checkin,
 )
@@ -365,8 +366,9 @@ def _checkin_list_position_queryset(checkinlists, ignore_status=False, ignore_pr
        qs = qs.prefetch_related(
            Prefetch(
                lookup='checkins',
-                queryset=Checkin.objects.filter(list_id__in=[cl.pk for cl in checkinlists])
+                queryset=Checkin.objects.filter(list_id__in=[cl.pk for cl in checkinlists]).select_related('device')
            ),
+            Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
            'answers', 'answers__options', 'answers__question',
            Prefetch('addons', OrderPosition.objects.select_related('item', 'variation')),
            Prefetch('order', Order.objects.select_related('invoice_address').prefetch_related(
@@ -378,6 +380,7 @@ def _checkin_list_position_queryset(checkinlists, ignore_status=False, ignore_pr
                    'positions',
                    OrderPosition.objects.prefetch_related(
                        Prefetch('checkins', queryset=Checkin.objects.select_related('device')),
+                        Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
                        'item', 'variation', 'answers', 'answers__options', 'answers__question',
                    )
                )
@@ -389,8 +392,9 @@ def _checkin_list_position_queryset(checkinlists, ignore_status=False, ignore_pr
        qs = qs.prefetch_related(
            Prefetch(
                lookup='checkins',
-                queryset=Checkin.objects.filter(list_id__in=[cl.pk for cl in checkinlists])
+                queryset=Checkin.objects.filter(list_id__in=[cl.pk for cl in checkinlists]).select_related('device')
            ),
+            Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
            'answers', 'answers__options', 'answers__question',
            Prefetch('addons', OrderPosition.objects.select_related('item', 'variation'))
        ).select_related('item', 'variation', 'order', 'addon_to', 'order__invoice_address', 'order', 'seat')
@@ -20,6 +20,7 @@
 # <https://www.gnu.org/licenses/>.
 #
 import base64
+import copy
 import logging

 from cryptography.hazmat.backends.openssl.backend import Backend
@@ -146,6 +147,8 @@ class InitializeView(APIView):
    permission_classes = ()

    def post(self, request, format=None):
+        from pretix.base.signals import device_info_updated
+
        serializer = InitializationRequestSerializer(data=request.data)
        serializer.is_valid(raise_exception=True)

@@ -160,6 +163,8 @@ class InitializeView(APIView):
        if device.revoked:
            raise ValidationError({'token': ['This initialization token has been revoked.']})

+        old_instance = copy.copy(device)
+
        device.initialized = now()
        device.hardware_brand = serializer.validated_data.get('hardware_brand')
        device.hardware_model = serializer.validated_data.get('hardware_model')
@@ -174,6 +179,10 @@ class InitializeView(APIView):

        device.log_action('pretix.device.initialized', data=serializer.validated_data, auth=device)

+        device_info_updated.send(
+            sender=Device, old_device=old_instance, new_device=device
+        )
+
        serializer = DeviceSerializer(device)
        return Response(serializer.data)

@@ -182,9 +191,12 @@ class UpdateView(APIView):
    authentication_classes = (DeviceTokenAuthentication,)

    def post(self, request, format=None):
+        from pretix.base.signals import device_info_updated
+
        serializer = UpdateRequestSerializer(data=request.data)
        serializer.is_valid(raise_exception=True)
        device = request.auth
+        old_instance = copy.copy(device)
        device.hardware_brand = serializer.validated_data.get('hardware_brand')
        device.hardware_model = serializer.validated_data.get('hardware_model')
        device.os_name = serializer.validated_data.get('os_name')
@@ -200,9 +212,8 @@ class UpdateView(APIView):
        device.save()
        device.log_action('pretix.device.updated', data=serializer.validated_data, auth=device)

-        from ...base.signals import device_info_updated
        device_info_updated.send(
-            sender=Device, old_device=request.auth, new_device=device
+            sender=Device, old_device=old_instance, new_device=device
        )

        serializer = DeviceSerializer(device)
@@ -42,6 +42,7 @@ from pretix.base.models import (
    Checkin, GiftCard, GiftCardAcceptance, GiftCardTransaction, OrderPosition,
    ReusableMedium,
 )
+from pretix.base.models.orders import PrintLog
 from pretix.helpers import OF_SELF
 from pretix.helpers.dicts import merge_dicts

@@ -79,6 +80,7 @@ class ReusableMediaViewSet(viewsets.ModelViewSet):
                    'order', 'order__event', 'order__event__organizer', 'seat',
                ).prefetch_related(
                    Prefetch('checkins', queryset=Checkin.objects.select_related('device')),
+                    Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
                    'answers', 'answers__options', 'answers__question',
                )
            ),
@@ -57,7 +57,8 @@ from pretix.api.serializers.order import (
    OrderPaymentCreateSerializer, OrderPaymentSerializer,
    OrderPositionSerializer, OrderRefundCreateSerializer,
    OrderRefundSerializer, OrderSerializer, PriceCalcSerializer,
-    RevokedTicketSecretSerializer, SimulatedOrderSerializer,
+    PrintLogSerializer, RevokedTicketSecretSerializer,
+    SimulatedOrderSerializer,
 )
 from pretix.api.serializers.orderchange import (
    BlockNameSerializer, OrderChangeOperationSerializer,
@@ -75,7 +76,7 @@ from pretix.base.models import (
    TeamAPIToken, generate_secret,
 )
 from pretix.base.models.orders import (
-    BlockedTicketSecret, QuestionAnswer, RevokedTicketSecret,
+    BlockedTicketSecret, PrintLog, QuestionAnswer, RevokedTicketSecret,
 )
 from pretix.base.payment import PaymentException
 from pretix.base.pdf import get_images
@@ -259,6 +260,7 @@ class OrderViewSetMixin:
                'positions',
                opq.all().prefetch_related(
                    Prefetch('checkins', queryset=Checkin.objects.select_related('device')),
+                    Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
                    Prefetch('item', queryset=self.request.event.items.prefetch_related(
                        Prefetch('meta_values', ItemMetaValue.objects.select_related('property'), to_attr='meta_values_cached')
                    )),
@@ -280,6 +282,7 @@ class OrderViewSetMixin:
                'positions',
                opq.all().prefetch_related(
                    Prefetch('checkins', queryset=Checkin.objects.select_related('device')),
+                    Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
                    'item', 'variation',
                    Prefetch('answers', queryset=QuestionAnswer.objects.prefetch_related('options', 'question').order_by('question__position')),
                    'seat',
@@ -1093,6 +1096,7 @@ class OrderPositionViewSet(viewsets.ModelViewSet):
            )
            qs = qs.prefetch_related(
                Prefetch('checkins', queryset=Checkin.objects.select_related("device")),
+                Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
                Prefetch('item', queryset=self.request.event.items.prefetch_related(
                    Prefetch('meta_values', ItemMetaValue.objects.select_related('property'),
                             to_attr='meta_values_cached')
@@ -1136,6 +1140,7 @@ class OrderPositionViewSet(viewsets.ModelViewSet):
        else:
            qs = qs.prefetch_related(
                Prefetch('checkins', queryset=Checkin.objects.select_related("device")),
+                Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
                'answers', 'answers__options', 'answers__question',
            ).select_related(
                'item', 'order', 'order__event', 'order__event__organizer', 'seat'
@@ -1254,6 +1259,34 @@ class OrderPositionViewSet(viewsets.ModelViewSet):
        )
        return resp

+    @action(detail=True, url_name="printlog", url_path="printlog", methods=["POST"])
+    def printlog(self, request, **kwargs):
+        pos = self.get_object()
+        serializer = PrintLogSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        with transaction.atomic():
+            serializer.save(
+                position=pos,
+                device=request.auth if isinstance(request.auth, Device) else None,
+                user=request.user if request.user.is_authenticated else None,
+                api_token=request.auth if isinstance(request.auth, TeamAPIToken) else None,
+                oauth_application=request.auth.application if isinstance(request.auth, OAuthAccessToken) else None,
+            )
+
+            pos.order.log_action(
+                "pretix.event.order.print",
+                data={
+                    "position": pos.pk,
+                    "positionid": pos.positionid,
+                    **serializer.validated_data,
+                },
+                auth=request.auth,
+                user=request.user,
+            )
+
+        return Response(serializer.data, status=status.HTTP_201_CREATED)
+
    @action(detail=True, url_name='pdf_image', url_path=r'pdf_image/(?P<key>[^/]+)')
    def pdf_image(self, request, key, **kwargs):
        pos = self.get_object()
@@ -0,0 +1,79 @@
+# Generated by Django 4.2.16 on 2024-09-19 10:41
+
+import django.db.models.deletion
+import django.utils.timezone
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.OAUTH2_PROVIDER_APPLICATION_MODEL),
+        ("pretixbase", "0271_itemcategory_cross_selling"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="PrintLog",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True, primary_key=True, serialize=False
+                    ),
+                ),
+                ("datetime", models.DateTimeField(default=django.utils.timezone.now)),
+                ("created", models.DateTimeField(auto_now_add=True, null=True)),
+                ("successful", models.BooleanField(default=True)),
+                ("source", models.CharField(max_length=255)),
+                ("type", models.CharField(max_length=255)),
+                ("info", models.JSONField(default=dict)),
+                (
+                    "api_token",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="pretixbase.teamapitoken",
+                    ),
+                ),
+                (
+                    "device",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="print_logs",
+                        to="pretixbase.device",
+                    ),
+                ),
+                (
+                    "oauth_application",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.OAUTH2_PROVIDER_APPLICATION_MODEL,
+                    ),
+                ),
+                (
+                    "position",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="print_logs",
+                        to="pretixbase.orderposition",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="print_logs",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ("-datetime",),
+            },
+        ),
+    ]
@@ -1118,13 +1118,12 @@ class ItemVariation(models.Model):
    :param original_price: The item's "original" price. Will not be used for any calculations, will just be shown.
    :type original_price: decimal.Decimal
    :param require_approval: If set to ``True``, orders containing this variation can only be processed and paid after
-    approval by an administrator
+                             approval by an administrator
    :type require_approval: bool
    :param all_sales_channels: A flag indicating that this variation is available on all channels and limit_sales_channels will be ignored.
    :type all_sales_channels: bool
    :param limit_sales_channels: A list of sales channel identifiers, that this variation is available for sale on.
    :type limit_sales_channels: list
-
    """
    item = models.ForeignKey(
        Item,
@@ -3391,6 +3391,74 @@ class BlockedTicketSecret(models.Model):
        unique_together = (('event', 'secret'),)


+class PrintLog(models.Model):
+    """
+    A print log object is created when a ticket or badge is printed with our apps.
+    """
+    TYPE_BADGE = 'badge'
+    TYPE_TICKET = 'ticket'
+    TYPE_CERTIFICATE = 'certificate'
+    TYPE_OTHER = 'other'
+    PRINT_TYPES = (
+        (TYPE_BADGE, _('Badge')),
+        (TYPE_TICKET, _('Ticket')),
+        (TYPE_CERTIFICATE, _('Certificate')),
+        (TYPE_OTHER, _('Other')),
+    )
+
+    position = models.ForeignKey(
+        'pretixbase.OrderPosition',
+        related_name='print_logs',
+        on_delete=models.CASCADE,
+    )
+    successful = models.BooleanField(
+        default=True,
+    )
+
+    # Datetime of checkin, might be different from created if past scans are uploaded
+    datetime = models.DateTimeField(default=now)
+
+    # Datetime of creation on server
+    created = models.DateTimeField(auto_now_add=True, null=True, blank=True)
+
+    # Who printed?
+    device = models.ForeignKey('Device', related_name='print_logs', null=True, blank=True, on_delete=models.PROTECT)
+    user = models.ForeignKey('User', related_name='print_logs', null=True, blank=True, on_delete=models.PROTECT)
+    api_token = models.ForeignKey('TeamAPIToken', null=True, blank=True, on_delete=models.PROTECT)
+    oauth_application = models.ForeignKey('pretixapi.OAuthApplication', null=True, blank=True, on_delete=models.PROTECT)
+
+    # Source = Tag field with undefined values, e.g. name of app ("pretixscan")
+    source = models.CharField(max_length=255)
+
+    # Type = Type of object printed ("badge", "ticket")
+    type = models.CharField(max_length=255, choices=PRINT_TYPES)
+
+    info = models.JSONField(default=dict)
+
+    objects = ScopedManager(organizer='position__order__event__organizer')
+
+    class Meta:
+        ordering = (('-datetime'),)
+
+    def __repr__(self):
+        return "<PrintLog: pos {} at {} from {}>".format(
+            self.position, self.datetime, self.source
+        )
+
+    def save(self, **kwargs):
+        super().save(**kwargs)
+        if self.position:
+            self.position.order.touch()
+
+    def delete(self, **kwargs):
+        super().delete(**kwargs)
+        self.position.order.touch()
+
+    @property
+    def is_late_upload(self):
+        return self.created and abs(self.created - self.datetime) > timedelta(minutes=2)
+
+
@receiver(post_delete, sender=CachedTicket)
 def cachedticket_delete(sender, instance, **kwargs):
    if instance.file:
@@ -53,6 +53,30 @@ class SeatingPlanLayoutValidator:
            e = str(e).replace('%', '%%')
            raise ValidationError(_('Your layout file is not a valid seating plan. Error message: {}').format(e))

+        try:
+            seat_guids = set()
+            for z in val["zones"]:
+                for r in z["rows"]:
+                    for s in r["seats"]:
+                        if not s.get("seat_guid"):
+                            raise ValidationError(
+                                _("Seat with zone {zone}, row {row}, and number {number} has no seat ID.").format(
+                                    zone=z["name"],
+                                    row=r["row_number"],
+                                    number=s["seat_number"],
+                                )
+                            )
+                        elif s["seat_guid"] in seat_guids:
+                            raise ValidationError(
+                                _("Multiple seats have the same ID: {id}").format(
+                                    id=s["seat_guid"],
+                                )
+                            )
+
+                        seat_guids.add(s["seat_guid"])
+        except ValidationError as e:
+            raise ValidationError(_('Your layout file is not a valid seating plan. Error message: {}').format(", ".join(e.message for e in e.error_list)))
+

 class SeatingPlan(LoggedModel):
    """
@@ -367,7 +367,7 @@ validate_cart_addons = EventPluginSignal()
 Arguments: ``addons``, ``base_position``, ``iao``

 This signal is sent when a user tries to select a combination of addons. In contrast to
- ``validate_cart``, this is executed before the cart is actually modified. You are passed
+``validate_cart``, this is executed before the cart is actually modified. You are passed
 an argument ``addons`` containing a dict of ``(item, variation or None) → count`` tuples as well
 as the ``ItemAddOn`` object as the argument ``iao`` and the base cart position as
 ``base_position``.
@@ -51,6 +51,7 @@ from pretix.base.models import (
    Checkin, CheckinList, Event, ItemVariation, LogEntry, OrderPosition,
    TaxRule,
 )
+from pretix.base.models.orders import PrintLog
 from pretix.base.signals import logentry_display, orderposition_blocked_display
 from pretix.base.templatetags.money import money_filter

@@ -639,6 +640,16 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
    if sender and logentry.action_type.startswith('pretix.event.checkin'):
        return _display_checkin(sender, logentry)

+    if logentry.action_type == 'pretix.event.order.print':
+        return _('Position #{posid} has been printed at {datetime} with type "{type}".').format(
+            posid=data.get('positionid'),
+            datetime=date_format(
+                dateutil.parser.parse(data["datetime"]).astimezone(sender.timezone),
+                "SHORT_DATETIME_FORMAT"
+            ),
+            type=dict(PrintLog.PRINT_TYPES)[data["type"]],
+        )
+
    if logentry.action_type == 'pretix.control.views.checkin':
        # deprecated
        dt = dateutil.parser.parse(data.get('datetime'))
@@ -12,10 +12,22 @@
    {% endif %}
    {% if object.id and not object.quotas.exists %}
        <div class="alert alert-warning">
-            {% blocktrans trimmed %}
-                Please note that your product will <strong>not</strong> be available for sale until you have added your
-                item to an existing or newly created quota.
-            {% endblocktrans %}
+            <div class="row">
+                <div class="col-lg-8">
+                    {% blocktrans trimmed %}
+                        Please note that your product will <strong>not</strong> be available for sale until you have added your
+                        item to an existing or newly created quota.
+                    {% endblocktrans %}
+                </div>
+                <div class="col-lg-4 text-right">
+                    <a class="btn btn-default btn-sm" href="{% url "control:event.items.quotas" organizer=request.event.organizer.slug event=request.event.slug %}">
+                        <i class="fa fa-wrench"></i> {% trans "Manage quotas" %}
+                    </a>
+                    <a class="btn btn-default btn-sm" href="{% url "control:event.items.quotas.add" organizer=request.event.organizer.slug event=request.event.slug %}?{% if object.has_variations %}{% for var in object.variations.all %}product={{ object.pk }}-{{ var.pk }}&{% endfor %}{% else %}product={{ object.pk }}{% endif %}">
+                        <i class="fa fa-plus"></i> {% trans "Create a new quota" %}
+                    </a>
+                </div>
+            </div>
        </div>
    {% elif object.pk and not object.is_available_by_time %}
        <div class="alert alert-warning">
@@ -67,10 +67,22 @@
                <div class="panel-body form-horizontal">
                    {% if form.instance.pk and not form.instance.quotas.exists %}
                        <div class="alert alert-warning">
-                            {% blocktrans trimmed %}
-                                Please note that your variation will <strong>not</strong> be available for sale
-                                until you have added it to an existing or newly created quota.
-                            {% endblocktrans %}
+                            <div class="row">
+                                <div class="col-lg-8">
+                                    {% blocktrans trimmed %}
+                                        Please note that your variation will <strong>not</strong> be available for sale
+                                        until you have added it to an existing or newly created quota.
+                                    {% endblocktrans %}
+                                </div>
+                                <div class="col-lg-4 text-right">
+                                    <a class="btn btn-default btn-xs" href="{% url "control:event.items.quotas" organizer=request.event.organizer.slug event=request.event.slug %}">
+                                        <i class="fa fa-wrench"></i> {% trans "Manage quotas" %}
+                                    </a>
+                                    <a class="btn btn-default btn-xs" href="{% url "control:event.items.quotas.add" organizer=request.event.organizer.slug event=request.event.slug %}?product={{ form.instance.item.pk }}-{{ form.instance.pk }}">
+                                        <i class="fa fa-plus"></i> {% trans "Create a new quota" %}
+                                    </a>
+                                </div>
+                            </div>
                        </div>
                    {% endif %}
                    {% bootstrap_form_errors form %}
@@ -16,9 +16,21 @@
                        {% bootstrap_field form.internal_name layout="control" %}
                    </div>
                    {% bootstrap_field form.description layout="control" %}
-                    {% bootstrap_field form.category_type layout="control" horizontal_field_class="big-radio-wrapper col-lg-9" %}
-                    {% bootstrap_field form.cross_selling_condition layout="control" horizontal_field_class="col-lg-9" %}
-                    {% bootstrap_field form.cross_selling_match_products layout="control" %}
+                    {% bootstrap_field form.category_type layout="control" horizontal_field_class="big-radio-wrapper col-md-9" %}
+                    <div class="row" data-display-dependency="#id_category_type_2">
+                        <div class="col-md-offset-3 col-md-9">
+                            <div class="alert alert-info">
+                                {% blocktrans trimmed %}
+                                Please note that cross-selling categories are intended as a marketing feature and are not
+                                suitable for strictly ensuring that products are only available in certain combinations.
+                                {% endblocktrans %}
+                            </div>
+                        </div>
+                    </div>
+                    <div data-display-dependency="#id_category_type_2,#id_category_type_3">
+                        {% bootstrap_field form.cross_selling_condition layout="control" horizontal_field_class="col-md-9" %}
+                        {% bootstrap_field form.cross_selling_match_products layout="control" %}
+                    </div>
                </fieldset>
            </div>
            {% if category %}
@@ -920,16 +920,19 @@ class QuotaCreate(EventPermissionRequiredMixin, CreateView):
    def get_form_kwargs(self):
        kwargs = super().get_form_kwargs()

+        kwargs.setdefault('initial', {})
        if self.copy_from:
            i = modelcopy(self.copy_from)
            i.pk = None
            kwargs['instance'] = i
-            kwargs.setdefault('initial', {})
            kwargs['initial']['itemvars'] = [str(i.pk) for i in self.copy_from.items.all()] + [
                '{}-{}'.format(v.item_id, v.pk) for v in self.copy_from.variations.all()
            ]
        else:
            kwargs['instance'] = Quota(event=self.request.event)
+            if 'product' in self.request.GET:
+                kwargs['initial']['itemvars'] = self.request.GET.getlist('product')
+
        return kwargs

    def form_invalid(self, form):
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-15 11:14+0000\n"
+"POT-Creation-Date: 2024-10-29 08:54+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,12 +25,19 @@ from rest_framework import serializers, viewsets

 from pretix.api.pagination import TotalOrderingFilter
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
-from pretix.base.models import ItemVariation
+from pretix.base.models import ItemVariation, SalesChannel
 from pretix.plugins.autocheckin.models import AutoCheckinRule
 from pretix.plugins.sendmail.models import Rule


 class AutoCheckinRuleSerializer(I18nAwareModelSerializer):
+    limit_sales_channels = serializers.SlugRelatedField(
+        slug_field="identifier",
+        queryset=SalesChannel.objects.none(),
+        required=False,
+        allow_empty=True,
+        many=True,
+    )

    class Meta:
        model = AutoCheckinRule
@@ -462,14 +462,28 @@ class BadgeExporter(BaseExporter):
                 )),
                ('date_from',
                 forms.DateField(
-                     label=_('Start date'),
+                     label=_('Start event date'),
                     widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
                     required=False,
                     help_text=_('Only include tickets for dates on or after this date.')
                 )),
                ('date_to',
                 forms.DateField(
-                     label=_('End date'),
+                     label=_('End event date'),
+                     widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
+                     required=False,
+                     help_text=_('Only include tickets ordered on or before this date.')
+                 )),
+                ('order_date_from',
+                 forms.DateField(
+                     label=_('Start order date'),
+                     widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
+                     required=False,
+                     help_text=_('Only include tickets ordered on or after this date.')
+                 )),
+                ('order_date_to',
+                 forms.DateField(
+                     label=_('End order date'),
                     widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
                     required=False,
                     help_text=_('Only include tickets for dates on or before this date.')
@@ -481,6 +495,7 @@ class BadgeExporter(BaseExporter):
                         ('name', _('Attendee name')),
                         ('company', _('Attendee company')),
                         ('code', _('Order code')),
+                         ('order_date', _('Order date')),
                         ('date', _('Event date')),
                     ] + ([
                         ('name:{}'.format(k), _('Attendee name: {part}').format(part=label))
@@ -533,6 +548,24 @@ class BadgeExporter(BaseExporter):
            ), self.event.timezone)
            qs = qs.filter(Q(subevent__date_from__lt=dt) | Q(subevent__isnull=True, order__event__date_from__lt=dt))

+        if form_data.get('order_date_from'):
+            if not isinstance(form_data.get('order_date_from'), date):
+                form_data['order_date_from'] = dateutil.parser.parse(form_data['order_date_from']).date()
+            df = make_aware(datetime.combine(
+                form_data['order_date_from'],
+                time(hour=0, minute=0, second=0)
+            ), self.event.timezone)
+            qs = qs.filter(order__datetime__gte=df)
+
+        if form_data.get('order_date_to'):
+            if not isinstance(form_data.get('order_date_to'), date):
+                form_data['order_date_to'] = dateutil.parser.parse(form_data['order_date_to']).date()
+            dt = make_aware(datetime.combine(
+                form_data['order_date_to'] + timedelta(days=1),
+                time(hour=0, minute=0, second=0)
+            ), self.event.timezone)
+            qs = qs.filter(order__datetime__lt=dt)
+
        if form_data.get('order_by') == 'name':
            qs = qs.annotate(
                resolved_name=Case(
@@ -553,6 +586,8 @@ class BadgeExporter(BaseExporter):
            ).order_by('resolved_company', 'order__code')
        elif form_data.get('order_by') == 'code':
            qs = qs.order_by('order__code')
+        elif form_data.get('order_by') == 'order_date':
+            qs = qs.order_by('order__datetime')
        elif form_data.get('order_by') == 'date':
            qs = qs.annotate(ed=Coalesce('subevent__date_from', 'order__event__date_from')).order_by('ed', 'order__code')
        elif form_data.get('order_by', '').startswith('name:'):
@@ -21,6 +21,7 @@
 #
 from django import forms
 from django.conf import settings
+from django.utils.translation import pgettext
 from i18nfield.strings import LazyI18nString

 from pretix.base.models import EventMetaValue, SubEventMetaValue
@@ -66,7 +67,7 @@ def meta_filtersets(organizer, event=None):
            ).values_list("value", flat=True).distinct())
            choices = [(k, k) for k in sorted(existing_values)]

-        choices.insert(0, ("", ""))
+        choices.insert(0, ("", "-- %s --" % pgettext("filter_empty", "all")))
        if len(choices) > 1:
            fields[f"attr[{prop.name}]"] = {
                "label": str(prop.public_label) or prop.name,
@@ -57,16 +57,29 @@
        </div>

        {% if cross_selling_data %}
-            <details class="panel panel-default cross-selling" open>
-                <summary class="panel-heading">
-                    <h3 class="panel-title">
-                        {% trans "More recommendations" %}
-                    </h3>
-                </summary>
+            {% if forms %}
+                <details class="panel panel-default cross-selling" open>
+                    <summary class="panel-heading">
+                        <h3 class="panel-title">
+                            {% trans "More recommendations" %}
+                        </h3>
+                    </summary>
+            {% else %}
+                <div class="panel panel-default cross-selling">
+                    <div class="panel-heading">
+                        <h3 class="panel-title">
+                            {% trans "Our recommendations" %}
+                        </h3>
+                    </div>
+            {% endif %}
                <div class="panel-body">
-                    {% include "pretixpresale/event/fragment_product_list.html" with items_by_category=cross_selling_data ev=event %}
+                    {% include "pretixpresale/event/fragment_product_list.html" with items_by_category=cross_selling_data ev=event headline_level=4 %}
                </div>
-            </details>
+            {% if forms %}
+                </details>
+            {% else %}
+                </div>
+            {% endif %}
        {% endif %}

        <div class="row checkout-button-row">
@@ -8,7 +8,7 @@
 {% for tup in items_by_category %}{% with category=tup.0 items=tup.1 form_prefix=tup.2 %}
    {% if category %}
        <section aria-labelledby="{{ form_prefix }}category-{{ category.id }}"{% if category.description %} aria-describedby="{{ form_prefix }}category-info-{{ category.id }}"{% endif %}>
-            <h3 id="{{ form_prefix }}category-{{ category.id }}">{{ category.name }}
+            <h{{ headline_level|default:3 }} class="h3" id="{{ form_prefix }}category-{{ category.id }}">{{ category.name }}
                {% if category.subevent_name %}
                    <small class="text-muted"><i class="fa fa-calendar"></i> {{ category.subevent_name }}</small>
                {% endif %}
@@ -19,13 +19,13 @@
                        {% trans "Your order qualifies for a discount" %}
                    </small>
                {% endif %}
-            </h3>
+            </h{{ headline_level|default:3 }}>
            {% if category.description %}
                <div id="{{ form_prefix }}category-info-{{ category.id }}">{{ category.description|localize|rich_text }}</div>
            {% endif %}
    {% else %}
        <section aria-labelledby="{{ form_prefix }}category-none">
-            <h3 id="{{ form_prefix }}category-none" class="sr-only">{% trans "Uncategorized items" %}</h3>
+            <h{{ headline_level|default:"3" }} id="{{ form_prefix }}category-none" class="h3 sr-only">{% trans "Uncategorized items" %}</h{{ headline_level|default:3 }}>
    {% endif %}
        {% for item in items %}
            {% if item.has_variations %}
@@ -43,7 +43,7 @@
                                </a>
                            {% endif %}
                            <div class="product-description {% if item.picture %}with-picture{% endif %}">
-                                <h4 id="{{ form_prefix }}item-{{ item.pk }}-legend">{{ item.name }}</h4>
+                                <h{{ headline_level|default:3|add:1 }} class="h4" id="{{ form_prefix }}item-{{ item.pk }}-legend">{{ item.name }}</h{{ headline_level|default:3|add:1 }}>
                                {% if item.description %}
                                    <div id="{{ form_prefix }}item-{{ item.pk }}-description" class="product-description">
                                        {{ item.description|localize|rich_text }}
@@ -117,7 +117,7 @@
                                data-price="{% if event.settings.display_net_prices %}{{ var.display_price.net|unlocalize }}{% else %}{{ var.display_price.gross|unlocalize }}{% endif %}"
                            {% endif %}>
                                <div class="col-md-8 col-sm-6 col-xs-12">
-                                    <h5 id="{{ form_prefix }}item-{{ item.pk }}-{{ var.pk }}-legend">{{ var }}</h5>
+                                    <h{{ headline_level|default:3|add:2 }} class="h5" id="{{ form_prefix }}item-{{ item.pk }}-{{ var.pk }}-legend">{{ var }}</h{{ headline_level|default:3|add:2 }}>
                                    {% if var.description %}
                                        <div id="{{ form_prefix }}item-{{ item.pk }}-{{ var.pk }}-description" class="variation-description">
                                            {{ var.description|localize|rich_text }}
@@ -261,7 +261,7 @@
                            </a>
                        {% endif %}
                        <div class="product-description {% if item.picture %}with-picture{% endif %}">
-                            <h4 id="{{ form_prefix }}item-{{ item.pk }}-legend">{{ item.name }}</h4>
+                            <h{{ headline_level|default:3|add:1 }} class="h4" id="{{ form_prefix }}item-{{ item.pk }}-legend">{{ item.name }}</h{{ headline_level|default:3 }}>
                            {% if item.description %}
                                <div id="{{ form_prefix }}item-{{ item.pk }}-description" class="product-description">
                                    {{ item.description|localize|rich_text }}
@@ -29,7 +29,7 @@ $(function () {
        autofill = false;
    })

-    $("input[name=itemvars]").change(function () {
+    function do_autofill() {
        if (autofill) {
            var names = [];
            $("input[name=itemvars]:checked").each(function () {
@@ -37,5 +37,7 @@ $(function () {
            });
            $("#id_name").val(names.join(', '));
        }
-    });
+    }
+    $("input[name=itemvars]").change(do_autofill);
+    do_autofill();
 });
@@ -102,15 +102,16 @@
    }
  }
 }
-.cross-selling .panel-body h3 {
+.cross-selling .panel-body h3, .cross-selling .panel-body .h3 {
  font-size: 21px;
  line-height: inherit;
  margin-top: 20px;
 }
-.cross-selling .panel-body > *:first-child > h3:first-child {
+.cross-selling .panel-body > *:first-child > h3:first-child,
+.cross-selling .panel-body > *:first-child > .h3:first-child {
  margin-top: 0;
 }
-.cross-selling .panel-body h3 small {
+.cross-selling .panel-body h3 small, .cross-selling .panel-body .h3 small {
  padding-left: 20px;
 }

@@ -53,7 +53,7 @@
    &.variation label {
        font-weight: normal;
    }
-    h4 {
+    h4, .h4 {
        font-size: inherit;
        margin: 0;
        line-height: inherit;
@@ -62,7 +62,7 @@
            font-weight: bold;
        }
    }
-    h5 {
+    h5, .h5 {
        font-size: inherit;
        font-weight: inherit;
        margin: 0;
@@ -40,7 +40,7 @@ def mocker_context():

 def get_redis_connection(alias="default", write=True):
    worker_id = os.environ.get("PYTEST_XDIST_WORKER")
-    if worker_id.startswith("gw"):
+    if worker_id and worker_id.startswith("gw"):
        redis_port = 1000 + int(worker_id.replace("gw", ""))
    else:
        redis_port = 1000
@@ -17,7 +17,8 @@ skip_glob = make_testdata.py,wsgi.py,bootstrap,celery_app.py,pretix/settings.py,

 [tool:pytest]
 DJANGO_SETTINGS_MODULE = tests.settings
-addopts = --reruns 3 -rw
+addopts = -rw
+asyncio_default_fixture_loop_scope = function
 filterwarnings =
    error
    ignore:.*invalid escape sequence.*:
@@ -123,6 +123,7 @@ TEST_ORDERPOSITION1_RES = {
    "secret": "z3fsn8jyufm5kpk768q69gkbyr5f4h6w",
    "addon_to": None,
    "checkins": [],
+    "print_logs": [],
    "downloads": [],
    "answers": [],
    "seat": None,
@@ -160,6 +161,7 @@ TEST_ORDERPOSITION2_RES = {
    "secret": "sf4HZG73fU6kwddgjg2QOusFbYZwVKpK",
    "addon_to": None,
    "checkins": [],
+    "print_logs": [],
    "downloads": [],
    "answers": [],
    "seat": None,
@@ -197,6 +199,7 @@ TEST_ORDERPOSITION3_RES = {
    "secret": "3u4ez6vrrbgb3wvezxhq446p548dt2wn",
    "addon_to": None,
    "checkins": [],
+    "print_logs": [],
    "downloads": [],
    "answers": [],
    "seat": None,
@@ -467,7 +470,7 @@ def test_list_all_items_positions(token_client, organizer, event, clist, clist_a
        p3["addon_to"] = p1["id"]

    # All items
-    with django_assert_num_queries(23):
+    with django_assert_num_queries(24):
        resp = token_client.get('/api/v1/organizers/{}/events/{}/checkinlists/{}/positions/?ordering=positionid'.format(
            organizer.slug, event.slug, clist_all.pk
        ))
@@ -1359,7 +1362,7 @@ def test_search(token_client, organizer, event, clist, clist_all, item, other_it
        p1["id"] = order.positions.get(positionid=1).pk
        p1["item"] = item.pk

-    with django_assert_max_num_queries(17):
+    with django_assert_max_num_queries(18):
        resp = token_client.get('/api/v1/organizers/{}/events/{}/checkinlists/{}/positions/?search=z3fsn8jyu'.format(
            organizer.slug, event.slug, clist_all.pk
        ))
@@ -163,6 +163,7 @@ TEST_ORDERPOSITION1_RES = {
    "secret": "z3fsn8jyufm5kpk768q69gkbyr5f4h6w",
    "addon_to": None,
    "checkins": [],
+    "print_logs": [],
    "downloads": [],
    "answers": [],
    "seat": None,
@@ -155,6 +155,7 @@ def test_giftcard_detail_expand(token_client, organizer, event, giftcard):
        "addon_to": None,
        "subevent": None,
        "checkins": [],
+        "print_logs": [],
        "downloads": [],
        "answers": [],
        "tax_rule": None,
@@ -463,6 +463,7 @@ def test_order_create_simulate(token_client, organizer, event, item, quota, ques
                'subevent': None,
                'discount': None,
                'checkins': [],
+                'print_logs': [],
                'downloads': [],
                "valid_from": None,
                "valid_until": None,
@@ -535,13 +536,13 @@ def test_order_create_positionids_addons_simulated(token_client, organizer, even
         'attendee_name': 'Peter', 'attendee_name_parts': {'full_name': 'Peter', '_scheme': 'full'}, 'company': None,
         'street': None, 'zipcode': None, 'city': None, 'country': None, 'state': None, 'attendee_email': None,
         'voucher': None, 'tax_rate': '0.00', 'tax_value': '0.00', 'discount': None, 'voucher_budget_use': None,
-         'addon_to': None, 'subevent': None, 'checkins': [], 'downloads': [], 'answers': [], 'tax_rule': None,
+         'addon_to': None, 'subevent': None, 'checkins': [], 'print_logs': [], 'downloads': [], 'answers': [], 'tax_rule': None,
         'pseudonymization_id': 'PREVIEW', 'seat': None, 'canceled': False, 'valid_from': None, 'valid_until': None, 'blocked': None},
        {'id': 0, 'order': '', 'positionid': 2, 'item': item.pk, 'variation': None, 'price': '23.00',
         'attendee_name': 'Peter', 'attendee_name_parts': {'full_name': 'Peter', '_scheme': 'full'}, 'company': None,
         'street': None, 'zipcode': None, 'city': None, 'country': None, 'state': None, 'attendee_email': None,
         'voucher': None, 'tax_rate': '0.00', 'tax_value': '0.00', 'discount': None, 'voucher_budget_use': None,
-         'addon_to': 1, 'subevent': None, 'checkins': [], 'downloads': [], 'answers': [], 'tax_rule': None,
+         'addon_to': 1, 'subevent': None, 'checkins': [], 'print_logs': [], 'downloads': [], 'answers': [], 'tax_rule': None,
         'pseudonymization_id': 'PREVIEW', 'seat': None, 'canceled': False, 'valid_from': None, 'valid_until': None, 'blocked': None}
    ]

@@ -76,7 +76,7 @@ def quota(event, item):


@pytest.fixture
-def order(event, item, taxrule, question):
+def order(event, item, device, taxrule, question):
    testtime = datetime.datetime(2017, 12, 1, 10, 0, 0, tzinfo=datetime.timezone.utc)
    event.plugins += ",pretix.plugins.stripe"
    event.save()
@@ -137,6 +137,13 @@ def order(event, item, taxrule, question):
            canceled=True,
            positionid=2,
        )
+        op.print_logs.create(
+            device=device,
+            type="badge",
+            source="pretixpos",
+            info={"cashier": 1234},
+            datetime=datetime.datetime(2017, 12, 1, 12, 0, 0, tzinfo=datetime.timezone.utc),
+        )
        op.answers.create(question=question, answer='S')
        return o

@@ -200,6 +207,19 @@ TEST_ORDERPOSITION_RES = {
    "addon_to": None,
    "pseudonymization_id": "ABCDEFGHKL",
    "checkins": [],
+    "print_logs": [
+        {
+            "id": -1,
+            "device_id": -1,
+            "successful": True,
+            "datetime": "2017-12-01T12:00:00Z",
+            "source": "pretixpos",
+            "type": "badge",
+            "info": {
+                "cashier": 1234
+            },
+        }
+    ],
    "downloads": [],
    "seat": None,
    "company": None,
@@ -321,7 +341,7 @@ TEST_ORDER_RES = {


@pytest.mark.django_db
-def test_order_list_filter_subevent_date(token_client, organizer, event, order, item, taxrule, subevent, question):
+def test_order_list_filter_subevent_date(token_client, device, organizer, event, order, item, taxrule, subevent, question):
    res = copy.deepcopy(TEST_ORDER_RES)
    with scopes_disabled():
        res["positions"][0]["id"] = order.positions.first().pk
@@ -329,6 +349,9 @@ def test_order_list_filter_subevent_date(token_client, organizer, event, order,
        p.subevent = subevent
        p.save()
        fee = order.fees.first()
+        pl = p.print_logs.first()
+    res["positions"][0]["print_logs"][0]["id"] = pl.pk
+    res["positions"][0]["print_logs"][0]["device_id"] = device.device_id
    res["positions"][0]["item"] = item.pk
    res["positions"][0]["subevent"] = subevent.pk
    res["positions"][0]["answers"][0]["question"] = question.pk
@@ -379,11 +402,13 @@ def test_order_list_filter_subevent_date(token_client, organizer, event, order,


@pytest.mark.django_db
-def test_order_list(token_client, organizer, event, order, item, taxrule, question):
+def test_order_list(token_client, organizer, event, order, item, taxrule, question, device):
    res = dict(TEST_ORDER_RES)
    with scopes_disabled():
        res["positions"][0]["id"] = order.positions.first().pk
        res["fees"][0]["id"] = order.fees.first().pk
+        res["positions"][0]["print_logs"][0]["id"] = order.positions.first().print_logs.first().pk
+        res["positions"][0]["print_logs"][0]["device_id"] = device.device_id
    res["positions"][0]["item"] = item.pk
    res["positions"][0]["answers"][0]["question"] = question.pk
    res["last_modified"] = order.last_modified.isoformat().replace('+00:00', 'Z')
@@ -497,6 +522,7 @@ def test_order_detail(token_client, organizer, event, order, item, taxrule, ques
    res = dict(TEST_ORDER_RES)
    with scopes_disabled():
        res["positions"][0]["id"] = order.positions.first().pk
+        res["positions"][0]["print_logs"][0]["id"] = order.positions.first().print_logs.first().pk
        res["fees"][0]["id"] = order.fees.first().pk
    res["positions"][0]["item"] = item.pk
    res["fees"][0]["tax_rule"] = taxrule.pk
@@ -968,12 +994,14 @@ def test_orderposition_list(token_client, organizer, device, event, order, item,
        var2 = item.variations.create(value="Children")
        res = copy.copy(TEST_ORDERPOSITION_RES)
        op = order.positions.first()
-    op.variation = var
-    op.save()
-    res["id"] = op.pk
-    res["item"] = item.pk
-    res["variation"] = var.pk
-    res["answers"][0]["question"] = question.pk
+        op.variation = var
+        op.save()
+        res["id"] = op.pk
+        res["item"] = item.pk
+        res["variation"] = var.pk
+        res["answers"][0]["question"] = question.pk
+        res["print_logs"][0]["id"] = op.print_logs.first().pk
+        res["print_logs"][0]["device_id"] = device.device_id

    resp = token_client.get('/api/v1/organizers/{}/events/{}/orderpositions/'.format(organizer.slug, event.slug))
    assert resp.status_code == 200
@@ -1072,7 +1100,7 @@ def test_orderposition_list(token_client, organizer, device, event, order, item,
        'gate': None,
        'type': 'entry'
    }]
-    with django_assert_num_queries(15):
+    with django_assert_num_queries(16):
        resp = token_client.get(
            '/api/v1/organizers/{}/events/{}/orderpositions/?has_checkin=true'.format(organizer.slug, event.slug)
        )
@@ -1107,6 +1135,7 @@ def test_orderposition_detail(token_client, organizer, event, order, item, quest
    res = dict(TEST_ORDERPOSITION_RES)
    with scopes_disabled():
        op = order.positions.first()
+        res["print_logs"][0]["id"] = op.print_logs.first().pk
    res["id"] = op.pk
    res["item"] = item.pk
    res["answers"][0]["question"] = question.pk
@@ -1171,6 +1200,30 @@ def test_orderposition_delete(token_client, organizer, event, order, item, quest
    assert order.total == Decimal('23.25')


+@pytest.mark.django_db
+def test_orderposition_printlog(token_client, team, organizer, event, order, item, question):
+    with scopes_disabled():
+        op = order.positions.first()
+    resp = token_client.post('/api/v1/organizers/{}/events/{}/orderpositions/{}/printlog/'.format(
+        organizer.slug, event.slug, op.pk
+    ), data={
+        "datetime": "2023-09-04T12:23:45+02:00",
+        "source": "pretixscan",
+        "type": "badge",
+        "info": {
+            "cashier": 1234,
+        }
+    }, format='json')
+    assert resp.status_code == 201
+
+    with scopes_disabled():
+        l = op.print_logs.get(source="pretixscan")
+        assert l.type == "badge"
+        assert l.info == {"cashier": 1234}
+        assert l.api_token.team == team
+        assert l.datetime.isoformat() == "2023-09-04T10:23:45+00:00"
+
+
@pytest.mark.django_db
 def test_order_mark_paid_pending(token_client, organizer, event, order):
    resp = token_client.post(
@@ -1920,7 +1973,7 @@ def test_pdf_data(token_client, organizer, event, order, django_assert_max_num_q
    assert not resp.data['positions'][0].get('pdf_data')

    # order list
-    with django_assert_max_num_queries(30):
+    with django_assert_max_num_queries(31):
        resp = token_client.get('/api/v1/organizers/{}/events/{}/orders/?pdf_data=true'.format(
            organizer.slug, event.slug
        ))
@@ -1935,7 +1988,7 @@ def test_pdf_data(token_client, organizer, event, order, django_assert_max_num_q
    assert not resp.data['results'][0]['positions'][0].get('pdf_data')

    # position list
-    with django_assert_max_num_queries(33):
+    with django_assert_max_num_queries(34):
        resp = token_client.get('/api/v1/organizers/{}/events/{}/orderpositions/?pdf_data=true'.format(
            organizer.slug, event.slug
        ))
@@ -192,6 +192,7 @@ def test_medium_detail(token_client, organizer, event, medium, giftcard, custome
            "addon_to": None,
            "subevent": None,
            "checkins": [],
+            "print_logs": [],
            "downloads": [],
            "answers": [],
            "tax_rule": None,
@@ -84,7 +84,7 @@ def reset_locale():
@pytest.fixture
 def fakeredis_client(monkeypatch):
    worker_id = os.environ.get("PYTEST_XDIST_WORKER")
-    if worker_id.startswith("gw"):
+    if worker_id and worker_id.startswith("gw"):
        redis_port = 1000 + int(worker_id.replace("gw", ""))
    else:
        redis_port = 1000
@@ -119,3 +119,13 @@ def fakeredis_client(monkeypatch):
        redis.flushall()
        monkeypatch.setattr('django_redis.get_redis_connection', get_redis_connection, raising=False)
        yield redis
+
+
+@pytest.fixture(autouse=True)
+def set_lock_namespaces(request):
+    worker_id = os.environ.get("PYTEST_XDIST_WORKER")
+    if worker_id and worker_id.startswith("gw"):
+        with override_settings(DATABASE_ADVISORY_LOCK_INDEX=int(worker_id.replace("gw", ""))):
+            yield
+    else:
+        yield
@@ -812,7 +812,7 @@ class WidgetCartTest(CartTestMixin, TestCase):
            data = json.loads(response.content.decode())
            assert data["meta_filter_fields"] == [
                {
-                    "choices": [["", ""], ["EN", "English"], ["DE", "German"]],
+                    "choices": [["", "-- all --"], ["EN", "English"], ["DE", "German"]],
                    "key": "attr[Language]",
                    "label": "Language"
                }
@@ -838,7 +838,7 @@ class WidgetCartTest(CartTestMixin, TestCase):
            data = json.loads(response.content.decode())
            assert data["meta_filter_fields"] == [
                {
-                    "choices": [["", ""], ["DE", "DE"], ["EN", "EN"]],
+                    "choices": [["", "-- all --"], ["DE", "DE"], ["EN", "EN"]],
                    "key": "attr[Language]",
                    "label": "Language"
                }
@@ -848,7 +848,7 @@ class WidgetCartTest(CartTestMixin, TestCase):
            data = json.loads(response.content.decode())
            assert data["meta_filter_fields"] == [
                {
-                    "choices": [["", ""], ["DE", "DE"]],
+                    "choices": [["", "-- all --"], ["DE", "DE"]],
                    "key": "attr[Language]",
                    "label": "Language"
                }
Author	SHA1	Message	Date
Mira Weller	80958fd95a	Fix conditional display of cross_selling_match_products	2024-10-31 14:46:28 +01:00
Raphael Michel	fc3b186b93	Badge export: Allow to filter and sort by order date (Z#23168742) (#4588 )	2024-10-31 14:42:44 +01:00
Tinna Sandström	a406884575	Translations: Update Swedish Currently translated at 98.3% (5679 of 5774 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/sv/ powered by weblate	2024-10-31 13:02:34 +01:00
Anarion Dunedain	57ccd5f289	Translations: Update Polish Currently translated at 100.0% (5774 of 5774 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/pl/ powered by weblate	2024-10-31 13:02:34 +01:00
Mira	f4ac7e7f65	Add warning that cross-selling can't prevent unwanted combinations (#4596 ) * Add warning that cross-selling can't prevent unwanted combinations * Update src/pretix/control/templates/pretixcontrol/items/category.html Co-authored-by: Raphael Michel <michel@rami.io> --------- Co-authored-by: Raphael Michel <michel@rami.io>	2024-10-31 12:59:28 +01:00
Raphael Michel	81d7045b31	Public event filter: Make "all" option clearer (Z#23169843) (#4585 ) * Public event filter: Make "all" option clearer * Fix widget tests * Update src/tests/presale/test_widget.py Co-authored-by: Richard Schreiber <schreiber@rami.io> --------- Co-authored-by: Richard Schreiber <schreiber@rami.io>	2024-10-29 17:31:51 +01:00
Richard Schreiber	f9502a3212	Fix testutils redis mock (#4586 )	2024-10-29 16:37:06 +01:00
Richard Schreiber	a31f624417	Dev: add support for asyncio_default_fixture_loop_scope in pytest-asyncio (#4589 )	2024-10-29 16:36:43 +01:00
Raphael Michel	3f99e0bece	Bump version to 2024.11.0.dev0	2024-10-29 11:47:44 +01:00
Raphael Michel	7e64f2b38a	Bump version to 2024.10.0	2024-10-29 11:47:10 +01:00
Raphael Michel	ee2bc93608	Fix handling of device_info_updated signal	2024-10-29 11:30:35 +01:00
Raphael Michel	fb4bed9d0d	Translations: Update German (informal) (de_Informal) Currently translated at 100.0% (5774 of 5774 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/de_Informal/ powered by weblate	2024-10-29 10:08:27 +01:00
Raphael Michel	aec75e4d0c	Translations: Update German Currently translated at 100.0% (5774 of 5774 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/de/ powered by weblate	2024-10-29 10:08:27 +01:00
Raphael Michel	e7e41470fb	Update po files [CI skip] Signed-off-by: Raphael Michel <michel@rami.io>	2024-10-29 09:54:05 +01:00
Raphael Michel	0aa9dda90a	Cross-selling: Use different label if there are no add-on products (#4577 ) * Cross-selling: Use different label if there are no add-on products * Update src/pretix/presale/templates/pretixpresale/event/checkout_addons.html Co-authored-by: Richard Schreiber <schreiber@rami.io> * Fix a11y problem * Fix headline order --------- Co-authored-by: Richard Schreiber <schreiber@rami.io>	2024-10-29 09:53:36 +01:00
Mira	d97c983b6f	Fix API serializer for auto_checkin_rules to accept sales channel identifiers (Z#23170095) (#4579 ) * Fix API serializer for auto_checkin_rules to accept sales channel identifiers instead of PKs * False -> false in json	2024-10-29 09:14:22 +01:00
dependabot[bot]	6c957f31ca	Update django-hijack requirement from ==3.6.* to ==3.7.* (#4581 ) Updates the requirements on [django-hijack](https://github.com/django-hijack/django-hijack) to permit the latest version. - [Release notes](https://github.com/django-hijack/django-hijack/releases) - [Changelog](https://github.com/django-hijack/django-hijack/blob/master/docs/release-button.png) - [Commits](https://github.com/django-hijack/django-hijack/compare/3.6.0...3.7.0) --- updated-dependencies: - dependency-name: django-hijack dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-10-29 09:14:04 +01:00
dependabot[bot]	8e6b4b3ec7	Update pypdf requirement from ==5.0.* to ==5.1.* (#4582 ) Updates the requirements on [pypdf](https://github.com/py-pdf/pypdf) to permit the latest version. - [Release notes](https://github.com/py-pdf/pypdf/releases) - [Changelog](https://github.com/py-pdf/pypdf/blob/main/CHANGELOG.md) - [Commits](https://github.com/py-pdf/pypdf/compare/5.0.0...5.1.0) --- updated-dependencies: - dependency-name: pypdf dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-10-29 09:13:58 +01:00
arjan-s	b24de62f73	Translations: Update Dutch Currently translated at 85.5% (4938 of 5773 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/nl/ powered by weblate	2024-10-29 09:13:45 +01:00
Raphael Michel	cdbd220a12	Fix time zone of parsed print log	2024-10-28 17:49:47 +01:00
Raphael Michel	2f11aee512	Translations: Update German (informal) (de_Informal) Currently translated at 100.0% (5773 of 5773 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/de_Informal/ powered by weblate	2024-10-28 13:04:02 +01:00
Raphael Michel	8ea475ce39	Translations: Update German Currently translated at 100.0% (5773 of 5773 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/de/ powered by weblate	2024-10-28 13:04:02 +01:00
Raphael Michel	b29bc9db96	Translations: Update German (informal) (de_Informal) Currently translated at 100.0% (5773 of 5773 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/de_Informal/ powered by weblate	2024-10-28 13:04:02 +01:00
Raphael Michel	6bd6694132	Translations: Update German Currently translated at 100.0% (5773 of 5773 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/de/ powered by weblate	2024-10-28 13:04:02 +01:00
Raphael Michel	110e6e248e	Update po files [CI skip] Signed-off-by: Raphael Michel <michel@rami.io>	2024-10-28 12:31:20 +01:00
Davide Manzella	985f4d969d	Translations: Update Italian Currently translated at 23.1% (1333 of 5762 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/it/ powered by weblate	2024-10-28 12:30:56 +01:00
Mira	826bd07b01	Add action buttons to "missing quota" warnings (#4533 ) * Add action buttons to "missing quota" warnings * Update item.py	2024-10-28 12:25:03 +01:00
Raphael Michel	3e4e86742a	Add print logs (#4475 ) * Add print logs * Add attribute successful * Rebase migration * Fix tests on postgres	2024-10-28 12:24:23 +01:00
Raphael Michel	ef5fcde5d9	Seating plans: Validate duplicate seat IDs (#4564 )	2024-10-28 11:27:27 +01:00
Raphael Michel	8f1d53d016	Tests: Add separation of database lock indices by pytest worker (#4553 ) * Add separation of database lock indices by pytest worker * Fix ID derivation * Update conftest.py	2024-10-25 22:05:02 +02:00
Raphael Michel	9ca1573fcf	Tests: Remove pytest-rerunfailures (#4572 )	2024-10-25 22:00:14 +02:00
Raphael Michel	5795aa6492	Docs: Fix various sphinx warnings	2024-10-25 21:58:14 +02:00
Raphael Michel	6e0613a2af	CI: Remove warnings from PostgreSQL about health check (#4571 ) * CI: Remove warnings from PostgreSQL about health check * Update tests.yml * Update tests.yml	2024-10-25 21:45:34 +02:00
Raphael Michel	b43ed38483	CI: Do not fail if codecov upload fails (#4570 ) This happens all the time with external PRs until https://github.com/codecov/engineering-team/issues/1574 is solved and is doing more harm than good. We still see if there is no coverage attached.	2024-10-25 21:40:03 +02:00
Raphael Michel	f0fedf0001	Tests: Resolve deprecation warning for pytest-asyncio (#4569 )	2024-10-25 21:27:38 +02:00
Raphael Michel	19373b8f91	CI: Update codecov-action (#4568 )	2024-10-25 21:19:48 +02:00
dependabot[bot]	45fd13786a	Update pillow requirement from ==10.4.* to ==11.0.* (#4566 ) Updates the requirements on [pillow](https://github.com/python-pillow/Pillow) to permit the latest version. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/10.4.0...11.0.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-10-25 21:14:30 +02:00