Allow to hide products that require membership (#2240)

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

src/pretix/base/models/customers.py

@@ -25,6 +25,7 @@ from django.contrib.auth.hashers import (
     check_password, is_password_usable, make_password,
 )
 from django.db import models
+from django.db.models import F, Q
 from django.utils.crypto import get_random_string, salted_hmac
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager, scopes_disabled
@@ -183,6 +184,12 @@ class Customer(LoggedModel):
     def stored_addresses(self):
         return self.invoice_addresses(manager='profiles')
 
+    def usable_memberships(self, for_event, testmode=False):
+        return self.memberships.active(for_event).with_usages().filter(
+            Q(membership_type__max_usages__isnull=True) | Q(usages__lt=F('membership_type__max_usages')),
+            testmode=testmode,
+        )
+
 
 class AttendeeProfile(models.Model):
     customer = models.ForeignKey(

src/pretix/base/models/items.py

@@ -523,6 +523,12 @@ class Item(LoggedModel):
         verbose_name=_('Allowed membership types'),
         blank=True,
     )
+    require_membership_hidden = models.BooleanField(
+        verbose_name=_('Hide without a valid membership'),
+        help_text=_('Do not show this unless the customer is logged in and has a valid membership. Be aware that '
+                    'this means it will never be visible in the widget.'),
+        default=False,
+    )
     grant_membership_type = models.ForeignKey(
         'MembershipType',
         null=True, blank=True,
@@ -802,6 +808,12 @@ class ItemVariation(models.Model):
         verbose_name=_('Membership types'),
         blank=True,
     )
+    require_membership_hidden = models.BooleanField(
+        verbose_name=_('Hide without a valid membership'),
+        help_text=_('Do not show this unless the customer is logged in and has a valid membership. Be aware that '
+                    'this means it will never be visible in the widget.'),
+        default=False,
+    )
     available_from = models.DateTimeField(
         verbose_name=_("Available from"),
         null=True, blank=True,

src/pretix/base/models/memberships.py

@@ -95,6 +95,7 @@ class MembershipQuerySet(models.QuerySet):
 
     def active(self, ev):
         return self.filter(
+            canceled=False,
             date_start__lte=ev.date_from,
             date_end__gte=ev.date_from
         )
@@ -175,7 +176,7 @@ class Membership(models.Model):
         else:
             dt = now()
 
-        return dt >= self.date_start and dt <= self.date_end
+        return not self.canceled and dt >= self.date_start and dt <= self.date_end
 
     def allow_delete(self):
         return self.testmode and not self.orderposition_set.exists()