Update tests.yml

* Fix orderlist export if orders with invalid payment provider identifiers exist (Z#23233440)
* Performance: Move _get_all_payment_methods out of loop

.github/workflows/tests.yml

@@ -123,7 +123,7 @@ jobs:
         working-directory: ./src
         run: make all compress
       - name: Install Playwright browsers
-        run: npx playwright install
+        run: playwright install
       - name: Run E2E tests
         working-directory: ./src
         run: PRETIX_CONFIG_FILE=tests/ci_postgres.cfg py.test tests/e2e/ -v --maxfail=10

pyproject.toml

@@ -83,7 +83,7 @@ dependencies = [
   "pycountry",
   "pycparser==3.0",
   "pycryptodome==3.23.*",
-  "pypdf==6.11.*",
+  "pypdf==6.5.*",
   "python-bidi==0.6.*",  # Support for Arabic in reportlab
   "python-dateutil==2.9.*",
   "pytz",
@@ -126,6 +126,7 @@ dev = [
   "pytest-xdist==3.8.*",
   "pytest-playwright",
   "pytest==9.0.*",
+  "playwright",
   "responses",
 ]
 

src/pretix/base/exporters/orderlist.py

@@ -160,7 +160,7 @@ class OrderListExporter(MultiSheetListExporter):
 
     def _get_all_payment_methods(self, qs):
         pps = dict(get_all_payment_providers())
-        return sorted([(pp, pps[pp]) for pp in set(
+        return sorted([(pp, pps.get(pp, pp)) for pp in set(
             OrderPayment.objects.exclude(provider='free').filter(order__event__in=self.events).values_list(
                 'provider', flat=True
             ).distinct()
@@ -330,6 +330,7 @@ class OrderListExporter(MultiSheetListExporter):
                 taxsum=Sum('tax_value'), grosssum=Sum('value')
             )
         }
+        payment_methods = None
         if form_data.get('include_payment_amounts'):
             payment_sum_cache = {
                 (o['order__id'], o['provider']): o['grosssum'] for o in
@@ -347,6 +348,7 @@ class OrderListExporter(MultiSheetListExporter):
                     grosssum=Sum('amount')
                 )
             }
+            payment_methods = self._get_all_payment_methods(qs)
         sum_cache = {
             (o['order__id'], o['tax_rate']): o for o in
             OrderPosition.objects.values('tax_rate', 'order__id').order_by().annotate(
@@ -434,7 +436,6 @@ class OrderListExporter(MultiSheetListExporter):
             )
 
             if form_data.get('include_payment_amounts'):
-                payment_methods = self._get_all_payment_methods(qs)
                 for id, vn in payment_methods:
                     row.append(
                         payment_sum_cache.get((order.id, id), Decimal('0.00')) -

src/pretix/base/modelimport_orders.py

@@ -442,7 +442,7 @@ class AttendeeState(ImportColumn):
 
     @property
     def verbose_name(self):
-        return _('Attendee address') + ': ' + _('State')
+        return _('Attendee address') + ': ' + pgettext('address', 'State')
 
     def clean(self, value, previous_values):
         if value:

src/pretix/base/models/base.py

@@ -125,7 +125,7 @@ class LoggingMixin:
         elif isinstance(self, Event):
             event = self
             organizer_id = self.organizer_id
-        elif hasattr(self, 'event'):
+        elif hasattr(self, 'event') and self.event:
             event = self.event
             organizer_id = self.event.organizer_id
         elif hasattr(self, 'organizer_id'):

src/pretix/base/pdf.py

@@ -1222,7 +1222,9 @@ class Renderer:
 
             for i, page in enumerate(fg_pdf.pages):
                 bg_page = self.bg_pdf.pages[i]
-                _merge_with_correct_page_media_box(output, page, bg_page)
+                _correct_page_media_box(bg_page)
+                page.merge_page(bg_page, over=False)
+                output.add_page(page)
 
             # pdf_header is a string like "%pdf-X.X"
             if float(self.bg_pdf.pdf_header[5:]) > float(fg_pdf.pdf_header[5:]):
@@ -1289,7 +1291,8 @@ def merge_background(fg_pdf: PdfWriter, bg_pdf: PdfWriter, out_file, compress):
     else:
         for i, page in enumerate(fg_pdf.pages):
             bg_page = bg_pdf.pages[i]
-            _merge_with_correct_page_media_box(fg_pdf, page, bg_page)
+            _correct_page_media_box(bg_page)
+            page.merge_page(bg_page, over=False)
 
         # pdf_header is a string like "%pdf-X.X"
         if float(bg_pdf.pdf_header[5:]) > float(fg_pdf.pdf_header[5:]):
@@ -1298,18 +1301,27 @@ def merge_background(fg_pdf: PdfWriter, bg_pdf: PdfWriter, out_file, compress):
         fg_pdf.write(out_file)
 
 
-def _merge_with_correct_page_media_box(output: pypdf.PdfWriter, fg_page: pypdf.PageObject, bg_page: pypdf.PageObject):
-    if bg_page.rotation != 0:
-        bg_page.transfer_rotation_to_content()
-    media_box = bg_page.mediabox
+def _correct_page_media_box(page: pypdf.PageObject):
+    if page.rotation != 0:
+        page.transfer_rotation_to_content()
+    media_box = page.mediabox
     trsf = pypdf.Transformation()
     if media_box.bottom != 0:
         trsf = trsf.translate(0, -media_box.bottom)
     if media_box.left != 0:
         trsf = trsf.translate(-media_box.left, 0)
-
-    fg_page = output.add_page(fg_page)
-    fg_page.merge_transformed_page(bg_page, trsf, over=False, expand=False)
+    page.add_transformation(trsf, False)
+    for b in ["/MediaBox", "/CropBox", "/BleedBox", "/TrimBox", "/ArtBox"]:
+        if b in page:
+            rr = pypdf.generic.RectangleObject(page[b])
+            pt1 = trsf.apply_on(rr.lower_left)
+            pt2 = trsf.apply_on(rr.upper_right)
+            page[pypdf.generic.NameObject(b)] = pypdf.generic.RectangleObject((
+                min(pt1[0], pt2[0]),
+                min(pt1[1], pt2[1]),
+                max(pt1[0], pt2[0]),
+                max(pt1[1], pt2[1]),
+            ))
 
 
 @deconstructible

src/pretix/control/logdisplay.py

@@ -34,11 +34,11 @@
 # License for the specific language governing permissions and limitations under the License.
 
 from collections import defaultdict
+from datetime import datetime
 from decimal import Decimal
 from typing import Optional
 
 import bleach
-import dateutil.parser
 from django.dispatch import receiver
 from django.urls import reverse
 from django.utils.formats import date_format
@@ -248,7 +248,7 @@ class OrderValidFromChanged(OrderChangeLogEntryType):
     def display_prefixed(self, event: Event, logentry: LogEntry, data):
         return _('The validity start date for position #{posid} has been changed to {value}.').format(
             posid=data.get('positionid', '?'),
-            value=date_format(dateutil.parser.parse(data.get('new_value')), 'SHORT_DATETIME_FORMAT') if data.get(
+            value=date_format(datetime.fromisoformat(data.get('new_value')), 'SHORT_DATETIME_FORMAT') if data.get(
                 'new_value') else '–'
         )
 
@@ -260,7 +260,7 @@ class OrderValidUntilChanged(OrderChangeLogEntryType):
     def display_prefixed(self, event: Event, logentry: LogEntry, data):
         return _('The validity end date for position #{posid} has been changed to {value}.').format(
             posid=data.get('positionid', '?'),
-            value=date_format(dateutil.parser.parse(data.get('new_value')), 'SHORT_DATETIME_FORMAT') if data.get('new_value') else '–'
+            value=date_format(datetime.fromisoformat(data.get('new_value')), 'SHORT_DATETIME_FORMAT') if data.get('new_value') else '–'
         )
 
 
@@ -364,7 +364,7 @@ class CheckinErrorLogEntryType(OrderLogEntryType):
         data['posid'] = logentry.parsed_data.get('positionid', '?')
 
         if 'datetime' in data:
-            dt = dateutil.parser.parse(data.get('datetime'))
+            dt = datetime.fromisoformat(data.get('datetime'))
             if abs((logentry.datetime - dt).total_seconds()) > 5 or data.get('forced'):
                 if event:
                     data['datetime'] = date_format(dt.astimezone(event.timezone), "SHORT_DATETIME_FORMAT")
@@ -430,7 +430,7 @@ class OrderPrintLogEntryType(OrderLogEntryType):
         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(logentry.event.timezone),
+                datetime.fromisoformat(data["datetime"]).astimezone(logentry.event.timezone),
                 "SHORT_DATETIME_FORMAT"
             ) if logentry.event else data["datetime"],
             type=dict(PrintLog.PRINT_TYPES)[data["type"]],
@@ -985,7 +985,7 @@ class LegacyCheckinLogEntryType(OrderLogEntryType):
 
     def display(self, logentry, data):
         # deprecated
-        dt = dateutil.parser.parse(data.get('datetime'))
+        dt = datetime.fromisoformat(data.get('datetime'))
         tz = logentry.event.timezone
         dt_formatted = date_format(dt.astimezone(tz), "SHORT_DATETIME_FORMAT")
         if 'list' in data:

src/pretix/control/templates/pretixcontrol/checkin/list_edit.html

@@ -89,7 +89,9 @@
             </button>
         </div>
     </form>
-    {{ items|json_script:"items" }}
+    {% if items %}
+        {{ items|json_script:"items" }}
+    {% endif %}
 
     {% compress js %}
         <script type="text/javascript" src="{% static "d3/d3.v6.js" %}"></script>

src/pretix/plugins/badges/exporters.py

@@ -55,6 +55,7 @@ from django.db.models.functions import Cast, Coalesce
 from django.utils.timezone import make_aware
 from django.utils.translation import gettext as _, gettext_lazy, pgettext_lazy
 from pypdf import PageObject, PdfReader, PdfWriter, Transformation
+from pypdf.generic import RectangleObject
 from reportlab.lib import pagesizes
 from reportlab.lib.units import inch, mm
 from reportlab.pdfgen import canvas
@@ -237,8 +238,15 @@ def _render_nup_page(nup_pdf: PdfWriter, input_pages: PageObject, opt: dict) ->
         di = i % badges_per_page
         tx = opt['margins'][3] + (di % opt['cols']) * opt['offsets'][0]
         ty = opt['margins'][2] + (opt['rows'] - 1 - (di // opt['cols'])) * opt['offsets'][1]
+        page.add_transformation(Transformation().translate(tx, ty))
+        page.mediabox = RectangleObject((
+            Decimal('%.5f' % (page.mediabox.left.as_numeric() + tx)),
+            Decimal('%.5f' % (page.mediabox.bottom.as_numeric() + ty)),
+            Decimal('%.5f' % (page.mediabox.right.as_numeric() + tx)),
+            Decimal('%.5f' % (page.mediabox.top.as_numeric() + ty))
+        ))
         page.trimbox = page.cropbox = page.mediabox
-        nup_page.merge_transformed_page(page, Transformation().translate(tx, ty))
+        nup_page.merge_page(page)
     return nup_page
 
 

src/pretix/static/pretixcontrol/js/ui/checkinrules/viz-node.vue

@@ -180,7 +180,7 @@ g
 				br
 				span(v-if="varresult !== null") {{ varresult }}
 				strong
-					| {{ op.label }} {{ rightoperand }}
+					| {{ op?.label}} {{ rightoperand }}
 			span(v-else-if="vardata && vardata.type === 'int_by_datetime'")
 				span.fa.fa-sign-in(v-if="variable.startsWith('entries_')")
 				| {{ vardata.label }}
@@ -193,21 +193,21 @@ g
 				br
 				span(v-if="varresult !== null") {{ varresult }}
 				strong
-					| {{ op.label }} {{ rightoperand }}
+					| {{ op?.label }} {{ rightoperand }}
 			span(v-else-if="vardata && variable === 'now'")
 				span.fa.fa-clock-o
 				|  {{ vardata.label }}
 				br
 				span(v-if="varresult !== null") {{ varresult }}
 				strong
-					| {{ op.label }}
+					| {{ op?.label }}
 					br
-					span(v-if="rightoperand.buildTime[0] === 'custom'")
-						| {{ df(rightoperand.buildTime[1]) }}
-					span(v-else-if="rightoperand.buildTime[0] === 'customtime'")
-						| {{ tf(rightoperand.buildTime[1]) }}
+					span(v-if="rightoperand?.buildTime[0] === 'custom'")
+						| {{ df(rightoperand?.buildTime[1]) }}
+					span(v-else-if="rightoperand?.buildTime[0] === 'customtime'")
+						| {{ tf(rightoperand?.buildTime[1]) }}
 					span(v-else)
-						| {{ TEXTS[rightoperand.buildTime[0]] }}
+						| {{ TEXTS[rightoperand?.buildTime[0]] }}
 					span(v-if="operands[2]")
 						span(v-if="operator === 'isBefore'") +
 						span(v-else) -
@@ -220,14 +220,14 @@ g
 				span(v-if="varresult !== null")  ({{ varresult }})
 				br
 				strong
-					| {{ rightoperand.objectList.map((o: any) => o.lookup[2]).join(", ") }}
+					| {{ rightoperand?.objectList.map((o: any) => o.lookup[2]).join(", ") }}
 			span(v-else-if="vardata && vardata.type === 'enum_entry_status'")
 				span.fa.fa-check-circle-o
 				| {{ vardata.label }}
 				span(v-if="varresult !== null")  ({{ varresult }})
 				br
 				strong
-					| {{ op.label }} {{ rightoperand }}
+					| {{ op?.label }} {{ rightoperand }}
 
 	g(v-if="result === false", :transform="`translate(${x + boxWidth - 15}, ${y - 10})`")
 		ellipse(fill="#fff", cx="14.685823", cy="14.318233", rx="12.140151", ry="11.55523")

src/pretix/static/pretixpresale/widget/src/components/PriceBox.vue

@@ -93,11 +93,11 @@ const showTaxline = computed(() => props.price.rate !== '0.00' && props.price.gr
 	span(v-if="!freePrice && !originalPrice", v-html="priceline")
 	span(v-if="!freePrice && originalPrice")
 		del.pretix-widget-pricebox-original-price(:aria-label="originalPriceAriaLabel", v-html="originalLine")
-		|
+		|!{' '}
 		ins.pretix-widget-pricebox-new-price(:aria-label="newPriceAriaLabel", v-html="priceline")
 	div(v-if="freePrice")
 		span.pretix-widget-pricebox-currency(:id="priceBoxId") {{ store.currency }}
-		|
+		|!{' '}
 		input.pretix-widget-pricebox-price-input(
 			type="number",
 			placeholder="0",