Re-organized some of the settings pages

2016-07-29 16:46:10 +02:00
parent a8709d6430
commit 9b573b99e4
7 changed files with 192 additions and 114 deletions
--- a/src/pretix/control/forms/event.py
+++ b/src/pretix/control/forms/event.py
@@ -97,10 +97,6 @@ class EventSettingsForm(SettingsForm):
        help_text=_("If disabled, the event's start and end date will be displayed without the time of day."),
        required=False
    )
-    payment_term_days = forms.IntegerField(
-        label=_('Payment term in days'),
-        help_text=_("The number of days after placing an order the user has to pay to preserve his reservation."),
-    )
    show_items_outside_presale_period = forms.BooleanField(
        label=_("Show items outside presale period"),
        help_text=_("Show item details before presale has started and after presale has ended"),
@@ -111,37 +107,12 @@ class EventSettingsForm(SettingsForm):
        help_text=_("Show the presale start date before presale has started"),
        required=False
    )
-    payment_term_last = forms.DateTimeField(
-        label=_('Last date of payments'),
-        help_text=_("The last date any payments are accepted. This has precedence over the number of "
-                    "days configured above."),
-        required=False
-    )
-    payment_term_expire_automatically = forms.BooleanField(
-        label=_('Automatically expire unpaid orders'),
-        help_text=_("If checked, all unpaid orders will automatically go from 'pending' to 'expired' "
-                    "after the end of their payment deadline. This means that those tickets go back to "
-                    "the pool and can be ordered by other people."),
-        required=False
-    )
-    payment_term_accept_late = forms.BooleanField(
-        label=_('Accept late payments'),
-        help_text=_("Accept payments for orders even when they are in 'expired' state as long as enough "
-                    "capacity is available. No payments will ever be accepted after the 'Last date of payments' "
-                    "configured above."),
-        required=False
-    )
    last_order_modification_date = forms.DateTimeField(
        label=_('Last date of modifications'),
        help_text=_("The last date users can modify details of their orders, such as attendee names or "
                    "answers to questions."),
        required=False
    )
-    tax_rate_default = forms.DecimalField(
-        label=_('Tax rate for payment fees'),
-        help_text=_("The tax rate that applies for additional fees you configured for single payment methods "
-                    "(in percent)."),
-    )
    timezone = forms.ChoiceField(
        choices=((a, a) for a in common_timezones),
        label=_("Default timezone"),
@@ -169,6 +140,98 @@ class EventSettingsForm(SettingsForm):
        help_text=_("Require customers to fill in the names of all attendees."),
        required=False
    )
+    max_items_per_order = forms.IntegerField(
+        min_value=1,
+        label=_("Maximum number of items per order")
+    )
+    reservation_time = forms.IntegerField(
+        min_value=0,
+        label=_("Reservation period"),
+        help_text=_("The number of minutes the items in a user's card are reserved for this user."),
+    )
+    imprint_url = forms.URLField(
+        label=_("Imprint URL"),
+        required=False,
+    )
+    contact_mail = forms.EmailField(
+        label=_("Contact address"),
+        required=False,
+        help_text=_("Public email address for contacting the organizer")
+    )
+
+    def clean(self):
+        data = super().clean()
+        if data['locale'] not in data['locales']:
+            raise ValidationError({
+                'locale': _('Your default locale must also be enebled for your event (see box above).')
+            })
+        if data['attendee_names_required'] and not data['attendee_names_asked']:
+            raise ValidationError({
+                'attendee_names_required': _('You cannot require specifying attendee names if you do not ask for them.')
+            })
+        return data
+
+
+class PaymentSettingsForm(SettingsForm):
+    payment_term_days = forms.IntegerField(
+        label=_('Payment term in days'),
+        help_text=_("The number of days after placing an order the user has to pay to preserve his reservation."),
+    )
+    payment_term_last = forms.DateTimeField(
+        label=_('Last date of payments'),
+        help_text=_("The last date any payments are accepted. This has precedence over the number of "
+                    "days configured above."),
+        required=False
+    )
+    payment_term_expire_automatically = forms.BooleanField(
+        label=_('Automatically expire unpaid orders'),
+        help_text=_("If checked, all unpaid orders will automatically go from 'pending' to 'expired' "
+                    "after the end of their payment deadline. This means that those tickets go back to "
+                    "the pool and can be ordered by other people."),
+        required=False
+    )
+    payment_term_accept_late = forms.BooleanField(
+        label=_('Accept late payments'),
+        help_text=_("Accept payments for orders even when they are in 'expired' state as long as enough "
+                    "capacity is available. No payments will ever be accepted after the 'Last date of payments' "
+                    "configured above."),
+        required=False
+    )
+    tax_rate_default = forms.DecimalField(
+        label=_('Tax rate for payment fees'),
+        help_text=_("The tax rate that applies for additional fees you configured for single payment methods "
+                    "(in percent)."),
+    )
+
+
+class ProviderForm(SettingsForm):
+    """
+    This is a SettingsForm, but if fields are set to required=True, validation
+    errors are only raised if the payment method is enabled.
+    """
+
+    def __init__(self, *args, **kwargs):
+        self.settingspref = kwargs.pop('settingspref')
+        super().__init__(*args, **kwargs)
+
+    def prepare_fields(self):
+        for k, v in self.fields.items():
+            v._required = v.required
+            v.required = False
+            v.widget.is_required = False
+
+    def clean(self):
+        cleaned_data = super().clean()
+        enabled = cleaned_data.get(self.settingspref + '_enabled') == 'True'
+        if not enabled:
+            return
+        for k, v in self.fields.items():
+            val = cleaned_data.get(k)
+            if v._required and (val is None or val == ""):
+                self.add_error(k, _('This field is required.'))
+
+
+class InvoiceSettingsForm(SettingsForm):
    invoice_address_asked = forms.BooleanField(
        label=_("Ask for invoice address"),
        required=False
@@ -208,63 +271,6 @@ class EventSettingsForm(SettingsForm):
        label=_("Invoice language"),
        choices=[('__user__', _('The user\'s language'))] + settings.LANGUAGES,
    )
-    max_items_per_order = forms.IntegerField(
-        min_value=1,
-        label=_("Maximum number of items per order")
-    )
-    reservation_time = forms.IntegerField(
-        min_value=0,
-        label=_("Reservation period"),
-        help_text=_("The number of minutes the items in a user's card are reserved for this user."),
-    )
-    imprint_url = forms.URLField(
-        label=_("Imprint URL"),
-        required=False,
-    )
-    contact_mail = forms.EmailField(
-        label=_("Contact address"),
-        required=False,
-        help_text=_("Public email address for contacting the organizer")
-    )
-
-    def clean(self):
-        data = super().clean()
-        if data['locale'] not in data['locales']:
-            raise ValidationError({
-                'locale': _('Your default locale must also be enebled for your event (see box above).')
-            })
-        if data['attendee_names_required'] and not data['attendee_names_asked']:
-            raise ValidationError({
-                'attendee_names_required': _('You cannot require specifying attendee names if you do not ask for them.')
-            })
-        return data
-
-
-class ProviderForm(SettingsForm):
-    """
-    This is a SettingsForm, but if fields are set to required=True, validation
-    errors are only raised if the payment method is enabled.
-    """
-
-    def __init__(self, *args, **kwargs):
-        self.settingspref = kwargs.pop('settingspref')
-        super().__init__(*args, **kwargs)
-
-    def prepare_fields(self):
-        for k, v in self.fields.items():
-            v._required = v.required
-            v.required = False
-            v.widget.is_required = False
-
-    def clean(self):
-        cleaned_data = super().clean()
-        enabled = cleaned_data.get(self.settingspref + '_enabled') == 'True'
-        if not enabled:
-            return
-        for k, v in self.fields.items():
-            val = cleaned_data.get(k)
-            if v._required and (val is None or val == ""):
-                self.add_error(k, _('This field is required.'))


 class MailSettingsForm(SettingsForm):
--- a/src/pretix/control/templates/pretixcontrol/event/invoicing.html
+++ b/src/pretix/control/templates/pretixcontrol/event/invoicing.html
@@ -0,0 +1,24 @@
+{% extends "pretixcontrol/event/settings_base.html" %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% block inside %}
+    <form action="" method="post" class="form-horizontal" enctype="multipart/form-data">
+        {% csrf_token %}
+        {% bootstrap_form_errors form %}
+        <fieldset>
+            <legend>{% trans "Invoicing" %}</legend>
+            {% bootstrap_field form.invoice_address_asked layout="horizontal" %}
+            {% bootstrap_field form.invoice_address_required layout="horizontal" %}
+            {% bootstrap_field form.invoice_address_vatid layout="horizontal" %}
+            {% bootstrap_field form.invoice_generate layout="horizontal" %}
+            {% bootstrap_field form.invoice_language layout="horizontal" %}
+            {% bootstrap_field form.invoice_address_from layout="horizontal" %}
+            {% bootstrap_field form.invoice_additional_text layout="horizontal" %}
+        </fieldset>
+        <div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
+        </div>
+    </form>
+{% endblock %}
--- a/src/pretix/control/templates/pretixcontrol/event/payment.html
+++ b/src/pretix/control/templates/pretixcontrol/event/payment.html
@@ -6,6 +6,14 @@
 		{% csrf_token %}
 		<fieldset>
 			<legend>{% trans "Payment settings" %}</legend>
+            {% bootstrap_field sform.payment_term_days layout="horizontal" %}
+            {% bootstrap_field sform.payment_term_last layout="horizontal" %}
+            {% bootstrap_field sform.payment_term_expire_automatically layout="horizontal" %}
+            {% bootstrap_field sform.payment_term_accept_late layout="horizontal" %}
+            {% bootstrap_field sform.tax_rate_default layout="horizontal" %}
+        </fieldset>
+        <fieldset>
+            <legend>{% trans "Payment providers" %}</legend>
 			{% for provider in providers %}
 				<div class="panel panel-default">
 					<div class="panel-heading">
--- a/src/pretix/control/templates/pretixcontrol/event/settings.html
+++ b/src/pretix/control/templates/pretixcontrol/event/settings.html
@@ -31,10 +31,6 @@
            {% bootstrap_field sform.presale_start_show_date layout="horizontal" %}
            {% bootstrap_field form.presale_end layout="horizontal" %}
            {% bootstrap_field sform.show_items_outside_presale_period layout="horizontal" %}
-            {% bootstrap_field sform.payment_term_days layout="horizontal" %}
-            {% bootstrap_field sform.payment_term_last layout="horizontal" %}
-            {% bootstrap_field sform.payment_term_expire_automatically layout="horizontal" %}
-            {% bootstrap_field sform.payment_term_accept_late layout="horizontal" %}
            {% bootstrap_field sform.last_order_modification_date layout="horizontal" %}
        </fieldset>
        <fieldset>
@@ -44,17 +40,6 @@
            {% bootstrap_field sform.attendee_names_asked layout="horizontal" %}
            {% bootstrap_field sform.attendee_names_required layout="horizontal" %}
        </fieldset>
-        <fieldset>
-            <legend>{% trans "Invoicing" %}</legend>
-            {% bootstrap_field sform.invoice_address_asked layout="horizontal" %}
-            {% bootstrap_field sform.invoice_address_required layout="horizontal" %}
-            {% bootstrap_field sform.invoice_address_vatid layout="horizontal" %}
-            {% bootstrap_field sform.tax_rate_default layout="horizontal" %}
-            {% bootstrap_field sform.invoice_generate layout="horizontal" %}
-            {% bootstrap_field sform.invoice_language layout="horizontal" %}
-            {% bootstrap_field sform.invoice_address_from layout="horizontal" %}
-            {% bootstrap_field sform.invoice_additional_text layout="horizontal" %}
-        </fieldset>
        <div class="form-group submit-group">
            <button type="submit" class="btn btn-primary btn-save">
                {% trans "Save" %}
--- a/src/pretix/control/templates/pretixcontrol/event/settings_base.html
+++ b/src/pretix/control/templates/pretixcontrol/event/settings_base.html
@@ -31,6 +31,11 @@
                    {% trans "Email" %}
                </a>
            </li>
+            <li {% if "event.settings.invoice" == url_name %}class="active"{% endif %}>
+                <a href="{% url 'control:event.settings.invoice' organizer=request.event.organizer.slug event=request.event.slug %}">
+                    {% trans "Invoicing" %}
+                </a>
+            </li>
        {% endif %}
        {% if request.eventperm.can_change_permissions %}
            <li {% if "event.settings.permissions" == url_name %}class="active"{% endif %}>
--- a/src/pretix/control/urls.py
+++ b/src/pretix/control/urls.py
@@ -28,6 +28,7 @@ urlpatterns = [
        url(r'^settings/payment$', event.PaymentSettings.as_view(), name='event.settings.payment'),
        url(r'^settings/tickets$', event.TicketSettings.as_view(), name='event.settings.tickets'),
        url(r'^settings/email$', event.MailSettings.as_view(), name='event.settings.mail'),
+        url(r'^settings/invoice$', event.InvoiceSettings.as_view(), name='event.settings.invoice'),
        url(r'^items/$', item.ItemList.as_view(), name='event.items'),
        url(r'^items/add$', item.ItemCreate.as_view(), name='event.items.add'),
        url(r'^items/(?P<item>\d+)/$', item.ItemUpdateGeneral.as_view(), name='event.item'),
--- a/src/pretix/control/views/event.py
+++ b/src/pretix/control/views/event.py
@@ -21,8 +21,8 @@ from pretix.base.signals import (
    register_payment_providers, register_ticket_outputs,
 )
 from pretix.control.forms.event import (
-    EventSettingsForm, EventUpdateForm, MailSettingsForm, ProviderForm,
-    TicketSettingsForm,
+    EventSettingsForm, EventUpdateForm, InvoiceSettingsForm, MailSettingsForm,
+    PaymentSettingsForm, ProviderForm, TicketSettingsForm,
 )
 from pretix.control.permissions import EventPermissionRequiredMixin

@@ -168,8 +168,17 @@ class PaymentSettings(EventPermissionRequiredMixin, TemplateView, SingleObjectMi

    def get_context_data(self, *args, **kwargs) -> dict:
        context = super().get_context_data(*args, **kwargs)
+        context['sform'] = self.sform
        return context

+    @cached_property
+    def sform(self):
+        return PaymentSettingsForm(
+            obj=self.object,
+            prefix='settings',
+            data=self.request.POST if self.request.method == 'POST' else None
+        )
+
    def get(self, request, *args, **kwargs):
        self.object = self.get_object()
        context = self.get_context_data(object=self.object)
@@ -179,7 +188,13 @@ class PaymentSettings(EventPermissionRequiredMixin, TemplateView, SingleObjectMi
    @transaction.atomic()
    def post(self, request, *args, **kwargs):
        self.object = self.get_object()
-        success = True
+        success = self.sform.is_valid()
+        if success:
+            self.sform.save()
+            if self.sform.has_changed():
+                self.request.event.log_action('pretix.event.settings', user=self.request.user, data={
+                    k: self.request.event.settings.get(k) for k in self.sform.changed_data
+                })
        for provider in self.provider_forms:
            if provider.form.is_valid():
                if provider.form.has_changed():
@@ -204,22 +219,14 @@ class PaymentSettings(EventPermissionRequiredMixin, TemplateView, SingleObjectMi
        })


-class MailSettings(EventPermissionRequiredMixin, FormView):
+class EventSettingsFormView(EventPermissionRequiredMixin, FormView):
    model = Event
-    form_class = MailSettingsForm
-    template_name = 'pretixcontrol/event/mail.html'
    permission = 'can_change_settings'

    def get_context_data(self, *args, **kwargs) -> dict:
        context = super().get_context_data(*args, **kwargs)
        return context

-    def get_success_url(self) -> str:
-        return reverse('control:event.settings.mail', kwargs={
-            'organizer': self.request.event.organizer.slug,
-            'event': self.request.event.slug
-        })
-
    def get_form_kwargs(self):
        kwargs = super().get_form_kwargs()
        kwargs['obj'] = self.request.event
@@ -234,7 +241,49 @@ class MailSettings(EventPermissionRequiredMixin, FormView):
                self.request.event.log_action(
                    'pretix.event.settings', user=self.request.user, data={
                        k: form.cleaned_data.get(k) for k in form.changed_data
-                    }
+                        }
+                )
+            messages.success(self.request, _('Your changes have been saved.'))
+            return redirect(self.get_success_url())
+        else:
+            return self.get(request)
+
+
+class InvoiceSettings(EventSettingsFormView):
+    model = Event
+    form_class = InvoiceSettingsForm
+    template_name = 'pretixcontrol/event/invoicing.html'
+    permission = 'can_change_settings'
+
+    def get_success_url(self) -> str:
+        return reverse('control:event.settings.invoice', kwargs={
+            'organizer': self.request.event.organizer.slug,
+            'event': self.request.event.slug
+        })
+
+
+class MailSettings(EventSettingsFormView):
+    model = Event
+    form_class = MailSettingsForm
+    template_name = 'pretixcontrol/event/mail.html'
+    permission = 'can_change_settings'
+
+    def get_success_url(self) -> str:
+        return reverse('control:event.settings.mail', kwargs={
+            'organizer': self.request.event.organizer.slug,
+            'event': self.request.event.slug
+        })
+
+    @transaction.atomic()
+    def post(self, request, *args, **kwargs):
+        form = self.get_form()
+        if form.is_valid():
+            form.save()
+            if form.has_changed():
+                self.request.event.log_action(
+                    'pretix.event.settings', user=self.request.user, data={
+                        k: form.cleaned_data.get(k) for k in form.changed_data
+                        }
                )

            if request.POST.get('test', '0').strip() == '1':