Order change: Fix list of unchangeable add-ons not filtered to category (Z#23223330)

pyproject.toml

@@ -92,7 +92,7 @@ dependencies = [
   "redis==7.1.*",
   "reportlab==4.4.*",
   "requests==2.32.*",
-  "sentry-sdk==2.52.*",
+  "sentry-sdk==2.51.*",
   "sepaxml==2.7.*",
   "stripe==7.9.*",
   "text-unidecode==1.*",

src/pretix/base/forms/questions.py

@@ -890,18 +890,18 @@ class BaseQuestionsForm(forms.Form):
                 if not help_text:
                     if q.valid_date_min and q.valid_date_max:
                         help_text = format_lazy(
-                            _('Please enter a date between {min} and {max}.'),
+                            'Please enter a date between {min} and {max}.',
                             min=date_format(q.valid_date_min, "SHORT_DATE_FORMAT"),
                             max=date_format(q.valid_date_max, "SHORT_DATE_FORMAT"),
                         )
                     elif q.valid_date_min:
                         help_text = format_lazy(
-                            _('Please enter a date no earlier than {min}.'),
+                            'Please enter a date no earlier than {min}.',
                             min=date_format(q.valid_date_min, "SHORT_DATE_FORMAT"),
                         )
                     elif q.valid_date_max:
                         help_text = format_lazy(
-                            _('Please enter a date no later than {max}.'),
+                            'Please enter a date no later than {max}.',
                             max=date_format(q.valid_date_max, "SHORT_DATE_FORMAT"),
                         )
                 if initial and initial.answer:
@@ -939,18 +939,18 @@ class BaseQuestionsForm(forms.Form):
                 if not help_text:
                     if q.valid_datetime_min and q.valid_datetime_max:
                         help_text = format_lazy(
-                            _('Please enter a date and time between {min} and {max}.'),
+                            'Please enter a date and time between {min} and {max}.',
                             min=date_format(q.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
                             max=date_format(q.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
                         )
                     elif q.valid_datetime_min:
                         help_text = format_lazy(
-                            _('Please enter a date and time no earlier than {min}.'),
+                            'Please enter a date and time no earlier than {min}.',
                             min=date_format(q.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
                         )
                     elif q.valid_datetime_max:
                         help_text = format_lazy(
-                            _('Please enter a date and time no later than {max}.'),
+                            'Please enter a date and time no later than {max}.',
                             max=date_format(q.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
                         )
 

src/pretix/base/plugins.py

@@ -65,7 +65,7 @@ def get_all_plugins(*, event=None, organizer=None) -> List[type]:
             if app.name in settings.PRETIX_PLUGINS_EXCLUDE:
                 continue
 
-            level = getattr(meta, "level", PLUGIN_LEVEL_EVENT)
+            level = getattr(app, "level", PLUGIN_LEVEL_EVENT)
             if level == PLUGIN_LEVEL_EVENT:
                 if event and hasattr(app, 'is_available'):
                     if not app.is_available(event):

src/pretix/control/templates/pretixcontrol/organizers/outgoing_mail.html

@@ -19,7 +19,7 @@
 
                     <dl class="dl-horizontal">
                         <dt>{% trans "From" context "email" %}</dt>
-                        <dd>{{ sender }}</dd>
+                        <dd>{{ mail.sender }}</dd>
                         <dt>{% trans "To" context "email" %}</dt>
                         <dd>{{ mail.to|join:", " }}</dd>
                         {% if mail.cc %}

src/pretix/control/views/mail.py

@@ -21,8 +21,6 @@
 #
 import base64
 import logging
-from email.header import decode_header, make_header
-from email.utils import parseaddr
 
 from django.conf import settings
 from django.contrib import messages
@@ -126,12 +124,6 @@ class OutgoingMailDetailView(OrganizerDetailViewMixin, OrganizerPermissionRequir
         ctx = super().get_context_data(**kwargs)
         if self.object.body_html:
             ctx['data_url'] = "data:text/html;charset=utf-8;base64," + base64.b64encode(self.object.body_html.encode()).decode()
-
-        from_name, from_email = parseaddr(self.object.sender)
-        if from_name:
-            from_name = make_header(decode_header(from_name))
-        ctx['sender'] = "{} <{}>".format(from_name, from_email) if from_name else from_email
-
         return ctx
 
 

src/pretix/presale/views/order.py

@@ -1510,7 +1510,10 @@ class OrderChangeMixin:
                             'max_count': iao.max_count,
                             'iao': iao,
                             'items': [i for i in items if not i.require_voucher],
-                            'items_missing': {k: v for k, v in current_addon_products_missing.items() if v},
+                            'items_missing': {
+                                k: v for k, v in current_addon_products_missing.items()
+                                if v and k[0].category_id == iao.addon_category_id
+                            },
                         })
 
         return positions