diff --git a/src/pretix/control/logdisplay.py b/src/pretix/control/logdisplay.py index 5edb5e217..5e7a13a7a 100644 --- a/src/pretix/control/logdisplay.py +++ b/src/pretix/control/logdisplay.py @@ -338,7 +338,7 @@ class CheckinErrorLogEntryType(OrderLogEntryType): else: data['list'] = _("(unknown)") - data['barcode'] = data.get('barcode')[:16] + data['barcode'] = data.get('barcode', '')[:16] data['posid'] = logentry.parsed_data.get('positionid', '?') if 'datetime' in data: @@ -529,7 +529,7 @@ class VoucherRedeemedLogEntryType(VoucherLogEntryType): }) return format_html( self.plain, - order_code=format_html('{}', url, data('order_code', '?')), + order_code=format_html('{}', url, data.get('order_code', '?')), ) diff --git a/src/pretix/plugins/paypal2/signals.py b/src/pretix/plugins/paypal2/signals.py index e5e4c9bfc..58894baa2 100644 --- a/src/pretix/plugins/paypal2/signals.py +++ b/src/pretix/plugins/paypal2/signals.py @@ -51,8 +51,8 @@ def register_payment_provider(sender, **kwargs): class PaypalEventLogEntryType(EventLogEntryType): action_type = 'pretix.plugins.paypal.event' - def display(self, logentry): - event_type = logentry.parsed_data.get('event_type') + def display(self, logentry, data): + event_type = data.get('event_type') text = None plains = { 'PAYMENT.SALE.COMPLETED': _('Payment completed.'),