Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/v1/transaction/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class Meta:
model = Transactions
fields = '__all__' # Adjust fields as necessary

class PropertyInvoiceSerializer(serializers.ModelSerializer):
class PropertyInvoiceSerializer(serializers.ModelSerializer):
transactionid = serializers.PrimaryKeyRelatedField(queryset=Transactions.objects.all())
payment_status = serializers.CharField()
payment_method = serializers.CharField()
Expand Down
2 changes: 1 addition & 1 deletion api/v1/transaction/urls.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# api/v1/transaction/urls.py

from django.urls import path
from .views import TransactionListView, TransactionDetailView,PropertyInvoiceView, EarningDetailsView
from .views import TransactionListView, TransactionDetailView,PropertyInvoiceView,EarningDetailsView

urlpatterns = [
path('transactions/', TransactionListView.as_view(), name='transaction-list'),
Expand Down
25 changes: 25 additions & 0 deletions api/v1/transaction/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,28 @@ def get(self, request):



class EarningDetailsView(APIView):
permission_classes = [IsAuthenticated]

def get(self, request):
user = request.user.id
#total
total_earnings = Transactions.objects.filter(userid=user, status=Transactions.Status.CREDIT_SUCCESS).aggregate(total=Sum('total_amount'))['total'] or 0
#available
available_earnings = total_earnings - withdrawn_earnings
#pending
pending_earnings = Transactions.objects.filter(userid=user, status=Transactions.Status.PENDING, payment_method='debit').aggregate(total=Sum('total_amount'))['total'] or 0
#withdrawn
withdrawn_earnings = Transactions.objects.filter(userid=user, status=Transactions.Status.DEBIT_SUCCESS).aggregate(total=Sum('total_amount'))['total'] or 0


earnings_data = {
'total_earnings': total_earnings,
'available_earnings': available_earnings,
'pending_earnings': pending_earnings,
'withdrawn_earnings': withdrawn_earnings,
}

serializer = EarningDetailsSerializer(earnings_data)

return Response(serializer.data, status=status.HTTP_200_OK)
Binary file modified db.sqlite3
Binary file not shown.
2 changes: 2 additions & 0 deletions property_hive/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@




DEBUG = os.getenv("DEBUG", "True")

ALLOWED_HOSTS = ["*"]
Expand Down Expand Up @@ -122,6 +123,7 @@




# Password validation
# https://docs.djangoproject.com/en/5.1/ref/settings/#auth-password-validators

Expand Down