From baa2817f573a4c437dee9c5319588feca6a50b30 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 5 Jul 2018 10:00:12 +0200
Subject: [PATCH] Update BillingAddressFormSignup: add email validation

---
 utils/forms.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/utils/forms.py b/utils/forms.py
index bd00b42d..fe5dc282 100644
--- a/utils/forms.py
+++ b/utils/forms.py
@@ -137,6 +137,31 @@ class BillingAddressFormSignup(BillingAddressForm):
     email = forms.EmailField(label=_('Email Address'))
     field_order = ['name', 'email']
 
+    class Meta:
+        model = BillingAddress
+        fields = ['name', 'email', 'cardholder_name', 'street_address',
+                  'city', 'postal_code', 'country']
+        labels = {
+            'name': 'Name',
+            'email': _('Email'),
+            'cardholder_name': _('Cardholder Name'),
+            'street_address': _('Street Address'),
+            'city': _('City'),
+            'postal_code': _('Postal Code'),
+            'Country': _('Country'),
+        }
+
+    def clean_email(self):
+        email = self.cleaned_data.get('email')
+        try:
+            CustomUser.objects.get(email=email)
+            raise forms.ValidationError(
+                _("The email {} is already registered with us. Please reset "
+                  "your password and access your account.".format(email))
+            )
+        except CustomUser.DoesNotExist:
+            return email
+
 
 class UserBillingAddressForm(forms.ModelForm):
     user = forms.ModelChoiceField(queryset=CustomUser.objects.all(),