From e4abfb0bdffa909d72dbee71a53bb57b42ee3efd Mon Sep 17 00:00:00 2001 From: Mira Weller Date: Wed, 6 Mar 2024 13:13:40 +0100 Subject: [PATCH] start implementing time machine mode --- src/pretix/base/models/event.py | 35 +++++++++++------- src/pretix/presale/checkoutflow.py | 1 + src/pretix/presale/forms/waitinglist.py | 1 + src/pretix/presale/middleware.py | 27 ++++++++++++++ .../templates/pretixpresale/event/base.html | 11 ++++++ src/pretix/presale/views/cart.py | 1 + src/pretix/presale/views/checkout.py | 2 +- src/pretix/presale/views/event.py | 36 +++++++++++-------- src/pretix/presale/views/order.py | 3 +- src/pretix/presale/views/organizer.py | 7 ++-- src/pretix/presale/views/widget.py | 5 +-- src/pretix/settings.py | 1 + 12 files changed, 96 insertions(+), 34 deletions(-) diff --git a/src/pretix/base/models/event.py b/src/pretix/base/models/event.py index 4914d59be3..f9aabe3fc2 100644 --- a/src/pretix/base/models/event.py +++ b/src/pretix/base/models/event.py @@ -80,6 +80,15 @@ from .organizer import Organizer, Team logger = logging.getLogger(__name__) +def annotate_with_time_based_properties(events_or_subevents, now_dt): + print("annotate_with_time_based_properties", now_dt) + for e_s in events_or_subevents: + if e_s: + e_s.presale_is_running = e_s.presale_is_running_by_time(now_dt) + e_s.presale_has_ended = e_s.presale_has_ended_by_time(now_dt) + return events_or_subevents + + class EventMixin: def clean(self): if self.presale_start and self.presale_end and self.presale_start > self.presale_end: @@ -229,17 +238,17 @@ class EventMixin: else: return self.presale_end - @property - def presale_has_ended(self): + def presale_has_ended_by_time(self, now_dt: datetime=None): """ Is true, when ``presale_end`` is set and in the past. """ + now_dt = now_dt or now() if self.effective_presale_end: - return now() > self.effective_presale_end + return now_dt > self.effective_presale_end elif self.date_to: - return now() > self.date_to + return now_dt > self.date_to else: - return now().astimezone(self.timezone).date() > self.date_from.astimezone(self.timezone).date() + return now_dt.astimezone(self.timezone).date() > self.date_from.astimezone(self.timezone).date() @property def effective_presale_start(self): @@ -253,15 +262,15 @@ class EventMixin: else: return self.presale_start - @property - def presale_is_running(self): + def presale_is_running_by_time(self, now_dt: datetime=None): """ Is true, when ``presale_end`` is not set or in the future and ``presale_start`` is not set or in the past. """ - if self.effective_presale_start and now() < self.effective_presale_start: + now_dt = now_dt or now() + if self.effective_presale_start and now_dt < self.effective_presale_start: return False - return not self.presale_has_ended + return not self.presale_has_ended_by_time(now_dt) @property def event_microdata(self): @@ -683,12 +692,12 @@ class Event(EventMixin, LoggedModel): return qs_annotated - @property - def presale_has_ended(self): + def presale_has_ended_by_time(self, now_dt: datetime = None): + now_dt = now_dt or now() if self.has_subevents: - return self.presale_end and now() > self.presale_end + return self.presale_end and now_dt > self.presale_end else: - return super().presale_has_ended + return super().presale_has_ended_by_time(now_dt) def delete_all_orders(self, really=False): from .checkin import Checkin diff --git a/src/pretix/presale/checkoutflow.py b/src/pretix/presale/checkoutflow.py index 748d0457f5..b9b17ec432 100644 --- a/src/pretix/presale/checkoutflow.py +++ b/src/pretix/presale/checkoutflow.py @@ -545,6 +545,7 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep): ) if getattr(self.request, 'customer', None) else None ), + now_dt=self.request.now_dt, ) item_cache[ckey] = items else: diff --git a/src/pretix/presale/forms/waitinglist.py b/src/pretix/presale/forms/waitinglist.py index 1343c1fbcb..b6b3c7c489 100644 --- a/src/pretix/presale/forms/waitinglist.py +++ b/src/pretix/presale/forms/waitinglist.py @@ -59,6 +59,7 @@ class WaitingListForm(forms.ModelForm): ) if customer else None ), + now_dt=request.now_dt, ) for i in items: if not i.allow_waitinglist: diff --git a/src/pretix/presale/middleware.py b/src/pretix/presale/middleware.py index 4cbf52a839..bced4f128f 100644 --- a/src/pretix/presale/middleware.py +++ b/src/pretix/presale/middleware.py @@ -32,8 +32,11 @@ # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations under the License. +from dateutil.parser import parse + from django.template.response import TemplateResponse from django.urls import resolve +from django.utils.timezone import now from django_scopes import scope from pretix.base.channels import WebshopSalesChannel @@ -79,3 +82,27 @@ class EventMiddleware: response = response.render() return response + + +class TimeMachineMiddleware: + def __init__(self, get_response=None): + self.get_response = get_response + super().__init__() + + def __call__(self, request): + if hasattr(request, 'event') and hasattr(request, '_namespace') and request._namespace == 'presale' and \ + 'time_machine' in request.COOKIES and \ + request.user.has_event_permission(request.organizer, request.event, 'can_change_event_settings', request): + print("setting now_dt from cookie") + request.now_dt = parse(request.COOKIES['time_machine']) + request.now_dt_is_fake = True + else: + print("setting now_dt to now", + "hasevent?",hasattr(request, 'event') , + "namespace?",hasattr(request, '_namespace') and request._namespace, + "cookies?",request.COOKIES) + request.now_dt = now() + + return self.get_response(request) + + diff --git a/src/pretix/presale/templates/pretixpresale/event/base.html b/src/pretix/presale/templates/pretixpresale/event/base.html index a3c2e48a81..f65b811ce4 100644 --- a/src/pretix/presale/templates/pretixpresale/event/base.html +++ b/src/pretix/presale/templates/pretixpresale/event/base.html @@ -33,6 +33,17 @@ {% endif %} + {% if request.now_dt_is_fake %} +
+
+ + {% trans "You are currently using the time machine. The ticket shop is rendered as if it were" %} {{ request.now_dt }} + + {% trans "Go back to current time" %} + +
+
+ {% endif %}
{% if event.settings.locales|length > 1 or request.organizer.settings.customer_accounts %} {% if event.settings.theme_color_background|upper != "#FFFFFF" or event_logo_image_large %} diff --git a/src/pretix/presale/views/cart.py b/src/pretix/presale/views/cart.py index c9b2968437..9ebcc032a6 100644 --- a/src/pretix/presale/views/cart.py +++ b/src/pretix/presale/views/cart.py @@ -569,6 +569,7 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, CartMixin, TemplateView testmode=self.request.event.testmode ) if getattr(self.request, 'customer', None) else None ), + now_dt=self.request.now_dt, ) # Calculate how many options the user still has. If there is only one option, we can diff --git a/src/pretix/presale/views/checkout.py b/src/pretix/presale/views/checkout.py index f61bb0c363..fe918cff04 100644 --- a/src/pretix/presale/views/checkout.py +++ b/src/pretix/presale/views/checkout.py @@ -55,7 +55,7 @@ class CheckoutView(View): messages.error(request, _("Your cart is empty")) return self.redirect(self.get_index_url(self.request)) - if not request.event.presale_is_running: + if not request.event.presale_is_running_by_time(request.now_dt): messages.error(request, _("The booking period for this event is over or has not yet started.")) return self.redirect(self.get_index_url(self.request)) diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py index 7af403ba55..35fb5b17dd 100644 --- a/src/pretix/presale/views/event.py +++ b/src/pretix/presale/views/event.py @@ -64,7 +64,7 @@ from pretix.base.channels import get_all_sales_channels from pretix.base.models import ( ItemVariation, Quota, SeatCategoryMapping, Voucher, ) -from pretix.base.models.event import Event, SubEvent +from pretix.base.models.event import Event, SubEvent, annotate_with_time_based_properties from pretix.base.models.items import ( ItemAddOn, ItemBundle, SubEventItem, SubEventItemVariation, ) @@ -105,7 +105,8 @@ def item_group_by_category(items): def get_grouped_items(event, subevent=None, voucher=None, channel='web', require_seat=0, base_qs=None, allow_addons=False, quota_cache=None, filter_items=None, filter_categories=None, memberships=None, - ignore_hide_sold_out_for_item_ids=None): + ignore_hide_sold_out_for_item_ids=None, now_dt: datetime=None): + now_dt = now_dt or now() base_qs_set = base_qs is not None base_qs = base_qs if base_qs is not None else event.items @@ -119,8 +120,8 @@ def get_grouped_items(event, subevent=None, voucher=None, channel='web', require requires_seat = Value(0, output_field=IntegerField()) variation_q = ( - Q(Q(available_from__isnull=True) | Q(available_from__lte=now()) | Q(available_from_mode='info')) & - Q(Q(available_until__isnull=True) | Q(available_until__gte=now()) | Q(available_until_mode='info')) + Q(Q(available_from__isnull=True) | Q(available_from__lte=now_dt) | Q(available_from_mode='info')) & + Q(Q(available_until__isnull=True) | Q(available_until__gte=now_dt) | Q(available_until_mode='info')) ) if not voucher or not voucher.show_hidden_items: variation_q &= Q(hide_without_voucher=False) @@ -137,8 +138,8 @@ def get_grouped_items(event, subevent=None, voucher=None, channel='web', require subevent_disabled=Exists( SubEventItemVariation.objects.filter( Q(disabled=True) - | (Exact(OuterRef('available_from_mode'), 'hide') & Q(available_from__gt=now())) - | (Exact(OuterRef('available_until_mode'), 'hide') & Q(available_until__lt=now())), + | (Exact(OuterRef('available_from_mode'), 'hide') & Q(available_from__gt=now_dt)) + | (Exact(OuterRef('available_until_mode'), 'hide') & Q(available_until__lt=now_dt)), variation_id=OuterRef('pk'), subevent=subevent, ) @@ -209,8 +210,8 @@ def get_grouped_items(event, subevent=None, voucher=None, channel='web', require subevent_disabled=Exists( SubEventItem.objects.filter( Q(disabled=True) - | (Exact(OuterRef('available_from_mode'), 'hide') & Q(available_from__gt=now())) - | (Exact(OuterRef('available_until_mode'), 'hide') & Q(available_until__lt=now())), + | (Exact(OuterRef('available_from_mode'), 'hide') & Q(available_from__gt=now_dt)) + | (Exact(OuterRef('available_until_mode'), 'hide') & Q(available_until__lt=now_dt)), item_id=OuterRef('pk'), subevent=subevent, ) @@ -306,7 +307,7 @@ def get_grouped_items(event, subevent=None, voucher=None, channel='web', require item._remove = True continue - item.current_unavailability_reason = item.unavailability_reason(has_voucher=voucher, subevent=subevent) + item.current_unavailability_reason = item.unavailability_reason(now_dt=now_dt, has_voucher=voucher, subevent=subevent) item.description = str(item.description) for recv, resp in item_description.send(sender=event, item=item, variation=None, subevent=subevent): @@ -422,7 +423,7 @@ def get_grouped_items(event, subevent=None, voucher=None, channel='web', require if not display_add_to_cart: display_add_to_cart = not item.requires_seat and var.order_max > 0 - var.current_unavailability_reason = var.unavailability_reason(has_voucher=voucher, subevent=subevent) + var.current_unavailability_reason = var.unavailability_reason(now_dt=now_dt, has_voucher=voucher, subevent=subevent) item.original_price = ( item.tax(item.original_price, currency=event.currency, include_bundled=True, @@ -535,6 +536,7 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView): context['ev'] = self.subevent or self.request.event context['subevent'] = self.subevent + annotate_with_time_based_properties([self.request.event, self.subevent], self.request.now_dt) # Show voucher option if an event is selected and vouchers exist vouchers_exist = self.request.event.cache.get('vouchers_exist') @@ -543,10 +545,10 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView): self.request.event.cache.set('vouchers_exist', vouchers_exist) context['show_vouchers'] = context['vouchers_exist'] = vouchers_exist and ( (self.request.event.has_subevents and not self.subevent) or - context['ev'].presale_is_running + context['ev'].presale_is_running_by_time(self.request.now_dt) ) - context['allow_waitinglist'] = self.request.event.settings.waiting_list_enabled and context['ev'].presale_is_running + context['allow_waitinglist'] = self.request.event.settings.waiting_list_enabled and context['ev'].presale_is_running_by_time(self.request.now_dt) if not self.request.event.has_subevents or self.subevent: # Fetch all items @@ -562,6 +564,7 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView): testmode=self.request.event.testmode ) if getattr(self.request, 'customer', None) else None ), + now_dt=self.request.now_dt ) context['waitinglist_seated'] = False @@ -612,7 +615,7 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView): context['show_cart'] = ( context['cart']['positions'] and ( - self.request.event.has_subevents or self.request.event.presale_is_running + self.request.event.has_subevents or self.request.event.presale_is_running_by_time(self.request.now_dt) ) ) if self.request.event.settings.redirect_to_checkout_directly: @@ -679,6 +682,7 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView): limit_before, after, ebd, set(), self.request.event, self.kwargs.get('cart_namespace'), voucher, + now_dt=self.request.now_dt, ) # Hide names of subevents in event series where it is always the same. No need to show the name of the museum thousands of times @@ -738,6 +742,7 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView): limit_before, after, ebd, set(), self.request.event, self.kwargs.get('cart_namespace'), voucher, + now_dt=self.request.now_dt, ) # Hide names of subevents in event series where it is always the same. No need to show the name of the museum thousands of times @@ -776,7 +781,7 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView): future_only=self.request.event.settings.event_calendar_future_only ) else: - context['subevent_list'] = self.request.event.subevents_sorted( + context['subevent_list'] = annotate_with_time_based_properties(self.request.event.subevents_sorted( filter_qs_by_attr( self.request.event.subevents_annotated( self.request.sales_channel.identifier, @@ -784,7 +789,8 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView): ).using(settings.DATABASE_REPLICA), self.request ) - ) + ), self.request.now_dt) + if self.request.event.settings.event_list_available_only and not voucher: context['subevent_list'] = [ se for se in context['subevent_list'] diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py index d48378d61f..99b729f1a2 100644 --- a/src/pretix/presale/views/order.py +++ b/src/pretix/presale/views/order.py @@ -1311,7 +1311,8 @@ class OrderChangeMixin: ) if self.order.customer else None ), - ignore_hide_sold_out_for_item_ids={k[0] for k in current_addon_products.keys()} + ignore_hide_sold_out_for_item_ids={k[0] for k in current_addon_products.keys()}, + now_dt=self.request.now_dt, ) item_cache[ckey] = items else: diff --git a/src/pretix/presale/views/organizer.py b/src/pretix/presale/views/organizer.py index 3bd5d6bdf9..fc5c148eff 100644 --- a/src/pretix/presale/views/organizer.py +++ b/src/pretix/presale/views/organizer.py @@ -63,6 +63,7 @@ from pretix.base.i18n import language from pretix.base.models import ( Event, EventMetaValue, Organizer, Quota, SubEvent, SubEventMetaValue, ) +from pretix.base.models.event import annotate_with_time_based_properties from pretix.base.services.quotas import QuotaAvailability from pretix.helpers.compat import date_fromisocalendar from pretix.helpers.daterange import daterange @@ -549,14 +550,16 @@ def add_events_for_days(request, baseqs, before, after, ebd, timezones): }) -def add_subevents_for_days(qs, before, after, ebd, timezones, event=None, cart_namespace=None, voucher=None): +def add_subevents_for_days(qs, before, after, ebd, timezones, event=None, cart_namespace=None, voucher=None, now_dt=None): + print("add_subevents_for_days", now_dt) + now_dt = now_dt or now() qs = qs.filter(active=True, is_public=True).filter( Q(Q(date_to__gte=before) & Q(date_from__lte=after)) | Q(Q(date_to__isnull=True) & Q(date_from__gte=before) & Q(date_from__lte=after)) ).order_by( 'date_from' ) - + qs = annotate_with_time_based_properties(qs, now_dt) quotas_to_compute = [] for se in qs: if se.presale_is_running: diff --git a/src/pretix/presale/views/widget.py b/src/pretix/presale/views/widget.py index 0f463c34ab..ef1abe9292 100644 --- a/src/pretix/presale/views/widget.py +++ b/src/pretix/presale/views/widget.py @@ -256,6 +256,7 @@ class WidgetAPIProductList(EventListMixin, View): testmode=self.request.event.testmode ) if getattr(self.request, 'customer', None) else None ), + now_dt=self.request.now_dt, ) grps = [] @@ -409,11 +410,11 @@ class WidgetAPIProductList(EventListMixin, View): availability['color'] = 'none' availability['text'] = gettext('More info') availability['reason'] = 'unknown' - elif ev.presale_is_running: + elif ev.presale_is_running_by_time(self.request.now_dt): availability['color'] = 'green' availability['text'] = gettext('Book now') availability['reason'] = 'ok' - elif ev.presale_has_ended: + elif ev.presale_has_ended_by_time(self.request.now_dt): availability['color'] = 'red' availability['text'] = gettext('Sale over') availability['reason'] = 'over' diff --git a/src/pretix/settings.py b/src/pretix/settings.py index 5721c3c4dc..3e0e84f971 100644 --- a/src/pretix/settings.py +++ b/src/pretix/settings.py @@ -443,6 +443,7 @@ MIDDLEWARE = [ 'pretix.base.middleware.LocaleMiddleware', 'pretix.base.middleware.SecurityMiddleware', 'pretix.presale.middleware.EventMiddleware', + 'pretix.presale.middleware.TimeMachineMiddleware', 'pretix.api.middleware.ApiScopeMiddleware', ]