From 2d66ae6783eb208898d47d43d627310b2272302c Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Sat, 21 Dec 2019 08:52:06 +0530
Subject: [PATCH] Improve BillingAddress string representation

Include VAT number if available
---
 utils/models.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/utils/models.py b/utils/models.py
index 3bf5020f..b6c0ef88 100644
--- a/utils/models.py
+++ b/utils/models.py
@@ -21,10 +21,16 @@ class BaseBillingAddress(models.Model):
 
 class BillingAddress(BaseBillingAddress):
     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
+            )
 
 
 class UserBillingAddress(BaseBillingAddress):