Allow quota-level vouchers for hidden products (#1123)

* Changes in checks

* Backwards-compatible implementation

* Add test

* Fix voucher bulk form

src/pretix/base/models/items.py

@@ -171,12 +171,11 @@ def filter_available(qs, channel='web', voucher=None, allow_addons=False):
     qs = qs.filter(q)
 
     vouchq = Q(hide_without_voucher=False)
-    if voucher:
+    if voucher and voucher.show_hidden_items:
         if voucher.item_id:
-            vouchq |= Q(pk=voucher.item_id)
-            qs = qs.filter(pk=voucher.item_id)
+            vouchq = Q(pk=voucher.item_id)
         elif voucher.quota_id:
-            qs = qs.filter(quotas__in=[voucher.quota_id])
+            vouchq = Q(quotas__in=[voucher.quota_id])
     return qs.filter(vouchq)
 
 
@@ -343,7 +342,7 @@ class Item(LoggedModel):
         verbose_name=_('This product will only be shown if a voucher matching the product is redeemed.'),
         default=False,
         help_text=_('This product will be hidden from the event page until the user enters a voucher '
-                    'code that is specifically tied to this product (and not via a quota).')
+                    'that unlocks this product.')
     )
     require_bundling = models.BooleanField(
         verbose_name=_('Only sell this product as part of a bundle'),

src/pretix/base/models/vouchers.py

@@ -176,6 +176,10 @@ class Voucher(LoggedModel):
         help_text=_("The text entered in this field will not be visible to the user and is available for your "
                     "convenience.")
     )
+    show_hidden_items = models.BooleanField(
+        verbose_name=_("Shows hidden products that match this voucher"),
+        default=True
+    )
 
     objects = ScopedManager(organizer='event__organizer')