From b305ac012c1e874085677b8dc2db373472421a11 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Tue, 21 Jul 2020 17:23:30 +0200
Subject: [PATCH] Fix price field when increasing number of bundles in cart

---
 .../templates/pretixpresale/event/fragment_cart.html     | 4 ++--
 src/pretix/presale/views/__init__.py                     | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
index ea90528b7..84d128b6e 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
+++ b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
@@ -173,12 +173,12 @@
                         <input type="hidden" name="variation_{{ line.item.id }}_{{ line.variation.id }}"
                             value="1" />
                         <input type="hidden" name="price_{{ line.item.id }}_{{ line.variation.id }}"
-                                value="{{ line.price }}" />
+                                value="{% if event.settings.display_net_prices %}{{ line.bundle_sum_net }}{% else %}{{ line.bundle_sum }}{% endif %}" />
                     {% else %}
                         <input type="hidden" name="item_{{ line.item.id }}"
                                 value="1" />
                         <input type="hidden" name="price_{{ line.item.id }}"
-                                value="{% if event.settings.display_net_prices %}{{ line.net_price }}{% else %}{{ line.price }}{% endif %}" />
+                                value="{% if event.settings.display_net_prices %}{{ line.bundle_sum_net }}{% else %}{{ line.bundle_sum }}{% endif %}" />
                     {% endif %}
                     <button class="btn btn-mini btn-link {% if line.seat %}btn-invisible{% endif %}" title="{% trans "Add one more" %}" {% if line.seat %}disabled{% endif %}>
                         <i class="fa fa-plus"></i>
diff --git a/src/pretix/presale/views/__init__.py b/src/pretix/presale/views/__init__.py
index 1c0afe35e..bc24ea3ff 100644
--- a/src/pretix/presale/views/__init__.py
+++ b/src/pretix/presale/views/__init__.py
@@ -74,7 +74,10 @@ class CartMixin:
             cartpos = self.positions
 
         lcp = list(cartpos)
-        has_addons = {cp.addon_to_id for cp in lcp if cp.addon_to_id}
+        has_addons = defaultdict(list)
+        for cp in lcp:
+            if cp.addon_to_id:
+                has_addons[cp.addon_to_id].append(cp)
 
         pos_additional_fields = defaultdict(list)
         for cp in lcp:
@@ -129,6 +132,10 @@ class CartMixin:
             group.net_total = group.count * group.net_price
             group.has_questions = answers and k[0] != ""
             group.tax_rule = group.item.tax_rule
+
+            group.bundle_sum = group.price + sum(a.price for a in has_addons[group.pk])
+            group.bundle_sum_net = group.net_price + sum(a.net_price for a in has_addons[group.pk])
+
             if answers:
                 group.cache_answers(all=False)
                 group.additional_answers = pos_additional_fields.get(group.pk)