diff --git a/inventory/forms.py b/inventory/forms.py index 1d928a94..381b4bcd 100644 --- a/inventory/forms.py +++ b/inventory/forms.py @@ -599,6 +599,13 @@ class VendorForm(forms.ModelForm): "logo", ] + unique_together = ( + ("dealer", "crn"), + ("dealer", "vrn"), + ("dealer", "email"), + ("dealer", "phone_number"), + ) + class CarColorsForm(forms.ModelForm): """ diff --git a/inventory/views.py b/inventory/views.py index 97e765c2..5d4d3503 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -3020,16 +3020,14 @@ class VendorCreateView( try: form.instance.save() except IntegrityError as e: - if "UNIQUE constraint" in str(e): - messages.error(self.request, _("Email already exists")) - logger.error(e) - return redirect("vendor_create", dealer_slug=self.kwargs["dealer_slug"]) + messages.error(self.request, _("Email already exists")) + logger.error(e) + return redirect("vendor_create", dealer_slug=self.kwargs["dealer_slug"]) except Exception as e: messages.error(self.request, _("Something went wrong")) logger.error(e) return redirect("vendor_create", dealer_slug=self.kwargs["dealer_slug"]) - return super().form_valid(form) def get_success_url(self):