Refs #82 -- Make order expiry more clear (#116)

src/pretix/base/models/items.py

@@ -531,7 +531,6 @@ class Quota(LoggedModel):
 
         return OrderPosition.objects.filter(
             self._position_lookup, order__status=Order.STATUS_PENDING,
-            order__expires__gte=now()
         ).distinct().count()
 
     def count_paid_orders(self):

src/pretix/base/models/orders.py

@@ -4,7 +4,6 @@ import string
 from datetime import datetime
 from decimal import Decimal
 
-from django import forms
 from django.db import models
 from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
@@ -204,6 +203,13 @@ class Order(LoggedModel):
                 return True
         return False  # nothing there to modify
 
+    @property
+    def is_expired_by_time(self):
+        return (
+            self.status == Order.STATUS_PENDING and self.expires < now()
+            and not self.event.settings.get('payment_term_expire_automatically')
+        )
+
     def _can_be_paid(self) -> Union[bool, str]:
         error_messages = {
             'late': _("The payment is too late to be accepted."),
@@ -212,7 +218,7 @@ class Order(LoggedModel):
         if self.event.settings.get('payment_term_last') \
                 and now() > self.event.settings.get('payment_term_last'):
             return error_messages['late']
-        if now() < self.expires:
+        if self.status == self.STATUS_PENDING:
             return True
         if not self.event.settings.get('payment_term_accept_late'):
             return error_messages['late']