From edbd24e94216d1a3ee21aeef613e2fd3290f5ac0 Mon Sep 17 00:00:00 2001
From: Julian Rother <github@jrother.eu>
Date: Fri, 7 Oct 2022 09:12:13 +0200
Subject: [PATCH] Checkout: do not show bundled products as "Selected add-ons"
 in questions step (#2820)

---
 src/pretix/base/models/orders.py                              | 4 ++++
 .../templates/pretixpresale/event/checkout_questions.html     | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py
index f10637dd9..d464f2905 100644
--- a/src/pretix/base/models/orders.py
+++ b/src/pretix/base/models/orders.py
@@ -2714,6 +2714,10 @@ class CartPosition(AbstractPosition):
             self.tax_rate = line_price.rate
             self.save(update_fields=['line_price_gross', 'tax_rate'])
 
+    @property
+    def addons_without_bundled(self):
+        return [op for op in self.addons.all() if not op.is_bundled]
+
 
 class InvoiceAddress(models.Model):
     last_modified = models.DateTimeField(auto_now=True)
diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
index dc3fb2852..48aa03a20 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
@@ -114,14 +114,14 @@
                                     </div>
                                 </div>
                             {% endif %}
-                            {% if pos.addons.all %}
+                            {% if pos.addons_without_bundled %}
                                 <div class="form-group">
                                     <label class="col-md-3 control-label">
                                         {% trans "Selected add-ons" %}
                                     </label>
                                     <div class="col-md-9 form-control-text">
                                         <ul class="addon-list">
-                                            {% regroup pos.addons.all by item_and_variation as addons_by_itemvar %}
+                                            {% regroup pos.addons_without_bundled by item_and_variation as addons_by_itemvar %}
                                             {% for group in addons_by_itemvar %}
                                                 <li>{% if group.list|length > 1 %}{{ group.list|length }}&times; {% endif %}{{ group.grouper.0.name }}{% if group.grouper.1 %} – {{ group.grouper.1.value }}{% endif %}</li>
                                             {% endfor %}