Merge pull request #388 from MySecondLanguage/fixed-invoice-logo-upload

Fixed invoice logo upload

Author: MySecondLanguage

nxtbn/core/admin_mutation.py

@@ -3,8 +3,8 @@
 
 from nxtbn.core import CurrencyTypes
 from nxtbn.core.admin_permissions import gql_required_perm
-from nxtbn.core.admin_types import CurrencyExchangeType
-from nxtbn.core.models import CurrencyExchange
+from nxtbn.core.admin_types import CurrencyExchangeType, InvoiceSettingsInput, InvoiceSettingsType
+from nxtbn.core.models import CurrencyExchange, InvoiceSettings
 from nxtbn.users import UserRole
 
 class CurrencyExchangeInput(graphene.InputObjectType):
@@ -77,9 +77,33 @@ def mutate(root, info, id):
 
         currency_exchange.delete()  # Delete the record
         return DeleteCurrencyExchange(success=True)  # Return success
+    
+
+
+class CreateInvoiceSettings(graphene.Mutation):
+    class Arguments:
+        input = InvoiceSettingsInput()
+
+    invoice_settings = graphene.Field(InvoiceSettingsType)
+
+    @gql_required_perm(InvoiceSettings, 'add_invoicesettings')
+    @staticmethod
+    def mutate(root, info, input):
+        invoice_settings = InvoiceSettings.objects.create(
+            store_name=input.store_name,
+            store_address=input.store_address,
+            city=input.city,
+            country=input.country,
+            postal_code=input.postal_code,
+            contact_email=input.contact_email,
+            contact_phone=input.contact_phone,
+            is_default=input.is_default,
+        )
+        return CreateInvoiceSettings(invoice_settings=invoice_settings)
 
 
 class CoreMutation(graphene.ObjectType):
     update_exchange_rate = UpdateCurrencyExchange.Field()
     create_exchange_rate = CreateCurrencyExchange.Field()
-    delete_exchange_rate = DeleteCurrencyExchange.Field() 
+    delete_exchange_rate = DeleteCurrencyExchange.Field()
+    create_invoice_settings = CreateInvoiceSettings.Field()

nxtbn/core/admin_queries.py

@@ -13,7 +13,8 @@ class AdminCoreQuery(graphene.ObjectType):
     currency_exchanges = DjangoFilterConnectionField(CurrencyExchangeType)
     currency_exchange = graphene.Field(CurrencyExchangeType, id=graphene.ID(required=True))
     allowed_currency_list = graphene.List(AdminCurrencyTypesEnum)
-    default_invoice_settings = graphene.Field(InvoiceSettingsType)
+    invoice_setting = graphene.Field(InvoiceSettingsType, invoice_settings_id=graphene.ID(required=False))
+    invoice_settings = DjangoFilterConnectionField(InvoiceSettingsType)
 
     @gql_store_admin_required
     def resolve_currency_exchanges(self, info, **kwargs):
@@ -39,6 +40,11 @@ def resolve_allowed_currency_list(self, info):
         ]
 
     @gql_store_admin_required
-    def resolve_default_invoice_settings(self, info):
-        site_id = getattr(settings, 'SITE_ID', 1)
-        return InvoiceSettings.objects.get(site__id=site_id)
+    def resolve_invoice_setting(self,  info, invoice_settings_id=None, **kwargs):
+        if not invoice_settings_id:
+            return InvoiceSettings.objects.get(is_default=True)
+        return InvoiceSettings.objects.get(id=invoice_settings_id)
+    
+    @gql_store_admin_required
+    def resolve_invoice_settings(self, info, **kwargs):
+        return InvoiceSettings.objects.all()

nxtbn/core/admin_types.py

@@ -20,9 +20,31 @@ class Meta:
 
 class InvoiceSettingsType(DjangoObjectType):
     db_id = graphene.ID(source='id')
+    logo = graphene.String()
+
+    def resolve_logo(self, info):
+        if self.logo:
+            return info.context.build_absolute_uri(self.logo.url)
+        return None
     class Meta:
         model = InvoiceSettings
         fields = "__all__"
+        interfaces = (relay.Node,)
+        filter_fields = {
+            'store_name': ['exact', 'icontains'],
+        }
+
+
+class InvoiceSettingsInput(graphene.InputObjectType):
+    store_name = graphene.String()
+    store_address = graphene.String()
+    city = graphene.String()
+    country = graphene.String()
+    postal_code = graphene.String()
+    contact_email = graphene.String()
+    contact_phone = graphene.String()
+    is_default = graphene.Boolean()
+
 
 class AdminCurrencyTypesEnum(graphene.ObjectType):
     value = graphene.String()

nxtbn/core/api/dashboard/serializers.py

@@ -23,6 +23,13 @@ class Meta:
             'country',
             'postal_code',
             'contact_email',
+            'is_default',
         ]
 
-    
+    
+
+class InvoiceSettingsLogoSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = InvoiceSettings
+        fields = ['id', 'logo']
+        read_only_fields = ['id']

nxtbn/core/api/dashboard/urls.py

@@ -4,7 +4,9 @@
 
 urlpatterns = [
     path('site-settings/', core_views.SiteSettingsView.as_view(), name='site-settings'),
-    path('invoice-settings/', core_views.InvoiceSettingsView.as_view(), name='invoice-settings'),
+    path('invoice-settings/<int:pk>/', core_views.InvoiceSettingsView.as_view(), name='invoice-settings'),
+    path('invoice-settings/upload-logo/<int:id>/', core_views.InvoiceSettingsLogoUploadAPIView.as_view(), name='upload-logo'),
+
     path('system-status/', status_views.SystemStatusAPIView.as_view(), name='system-status'),
     path('db-tables-details/', status_views.DatabaseTableInfoAPIView.as_view(), name='db-details'),
     path('language-list/', core_views.LanguageChoicesAPIView.as_view(), name='language-list'),

nxtbn/core/api/dashboard/views.py

@@ -27,7 +27,7 @@
 
 from nxtbn.core import LanguageChoices
 from nxtbn.core.admin_permissions import GranularPermission, IsStoreAdmin, IsStoreStaff
-from nxtbn.core.api.dashboard.serializers import InvoiceSettingsSerializer, SiteSettingsSerializer
+from nxtbn.core.api.dashboard.serializers import InvoiceSettingsLogoSerializer, InvoiceSettingsSerializer, SiteSettingsSerializer
 from nxtbn.core.models import InvoiceSettings, SiteSettings
 from nxtbn.users import UserRole
 
@@ -54,16 +54,19 @@ class InvoiceSettingsView(generics.RetrieveUpdateAPIView):
     permission_classes = (IsStoreAdmin,)
     queryset = InvoiceSettings.objects.all()
     serializer_class = InvoiceSettingsSerializer
+    lookup_field = 'pk'
+        
 
 
+class InvoiceSettingsLogoUploadAPIView(generics.UpdateAPIView):
+    permission_classes = (IsStoreAdmin,)
+    queryset = InvoiceSettings.objects.all()
+    serializer_class = InvoiceSettingsLogoSerializer
+    lookup_field = 'id'
 
-    def get_object(self):
-        current_site = get_current_site(self.request)
-        try:
-            return InvoiceSettings.objects.get(site=current_site)
-        except InvoiceSettings.DoesNotExist:
-            raise NotFound("Site settings for the current site do not exist.")
-        
+    def partial_update(self, request, *args, **kwargs):
+        kwargs['partial'] = True
+        return self.update(request, *args, **kwargs)
 
 
 class LanguageChoicesAPIView(APIView):

nxtbn/core/migrations/0004_remove_invoicesettings_site.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.11 on 2025-02-14 07:57
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0003_alter_currencyexchange_base_currency_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="invoicesettings",
+            name="site",
+        ),
+    ]

nxtbn/core/migrations/0005_invoicesettings_is_default.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.11 on 2025-02-14 08:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0004_remove_invoicesettings_site"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="invoicesettings",
+            name="is_default",
+            field=models.BooleanField(
+                default=False, help_text="If this is the default invoice settings."
+            ),
+        ),
+    ]

nxtbn/core/models.py

@@ -162,7 +162,6 @@ class Meta:
         verbose_name_plural = "Site Settings"
 
 class InvoiceSettings(models.Model): # This info will be seen in the invoice
-    site = models.OneToOneField(Site, on_delete=models.CASCADE, null=True, blank=True, help_text="The site this configuration applies to.")
     store_name = models.CharField(max_length=100, blank=True, null=True, help_text="Name of the store.")
     store_address = models.TextField(blank=True, null=True, help_text="Physical address of the store.")
     city = models.CharField(max_length=100, blank=True, null=True, help_text="City of the store.")
@@ -171,6 +170,15 @@ class InvoiceSettings(models.Model): # This info will be seen in the invoice
     logo = models.ImageField(upload_to='logos/', blank=True, null=True, help_text="Logo of the site.")
     contact_email = models.EmailField(blank=True, null=True, help_text="Contact email for site administrators.")
     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)
 
 
 

nxtbn/core/receivers.py

@@ -31,13 +31,13 @@ def create_default_site_settings(sender, **kwargs):
         )
 
         InvoiceSettings.objects.create(
-            site=site,
             store_name="nxtbn commerce",
             store_address="Default Store Address",
             city="Default City",
             country="Default Country",
             postal_code="123456",
             contact_email="[email protected]",
+            is_default=True,
         )
 
     if Warehouse.objects.count() == 0: