CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-11 16:13:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clarify meaning of cancelled for scheduled mails

Browse Source
This commit is contained in:
Kara Engelhardt
2026-04-01 14:40:37 +02:00
parent 08d8e4dcc4
commit cf52cccb8a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pretix/base/models/orders.py
View File

@@ -323,7 +323,6 @@ class Order(LockModel, LoggedModel):
) )
STATUS_FILTERS = ( STATUS_FILTERS = (
('', _('All orders')),
(_('Valid orders'), ( (_('Valid orders'), (
(STATUS_PAID, _('Paid (or canceled with paid fee)')), (STATUS_PAID, _('Paid (or canceled with paid fee)')),
(STATUS_PAID + 'v', _('Paid or confirmed')), (STATUS_PAID + 'v', _('Paid or confirmed')),

2
src/pretix/control/forms/filter.py
View File

@@ -219,7 +219,7 @@ class OrderFilterForm(FilterForm):
) )
status = forms.ChoiceField( status = forms.ChoiceField(
label=_('Order status'), label=_('Order status'),
choices=Order.STATUS_FILTERS, choices=[('', _('All orders')), *Order.STATUS_FILTERS],
required=False, required=False,
) )

3
src/pretix/plugins/sendmail/forms.py
View File

@@ -376,7 +376,7 @@ class RuleForm(FormPlaceholderMixin, I18nModelForm):
self._set_field_placeholders('subject', ['event', 'order', 'event_or_subevent']) self._set_field_placeholders('subject', ['event', 'order', 'event_or_subevent'])
self._set_field_placeholders('template', ['event', 'order', 'event_or_subevent'], rich=True) 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__valid_if_pending', _('payment pending but already confirmed')))
choices.insert(0, ('n__not_pending_approval_and_not_valid_if_pending', choices.insert(0, ('n__not_pending_approval_and_not_valid_if_pending',
_('payment pending (except unapproved or already confirmed)'))) _('payment pending (except unapproved or already confirmed)')))
@@ -385,6 +385,7 @@ class RuleForm(FormPlaceholderMixin, I18nModelForm):
choices.append( choices.append(
('n__pending_overdue', _('pending with payment overdue')) ('n__pending_overdue', _('pending with payment overdue'))
) )
choices.append(('c', _('Canceled (fully)')))
self.fields['restrict_to_status'] = forms.MultipleChoiceField( self.fields['restrict_to_status'] = forms.MultipleChoiceField(
label=pgettext_lazy('sendmail_from', 'Restrict to orders with status'), label=pgettext_lazy('sendmail_from', 'Restrict to orders with status'),
widget=forms.CheckboxSelectMultiple( widget=forms.CheckboxSelectMultiple(