Do not issue invoices for free payments

This commit is contained in:
Raphael Michel
2016-08-05 11:06:22 +02:00
parent f93b2211a6
commit a61792ed4e
9 changed files with 78 additions and 26 deletions

View File

@@ -298,6 +298,12 @@ class MailSettingsForm(SettingsForm):
widget=I18nTextarea,
help_text=_("Available placeholders: {event}, {url}")
)
mail_text_order_free = I18nFormField(
label=_("Free order"),
required=False,
widget=I18nTextarea,
help_text=_("Available placeholders: {event}, {url}")
)
mail_text_resend_link = I18nFormField(
label=_("Resend link"),
required=False,

View File

@@ -110,7 +110,7 @@
{% endif %}
{% endfor %}
</dd>
{% elif request.event.settings.invoice_generate == 'admin' or request.event.settings.invoice_generate == 'user' %}
{% elif can_generate_invoice %}
<dt>{% trans "Invoices" %}</dt>
<dd>
<form class="form-inline helper-display-inline" method="post"

View File

@@ -17,7 +17,9 @@ from pretix.base.models import (
)
from pretix.base.services import tickets
from pretix.base.services.export import export
from pretix.base.services.invoices import generate_invoice, invoice_pdf
from pretix.base.services.invoices import (
generate_invoice, invoice_pdf, invoice_qualified,
)
from pretix.base.services.mail import mail
from pretix.base.services.orders import cancel_order, mark_order_paid
from pretix.base.services.stats import order_overview
@@ -75,6 +77,14 @@ class OrderView(EventPermissionRequiredMixin, DetailView):
def order(self):
return self.get_object()
def get_context_data(self, **kwargs):
ctx = super().get_context_data(**kwargs)
ctx['can_generate_invoice'] = invoice_qualified(self.order) and (
self.request.event.settings.invoice_generate == 'admin' or
self.request.event.settings.invoice_generate == 'user'
)
return ctx
@cached_property
def payment_provider(self):
responses = register_payment_providers.send(self.request.event)
@@ -212,7 +222,8 @@ class OrderInvoiceCreate(OrderView):
permission = 'can_change_orders'
def post(self, *args, **kwargs):
if self.request.event.settings.get('invoice_generate') not in ('admin', 'user'):
if self.request.event.settings.get('invoice_generate') not in ('admin', 'user') or not invoice_qualified(
self.order):
messages.error(self.request, _('You cannot generate an invoice for this order.'))
elif self.order.invoices.exists():
messages.error(self.request, _('An invoice for this order already exists.'))