fix: Use event timezone in ticket PDF (#7437)

fossasia · Nov 12, 2020 · ef592f0 · ef592f0
1 parent 7fcc8a6
commit ef592f0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/app/templates/flask_ext/jinja/filters.py b/app/templates/flask_ext/jinja/filters.py
@@ -24,8 +24,10 @@ def money_filter(string):
         return '{:20,.2f}'.format(float(string))
 
     @app.template_filter('datetime')
-    def simple_datetime_display(date):
-        return date.strftime('%B %d, %Y %I:%M %p')
+    def simple_datetime_display(date, timezone='UTC', format='%B %d, %Y %I:%M %p'):
+        if not date:
+            return ''
+        return date.astimezone(pytz.timezone(timezone)).strftime(format)
 
     @app.template_filter('date')
     def simple_date_display(date):

diff --git a/app/templates/pdf/ticket_attendee.html b/app/templates/pdf/ticket_attendee.html
@@ -50,7 +50,8 @@
             <span style="font-size: 15px;"> {{order.event.location_name }}</span><br><br>
 
             <span class="label">Date and Time</span><br>
-            <span  style="font-size: 15px;">{{ order.event.starts_at.strftime('%H:%M %Z') }} to {{ order.event.ends_at.strftime('%H:%M %Z') }}</span>
+            <span style="font-size: 15px;">From: {{ order.event.starts_at | datetime(order.event.timezone) }}</span><br>
+            <span style="font-size: 15px;">To: {{ order.event.ends_at | datetime(order.event.timezone) }}</span>
             <br><br>
 
             <span class="label">Type</span><br>

diff --git a/app/templates/pdf/ticket_purchaser.html b/app/templates/pdf/ticket_purchaser.html
@@ -51,8 +51,8 @@
             <span style="font-size: 15px;">{{ order.event.location_name }}</span><br><br>
 
             <span class="label">Date and Time</span><br>
-            <span  style="font-size: 15px;">From: {{ order.event.starts_at.strftime("%H:%M %Z") }} on {{ order.event.starts_at.date() }}</span><br>
-            <span style="font-size: 15px;">To: {{ order.event.ends_at.strftime("%H:%M %Z") }} on {{ order.event.ends_at.date() }}</span>
+            <span style="font-size: 15px;">From: {{ order.event.starts_at | datetime(order.event.timezone) }}</span><br>
+            <span style="font-size: 15px;">To: {{ order.event.ends_at | datetime(order.event.timezone) }}</span>
             <br><br>
 
             <span class="label">Type</span><br>