xoliqberdiyev/ibapp-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
behruz-dev
2025-09-11 15:02:21 +05:00
parent 2ea839bb5f
commit 4617377e9e
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/apps/finance/serializers/expence.py
View File

@@ -95,8 +95,7 @@ class ExpenceListSerializer(serializers.ModelSerializer):
def get_user(self, obj): def get_user(self, obj):
return { return {
'id': obj.user.id, 'id': obj.user.id,
'first_name': obj.user.first_name, 'full_name': obj.user.full_name,
'last_name': obj.user.last_name,
} if obj.user else None } if obj.user else None
def get_cash_transaction(self, obj): def get_cash_transaction(self, obj):

3
core/apps/finance/serializers/income.py
View File

@@ -61,8 +61,7 @@ class IncomeListSerializer(serializers.ModelSerializer):
def get_user(self, obj): def get_user(self, obj):
return { return {
'id': obj.user.id, 'id': obj.user.id,
'first_name': obj.user.first_name, 'full_name': obj.user.full_name,
'last_name': obj.user.last_name,
} if obj.user else None } if obj.user else None

7
core/apps/finance/views/expence.py
View File

@@ -1,4 +1,4 @@
from rest_framework import generics, views, parsers from rest_framework import generics, views, parsers, filters
from rest_framework.response import Response from rest_framework.response import Response
from django_filters.rest_framework.backends import DjangoFilterBackend from django_filters.rest_framework.backends import DjangoFilterBackend
@@ -46,8 +46,11 @@ class ExpenceListApiView(generics.GenericAPIView):
'counterparty', 'expence_type', 'counterparty', 'expence_type',
) )
permission_classes = [HasRolePermission] permission_classes = [HasRolePermission]
filter_backends = [DjangoFilterBackend] filter_backends = [DjangoFilterBackend, filters.SearchFilter]
filterset_class = ExpenceFilter filterset_class = ExpenceFilter
search_fields = [
'cash_transaction__name', 'payment_type__name', 'project_folder__name', 'project__name', 'counterparty__name', 'expence_type__name', 'user__full_name'
]
def get(self, request): def get(self, request):
cash_transaction_ids = request.query_params.getlist('cash_transaction') cash_transaction_ids = request.query_params.getlist('cash_transaction')

7
core/apps/finance/views/income.py
View File

@@ -1,6 +1,6 @@
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from rest_framework import generics, views, parsers from rest_framework import generics, views, parsers, filters
from rest_framework.response import Response from rest_framework.response import Response
from django_filters.rest_framework.backends import DjangoFilterBackend from django_filters.rest_framework.backends import DjangoFilterBackend
@@ -18,8 +18,11 @@ class IncomeListApiView(generics.GenericAPIView):
'user' 'user'
) )
permission_classes = [HasRolePermission] permission_classes = [HasRolePermission]
filter_backends = [DjangoFilterBackend] filter_backends = [DjangoFilterBackend, filters.SearchFilter]
filterset_class = IncomeFilter filterset_class = IncomeFilter
search_fields = [
'cash_transaction__name', 'payment_type__name', 'project_folder__name', 'project__name', 'counterparty__name', 'type_income__name', 'user__full_name'
]
def get(self, request): def get(self, request):
cash_transaction_ids = request.query_params.getlist('cash_transaction') cash_transaction_ids = request.query_params.getlist('cash_transaction')