Updated invoice

Author: MySecondLanguage

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

@@ -23,6 +23,10 @@ class InvoiceSettingsType(DjangoObjectType):
     class Meta:
         model = InvoiceSettings
         fields = "__all__"
+        interfaces = (relay.Node,)
+        filter_fields = {
+            'store_name': ['exact', 'icontains'],
+        }
 
 class AdminCurrencyTypesEnum(graphene.ObjectType):
     value = graphene.String()

nxtbn/core/api/dashboard/serializers.py

@@ -23,6 +23,7 @@ class Meta:
             'country',
             'postal_code',
             'contact_email',
+            'is_default',
         ]
 
 

nxtbn/core/api/dashboard/urls.py

@@ -4,7 +4,7 @@
 
 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('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

@@ -54,15 +54,7 @@ class InvoiceSettingsView(generics.RetrieveUpdateAPIView):
     permission_classes = (IsStoreAdmin,)
     queryset = InvoiceSettings.objects.all()
     serializer_class = InvoiceSettingsSerializer
-
-
-
-    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.")
+    lookup_field = 'pk'
 
 
 

nxtbn/core/receivers.py

@@ -37,6 +37,7 @@ def create_default_site_settings(sender, **kwargs):
             country="Default Country",
             postal_code="123456",
             contact_email="[email protected]",
+            is_default=True,
         )
 
     if Warehouse.objects.count() == 0: