diff --git a/src/pretix/base/services/orders.py b/src/pretix/base/services/orders.py index a2a75d4ccb..020e3db525 100644 --- a/src/pretix/base/services/orders.py +++ b/src/pretix/base/services/orders.py @@ -500,6 +500,7 @@ class OrderChangeManager: if isinstance(op, self.ItemOperation): self.order.log_action('pretix.event.order.changed.item', user=self.user, data={ 'position': op.position.pk, + 'positionid': op.position.positionid, 'old_item': op.position.item.pk, 'old_variation': op.position.variation.pk if op.position.variation else None, 'new_item': op.item.pk, @@ -515,6 +516,7 @@ class OrderChangeManager: elif isinstance(op, self.PriceOperation): self.order.log_action('pretix.event.order.changed.price', user=self.user, data={ 'position': op.position.pk, + 'positionid': op.position.positionid, 'old_price': op.position.price, 'new_price': op.price }) @@ -524,6 +526,7 @@ class OrderChangeManager: elif isinstance(op, self.CancelOperation): self.order.log_action('pretix.event.order.changed.cancel', user=self.user, data={ 'position': op.position.pk, + 'positionid': op.position.positionid, 'old_item': op.position.item.pk, 'old_variation': op.position.variation.pk if op.position.variation else None, 'old_price': op.position.price, diff --git a/src/pretix/control/logdisplay.py b/src/pretix/control/logdisplay.py index 912e447f41..e4174d38a3 100644 --- a/src/pretix/control/logdisplay.py +++ b/src/pretix/control/logdisplay.py @@ -20,14 +20,18 @@ def _display_order_changed(event: Event, logentry: LogEntry): new_item = str(event.items.get(pk=data['new_item'])) if data['new_variation']: new_item += ' - ' + str(event.itemvariations.get(pk=data['new_variation'])) - return text + ' ' + _('{old_item} ({old_price} {currency}) changed to {new_item} ({new_price} {currency}).').format( + return text + ' ' + _('Position #{posid}: {old_item} ({old_price} {currency}) changed ' + 'to {new_item} ({new_price} {currency}).').format( + posid=data.get('positionid', '?'), old_item=old_item, new_item=new_item, old_price=formats.localize(Decimal(data['old_price'])), new_price=formats.localize(Decimal(data['new_price'])), currency=event.currency ) elif logentry.action_type == 'pretix.event.order.changed.price': - return text + ' ' + _('Price of a position changed from {old_price} {currency} to {new_price} {currency}.').format( + return text + ' ' + _('Price of position #{posid} changed from {old_price} {currency} ' + 'to {new_price} {currency}.').format( + posid=data.get('positionid', '?'), old_price=formats.localize(Decimal(data['old_price'])), new_price=formats.localize(Decimal(data['new_price'])), currency=event.currency @@ -36,7 +40,8 @@ def _display_order_changed(event: Event, logentry: LogEntry): old_item = str(event.items.get(pk=data['old_item'])) if data['old_variation']: old_item += ' - ' + str(ItemVariation.objects.get(pk=data['old_variation'])) - return text + ' ' + _('{old_item} ({old_price} {currency}) removed.').format( + return text + ' ' + _('Position #{posid} ({old_item}, {old_price} {currency}) removed.').format( + posid=data.get('positionid', '?'), old_item=old_item, old_price=formats.localize(Decimal(data['old_price'])), currency=event.currency