Presale: Fix booking period error message logic (Z#23115841) (#3832)

* Fix presale start and end error message logic * Improve readability
pretix · Jan 23, 2024 · 0a154dc · 0a154dc
1 parent 7022e5b
commit 0a154dc
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/pretix/presale/views/cart.py b/src/pretix/presale/views/cart.py
@@ -642,10 +642,11 @@ def dispatch(self, request, *args, **kwargs):
             context['show_cart'] = context['cart']['positions']
             return render(request, 'pretixpresale/event/voucher_form.html', context)
 
-        if request.event.presale_start and now() < request.event.presale_start:
-            err = error_messages['not_started']
-        if request.event.presale_end and now() > request.event.presale_end:
+        if request.event.presale_has_ended or (request.event.presale_end and now() > request.event.presale_end):
             err = error_messages['ended']
+        elif not request.event.presale_is_running or (
+                request.event.presale_start and now() < request.event.presale_start):
+            err = error_messages['not_started']
 
         self.subevent = None
         if request.event.has_subevents: