Merge pull request #390 from MySecondLanguage/device-api-added

Device api added

Author: MySecondLanguage

nxtbn/admin_schema.py

@@ -3,6 +3,8 @@
 from nxtbn.cart.admin_query import AdminCartQuery
 from nxtbn.core.admin_mutation import CoreMutation
 from nxtbn.core.admin_queries import AdminCoreQuery
+from nxtbn.order.admin_mutation import AdminOrderMutation
+from nxtbn.payment.admin_queries import AdminPaymentQuery
 from nxtbn.product.admin_mutations import ProductMutation
 from nxtbn.product.admin_queries import ProductQuery
 from nxtbn.users.admin_mutation import AdminUserMutation
@@ -13,10 +15,10 @@
 
 
 
-class Query(ProductQuery, AdminOrderQuery, AdminCoreQuery, WarehouseQuery, AdminCartQuery, UserAdminQuery, PurchaseQuery):
+class Query(ProductQuery, AdminOrderQuery, AdminCoreQuery, WarehouseQuery, AdminCartQuery, UserAdminQuery, PurchaseQuery, AdminPaymentQuery):
     pass
 
-class Mutation(AdminUserMutation, ProductMutation, CoreMutation):
+class Mutation(AdminUserMutation, ProductMutation, CoreMutation, AdminOrderMutation):
     pass
 
 admin_schema = graphene.Schema(query=Query, mutation=Mutation)

nxtbn/order/admin_mutation.py

@@ -0,0 +1,27 @@
+import graphene
+import graphene
+from graphql import GraphQLError
+from nxtbn.core.admin_permissions import gql_store_admin_required
+from nxtbn.order import OrderStatus
+from nxtbn.order.models import OrderLineItem, Order, OrderStockReservationStatus
+
+
+class UpdateOrderComment(graphene.Mutation):
+    class Arguments:
+        id = graphene.ID(required=True)
+        comment = graphene.String(required=True)
+
+    success = graphene.Boolean()
+
+    @gql_store_admin_required
+    def mutate(root, info, id, comment):
+        try:
+            order = Order.objects.get(pk=id)
+            order.comment = comment
+            order.save()
+            return UpdateOrderComment(success=True)
+        except Order.DoesNotExist:
+            raise Exception("Order not found")
+
+class AdminOrderMutation(graphene.ObjectType):
+    update_order_comment = UpdateOrderComment.Field()

nxtbn/order/admin_queries.py

@@ -4,14 +4,17 @@
 
 from nxtbn.core.admin_permissions import gql_store_admin_required
 from nxtbn.core.models import SiteSettings
-from nxtbn.order.admin_types import OrderInvoiceType, OrderType
-from nxtbn.order.models import Address, Order
+from nxtbn.order.admin_types import OrderDeviceMetaType, OrderInvoiceType, OrderType
+from nxtbn.order.models import Address, Order, OrderDeviceMeta
 from nxtbn.users import UserRole
 
 
 class AdminOrderQuery(graphene.ObjectType):
     orders = DjangoFilterConnectionField(OrderType)
-    order = graphene.Field(OrderType, id=graphene.Int(required=True))
+    order = graphene.Field(OrderType, alias=graphene.UUID(required=True))
+    order_device_meta = DjangoFilterConnectionField(OrderDeviceMetaType)
+    order_device_metas = DjangoFilterConnectionField(OrderDeviceMetaType)
+
     order_invoice = graphene.Field(OrderInvoiceType, order_id=graphene.Int(required=True))
     order_invoices = graphene.List(OrderInvoiceType, order_ids=graphene.List(graphene.Int))
 
@@ -22,14 +25,22 @@ def resolve_orders(self, info, **kwargs):
         return Order.objects.all()
 
     @gql_store_admin_required
-    def resolve_order(self, info, id):
+    def resolve_order(self, info, alias):
         try:
-            order = Order.objects.get(id=id)
+            order = Order.objects.get(alias=alias)
         except Order.DoesNotExist:
             raise Exception("Order not found")
 
         return order
 
+    @gql_store_admin_required
+    def resolve_order_device_meta(self, info, **kwargs):
+        return OrderDeviceMeta.objects.all()
+    
+    @gql_store_admin_required
+    def resolve_order_device_metas(self, info, **kwargs):
+        return OrderDeviceMeta.objects.all()
+    
 
     @gql_store_admin_required
     def resolve_order_invoice(self, info, order_id):

nxtbn/order/admin_types.py

@@ -3,7 +3,7 @@
 from graphene_django import DjangoObjectType
 from graphene import relay
 from nxtbn.core.models import SiteSettings
-from nxtbn.order.models import Address, Order, OrderLineItem
+from nxtbn.order.models import Address, Order, OrderDeviceMeta, OrderLineItem
 
 from nxtbn.order.admin_filters import OrderFilter
 
@@ -25,12 +25,78 @@ class Meta:
         )
 
 
+class OrderLineItemsType(DjangoObjectType):
+    db_id = graphene.Int(source='id')
+    humanize_total_price = graphene.String()
+    humanize_price_per_unit = graphene.String()
+
+    def resolve_humanize_total_price(self, info):
+        return self.humanize_total_price()
+    
+    def resolve_humanize_price_per_unit(self, info):
+        return self.humanize_price_per_unit()
+    class Meta:
+        model = OrderLineItem
+        fields = (
+            'id',
+            'quantity',
+            'variant',
+            'total_price',
+            'price_per_unit',
+        )
+
 class OrderType(DjangoObjectType):
     db_id = graphene.Int(source='id')
     humanize_total_price = graphene.String()
+    line_items  = graphene.List(OrderLineItemsType)
+    overcharged_amount = graphene.String()
+    is_overdue = graphene.Boolean()
+    payment_method = graphene.String()
+    humanize_total_price = graphene.String()
+    humanize_total_shipping_cost = graphene.String()
+    humanize_total_discounted_amount = graphene.String()
+    humanize_total_tax = graphene.String()
+    humanize_total_paid_amount = graphene.String()
+    due = graphene.String()
+    total_price_without_symbol = graphene.String()
+
+    def resolve_total_price_without_symbol(self, info):
+        return self.humanize_total_price(locale='')
 
     def resolve_humanize_total_price(self, info):
         return self.humanize_total_price()
+    
+    def resolve_line_items(self, info):
+        return self.line_items.all()
+    
+    def resolve_overcharged_amount(self, info):
+        return self.get_overcharged_amount()
+    
+    def resolve_is_overdue(self, info):
+        return self.is_overdue()
+    
+    def resolve_payment_method(self, info):
+        return self.get_payment_method()
+    
+    def resolve_humanize_total_price(self, info):
+        return self.humanize_total_price()
+    
+    def resolve_humanize_total_shipping_cost(self, info):
+        return self.humanize_total_shipping_cost()
+    
+    def resolve_humanize_total_discounted_amount(self, info):
+        return self.humanize_total_discounted_amount()
+    
+    def resolve_humanize_total_tax(self, info):
+        return self.humanize_total_tax()
+    
+    def resolve_humanize_total_paid_amount(self, info):
+        return self.humanize_total_paid_amount()
+    
+    def resolve_due(self, info):
+        return self.get_due()
+
+
     class Meta:
         model = Order
         fields = (
@@ -58,6 +124,8 @@ class Meta:
             'reservation_status',
             'note',
             'comment',
+            'user',
+            'due'
         )
         interfaces = (relay.Node,)
         filterset_class = OrderFilter
@@ -131,4 +199,24 @@ class Meta:
             'preferred_payment_method',
             'reservation_status',
             'note',
+        )
+
+
+class OrderDeviceMetaType(DjangoObjectType):
+    db_id = graphene.Int(source='id')
+    class Meta:
+        model = OrderDeviceMeta
+        fields = (
+            'id',
+            'order',
+            'ip_address',
+            'user_agent',
+            'browser',
+            'browser_version',
+            'operating_system',
+            'device_type',
+        )
+        interfaces = (relay.Node,)
+        filter_fields = (
+            'order__alias',
         )

nxtbn/order/api/dashboard/serializers.py

@@ -158,6 +158,7 @@ class Meta:
             'total_paid_amount',
             'device_meta',
             'reservation_status',
+            'comment',
         )
 
     def get_total_price(self, obj):

nxtbn/payment/admin_queries.py

@@ -0,0 +1,25 @@
+from django.conf import settings
+import graphene
+from graphene_django.filter import DjangoFilterConnectionField
+
+from nxtbn.core.admin_permissions import gql_store_admin_required
+from nxtbn.payment.admin_types import PaymentType
+from nxtbn.payment.models import Payment
+
+
+class AdminPaymentQuery(graphene.ObjectType):
+    payments = DjangoFilterConnectionField(PaymentType)
+    payment = graphene.Field(PaymentType, id=graphene.Int(required=True))
+
+    @gql_store_admin_required
+    def resolve_payments(self, info, **kwargs):
+        return Payment.objects.all()
+
+    @gql_store_admin_required
+    def resolve_payment(self, info, id):
+        try:
+            payment = Payment.objects.get(id=id)
+        except Payment.DoesNotExist:
+            raise Exception("Payment not found")
+
+        return payment

nxtbn/payment/admin_types.py

@@ -0,0 +1,32 @@
+from django.conf import settings
+import graphene
+from graphene_django import DjangoObjectType
+from graphene import relay
+
+from nxtbn.payment.models import Payment
+
+class PaymentType(DjangoObjectType):
+    db_id = graphene.Int(source='id')
+    
+    class Meta:
+        model = Payment
+        fields = (
+            'id',
+            'user',
+            'order',
+            'payment_method',
+            'transaction_id',
+            'payment_status',
+            'is_successful',
+            'currency',
+            'payment_amount',
+            'gateway_response_raw',
+            'paid_at',
+            'payment_plugin_id',
+            'gateway_name',
+        )
+
+        interfaces = (relay.Node,)
+        filter_fields = (
+            'order__alias',
+        )

nxtbn/product/admin_types.py

@@ -108,6 +108,10 @@ class Meta:
 class ProductVariantAdminType(DjangoObjectType):
     db_id = graphene.Int(source="id")
     display_name = graphene.String()
+    humanize_price = graphene.String()
+
+    def resolve_humanize_price(self, info):
+        return self.humanize_total_price()
     class Meta:
         model = ProductVariant
         fields = (