Added invoice addresses

src/pretix/base/migrations/0008_invoiceaddress.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2016-02-22 11:17
+from __future__ import unicode_literals
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0007_auto_20160211_1710'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='InvoiceAddress',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('last_modified', models.DateTimeField(auto_now=True)),
+                ('company', models.CharField(blank=True, max_length=255, verbose_name='Company name')),
+                ('name', models.CharField(blank=True, max_length=255, verbose_name='Name')),
+                ('street', models.TextField(verbose_name='Address')),
+                ('zipcode', models.CharField(max_length=30, verbose_name='ZIP code')),
+                ('city', models.CharField(max_length=255, verbose_name='City')),
+                ('country', models.CharField(max_length=255, verbose_name='Country')),
+                ('phone', models.CharField(blank=True, max_length=255, verbose_name='Phone number')),
+                ('vat_id', models.CharField(blank=True, max_length=255, verbose_name='VAT ID')),
+                ('order', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='pretixbase.Order')),
+            ],
+        ),
+    ]

src/pretix/base/models/orders.py

@@ -3,6 +3,7 @@
 from datetime import datetime
 from decimal import Decimal
 
+from django import forms
 from django.db import models
 from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
@@ -461,3 +462,16 @@ def tax_value(self):
         if not self.tax_rate:
             return Decimal('0.00')
         return round_decimal(self.price * (1 - 100 / (100 + self.item.tax_rate)))
+
+
+class InvoiceAddress(models.Model):
+    last_modified = models.DateTimeField(auto_now=True)
+    order = models.OneToOneField(Order, null=True, blank=True, related_name='invoice_address')
+    company = models.CharField(max_length=255, blank=True, verbose_name=_('Company name'))
+    name = models.CharField(max_length=255, verbose_name=_('Name'), blank=True)
+    street = models.TextField(verbose_name=_('Address'), blank=False)
+    zipcode = models.CharField(max_length=30, verbose_name=_('ZIP code'), blank=False)
+    city = models.CharField(max_length=255, verbose_name=_('City'), blank=False)
+    country = models.CharField(max_length=255, verbose_name=_('Country'), blank=False)
+    phone = models.CharField(max_length=255, blank=True, verbose_name=_('Phone number'))
+    vat_id = models.CharField(max_length=255, blank=True, verbose_name=_('VAT ID'))

src/pretix/base/services/orders.py

@@ -10,6 +10,7 @@
 from pretix.base.models import (
     CartPosition, Event, EventLock, Order, OrderPosition, Quota, User,
 )
+from pretix.base.models.orders import InvoiceAddress
 from pretix.base.payment import BasePaymentProvider
 from pretix.base.services.mail import mail
 from pretix.base.signals import (
@@ -216,7 +217,7 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], dt: d
 
 
 def _perform_order(event: str, payment_provider: str, position_ids: List[str],
-                   email: str, locale: str):
+                   email: str, locale: str, address: int):
     event = Event.objects.get(id=event)
     responses = register_payment_providers.send(event)
     pprov = None
@@ -237,6 +238,18 @@ def _perform_order(event: str, payment_provider: str, position_ids: List[str],
         order = _create_order(event, email, positions, dt, pprov,
                               locale=locale)
 
+    if address is not None:
+        try:
+            addr = InvoiceAddress.objects.get(
+                pk=address
+            )
+            if addr.order is not None:
+                addr.pk = None
+            addr.order = order
+            addr.save()
+        except InvoiceAddress.DoesNotExist:
+            pass
+
     mail(
         order.email, _('Your order: %(code)s') % {'code': order.code},
         event.settings.mail_text_order_placed,
@@ -257,9 +270,9 @@ def _perform_order(event: str, payment_provider: str, position_ids: List[str],
 
 
 def perform_order(event: str, payment_provider: str, positions: List[str],
-                  email: str=None, locale: str=None):
+                  email: str=None, locale: str=None, address: int=None):
     try:
-        return _perform_order(event, payment_provider, positions, email, locale)
+        return _perform_order(event, payment_provider, positions, email, locale, address)
     except EventLock.LockTimeoutException:
         # Is raised when there are too many threads asking for event locks and we were
         # unable to get one
@@ -271,9 +284,9 @@ def perform_order(event: str, payment_provider: str, positions: List[str],
 
     @app.task(bind=True, max_retries=5, default_retry_delay=2)
     def perform_order_task(self, event: str, payment_provider: str, positions: List[str],
-                           email: str=None, locale: str=None):
+                           email: str=None, locale: str=None, address: int=None):
         try:
-            return _perform_order(event, payment_provider, positions, email, locale)
+            return _perform_order(event, payment_provider, positions, email, locale, address)
         except EventLock.LockTimeoutException:
             self.retry(exc=OrderError(error_messages['busy']))
 

src/pretix/base/settings.py

@@ -25,6 +25,18 @@
         'default': 'False',
         'type': bool
     },
+    'invoice_address_asked': {
+        'default': 'True',
+        'type': bool,
+    },
+    'invoice_address_required': {
+        'default': 'False',
+        'type': bool,
+    },
+    'invoice_address_vatid': {
+        'default': 'False',
+        'type': bool,
+    },
     'reservation_time': {
         'default': '30',
         'type': int

src/pretix/control/forms/event.py

@@ -130,6 +130,19 @@ class EventSettingsForm(SettingsForm):
         help_text=_("Require customers to fill in the names of all attendees."),
         required=False
     )
+    invoice_address_asked = forms.BooleanField(
+        label=_("Ask for invoice address"),
+        required=False
+    )
+    invoice_address_required = forms.BooleanField(
+        label=_("Require invoice address"),
+        required=False
+    )
+    invoice_address_vatid = forms.BooleanField(
+        label=_("Ask for VAT ID"),
+        help_text=_("Does only work if an invoice address is asked for. VAT ID is not required."),
+        required=False
+    )
     max_items_per_order = forms.IntegerField(
         min_value=1,
         label=_("Maximum number of items per order")

src/pretix/control/templates/pretixcontrol/event/settings.html

@@ -41,6 +41,9 @@
             {% bootstrap_field sform.max_items_per_order layout="horizontal" %}
             {% bootstrap_field sform.attendee_names_asked layout="horizontal" %}
             {% bootstrap_field sform.attendee_names_required layout="horizontal" %}
+            {% bootstrap_field sform.invoice_address_asked layout="horizontal" %}
+            {% bootstrap_field sform.invoice_address_required layout="horizontal" %}
+            {% bootstrap_field sform.invoice_address_vatid layout="horizontal" %}
         </fieldset>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">

src/pretix/control/templates/pretixcontrol/order/index.html

@@ -176,4 +176,33 @@ <h3 class="panel-title">
             {% endif %}
         </div>
     </div>
+    {% if request.event.settings.invoice_address_asked %}
+        <div class="panel panel-primary">
+            <div class="panel-heading">
+                <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 %}
 {% endblock %}