Sendmail: Allow to send only to (un)approved

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

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