diff --git a/utils/forms.py b/utils/forms.py index 71a675bc..6e8f4606 100644 --- a/utils/forms.py +++ b/utils/forms.py @@ -182,6 +182,7 @@ class UserBillingAddressForm(forms.ModelForm): 'city': _('City'), 'postal_code': _('Postal Code'), 'Country': _('Country'), + 'vat_number': _('VAT Number'), } diff --git a/utils/models.py b/utils/models.py index b6c0ef88..0084ddd4 100644 --- a/utils/models.py +++ b/utils/models.py @@ -38,10 +38,16 @@ class UserBillingAddress(BaseBillingAddress): current = models.BooleanField(default=True) def __str__(self): - return "%s, %s, %s, %s, %s" % ( - self.cardholder_name, self.street_address, self.city, - self.postal_code, self.country - ) + if self.vat_number: + return "%s, %s, %s, %s, %s, %s" % ( + self.cardholder_name, self.street_address, self.city, + self.postal_code, self.country, self.vat_number + ) + else: + return "%s, %s, %s, %s, %s" % ( + self.cardholder_name, self.street_address, self.city, + self.postal_code, self.country + ) def to_dict(self): return { @@ -50,6 +56,7 @@ class UserBillingAddress(BaseBillingAddress): 'City': self.city, 'Postal Code': self.postal_code, 'Country': self.country, + 'VAT Number': self.vat_number }