From 0d0bbe1ce5ff7a814a8ce33df5498523facd9f99 Mon Sep 17 00:00:00 2001 From: Richard Schreiber Date: Wed, 17 Feb 2021 12:37:26 +0100 Subject: [PATCH] add send_email field to mark-paid --- src/pretix/control/forms/orders.py | 7 ++++++- src/pretix/control/templates/pretixcontrol/order/pay.html | 1 + src/pretix/control/views/orders.py | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/pretix/control/forms/orders.py b/src/pretix/control/forms/orders.py index 9f6d3d968d..e799312456 100644 --- a/src/pretix/control/forms/orders.py +++ b/src/pretix/control/forms/orders.py @@ -104,7 +104,7 @@ class ConfirmPaymentForm(forms.Form): class CancelForm(ConfirmPaymentForm): send_email = forms.BooleanField( required=False, - label=_('Notify user by e-mail'), + label=_('Notify customer by email'), initial=True ) cancellation_fee = forms.DecimalField( @@ -139,6 +139,11 @@ class CancelForm(ConfirmPaymentForm): class MarkPaidForm(ConfirmPaymentForm): + send_email = forms.BooleanField( + required=False, + label=_('Notify customer by email'), + initial=True + ) amount = forms.DecimalField( required=True, max_digits=10, decimal_places=2, diff --git a/src/pretix/control/templates/pretixcontrol/order/pay.html b/src/pretix/control/templates/pretixcontrol/order/pay.html index cc359d46d5..78403cfbe2 100644 --- a/src/pretix/control/templates/pretixcontrol/order/pay.html +++ b/src/pretix/control/templates/pretixcontrol/order/pay.html @@ -24,6 +24,7 @@ {% bootstrap_form_errors form %} {% bootstrap_field form.amount layout='horizontal' %} {% bootstrap_field form.payment_date layout='horizontal' %} + {% bootstrap_field form.send_email layout='horizontal' %} {% if form.force %} {% bootstrap_field form.force layout='horizontal' horizontal_label_class='sr-only' horizontal_field_class='col-md-12' %} {% endif %} diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py index fcd7971d37..e10b2e3e43 100644 --- a/src/pretix/control/views/orders.py +++ b/src/pretix/control/views/orders.py @@ -1105,6 +1105,7 @@ class OrderTransition(OrderView): try: p.confirm(user=self.request.user, count_waitinglist=False, payment_date=payment_date, + send_mail=self.mark_paid_form.cleaned_data['send_email'], force=self.mark_paid_form.cleaned_data.get('force', False)) except Quota.QuotaExceededException as e: p.state = OrderPayment.PAYMENT_STATE_FAILED