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 filter by order date

Browse Source
This commit is contained in:
Raphael Michel
2021-02-12 12:41:45 +01:00
parent 72b6ff0389
commit c8d039b196
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,6 +65,16 @@ class MailForm(forms.Form):
label=pgettext_lazy('subevent', 'Only send to customers of dates starting before'),
required=False,
)
created_from = forms.SplitDateTimeField(
widget=SplitDateTimePickerWidget(),
label=pgettext_lazy('subevent', 'Only send to customers with orders created after'),
required=False,
)
created_to = forms.SplitDateTimeField(
widget=SplitDateTimePickerWidget(),
label=pgettext_lazy('subevent', 'Only send to customers with orders created before'),
required=False,
)
def clean(self):
d = super().clean()

2
src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html
View File

@@ -15,6 +15,8 @@
{% bootstrap_field form.subevents_from layout='horizontal' %}
{% bootstrap_field form.subevents_to layout='horizontal' %}
{% endif %}
{% bootstrap_field form.created_from layout='horizontal' %}
{% bootstrap_field form.created_to layout='horizontal' %}
{% bootstrap_field form.items layout='horizontal' %}
<div class="row">
<div class="col-md-9 col-md-offset-3">

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

@@ -64,6 +64,10 @@ class SenderView(EventPermissionRequiredMixin, FormView):
kwargs['initial']['subevents_from'] = dateutil.parser.parse(logentry.parsed_data['subevents_from'])
if logentry.parsed_data.get('subevents_to'):
kwargs['initial']['subevents_to'] = dateutil.parser.parse(logentry.parsed_data['subevents_to'])
if logentry.parsed_data.get('created_from'):
kwargs['initial']['created_from'] = dateutil.parser.parse(logentry.parsed_data['created_from'])
if logentry.parsed_data.get('created_to'):
kwargs['initial']['created_to'] = dateutil.parser.parse(logentry.parsed_data['created_to'])
if logentry.parsed_data.get('subevent'):
try:
kwargs['initial']['subevent'] = self.request.event.subevents.get(
@@ -117,6 +121,10 @@ class SenderView(EventPermissionRequiredMixin, FormView):
opq = opq.filter(subevent__date_from__gte=form.cleaned_data.get('subevents_from'))
if form.cleaned_data.get('subevents_to'):
opq = opq.filter(subevent__date_from__lt=form.cleaned_data.get('subevents_to'))
if form.cleaned_data.get('created_from'):
opq = opq.filter(order__datetime__gte=form.cleaned_data.get('created_from'))
if form.cleaned_data.get('created_to'):
opq = opq.filter(order__datetime__lt=form.cleaned_data.get('created_to'))
orders = orders.annotate(match_pos=Exists(opq)).filter(match_pos=True).distinct()