CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Use new position ids in order change logs

Browse Source
This commit is contained in:
Raphael Michel
2016-12-21 18:59:51 +01:00
parent 9bf9cc0f9f
commit 18c24623d7
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pretix/base/services/orders.py
View File

@@ -500,6 +500,7 @@ class OrderChangeManager:
if isinstance(op, self.ItemOperation): if isinstance(op, self.ItemOperation):
self.order.log_action('pretix.event.order.changed.item', user=self.user, data={ self.order.log_action('pretix.event.order.changed.item', user=self.user, data={
'position': op.position.pk, 'position': op.position.pk,
'positionid': op.position.positionid,
'old_item': op.position.item.pk, 'old_item': op.position.item.pk,
'old_variation': op.position.variation.pk if op.position.variation else None, 'old_variation': op.position.variation.pk if op.position.variation else None,
'new_item': op.item.pk, 'new_item': op.item.pk,
@@ -515,6 +516,7 @@ class OrderChangeManager:
elif isinstance(op, self.PriceOperation): elif isinstance(op, self.PriceOperation):
self.order.log_action('pretix.event.order.changed.price', user=self.user, data={ self.order.log_action('pretix.event.order.changed.price', user=self.user, data={
'position': op.position.pk, 'position': op.position.pk,
'positionid': op.position.positionid,
'old_price': op.position.price, 'old_price': op.position.price,
'new_price': op.price 'new_price': op.price
}) })
@@ -524,6 +526,7 @@ class OrderChangeManager:
elif isinstance(op, self.CancelOperation): elif isinstance(op, self.CancelOperation):
self.order.log_action('pretix.event.order.changed.cancel', user=self.user, data={ self.order.log_action('pretix.event.order.changed.cancel', user=self.user, data={
'position': op.position.pk, 'position': op.position.pk,
'positionid': op.position.positionid,
'old_item': op.position.item.pk, 'old_item': op.position.item.pk,
'old_variation': op.position.variation.pk if op.position.variation else None, 'old_variation': op.position.variation.pk if op.position.variation else None,
'old_price': op.position.price, 'old_price': op.position.price,

11
src/pretix/control/logdisplay.py
View File

@@ -20,14 +20,18 @@ def _display_order_changed(event: Event, logentry: LogEntry):
new_item = str(event.items.get(pk=data['new_item'])) new_item = str(event.items.get(pk=data['new_item']))
if data['new_variation']: if data['new_variation']:
new_item += ' - ' + str(event.itemvariations.get(pk=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_item=old_item, new_item=new_item,
old_price=formats.localize(Decimal(data['old_price'])), old_price=formats.localize(Decimal(data['old_price'])),
new_price=formats.localize(Decimal(data['new_price'])), new_price=formats.localize(Decimal(data['new_price'])),
currency=event.currency currency=event.currency
) )
elif logentry.action_type == 'pretix.event.order.changed.price': 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'])), old_price=formats.localize(Decimal(data['old_price'])),
new_price=formats.localize(Decimal(data['new_price'])), new_price=formats.localize(Decimal(data['new_price'])),
currency=event.currency 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'])) old_item = str(event.items.get(pk=data['old_item']))
if data['old_variation']: if data['old_variation']:
old_item += ' - ' + str(ItemVariation.objects.get(pk=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_item=old_item,
old_price=formats.localize(Decimal(data['old_price'])), old_price=formats.localize(Decimal(data['old_price'])),
currency=event.currency currency=event.currency