From 93f824879e8b4b7e11bc3df7df38e86c33790bd2 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 13 Apr 2016 11:09:14 +0200 Subject: [PATCH] Fixed a bug in cart sorting method --- src/pretix/control/views/orders.py | 4 ++-- src/pretix/presale/views/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py index 5919d9d7ef..356c4fb3ec 100644 --- a/src/pretix/control/views/orders.py +++ b/src/pretix/control/views/orders.py @@ -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): diff --git a/src/pretix/presale/views/__init__.py b/src/pretix/presale/views/__init__.py index 8ad0dc397c..73a9af3e01 100644 --- a/src/pretix/presale/views/__init__.py +++ b/src/pretix/presale/views/__init__.py @@ -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):