From 0a154dc79f00a68912c73e4ab32b7799c578d515 Mon Sep 17 00:00:00 2001 From: Phin Wolkwitz Date: Tue, 23 Jan 2024 15:58:35 +0100 Subject: [PATCH] Presale: Fix booking period error message logic (Z#23115841) (#3832) * Fix presale start and end error message logic * Improve readability --- src/pretix/presale/views/cart.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pretix/presale/views/cart.py b/src/pretix/presale/views/cart.py index f58a115db0..2f00868ea4 100644 --- a/src/pretix/presale/views/cart.py +++ b/src/pretix/presale/views/cart.py @@ -642,10 +642,11 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, CartMixin, TemplateView 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: