From cf52cccb8aad4ab785a0824e4048175e07542a91 Mon Sep 17 00:00:00 2001
From: Kara Engelhardt <engelhardt@pretix.eu>
Date: Wed, 1 Apr 2026 14:40:37 +0200
Subject: [PATCH] Clarify meaning of cancelled for scheduled mails

---
 src/pretix/base/models/orders.py     | 1 -
 src/pretix/control/forms/filter.py   | 2 +-
 src/pretix/plugins/sendmail/forms.py | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py
index e1d84409f2..27b18dad02 100644
--- a/src/pretix/base/models/orders.py
+++ b/src/pretix/base/models/orders.py
@@ -323,7 +323,6 @@ class Order(LockModel, LoggedModel):
     )
 
     STATUS_FILTERS = (
-        ('', _('All orders')),
         (_('Valid orders'), (
             (STATUS_PAID, _('Paid (or canceled with paid fee)')),
             (STATUS_PAID + 'v', _('Paid or confirmed')),
diff --git a/src/pretix/control/forms/filter.py b/src/pretix/control/forms/filter.py
index fcdae7f2c1..0f7208af2c 100644
--- a/src/pretix/control/forms/filter.py
+++ b/src/pretix/control/forms/filter.py
@@ -219,7 +219,7 @@ class OrderFilterForm(FilterForm):
     )
     status = forms.ChoiceField(
         label=_('Order status'),
-        choices=Order.STATUS_FILTERS,
+        choices=[('', _('All orders')), *Order.STATUS_FILTERS],
         required=False,
     )
 
diff --git a/src/pretix/plugins/sendmail/forms.py b/src/pretix/plugins/sendmail/forms.py
index 613af0d0b4..abb0c8e611 100644
--- a/src/pretix/plugins/sendmail/forms.py
+++ b/src/pretix/plugins/sendmail/forms.py
@@ -376,7 +376,7 @@ class RuleForm(FormPlaceholderMixin, I18nModelForm):
         self._set_field_placeholders('subject', ['event', 'order', 'event_or_subevent'])
         self._set_field_placeholders('template', ['event', 'order', 'event_or_subevent'], rich=True)
 
-        choices = [(e, l) for e, l in Order.STATUS_CHOICE if e != 'n']
+        choices = [(e, l) for e, l in Order.STATUS_CHOICE if e != 'n' and e != 'c']
         choices.insert(0, ('n__valid_if_pending', _('payment pending but already confirmed')))
         choices.insert(0, ('n__not_pending_approval_and_not_valid_if_pending',
                            _('payment pending (except unapproved or already confirmed)')))
@@ -385,6 +385,7 @@ class RuleForm(FormPlaceholderMixin, I18nModelForm):
             choices.append(
                 ('n__pending_overdue', _('pending with payment overdue'))
             )
+        choices.append(('c', _('Canceled (fully)')))
         self.fields['restrict_to_status'] = forms.MultipleChoiceField(
             label=pgettext_lazy('sendmail_from', 'Restrict to orders with status'),
             widget=forms.CheckboxSelectMultiple(