Fixed an quota calculation issue

src/pretix/base/models/items.py

@@ -470,13 +470,13 @@ class Quota(LoggedModel):
         # TODO: Test for interference with old versions of Item-Quota-relations, etc.
         # TODO: Prevent corner-cases like people having ordered an item before it got
         # its first variationsadde
-        orders = self.count_orders()
+        paid, pending = self.count_orders()
 
-        size_left -= orders['paid']
+        size_left -= paid
         if size_left <= 0:
             return Quota.AVAILABILITY_GONE, 0
 
-        size_left -= orders['pending']
+        size_left -= pending
         if size_left <= 0:
             return Quota.AVAILABILITY_ORDERED, 0
 
@@ -497,7 +497,7 @@ class Quota(LoggedModel):
             Q(block_quota=True) &
             Q(redeemed=False) &
             self._position_lookup
-        ).count()
+        ).distinct().count()
 
     def count_in_cart(self) -> int:
         from pretix.base.models import CartPosition
@@ -505,25 +505,19 @@ class Quota(LoggedModel):
         return CartPosition.objects.filter(
             Q(expires__gte=now()) &
             self._position_lookup
-        ).count()
+        ).distinct().count()
 
     def count_orders(self) -> dict:
         from pretix.base.models import Order, OrderPosition
 
-        o = OrderPosition.objects.filter(self._position_lookup).aggregate(
+        paid = OrderPosition.objects.filter(
-            paid=Sum(
+            self._position_lookup, order__status=Order.STATUS_PAID
-                Case(When(order__status=Order.STATUS_PAID, then=1),
+        ).distinct().count()
-                     output_field=models.IntegerField())
+        pending = OrderPosition.objects.filter(
-            ),
+            self._position_lookup, order__status=Order.STATUS_PENDING,
-            pending=Sum(
+            order__expires__gte=now()
-                Case(When(Q(order__status=Order.STATUS_PENDING) & Q(order__expires__gte=now()), then=1),
+        ).distinct().count()
-                     output_field=models.IntegerField())
+        return paid, pending
-            )
-        )
-        for k, v in o.items():
-            if v is None:
-                o[k] = 0
-        return o
 
     @cached_property
     def _position_lookup(self) -> Q:

src/tests/base/test_models.py

@@ -105,6 +105,20 @@ class QuotaTestCase(BaseQuotaTestCase):
         order.save()
         self.assertEqual(self.item1.check_quotas(), (Quota.AVAILABILITY_OK, 1))
 
+    def test_ordered_multi_quota(self):
+        quota2 = Quota.objects.create(name="Test", size=2, event=self.event)
+        quota2.items.add(self.item2)
+        quota2.variations.add(self.var1)
+        self.quota.items.add(self.item2)
+        self.quota.variations.add(self.var1)
+
+        order = Order.objects.create(event=self.event, status=Order.STATUS_PAID,
+                                     expires=now() + timedelta(days=3),
+                                     total=4)
+        OrderPosition.objects.create(order=order, item=self.item2, variation=self.var1, price=2)
+
+        self.assertEqual(quota2.availability(), (Quota.AVAILABILITY_OK, 1))
+
     def test_reserved(self):
         self.quota.items.add(self.item1)
         self.quota.size = 3