Merge pull request #389 from MySecondLanguage/invoice-exception-handled

Raised error

Author: MySecondLanguage

nxtbn/core/admin_queries.py

@@ -42,7 +42,10 @@ def resolve_allowed_currency_list(self, info):
     @gql_store_admin_required
     def resolve_invoice_setting(self,  info, invoice_settings_id=None, **kwargs):
         if not invoice_settings_id:
-            return InvoiceSettings.objects.get(is_default=True)
+            try:
+                return InvoiceSettings.objects.get(is_default=True)
+            except InvoiceSettings.DoesNotExist:
+                raise GraphQLError("Default Invoice Settings not found.")
         return InvoiceSettings.objects.get(id=invoice_settings_id)
 
     @gql_store_admin_required

nxtbn/core/models.py

@@ -172,14 +172,6 @@ class InvoiceSettings(models.Model): # This info will be seen in the invoice
     contact_phone = models.CharField(max_length=20, blank=True, null=True, help_text="Contact phone number for site administrators.")
     is_default = models.BooleanField(default=False, help_text="If this is the default invoice settings.")
 
-    def save(self, *args, **kwargs):
-        if self.is_default:
-            InvoiceSettings.objects.filter(is_default=True).update(is_default=False)
-        else:
-            if not InvoiceSettings.objects.filter(is_default=True).exists():
-                raise ValidationError("There must be at least one default invoice setting.")
-        super().save(*args, **kwargs)
-