diff --git a/src/pretix/base/services/invoices.py b/src/pretix/base/services/invoices.py index a9f1b9464a..803bba2120 100644 --- a/src/pretix/base/services/invoices.py +++ b/src/pretix/base/services/invoices.py @@ -257,7 +257,8 @@ def invoice_pdf_task(invoice: int): def invoice_qualified(order: Order): - if order.total == Decimal('0.00') or order.require_approval: + if order.total == Decimal('0.00') or order.require_approval or \ + order.sales_channel not in order.event.settings.get('invoice_generate_sales_channels'): return False return True diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index 9074037bc4..f3b2fbf320 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -145,6 +145,10 @@ DEFAULTS = { 'default': 'False', 'type': str }, + 'invoice_generate_sales_channels': { + 'default': json.dumps(['web']), + 'type': list + }, 'invoice_address_from': { 'default': '', 'type': str diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py index ce88f92997..2601a6e487 100644 --- a/src/pretix/control/forms/event.py +++ b/src/pretix/control/forms/event.py @@ -18,6 +18,7 @@ from i18nfield.forms import ( ) from pytz import common_timezones, timezone +from pretix.base.channels import get_all_sales_channels from pretix.base.forms import I18nModelForm, PlaceholderValidator, SettingsForm from pretix.base.models import Event, Organizer, TaxRule from pretix.base.models.event import EventMetaValue, SubEvent @@ -664,6 +665,13 @@ class InvoiceSettingsForm(SettingsForm): ), help_text=_("Invoices will never be automatically generated for free orders.") ) + invoice_generate_sales_channels = forms.MultipleChoiceField( + label=_('Generate invoices for Sales channels'), + choices=[], + widget=forms.CheckboxSelectMultiple, + help_text=_("If you have enabled invoice generation in the previous setting, you can limit it here to specific " + "sales channels.") + ) invoice_attendee_name = forms.BooleanField( label=_("Show attendee names on invoices"), required=False @@ -779,6 +787,9 @@ class InvoiceSettingsForm(SettingsForm): self.fields['invoice_numbers_prefix'].widget.attrs['placeholder'] = event.slug.upper() + '-' locale_names = dict(settings.LANGUAGES) self.fields['invoice_language'].choices = [('__user__', _('The user\'s language'))] + [(a, locale_names[a]) for a in event.settings.locales] + self.fields['invoice_generate_sales_channels'].choices = ( + (c.identifier, c.verbose_name) for c in get_all_sales_channels().values() + ) def multimail_validate(val): diff --git a/src/pretix/control/templates/pretixcontrol/event/invoicing.html b/src/pretix/control/templates/pretixcontrol/event/invoicing.html index a1f0902f3a..a9870ac2df 100644 --- a/src/pretix/control/templates/pretixcontrol/event/invoicing.html +++ b/src/pretix/control/templates/pretixcontrol/event/invoicing.html @@ -9,6 +9,7 @@
{% trans "General settings" %} {% bootstrap_field form.invoice_generate layout="control" %} + {% bootstrap_field form.invoice_generate_sales_channels layout="control" %} {% bootstrap_field form.invoice_email_attachment layout="control" %} {% bootstrap_field form.invoice_numbers_prefix layout="control" %} {% bootstrap_field form.invoice_numbers_consecutive layout="control" %} diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py index 6747e1a9f8..54ccff601f 100644 --- a/src/pretix/presale/views/order.py +++ b/src/pretix/presale/views/order.py @@ -122,10 +122,13 @@ class OrderDetails(EventViewMixin, OrderDetailMixin, CartMixin, TemplateView): ) ctx['invoices'] = list(self.order.invoices.all()) can_generate_invoice = ( - self.request.event.settings.get('invoice_generate') in ('user', 'True') - or ( - self.request.event.settings.get('invoice_generate') == 'paid' - and self.order.status == Order.STATUS_PAID + self.order.sales_channel in self.request.event.settings.get('invoice_generate_sales_channels') + and ( + self.request.event.settings.get('invoice_generate') in ('user', 'True') + or ( + self.request.event.settings.get('invoice_generate') == 'paid' + and self.order.status == Order.STATUS_PAID + ) ) ) ctx['can_generate_invoice'] = invoice_qualified(self.order) and can_generate_invoice @@ -516,10 +519,13 @@ class OrderInvoiceCreate(EventViewMixin, OrderDetailMixin, View): def post(self, request, *args, **kwargs): can_generate_invoice = ( - self.request.event.settings.get('invoice_generate') in ('user', 'True') - or ( - self.request.event.settings.get('invoice_generate') == 'paid' - and self.order.status == Order.STATUS_PAID + self.order.sales_channel in self.request.event.settings.get('invoice_generate_sales_channels') + and ( + self.request.event.settings.get('invoice_generate') in ('user', 'True') + or ( + self.request.event.settings.get('invoice_generate') == 'paid' + and self.order.status == Order.STATUS_PAID + ) ) ) if not can_generate_invoice or not invoice_qualified(self.order): diff --git a/src/tests/api/test_orders.py b/src/tests/api/test_orders.py index e660ec8b8c..0ed9bbd6e1 100644 --- a/src/tests/api/test_orders.py +++ b/src/tests/api/test_orders.py @@ -2705,6 +2705,17 @@ def test_order_update_locale_to_invalid(token_client, organizer, event, order): @pytest.mark.django_db def test_order_create_invoice(token_client, organizer, event, order): event.settings.invoice_generate = 'True' + + event.settings.invoice_generate_sales_channels = [] + + resp = token_client.post( + '/api/v1/organizers/{}/events/{}/orders/{}/create_invoice/'.format( + organizer.slug, event.slug, order.code + ), format='json', data={} + ) + assert resp.status_code == 400 + + event.settings.invoice_generate_sales_channels = ['web'] resp = token_client.post( '/api/v1/organizers/{}/events/{}/orders/{}/create_invoice/'.format( organizer.slug, event.slug, order.code diff --git a/src/tests/base/test_invoices.py b/src/tests/base/test_invoices.py index b46b761060..2ef1d18c4a 100644 --- a/src/tests/base/test_invoices.py +++ b/src/tests/base/test_invoices.py @@ -16,7 +16,7 @@ from pretix.base.models.orders import OrderFee from pretix.base.services.invoices import ( build_preview_invoice_pdf, generate_cancellation, generate_invoice, invoice_pdf_task, regenerate_invoice, -) + invoice_qualified) from pretix.base.services.orders import OrderChangeManager from pretix.base.settings import GlobalSettingsObject @@ -398,3 +398,21 @@ def test_invoice_number_prefixes(env): locale='en', invoice_no='00001', ) + + +@pytest.mark.django_db +def test_sales_channels_qualify(env): + event, order = env + event.settings.set('invoice_generate', 'admin') + + # Orders with Total of 0 do never qualify + assert invoice_qualified(order) is False + + order.total = Decimal('42.00') + + # Order with default Sales Channel (web) + assert invoice_qualified(order) is True + + event.settings.set('invoice_generate_sales_channels', []) + assert invoice_qualified(order) is False +