Vouchers: Allow to set all addons or bundles as included (#3322)

Co-authored-by: Richard Schreiber <schreiber@rami.io>

src/pretix/base/services/cart.py

@@ -512,7 +512,10 @@ class CartManager:
             if cp.is_bundled:
                 bundle = cp.addon_to.item.bundles.filter(bundled_item=cp.item, bundled_variation=cp.variation).first()
                 if bundle:
-                    listed_price = bundle.designated_price or Decimal('0.00')
+                    if cp.addon_to.voucher_id and cp.addon_to.voucher.all_bundles_included:
+                        listed_price = Decimal('0.00')
+                    else:
+                        listed_price = bundle.designated_price
                 else:
                     listed_price = cp.price
                 price_after_voucher = listed_price
@@ -712,6 +715,11 @@ class CartManager:
                 else:
                     bundle_quotas = []
 
+                if voucher and voucher.all_bundles_included:
+                    bundled_price = Decimal('0.00')
+                else:
+                    bundled_price = bundle.designated_price
+
                 bop = self.AddOperation(
                     count=bundle.count,
                     item=bitem,
@@ -722,8 +730,8 @@ class CartManager:
                     subevent=subevent,
                     bundled=[],
                     seat=None,
-                    listed_price=bundle.designated_price,
-                    price_after_voucher=bundle.designated_price,
+                    listed_price=bundled_price,
+                    price_after_voucher=bundled_price,
                     custom_price_input=None,
                     custom_price_input_is_net=False,
                     voucher_ignored=False,
@@ -809,7 +817,6 @@ class CartManager:
         quota_diff = Counter()  # Quota -> Number of usages
         operations = []
         available_categories = defaultdict(set)  # CartPos -> Category IDs to choose from
-        price_included = defaultdict(dict)  # CartPos -> CategoryID -> bool(price is included)
         toplevel_cp = self.positions.filter(
             addon_to__isnull=True
         ).prefetch_related(
@@ -819,7 +826,6 @@ class CartManager:
         # Prefill some of the cache containers
         for cp in toplevel_cp:
             available_categories[cp.pk] = {iao.addon_category_id for iao in cp.item.addons.all()}
-            price_included[cp.pk] = {iao.addon_category_id: iao.price_included for iao in cp.item.addons.all()}
             cpcache[cp.pk] = cp
             for a in cp.addons.all():
                 if not a.is_bundled:

src/pretix/base/services/orders.py

@@ -1892,7 +1892,7 @@ class OrderChangeManager:
             input_addons[op.id][a['item'], a['variation']] = a.get('count', 1)
             selected_addons[op.id, item.category_id][a['item'], a['variation']] = a.get('count', 1)
 
-            if price_included[op.pk].get(item.category_id):
+            if price_included[op.pk].get(item.category_id) or (op.voucher_id and op.voucher.all_addons_included):
                 price = TAXED_ZERO
             else:
                 price = get_price(

src/pretix/base/services/pricing.py

@@ -110,6 +110,8 @@ def is_included_for_free(item: Item, addon_to: AbstractPosition):
                 return True
         except ItemAddOn.DoesNotExist:
             pass
+        if addon_to.voucher_id and addon_to.voucher.all_addons_included:
+            return True
     return False