Merge branch 'enext' into unscheduled-room-addition

Author: Sak1012

app/eventyay/api/webhooks.py

@@ -175,51 +175,51 @@ def build_payload(self, logentry: LogEntry):
 def register_default_webhook_events(sender, **kwargs):
     return (
         ParametrizedOrderWebhookEvent(
-            'pretix.event.order.placed',
+            'eventyay.event.order.placed',
             _('New order placed'),
         ),
         ParametrizedOrderWebhookEvent(
-            'pretix.event.order.placed.require_approval',
+            'eventyay.event.order.placed.require_approval',
             _('New order requires approval'),
         ),
         ParametrizedOrderWebhookEvent(
-            'pretix.event.order.paid',
+            'eventyay.event.order.paid',
             _('Order marked as paid'),
         ),
         ParametrizedOrderWebhookEvent(
-            'pretix.event.order.canceled',
+            'eventyay.event.order.canceled',
             _('Order canceled'),
         ),
         ParametrizedOrderWebhookEvent(
-            'pretix.event.order.reactivated',
+            'eventyay.event.order.reactivated',
             _('Order reactivated'),
         ),
         ParametrizedOrderWebhookEvent(
-            'pretix.event.order.expired',
+            'eventyay.event.order.expired',
             _('Order expired'),
         ),
         ParametrizedOrderWebhookEvent(
-            'pretix.event.order.modified',
+            'eventyay.event.order.modified',
             _('Order information changed'),
         ),
         ParametrizedOrderWebhookEvent(
-            'pretix.event.order.contact.changed',
+            'eventyay.event.order.contact.changed',
             _('Order contact address changed'),
         ),
         ParametrizedOrderWebhookEvent(
-            'pretix.event.order.changed.*',
+            'eventyay.event.order.changed.*',
             _('Order changed'),
         ),
         ParametrizedOrderWebhookEvent(
-            'pretix.event.order.refund.created.externally',
+            'eventyay.event.order.refund.created.externally',
             _('External refund of payment'),
         ),
         ParametrizedOrderWebhookEvent(
-            'pretix.event.order.approved',
+            'eventyay.event.order.approved',
             _('Order approved'),
         ),
         ParametrizedOrderWebhookEvent(
-            'pretix.event.order.denied',
+            'eventyay.event.order.denied',
             _('Order denied'),
         ),
         ParametrizedOrderPositionWebhookEvent(
@@ -243,15 +243,15 @@ def register_default_webhook_events(sender, **kwargs):
             _('Event details changed'),
         ),
         ParametrizedSubEventWebhookEvent(
-            'pretix.subevent.added',
+            'eventyay.subevent.added',
             pgettext_lazy('subevent', 'Event series date added'),
         ),
         ParametrizedSubEventWebhookEvent(
-            'pretix.subevent.changed',
+            'eventyay.subevent.changed',
             pgettext_lazy('subevent', 'Event series date changed'),
         ),
         ParametrizedSubEventWebhookEvent(
-            'pretix.subevent.deleted',
+            'eventyay.subevent.deleted',
             pgettext_lazy('subevent', 'Event series date deleted'),
         ),
     )

app/eventyay/base/exporters/json.py

@@ -1,6 +1,7 @@
 import json
 from decimal import Decimal
 
+import pytz
 from django.core.serializers.json import DjangoJSONEncoder
 from django.dispatch import receiver
 
@@ -13,6 +14,7 @@ class JSONExporter(BaseExporter):
     verbose_name = 'Order data (JSON)'
 
     def render(self, form_data):
+        event_tz = pytz.timezone(self.event.settings.timezone)
         jo = {
             'event': {
                 'name': str(self.event.name),
@@ -62,12 +64,13 @@ def render(self, form_data):
                     }
                     for question in self.event.questions.all()
                 ],
+                'timezone': str(event_tz),
                 'orders': [
                     {
                         'code': order.code,
                         'status': order.status,
                         'user': order.email,
-                        'datetime': order.datetime,
+                        'datetime': order.datetime.astimezone(event_tz).isoformat(),
                         'fees': [
                             {
                                 'type': fee.fee_type,

app/eventyay/base/exporters/orderlist.py

@@ -388,7 +388,6 @@ def iterate_orders(self, form_data: dict):
         yield self.ProgressSetTotal(total=qs.count())
         for order in qs.order_by('datetime').iterator():
             tz = pytz.timezone(self.event_object_cache[order.event_id].settings.timezone)
-
             row = [
                 self.event_object_cache[order.event_id].slug,
                 order.code,
@@ -397,7 +396,7 @@ def iterate_orders(self, form_data: dict):
                 order.email,
                 str(order.phone) if order.phone else '',
                 order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
-                order.datetime.astimezone(tz).strftime('%H:%M:%S'),
+                order.datetime.astimezone(tz).strftime('%H:%M:%S %Z'),
             ]
             try:
                 row += [
@@ -424,7 +423,7 @@ def iterate_orders(self, form_data: dict):
                 )
 
             row += [
-                order.payment_date.astimezone(tz).strftime('%Y-%m-%d') if order.payment_date else '',
+                order.payment_date.astimezone(tz).strftime('%Y-%m-%d %H:%M:%S %Z') if order.payment_date else '',
                 full_fee_sum_cache.get(order.id) or Decimal('0.00'),
                 order.locale,
             ]
@@ -548,7 +547,7 @@ def iterate_fees(self, form_data: dict):
                 order.email,
                 str(order.phone) if order.phone else '',
                 order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
-                order.datetime.astimezone(tz).strftime('%H:%M:%S'),
+                order.datetime.astimezone(tz).strftime('%H:%M:%S %Z'),
                 op.get_fee_type_display(),
                 op.description,
                 op.value,
@@ -728,21 +727,21 @@ def iterate_positions(self, form_data: dict):
                     order.email,
                     str(order.phone) if order.phone else '',
                     order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
-                    order.datetime.astimezone(tz).strftime('%H:%M:%S'),
+                    order.datetime.astimezone(tz).strftime('%H:%M:%S %Z'),
                 ]
                 if has_subevents:
                     if op.subevent:
                         row.append(op.subevent.name)
                         row.append(
                             op.subevent.date_from.astimezone(self.event_object_cache[order.event_id].timezone).strftime(
-                                '%Y-%m-%d %H:%M:%S'
+                                '%Y-%m-%d %H:%M:%S %Z'
                             )
                         )
                         if op.subevent.date_to:
                             row.append(
                                 op.subevent.date_to.astimezone(
                                     self.event_object_cache[order.event_id].timezone
-                                ).strftime('%Y-%m-%d %H:%M:%S')
+                                ).strftime('%Y-%m-%d %H:%M:%S %Z')
                             )
                         else:
                             row.append('')
@@ -920,16 +919,16 @@ def iterate_list(self, form_data):
         for obj in objs:
             tz = pytz.timezone(obj.order.event.settings.timezone)
             if isinstance(obj, OrderPayment) and obj.payment_date:
-                d2 = obj.payment_date.astimezone(tz).date().strftime('%Y-%m-%d')
+                d2 = obj.payment_date.astimezone(tz).strftime('%Y-%m-%d %H:%M:%S %Z')
             elif isinstance(obj, OrderRefund) and obj.execution_date:
-                d2 = obj.execution_date.astimezone(tz).date().strftime('%Y-%m-%d')
+                d2 = obj.execution_date.astimezone(tz).strftime('%Y-%m-%d %H:%M:%S %Z')
             else:
                 d2 = ''
             row = [
                 obj.order.event.slug,
                 obj.order.code,
                 obj.full_id,
-                obj.created.astimezone(tz).date().strftime('%Y-%m-%d'),
+                obj.created.astimezone(tz).strftime('%Y-%m-%d %H:%M:%S %Z'),
                 d2,
                 obj.get_state_display(),
                 obj.state,
@@ -990,9 +989,9 @@ def iterate_list(self, form_data):
             if has_subevents:
                 if quota.subevent:
                     row.append(quota.subevent.name)
-                    row.append(quota.subevent.date_from.astimezone(self.event.timezone).strftime('%Y-%m-%d %H:%M:%S'))
+                    row.append(quota.subevent.date_from.astimezone(self.event.timezone).strftime('%Y-%m-%d %H:%M:%S %Z'))
                     if quota.subevent.date_to:
-                        row.append(quota.subevent.date_to.astimezone(self.event.timezone).strftime('%Y-%m-%d %H:%M:%S'))
+                        row.append(quota.subevent.date_to.astimezone(self.event.timezone).strftime('%Y-%m-%d %H:%M:%S %Z'))
                     else:
                         row.append('')
                 else:
@@ -1044,7 +1043,7 @@ def iterate_list(self, form_data):
                 obj.order.event.slug,
                 obj.order.code,
                 obj.full_id,
-                obj.created.astimezone(tz).date().strftime('%Y-%m-%d'),
+                obj.created.astimezone(tz).strftime('%Y-%m-%d %H:%M:%S %Z'),
                 gc.secret,
                 obj.amount * (-1 if isinstance(obj, OrderRefund) else 1),
                 gc.issuer,
@@ -1169,8 +1168,8 @@ def iterate_list(self, form_data):
                 row = [
                     obj.secret,
                     _('Yes') if obj.testmode else _('No'),
-                    obj.issuance.astimezone(tz).date().strftime('%Y-%m-%d'),
-                    obj.expires.astimezone(tz).date().strftime('%Y-%m-%d') if obj.expires else '',
+                    obj.issuance.astimezone(tz).strftime('%Y-%m-%d %H:%M:%S %Z'),
+                    obj.expires.astimezone(tz).strftime('%Y-%m-%d %H:%M:%S %Z') if obj.expires else '',
                     obj.conditions or '',
                     obj.currency,
                     obj.cached_value,

app/eventyay/base/exporters/waitinglist.py

@@ -115,7 +115,7 @@ def iterate_list(self, form_data):
             # which event should be used to output dates in columns "Start date" and "End date"
             event_for_date_columns = entry.subevent if entry.subevent else entry.event
             tz = pytz.timezone(entry.event.settings.timezone)
-            datetime_format = '%Y-%m-%d %H:%M:%S'
+            datetime_format = '%Y-%m-%d %H:%M:%S %Z'
 
             row = [
                 entry.created.astimezone(tz).strftime(datetime_format),  # alternative: .isoformat(),

app/eventyay/base/models/access_code.py

@@ -61,7 +61,7 @@ class SubmitterAccessCode(GenerateCode, PretalxModel):
 
     _code_length = 32
 
-    log_prefix = 'pretalx.access_code'
+    log_prefix = 'eventyay.access_code'
 
     class Meta:
         unique_together = (('event', 'code'),)

app/eventyay/base/models/information.py

@@ -52,7 +52,7 @@ class SpeakerInformation(PretalxModel):
         upload_to=resource_path,
     )
 
-    log_prefix = 'speaker_information'
+    log_prefix = 'eventyay.speaker_information'
 
     @property
     def log_parent(self):

app/eventyay/base/models/mail.py

@@ -62,7 +62,7 @@ class MailTemplate(PretalxModel):
     special cases, for now.
     """
 
-    log_prefix = 'pretalx.mail_template'
+    log_prefix = 'eventyay.mail_template'
 
     event = models.ForeignKey(
         to='Event',

app/eventyay/base/models/question.py

@@ -247,7 +247,7 @@ class TalkQuestion(OrderedModel, PretalxModel):
     objects = ScopedManager(event='event', _manager_class=TalkQuestionManager)
     all_objects = ScopedManager(event='event', _manager_class=AllTalkQuestionManager)
 
-    log_prefix = 'pretalx.question'
+    log_prefix = 'eventyay.question'
 
     class Meta:
         ordering = ('position', 'id')

app/eventyay/base/models/room.py

@@ -177,7 +177,7 @@ class Room(VersionedModel, OrderedModel, PretalxModel):
     are not in use right now.
     """
 
-    log_prefix = "pretalx.room"
+    log_prefix = "eventyay.room"
 
     deleted = models.BooleanField(default=False)
     description = I18nCharField(

app/eventyay/base/models/schedule.py

@@ -102,7 +102,7 @@ def freeze(self, name: str, user=None, notify_speakers: bool = True, comment: st
         wip_schedule = Schedule.objects.create(event=self.event)
 
         self.save(update_fields=['published', 'version', 'comment'])
-        self.log_action('pretalx.schedule.release', person=user, orga=True)
+        self.log_action('eventyay.schedule.release', person=user, orga=True)
 
         # Set visibility
         self.talks.all().update(is_visible=False)