Merge pull request #384 from MySecondLanguage/fixed-some-minor-issue

Fixed some minor issue

Author: MySecondLanguage

nxtbn/admin_schema.py

@@ -9,12 +9,11 @@
 from nxtbn.order.admin_queries import AdminOrderQuery
 from nxtbn.users.admin_queries import UserAdminQuery
 from nxtbn.warehouse.admin_queries import WarehouseQuery
+from nxtbn.purchase.admin_queries import PurchaseQuery
 
 
 
-
-
-class Query(ProductQuery, AdminOrderQuery, AdminCoreQuery, WarehouseQuery, AdminCartQuery, UserAdminQuery):
+class Query(ProductQuery, AdminOrderQuery, AdminCoreQuery, WarehouseQuery, AdminCartQuery, UserAdminQuery, PurchaseQuery):
     pass
 
 class Mutation(AdminUserMutation, ProductMutation, CoreMutation):

nxtbn/cart/admin_types.py

@@ -10,7 +10,7 @@ class CartItemType(DjangoObjectType):
     db_id = graphene.ID(source='id')
     class Meta:
         model = CartItem
-        fields = ('id', 'cart', 'variant', 'quantity', 'created_at', 'updated_at')
+        fields = ('id', 'cart', 'variant', 'quantity', 'created_at', 'last_modified')
 
 
 class CartType(DjangoObjectType):

nxtbn/purchase/admin_queries.py

@@ -0,0 +1,29 @@
+
+
+import graphene
+
+from graphene_django.filter import DjangoFilterConnectionField
+from nxtbn.core.admin_permissions import gql_store_admin_required
+from nxtbn.purchase.admin_types import PurchaseType
+from nxtbn.purchase.models import PurchaseOrder
+
+
+
+class PurchaseQuery(graphene.ObjectType):
+    purchase = graphene.Field(PurchaseType, id=graphene.ID(required=True))
+    purchases = DjangoFilterConnectionField(PurchaseType)
+
+
+ 
+    @gql_store_admin_required
+    def resolve_purchase(root, info, id):
+
+        try:
+            return PurchaseOrder.objects.get(pk=id)
+        except PurchaseOrder.DoesNotExist:
+            return None
+        
+   
+    @gql_store_admin_required
+    def resolve_purchases(root, info, **kwargs):
+        return PurchaseOrder.objects.all()

nxtbn/purchase/admin_types.py

@@ -0,0 +1,40 @@
+import graphene
+from graphene_django.types import DjangoObjectType
+from graphene_django.filter import DjangoFilterConnectionField
+from graphene import relay
+
+from nxtbn.purchase.models import PurchaseOrder, PurchaseOrderItem
+
+
+
+
+class PurchaseType(DjangoObjectType):
+    db_id = graphene.Int(source="id")
+    class Meta:
+        model = PurchaseOrder
+        fields = '__all__'
+
+        interfaces = (relay.Node,)
+        filter_fields = {
+            'supplier__id': ['exact'],
+            'destination__id': ['exact'],
+            'status': ['exact'],
+            'expected_delivery_date': ['exact', 'lte', 'gte'],
+            'created_by__id': ['exact'],
+        }
+
+
+class PurchaseOrderItemType(DjangoObjectType):
+    db_id = graphene.Int(source="id")
+    class Meta:
+        model = PurchaseOrderItem
+        fields = '__all__'
+        interfaces = (relay.Node,)
+        filter_fields = {
+            'purchase_order__id': ['exact'],
+            'variant__id': ['exact'],
+            'ordered_quantity': ['exact', 'lte', 'gte'],
+            'received_quantity': ['exact', 'lte', 'gte'],
+            'rejected_quantity': ['exact', 'lte', 'gte'],
+            'unit_cost': ['exact', 'lte', 'gte'],
+        }

nxtbn/purchase/api/dashboard/serializers.py

@@ -151,6 +151,7 @@ def update(self, instance, validated_data):
                     item.delete()
 
         # Return the updated purchase order instance
+        instance.save()
         return instance