Display payment details

src/pretix/presale/views/__init__.py

@@ -52,22 +52,33 @@ class CartDisplayMixin:
             'item__questions', 'answers'
         ))
 
-    def get_cart(self):
-        cartpos = CartPosition.objects.current.filter(
-            Q(user=self.request.user) & Q(event=self.request.event)
-        ).order_by(
+    def get_cart(self, answers=False, queryset=None, payment_fee=None):
+        if queryset is None:
+            queryset = CartPosition.objects.current.filter(
+                Q(user=self.request.user) & Q(event=self.request.event)
+            )
+
+        prefetch = ['variation__values', 'variation__values__prop']
+        if answers:
+            prefetch.append('item__questions')
+            prefetch.append('answers')
+
+        cartpos = queryset.order_by(
             'item', 'variation'
         ).select_related(
             'item', 'variation'
         ).prefetch_related(
-            'variation__values', 'variation__values__prop'
+            *prefetch
         )
 
         # Group items of the same variation
         # We do this by list manipulations instead of a GROUP BY query, as
         # Django is unable to join related models in a .values() query
         def keyfunc(pos):
-            return pos.item_id, pos.variation_id, pos.price
+            if answers and ((pos.item.admission and self.request.event.settings.attendee_names_asked == 'True')
+                    or pos.item.questions.all()):
+                return pos.id, "", "", ""
+            return "", pos.item_id, pos.variation_id, pos.price
 
         positions = []
         for k, g in groupby(sorted(list(cartpos), key=keyfunc), key=keyfunc):
@@ -75,27 +86,42 @@ class CartDisplayMixin:
             group = g[0]
             group.count = len(g)
             group.total = group.count * group.price
+            group.has_questions = answers and k[0] != ""
+            if answers:
+                group.answ = {}
+                for a in group.answers.all():
+                    group.answ[a.question_id] = a.answer
+                group.questions = []
+                for q in group.item.questions.all():
+                    if q.identity in group.answ:
+                        q.answer = group.answ[q.identity]
+                    else:
+                        q.answer = ""
+                    group.questions.append(q)
             positions.append(group)
 
         total = sum(p.total for p in positions)
 
-        payment_fee = 0
-        if 'payment' in self.request.session:
-            responses = register_payment_providers.send(self.request.event)
-            for receiver, response in responses:
-                provider = response(self.request.event)
-                if provider.identifier == self.request.session['payment']:
-                    payment_fee = provider.calculate_fee(total)
+        if payment_fee is None:
+            payment_fee = 0
+            if 'payment' in self.request.session:
+                responses = register_payment_providers.send(self.request.event)
+                for receiver, response in responses:
+                    provider = response(self.request.event)
+                    if provider.identifier == self.request.session['payment']:
+                        payment_fee = provider.calculate_fee(total)
 
+        try:
+            minutes_left = max(min(p.expires for p in positions) - now(), timedelta()).seconds // 60 if positions else 0
+        except AttributeError:
+            minutes_left = None
         return {
             'positions': positions,
             'raw': cartpos,
             'total': total + payment_fee,
             'payment_fee': payment_fee,
-            'minutes_left': (
-                max(min(p.expires for p in positions) - now(), timedelta()).seconds // 60
-                if positions else 0
-            ),
+            'answers': answers,
+            'minutes_left': minutes_left,
         }