Added invoice addresses

src/pretix/presale/checkoutflow.py

@@ -11,10 +11,11 @@ from django.utils.translation import ugettext_lazy as _
 from django.views.generic.base import TemplateResponseMixin
 
 from pretix.base.models import CartPosition, Order
+from pretix.base.models.orders import InvoiceAddress
 from pretix.base.services.orders import OrderError, perform_order
 from pretix.base.signals import register_payment_providers
 from pretix.multidomain.urlreverse import eventreverse
-from pretix.presale.forms.checkout import ContactForm
+from pretix.presale.forms.checkout import ContactForm, InvoiceAddressForm
 from pretix.presale.signals import checkout_flow_steps
 from pretix.presale.views import CartMixin
 from pretix.presale.views.async import AsyncAction
@@ -139,14 +140,36 @@ class QuestionsStep(QuestionsViewMixin, CartMixin, TemplateFlowStep):
                                'email': self.request.session.get('email', '')
                            })
 
+    @cached_property
+    def invoice_address(self):
+        try:
+            return InvoiceAddress.objects.get(
+                pk=self.request.session.get('invoice_address'),
+                order__isnull=True
+            )
+        except InvoiceAddress.DoesNotExist:
+            return InvoiceAddress()
+
+    @cached_property
+    def invoice_form(self):
+        return InvoiceAddressForm(data=self.request.POST if self.request.method == "POST" else None,
+                                  event=self.request.event,
+                                  instance=self.invoice_address)
+
     def post(self, request):
         self.request = request
         failed = not self.save() or not self.contact_form.is_valid()
+        if request.event.settings.invoice_address_asked:
+            failed = failed or not self.invoice_form.is_valid()
         if failed:
             messages.error(request,
                            _("We had difficulties processing your input. Please review the errors below."))
             return self.render()
         request.session['email'] = self.contact_form.cleaned_data['email']
+        if request.event.settings.invoice_address_asked:
+            addr = self.invoice_form.save()
+            request.session['invoice_address'] = addr.pk
+
         return redirect(self.get_next_url(request))
 
     def is_completed(self, request, warn=False):
@@ -183,6 +206,7 @@ class QuestionsStep(QuestionsViewMixin, CartMixin, TemplateFlowStep):
         ctx = super().get_context_data(**kwargs)
         ctx['forms'] = self.forms
         ctx['contact_form'] = self.contact_form
+        ctx['invoice_form'] = self.invoice_form
         return ctx
 
 
@@ -282,6 +306,7 @@ class ConfirmStep(CartMixin, AsyncAction, TemplateFlowStep):
         ctx['cart'] = self.get_cart(answers=True)
         ctx['payment'] = self.payment_provider.checkout_confirm_render(self.request)
         ctx['payment_provider'] = self.payment_provider
+        ctx['addr'] = self.invoice_address
         return ctx
 
     @cached_property
@@ -292,6 +317,16 @@ class ConfirmStep(CartMixin, AsyncAction, TemplateFlowStep):
             if provider.identifier == self.request.session['payment']:
                 return provider
 
+    @cached_property
+    def invoice_address(self):
+        try:
+            return InvoiceAddress.objects.get(
+                pk=self.request.session.get('invoice_address'),
+                order__isnull=True
+            )
+        except InvoiceAddress.DoesNotExist:
+            return InvoiceAddress()
+
     def get(self, request):
         self.request = request
         if 'async_id' in request.GET and settings.HAS_CELERY:
@@ -302,7 +337,7 @@ class ConfirmStep(CartMixin, AsyncAction, TemplateFlowStep):
         self.request = request
         return self.do(self.request.event.id, self.payment_provider.identifier,
                        [p.id for p in self.positions], request.session.get('email'),
-                       translation.get_language())
+                       translation.get_language(), self.invoice_address.pk)
 
     def get_success_message(self, value):
         return None

src/pretix/presale/forms/checkout.py

@@ -1,13 +1,42 @@
 from django import forms
+from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
 
 from pretix.base.models import Question
+from pretix.base.models.orders import InvoiceAddress
 
 
 class ContactForm(forms.Form):
     email = forms.EmailField(label=_('E-mail'))
 
 
+class InvoiceAddressForm(forms.ModelForm):
+
+    class Meta:
+        model = InvoiceAddress
+        fields = ('company', 'name', 'street', 'zipcode', 'city', 'country', 'phone', 'vat_id')
+        widgets = {
+            'street': forms.Textarea(attrs={'rows': 2, 'placeholder': _('Street and Number')}),
+        }
+
+    def __init__(self, *args, **kwargs):
+        self.event = event = kwargs.pop('event')
+        super().__init__(*args, **kwargs)
+        if not event.settings.invoice_address_vatid:
+            del self.fields['vat_id']
+        if not event.settings.invoice_address_required:
+            for k, f in self.fields.items():
+                f.required = False
+                f.widget.is_required = False
+                if 'required' in f.widget.attrs:
+                    del f.widget.attrs['required']
+
+    def clean(self):
+        data = self.cleaned_data
+        if not data['name'] and not data['company'] and self.event.settings.invoice_address_required:
+            raise ValidationError(_('You need to provide either a company name or your name.'))
+
+
 class QuestionsForm(forms.Form):
     """
     This form class is responsible for asking order-related questions. This includes

src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html

@@ -37,26 +37,63 @@
                 </div>
             </div>
         </div>
-        <div class="row-fluid">
-            <div class="panel panel-primary">
-                <div class="panel-heading">
-                    {% if payment_provider.identifier != "free" %}
-                        <div class="pull-right">
-                            <a href="{% eventurl request.event "presale:event.checkout" step="payment" %}">
-                                <span class="fa fa-edit"></span>
-                                {% trans "Modify" %}
-                            </a>
-                        </div>
-                    {% endif %}
-                    <h3 class="panel-title">
-                        {% trans "Payment" %}
-                    </h3>
-                </div>
-                <div class="panel-body">
-                    {{ payment }}
-                </div>
+        <div class="panel panel-primary">
+            <div class="panel-heading">
+                {% if payment_provider.identifier != "free" %}
+                    <div class="pull-right">
+                        <a href="{% eventurl request.event "presale:event.checkout" step="payment" %}">
+                            <span class="fa fa-edit"></span>
+                            {% trans "Modify" %}
+                        </a>
+                    </div>
+                {% endif %}
+                <h3 class="panel-title">
+                    {% trans "Payment" %}
+                </h3>
             </div>
-            <div class="row-fluid">
+            <div class="panel-body">
+                {{ payment }}
+            </div>
+        </div>
+        <div class="row">
+            {% if request.event.settings.invoice_address_asked %}
+                <div class="col-md-6 col-xs-12">
+                    <div class="panel panel-primary panel-contact">
+                        <div class="panel-heading">
+                            <div class="pull-right">
+                                <a href="{% eventurl request.event "presale:event.checkout" step="questions" %}">
+                                    <span class="fa fa-edit"></span>
+                                    {% trans "Modify" %}
+                                </a>
+                            </div>
+                            <h3 class="panel-title">
+                                {% trans "Invoice information" %}
+                            </h3>
+                        </div>
+                        <div class="panel-body">
+                            <dl class="dl-horizontal">
+                                <dt>{% trans "Company" %}</dt>
+                                <dd>{{ addr.company }}</dd>
+                                <dt>{% trans "Name" %}</dt>
+                                <dd>{{ addr.name }}</dd>
+                                <dt>{% trans "Address" %}</dt>
+                                <dd>{{ addr.street|linebreaksbr }}</dd>
+                                <dt>{% trans "ZIP code and city" %}</dt>
+                                <dd>{{ addr.zipcode }} {{ addr.city }}</dd>
+                                <dt>{% trans "Country" %}</dt>
+                                <dd>{{ addr.country }}</dd>
+                                <dt>{% trans "Phone" %}</dt>
+                                <dd>{{ addr.phone }}</dd>
+                                {% if request.event.settings.invoice_address_vatid %}
+                                    <dt>{% trans "VAT ID" %}</dt>
+                                    <dd>{{ addr.vat_id }}</dd>
+                                {% endif %}
+                            </dl>
+                        </div>
+                    </div>
+                </div>
+            {% endif %}
+            <div class="{% if request.event.settings.invoice_address_asked %}col-md-6{% endif %} col-xs-12">
                 <div class="panel panel-primary panel-contact">
                     <div class="panel-heading">
                         <div class="pull-right">
@@ -77,20 +114,20 @@
                     </div>
                 </div>
             </div>
-            <div class="row checkout-button-row">
-                <div class="col-md-4">
-                    <a class="btn btn-block btn-default btn-lg"
-                            href="{{ prev_url }}">
-                        {% trans "Go back" %}
-                    </a>
-                </div>
-                <div class="col-md-4 col-md-offset-4">
-                    <button class="btn btn-block btn-primary btn-lg" type="submit">
-                        {% trans "Place binding order" %}
-                    </button>
-                </div>
-                <div class="clearfix"></div>
+        </div>
+        <div class="row checkout-button-row clearfix">
+            <div class="col-md-4">
+                <a class="btn btn-block btn-default btn-lg"
+                        href="{{ prev_url }}">
+                    {% trans "Go back" %}
+                </a>
             </div>
+            <div class="col-md-4 col-md-offset-4">
+                <button class="btn btn-block btn-primary btn-lg" type="submit">
+                    {% trans "Place binding order" %}
+                </button>
+            </div>
+            <div class="clearfix"></div>
         </div>
     </form>
 {% endblock %}

src/pretix/presale/templates/pretixpresale/event/checkout_questions.html

@@ -22,6 +22,22 @@
                     </div>
                 </div>
             </div>
+            {% if event.settings.invoice_address_asked %}
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h4 class="panel-title">
+                            <a data-toggle="collapse" href="#invoice" data-parent="#questions_accordion">
+                                <strong>{% trans "Invoice information" %}</strong>
+                            </a>
+                        </h4>
+                    </div>
+                    <div id="invoice" class="panel-collapse collapsed in">
+                        <div class="panel-body">
+                            {% bootstrap_form invoice_form layout="horizontal" %}
+                        </div>
+                    </div>
+                </div>
+            {% endif %}
             {% for form in forms %}
                 <div class="panel panel-default">
                     <div class="panel-heading">

src/pretix/presale/templates/pretixpresale/event/order.html

@@ -91,6 +91,43 @@
             {% include "pretixpresale/event/fragment_cart.html" with cart=cart event=request.event editable=False %}
         </div>
     </div>
+    {% if request.event.settings.invoice_address_asked %}
+        <div class="panel panel-primary">
+            <div class="panel-heading">
+                {% if order.can_modify_answers %}
+                    <div class="pull-right">
+                        <a href="{% eventurl event "presale:event.order.modify" secret=order.secret order=order.code %}">
+                            <span class="fa fa-edit"></span>
+                            {% trans "Change details" %}
+                        </a>
+                    </div>
+                {% endif %}
+                <h3 class="panel-title">
+                    {% trans "Invoice information" %}
+                </h3>
+            </div>
+            <div class="panel-body">
+                <dl class="dl-horizontal">
+                    <dt>{% trans "Company" %}</dt>
+                    <dd>{{ order.invoice_address.company }}</dd>
+                    <dt>{% trans "Name" %}</dt>
+                    <dd>{{ order.invoice_address.name }}</dd>
+                    <dt>{% trans "Address" %}</dt>
+                    <dd>{{ order.invoice_address.street|linebreaksbr }}</dd>
+                    <dt>{% trans "ZIP code and city" %}</dt>
+                    <dd>{{ order.invoice_address.zipcode }} {{ addr.city }}</dd>
+                    <dt>{% trans "Country" %}</dt>
+                    <dd>{{ order.invoice_address.country }}</dd>
+                    <dt>{% trans "Phone" %}</dt>
+                    <dd>{{ order.invoice_address.phone }}</dd>
+                    {% if request.event.settings.invoice_address_vatid %}
+                        <dt>{% trans "VAT ID" %}</dt>
+                        <dd>{{ order.invoice_address.vat_id }}</dd>
+                    {% endif %}
+                </dl>
+            </div>
+        </div>
+    {% endif %}
     {% if order.status == "n" %}
         <div class="row">
             <div class="col-md-12 text-right">

src/pretix/presale/templates/pretixpresale/event/order_modify.html

@@ -11,6 +11,22 @@
     <form class="form-horizontal" method="post">
         {% csrf_token %}
         <div class="panel-group" id="questions_accordion">
+            {% if event.settings.invoice_address_asked %}
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h4 class="panel-title">
+                            <a data-toggle="collapse" href="#invoice" data-parent="#questions_accordion">
+                                <strong>{% trans "Invoice information" %}</strong>
+                            </a>
+                        </h4>
+                    </div>
+                    <div id="invoice" class="panel-collapse collapsed in">
+                        <div class="panel-body">
+                            {% bootstrap_form invoice_form layout="horizontal" %}
+                        </div>
+                    </div>
+                </div>
+            {% endif %}
             {% for form in forms %}
                 <div class="panel panel-default">
                     <div class="panel-heading">

src/pretix/presale/views/order.py

@@ -10,12 +10,14 @@ from django.utils.translation import ugettext_lazy as _
 from django.views.generic import TemplateView, View
 
 from pretix.base.models import CachedFile, CachedTicket, Order, OrderPosition
+from pretix.base.models.orders import InvoiceAddress
 from pretix.base.services.orders import cancel_order
 from pretix.base.services.tickets import generate
 from pretix.base.signals import (
     register_payment_providers, register_ticket_outputs,
 )
 from pretix.multidomain.urlreverse import eventreverse
+from pretix.presale.forms.checkout import InvoiceAddressForm
 from pretix.presale.views import CartMixin, EventViewMixin
 from pretix.presale.views.questions import QuestionsViewMixin
 
@@ -210,12 +212,26 @@ class OrderModify(EventViewMixin, OrderDetailMixin, QuestionsViewMixin, Template
             'item__questions', 'answers'
         ))
 
+    @cached_property
+    def invoice_address(self):
+        if self.order.invoice_address:
+            return self.order.invoice_address
+        else:
+            return InvoiceAddress(order=self.order)
+
+    @cached_property
+    def invoice_form(self):
+        return InvoiceAddressForm(data=self.request.POST if self.request.method == "POST" else None,
+                                  event=self.request.event,
+                                  instance=self.invoice_address)
+
     def post(self, request, *args, **kwargs):
-        failed = not self.save()
+        failed = not self.save() or not self.invoice_form.is_valid()
         if failed:
             messages.error(self.request,
                            _("We had difficulties processing your input. Please review the errors below."))
             return self.get(request, *args, **kwargs)
+        self.invoice_form.save()
         self.order.log_action('pretix.event.order.modified')
         return redirect(self.get_order_url())
 
@@ -236,6 +252,7 @@ class OrderModify(EventViewMixin, OrderDetailMixin, QuestionsViewMixin, Template
         ctx = super().get_context_data(**kwargs)
         ctx['order'] = self.order
         ctx['forms'] = self.forms
+        ctx['invoice_form'] = self.invoice_form
         return ctx