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

Removed CleanerVersion layer [backwards-incompatible!]

Browse Source
This commit is contained in:
Raphael Michel
2015-12-12 13:08:33 +01:00
parent 0c9c9dd22c
commit d133d2abff
85 changed files with 712 additions and 1089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ class CartMixin:
"""
A list of this users cart position
"""
return list(CartPosition.objects.current.filter(
return list(CartPosition.objects.filter(
cart_id=self.request.session.session_key, event=self.request.event
).order_by(
'item', 'variation'
@@ -26,7 +26,7 @@ class CartMixin:
))
def get_cart(self, answers=False, queryset=None, payment_fee=None):
queryset = queryset or CartPosition.objects.current.filter(
queryset = queryset or CartPosition.objects.filter(
cart_id=self.request.session.session_key, event=self.request.event
)
@@ -49,8 +49,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, "", "", ""
return "", pos.item_id, pos.variation_id, pos.price
return pos.id, 0, 0, 0
return 0, pos.item_id, pos.variation_id, pos.price
positions = []
for k, g in groupby(sorted(list(cartpos), key=keyfunc), key=keyfunc):