Allow to explicitly disable products for certain subevents

src/pretix/base/migrations/0154_auto_20200620_1633.py

@@ -0,0 +1,31 @@
+# Generated by Django 3.0.6 on 2020-06-20 16:33
+
+import django_countries.fields
+from django.db import migrations, models
+
+import pretix.helpers.countries
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0153_auto_20200528_1953'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='subeventitem',
+            name='disabled',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='subeventitemvariation',
+            name='disabled',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='invoiceaddress',
+            name='country',
+            field=django_countries.fields.CountryField(countries=pretix.helpers.countries.CachedCountries, max_length=2),
+        ),
+    ]

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)

src/pretix/base/services/cart.py

@@ -253,6 +253,12 @@ class CartManager:
             if self._sales_channel not in op.item.sales_channels:
                 raise CartError(error_messages['unavailable'])
 
+            if op.subevent and op.item.pk in op.subevent.item_overrides and op.subevent.item_overrides[op.item.pk].disabled:
+                raise CartError(error_messages['not_for_sale'])
+
+            if op.subevent and op.variation and op.variation.pk in op.subevent.var_overrides and op.subevent.var_overrides[op.variation.pk].disabled:
+                raise CartError(error_messages['not_for_sale'])
+
             if op.item.has_variations and not op.variation:
                 raise CartError(error_messages['not_for_sale'])
 

src/pretix/base/services/orders.py

@@ -641,6 +641,16 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
             delete(cp)
             continue
 
+        if cp.subevent and cp.item.pk in cp.subevent.item_overrides and cp.subevent.item_overrides[cp.item.pk].disabled:
+            err = err or error_messages['unavailable']
+            delete(cp)
+            continue
+
+        if cp.subevent and cp.variation and cp.variation.pk in cp.subevent.var_overrides and cp.subevent.var_overrides[cp.variation.pk].disabled:
+            err = err or error_messages['unavailable']
+            delete(cp)
+            continue
+
         if cp.voucher:
             if cp.voucher.valid_until and cp.voucher.valid_until < now_dt:
                 err = err or error_messages['voucher_expired']