Fix #1567 -- Per-subevent availability of items (#2040)

src/pretix/base/models/event.py

@@ -50,6 +50,7 @@ from django.core.validators import (
 )
 from django.db import models
 from django.db.models import Exists, OuterRef, Prefetch, Q, Subquery, Value
+from django.db.models.functions import Coalesce
 from django.template.defaultfilters import date as _date
 from django.urls import reverse
 from django.utils.crypto import get_random_string
@@ -280,6 +281,14 @@ class EventMixin:
         vars_reserved = set()
         items_gone = set()
         vars_gone = set()
+        items_disabled = set()
+        vars_disabled = set()
+
+        if hasattr(self, 'disabled_items'):  # SubEventItem
+            items_disabled = set(self.disabled_items.split(","))
+
+        if hasattr(self, 'disabled_vars'):  # SubEventItemVariation
+            vars_disabled = set(self.disabled_vars.split(","))
 
         r = getattr(self, '_quota_cache', {})
         for q in self.active_quotas:
@@ -300,8 +309,19 @@ class EventMixin:
                     items_gone.update(q.active_items.split(","))
                 if q.active_variations:
                     vars_gone.update(q.active_variations.split(","))
-        if not self.active_quotas:
+
+        items_available -= items_disabled
+        items_reserved -= items_disabled
+        items_gone -= items_disabled
+        vars_available -= vars_disabled
+        vars_reserved -= vars_disabled
+        vars_gone -= vars_gone
+
+        if not self.active_quotas or (
+            not items_available and not items_reserved and not items_gone and not vars_gone and not vars_available and not vars_reserved
+        ):
             return None
+
         if items_available - items_reserved - items_gone or vars_available - vars_reserved - vars_gone:
             return Quota.AVAILABILITY_OK
         if items_reserved - items_gone or vars_reserved - vars_gone:
@@ -1227,6 +1247,36 @@ class SubEvent(EventMixin, LoggedModel):
                                       distance_only_within_row=self.settings.seating_distance_within_row)
         return qs_annotated
 
+    @classmethod
+    def annotated(cls, qs, channel='web'):
+        from .items import SubEventItem, SubEventItemVariation
+
+        qs = super().annotated(qs, channel)
+        qs = qs.annotate(
+            disabled_items=Coalesce(
+                Subquery(
+                    SubEventItem.objects.filter(
+                        Q(disabled=True) | Q(available_from__gt=now()) | Q(available_until__lt=now()),
+                        subevent=OuterRef('pk'),
+                    ).order_by().values('subevent').annotate(items=GroupConcat('item_id', delimiter=',')).values('items'),
+                    output_field=models.TextField(),
+                ),
+                Value('')
+            ),
+            disabled_vars=Coalesce(
+                Subquery(
+                    SubEventItemVariation.objects.filter(
+                        Q(disabled=True) | Q(available_from__gt=now()) | Q(available_until__lt=now()),
+                        subevent=OuterRef('pk'),
+                    ).order_by().values('subevent').annotate(items=GroupConcat('variation_id', delimiter=',')).values('items'),
+                    output_field=models.TextField(),
+                ),
+                Value('')
+            )
+        )
+
+        return qs
+
     @cached_property
     def settings(self):
         return self.event.settings

src/pretix/base/models/items.py

@@ -151,11 +151,29 @@ class SubEventItem(models.Model):
     :type item: Item
     :param price: The modified price (or ``None`` for the original price)
     :type price: Decimal
+    :param disabled: Disable the product for this subevent
+    :type disabled: bool
+    :param available_until: The date until when the product is on sale
+    :type available_until: datetime
+    :param available_from: The date this product goes on sale
+    :type available_from: datetime
+    :param available_until: The date until when the product is on sale
+    :type available_until: datetime
     """
     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, verbose_name=_('Disable product for this date'))
+    available_from = models.DateTimeField(
+        verbose_name=_("Available from"),
+        null=True, blank=True,
+        help_text=_('This product will not be sold before the given date.')
+    )
+    available_until = models.DateTimeField(
+        verbose_name=_("Available until"),
+        null=True, blank=True,
+        help_text=_('This product will not be sold after the given date.')
+    )
 
     def delete(self, *args, **kwargs):
         super().delete(*args, **kwargs)
@@ -167,6 +185,16 @@ class SubEventItem(models.Model):
         if self.subevent:
             self.subevent.event.cache.clear()
 
+    def is_available(self, now_dt: datetime=None) -> bool:
+        now_dt = now_dt or now()
+        if self.disabled:
+            return False
+        if self.available_from and self.available_from > now_dt:
+            return False
+        if self.available_until and self.available_until < now_dt:
+            return False
+        return True
+
 
 class SubEventItemVariation(models.Model):
     """
@@ -179,11 +207,29 @@ class SubEventItemVariation(models.Model):
     :type variation: ItemVariation
     :param price: The modified price (or ``None`` for the original price)
     :type price: Decimal
+    :param disabled: Disable the product for this subevent
+    :type disabled: bool
+    :param available_until: The date until when the product is on sale
+    :type available_until: datetime
+    :param available_from: The date this product goes on sale
+    :type available_from: datetime
+    :param available_until: The date until when the product is on sale
+    :type available_until: datetime
     """
     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)
+    disabled = models.BooleanField(default=False, verbose_name=_('Disable product for this date'))
+    available_from = models.DateTimeField(
+        verbose_name=_("Available from"),
+        null=True, blank=True,
+        help_text=_('This product will not be sold before the given date.')
+    )
+    available_until = models.DateTimeField(
+        verbose_name=_("Available until"),
+        null=True, blank=True,
+        help_text=_('This product will not be sold after the given date.')
+    )
 
     def delete(self, *args, **kwargs):
         super().delete(*args, **kwargs)
@@ -195,6 +241,16 @@ class SubEventItemVariation(models.Model):
         if self.subevent:
             self.subevent.event.cache.clear()
 
+    def is_available(self, now_dt: datetime=None) -> bool:
+        now_dt = now_dt or now()
+        if self.disabled:
+            return False
+        if self.available_from and self.available_from > now_dt:
+            return False
+        if self.available_until and self.available_until < now_dt:
+            return False
+        return True
+
 
 def filter_available(qs, channel='web', voucher=None, allow_addons=False):
     q = (