updates mark_oder_expired() docstring to match reality

Seems to have been lost in merge conflict https://github.com/pretix/pretix/commit/5ffb1f469e8f066269b407a64502353792041786

src/pretix/base/services/mail.py

@@ -316,6 +316,7 @@ def mail(email: Union[str, Sequence[str]], subject: Union[str, FormattedString],
                 body_html = None
 
         m = OutgoingMail.objects.create(
+            guid=guid,
             organizer=organizer,
             event=event,
             order=order,

src/pretix/base/services/orders.py

@@ -359,7 +359,8 @@ def mark_order_refunded(order, user=None, auth=None, api_token=None):
 
 def mark_order_expired(order, user=None, auth=None):
     """
-    Mark this order as expired. This sets the payment status and returns the order object.
+    Mark this order as expired. This sets the order status, generates an invoice cancellation
+    and returns the order object.
     :param order: The order to change
     :param user: The user that performed the change
     """

src/pretix/base/services/placeholders.py

@@ -752,6 +752,11 @@ def base_placeholders(sender, **kwargs):
         lambda position_or_address: concatenation_for_salutation(get_best_name(position_or_address, parts=True)),
         lambda event: concatenation_for_salutation(name_scheme['sample']),
     ))
+    ph.append(SimpleFunctionalTextPlaceholder(
+        "attendee_name_for_salutation", ["position"],
+        lambda position: concatenation_for_salutation(position.attendee_name_parts),
+        lambda event: concatenation_for_salutation(name_scheme['sample']),
+    ))
 
     for f, l, w in name_scheme['fields']:
         if f == 'full_name':

src/pretix/control/views/typeahead.py

@@ -342,7 +342,7 @@ def nav_context_list(request):
         max_to=Max('subevents__date_to'),
         max_fromto=Greatest(Max('subevents__date_to'), Max('subevents__date_from'))
     ).annotate(
-        order_from=Coalesce('min_from', 'date_from'),
+        order_from=Coalesce('max_from', 'date_from'),
     ).order_by('-order_from', 'slug')
 
     if request.user.has_active_staff_session(request.session.session_key):

src/pretix/plugins/stripe/payment.py

@@ -138,7 +138,7 @@ logger = logging.getLogger('pretix.plugins.stripe')
 # - BLIK: ✗
 # - Pay By Bank: ✓
 # - TWINT: ✓
-# - Wero: ✓ (No settings UI yet)
+# - Wero: ✓
 # - giropay: ✗ (deprecated)
 # - Sofort: ✗ (deprecated)
 #
@@ -529,15 +529,14 @@ class StripeSettingsHolder(BasePaymentProvider):
                                  'before they work properly.'),
                      required=False,
                  )),
-                # Disabled for now, since still in closed Beta and only available to dedicated boarded accounts.
-                # ('method_wero',
-                #  forms.BooleanField(
-                #     label=_('Wero'),
-                #      disabled=self.event.currency not in 'EUR',
-                #      help_text=_('Some payment methods might need to be enabled in the settings of your Stripe account '
-                #                  'before they work properly.'),
-                #      required=False,
-                #  )),
+                ('method_wero',
+                 forms.BooleanField(
+                     label=_('Wero'),
+                     disabled=self.event.currency not in 'EUR',
+                     help_text=_('Some payment methods might need to be enabled in the settings of your Stripe account '
+                                 'before they work properly.'),
+                     required=False,
+                 )),
             ] + extra_fields + list(super().settings_form_fields.items()) + moto_settings
         )
         if not self.settings.connect_client_id or self.settings.secret_key:

src/pretix/presale/views/event.py

@@ -247,6 +247,10 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
         context['has_addon_choices'] = any(cp.has_addon_choices for cp in get_cart(self.request))
 
         templating_context = PlaceholderContext(event_or_subevent=self.subevent or self.request.event, event=self.request.event)
+
+        for field in ('presale_has_ended_text',):
+            context[field] = templating_context.format(str(self.request.event.settings[field]))
+
         if self.subevent:
             context['frontpage_text'] = templating_context.format(str(self.subevent.frontpage_text))
         else: