forked from CGM_Public/pretix_original
Check-in log: Correctly use name from parent product (Z#23192134) (#5091)
This commit is contained in:
@@ -801,7 +801,13 @@ class CheckinLogList(ListExporter):
|
|||||||
ia = ci.position.order.invoice_address
|
ia = ci.position.order.invoice_address
|
||||||
except InvoiceAddress.DoesNotExist:
|
except InvoiceAddress.DoesNotExist:
|
||||||
ia = InvoiceAddress()
|
ia = InvoiceAddress()
|
||||||
|
name = (
|
||||||
|
ci.position.attendee_name or
|
||||||
|
(ci.position.addon_to.attendee_name if ci.position.addon_to else '') or
|
||||||
|
ia.name
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
name = ""
|
||||||
yield [
|
yield [
|
||||||
date_format(ci.datetime.astimezone(self.timezone), 'SHORT_DATE_FORMAT'),
|
date_format(ci.datetime.astimezone(self.timezone), 'SHORT_DATE_FORMAT'),
|
||||||
date_format(ci.datetime.astimezone(self.timezone), 'TIME_FORMAT'),
|
date_format(ci.datetime.astimezone(self.timezone), 'TIME_FORMAT'),
|
||||||
@@ -811,7 +817,7 @@ class CheckinLogList(ListExporter):
|
|||||||
ci.position.positionid if ci.position else '',
|
ci.position.positionid if ci.position else '',
|
||||||
ci.raw_barcode or ci.position.secret,
|
ci.raw_barcode or ci.position.secret,
|
||||||
str(ci.position.item) if ci.position else (str(ci.raw_item) if ci.raw_item else ''),
|
str(ci.position.item) if ci.position else (str(ci.raw_item) if ci.raw_item else ''),
|
||||||
(ci.position.attendee_name or ia.name) if ci.position else '',
|
name,
|
||||||
str(ci.device) if ci.device else '',
|
str(ci.device) if ci.device else '',
|
||||||
_('Yes') if ci.force_sent is True else (_('No') if ci.force_sent is False else '?'),
|
_('Yes') if ci.force_sent is True else (_('No') if ci.force_sent is False else '?'),
|
||||||
_('Yes') if ci.forced else _('No'),
|
_('Yes') if ci.forced else _('No'),
|
||||||
|
|||||||
Reference in New Issue
Block a user