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

Fixed a bug in cart sorting method

Browse Source
This commit is contained in:
Raphael Michel
2016-04-13 11:09:14 +02:00
parent b653915a35
commit 93f824879e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/control/views/orders.py
View File

@@ -140,8 +140,8 @@ class OrderDetail(OrderView):
def keyfunc(pos):
if (pos.item.admission and self.request.event.settings.attendee_names_asked) \
or pos.item.questions.all():
return pos.id, 0, 0, 0, 0, None
return 0, pos.item_id, pos.variation_id, pos.price, pos.tax_rate, pos.voucher
return pos.id, 0, 0, 0, 0, 0
return 0, pos.item_id, pos.variation_id, pos.price, pos.tax_rate, (pos.voucher_id or 0)
positions = []
for k, g in groupby(sorted(list(cartpos), key=keyfunc), key=keyfunc):

4
src/pretix/presale/views/__init__.py
View File

@@ -48,8 +48,8 @@ class CartMixin:
def keyfunc(pos):
if answers and ((pos.item.admission and self.request.event.settings.attendee_names_asked)
or pos.item.questions.all()):
return pos.id, 0, 0, 0, None
return 0, pos.item_id, pos.variation_id, pos.price, pos.voucher
return pos.id, 0, 0, 0, 0
return 0, pos.item_id, pos.variation_id, pos.price, (pos.voucher_id or 0)
positions = []
for k, g in groupby(sorted(list(cartpos), key=keyfunc), key=keyfunc):