From 5fa40fd10bc1f60a152e11f0eab9ed3cd42e46eb Mon Sep 17 00:00:00 2001
From: Phin Wolkwitz <wolkwitz@rami.io>
Date: Wed, 10 Dec 2025 13:31:20 +0100
Subject: [PATCH] Fix presale date display in calendar

---
 .../presale/templates/pretixpresale/fragment_calendar.html  | 6 +++---
 .../templates/pretixpresale/fragment_day_calendar.html      | 6 +++---
 .../templates/pretixpresale/fragment_week_calendar.html     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pretix/presale/templates/pretixpresale/fragment_calendar.html b/src/pretix/presale/templates/pretixpresale/fragment_calendar.html
index b61189d68..8a7b74ad2 100644
--- a/src/pretix/presale/templates/pretixpresale/fragment_calendar.html
+++ b/src/pretix/presale/templates/pretixpresale/fragment_calendar.html
@@ -55,7 +55,7 @@
         running
     {% elif event.event.presale_has_ended %}
         over
-    {% elif event.event.settings.presale_start_show_date and event.event.presale_start %}
+    {% elif event.event.settings.presale_start_show_date and event.event.effective_presale_start %}
         soon
     {% else %}
         soon
@@ -108,9 +108,9 @@
                                                     <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Book now" %}
                                                 {% elif event.event.presale_has_ended %}
                                                     {% trans "Sale over" %}
-                                                {% elif event.event.settings.presale_start_show_date and event.event.presale_start %}
+                                                {% elif event.event.settings.presale_start_show_date and event.event.effective_presale_start %}
                                                     <span class="fa fa-ticket" aria-hidden="true"></span>
-                                                    {% with date_human=event.event.presale_start|date_fast:"SHORT_DATE_FORMAT" date_iso=event.event.presale_start|date_fast:"c"  %}
+                                                    {% with date_human=event.event.effective_presale_start|date_fast:"SHORT_DATE_FORMAT" date_iso=event.event.effective_presale_start|date_fast:"c"  %}
                                                     {% blocktrans with start_date="<time datetime='"|add:date_iso|add:"'>"|add:date_human|add:"</time>"|safe %}
                                                         from {{ start_date }}
                                                     {% endblocktrans %}
diff --git a/src/pretix/presale/templates/pretixpresale/fragment_day_calendar.html b/src/pretix/presale/templates/pretixpresale/fragment_day_calendar.html
index 7aec699b7..ab2c6f168 100644
--- a/src/pretix/presale/templates/pretixpresale/fragment_day_calendar.html
+++ b/src/pretix/presale/templates/pretixpresale/fragment_day_calendar.html
@@ -52,7 +52,7 @@
         running
     {% elif event.event.presale_has_ended %}
         over
-    {% elif event.event.settings.presale_start_show_date and event.event.presale_start %}
+    {% elif event.event.settings.presale_start_show_date and event.event.effective_presale_start %}
         soon
     {% else %}
         soon
@@ -114,9 +114,9 @@
                                 <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Book now" %}
                             {% elif event.event.presale_has_ended %}
                                 <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Sale over" %}
-                            {% elif event.event.settings.presale_start_show_date and event.event.presale_start %}
+                            {% elif event.event.settings.presale_start_show_date and event.event.effective_presale_start %}
                                 <span class="fa fa-ticket" aria-hidden="true"></span>
-                                {% blocktrans with start_date=event.event.presale_start|date:"SHORT_DATE_FORMAT" %}
+                                {% blocktrans with start_date=event.event.effective_presale_start|date:"SHORT_DATE_FORMAT" %}
                                     from {{ start_date }}
                                 {% endblocktrans %}
                             {% else %}
diff --git a/src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html b/src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html
index 84831fd10..61d536b87 100644
--- a/src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html
+++ b/src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html
@@ -24,7 +24,7 @@
         running
     {% elif event.event.presale_has_ended %}
         over
-    {% elif event.event.settings.presale_start_show_date and event.event.presale_start %}
+    {% elif event.event.settings.presale_start_show_date and event.event.effective_presale_start %}
         soon
     {% else %}
         soon
@@ -77,9 +77,9 @@
                                     <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Book now" %}
                                 {% elif event.event.presale_has_ended %}
                                     {% trans "Sale over" %}
-                                {% elif event.event.settings.presale_start_show_date and event.event.presale_start %}
+                                {% elif event.event.settings.presale_start_show_date and event.event.effective_presale_start %}
                                     <span class="fa fa-ticket" aria-hidden="true"></span>
-                                    {% blocktrans with start_date=event.event.presale_start|date_fast:"SHORT_DATE_FORMAT" %}
+                                    {% blocktrans with start_date=event.event.effective_presale_start|date_fast:"SHORT_DATE_FORMAT" %}
                                         from {{ start_date }}
                                     {% endblocktrans %}
                                 {% else %}