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

Sendmail: Allow to send only to (un)approved

Browse Source
This commit is contained in:
Raphael Michel
2020-11-10 11:37:38 +01:00
parent 2c1195eaa1
commit eae1fc9a81
3 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,7 +117,9 @@ class MailForm(forms.Form):
)
self._set_field_placeholders('subject', ['event', 'order', 'position_or_address'])
self._set_field_placeholders('message', ['event', 'order', 'position_or_address'])
choices = list(Order.STATUS_CHOICE)
choices = [(e, l) for e, l in Order.STATUS_CHOICE if e != 'n']
choices.insert(0, ('na', _('payment pending (except unapproved)')))
choices.insert(0, ('pa', _('approval pending')))
if not event.settings.get('payment_term_expire_automatically', as_type=bool):
choices.append(
('overdue', _('pending with payment overdue'))
@@ -130,7 +132,10 @@ class MailForm(forms.Form):
choices=choices
)
if not self.initial.get('sendto'):
self.initial['sendto'] = ['p', 'n']
self.initial['sendto'] = ['p', 'na']
elif 'n' in self.initial['sendto']:
self.initial['sendto'].append('pa')
self.initial['sendto'].append('na')
self.fields['items'].queryset = event.items.all()
if not self.initial.get('items'):

6
src/pretix/plugins/sendmail/views.py
View File

@@ -84,6 +84,10 @@ class SenderView(EventPermissionRequiredMixin, FormView):
statusq = Q(status__in=form.cleaned_data['sendto'])
if 'overdue' in form.cleaned_data['sendto']:
statusq |= Q(status=Order.STATUS_PENDING, expires__lt=now())
if 'pa' in form.cleaned_data['sendto']:
statusq |= Q(status=Order.STATUS_PENDING, require_approval=True)
if 'na' in form.cleaned_data['sendto']:
statusq |= Q(status=Order.STATUS_PENDING, require_approval=False)
orders = qs.filter(statusq)
opq = OrderPosition.objects.filter(
@@ -205,6 +209,8 @@ class EmailHistoryView(EventPermissionRequiredMixin, ListView):
}
status = dict(Order.STATUS_CHOICE)
status['overdue'] = _('pending with payment overdue')
status['na'] = _('payment pending (except unapproved)')
status['pa'] = _('approval pending')
status['r'] = status['c']
for log in ctx['logs']:
log.pdata = log.parsed_data