Allow to explicitly disable products for certain subevents

src/pretix/base/models/event.py

@@ -1061,21 +1061,35 @@ class SubEvent(EventMixin, LoggedModel):
         return self.event.settings
 
     @cached_property
-    def item_price_overrides(self):
+    def item_overrides(self):
         from .items import SubEventItem
 
         return {
-            si.item_id: si.price
-            for si in SubEventItem.objects.filter(subevent=self, price__isnull=False)
+            si.item_id: si
+            for si in SubEventItem.objects.filter(subevent=self)
         }
 
     @cached_property
-    def var_price_overrides(self):
+    def var_overrides(self):
         from .items import SubEventItemVariation
 
+        return {
+            si.variation_id: si
+            for si in SubEventItemVariation.objects.filter(subevent=self)
+        }
+
+    @property
+    def item_price_overrides(self):
+        return {
+            si.item_id: si.price
+            for si in self.item_overrides.values() if si.price is not None
+        }
+
+    @property
+    def var_price_overrides(self):
         return {
             si.variation_id: si.price
-            for si in SubEventItemVariation.objects.filter(subevent=self, price__isnull=False)
+            for si in self.var_overrides.values() if si.price is not None
         }
 
     @property

src/pretix/base/models/items.py

@@ -118,6 +118,7 @@ class SubEventItem(models.Model):
     subevent = models.ForeignKey('SubEvent', on_delete=models.CASCADE)
     item = models.ForeignKey('Item', on_delete=models.CASCADE)
     price = models.DecimalField(max_digits=7, decimal_places=2, null=True, blank=True)
+    disabled = models.BooleanField(default=False)
 
     def delete(self, *args, **kwargs):
         super().delete(*args, **kwargs)
@@ -145,6 +146,7 @@ class SubEventItemVariation(models.Model):
     subevent = models.ForeignKey('SubEvent', on_delete=models.CASCADE)
     variation = models.ForeignKey('ItemVariation', on_delete=models.CASCADE)
     price = models.DecimalField(max_digits=7, decimal_places=2, null=True, blank=True)
+    disabled = models.BooleanField(default=False)
 
     def delete(self, *args, **kwargs):
         super().delete(*args, **kwargs)