add: add filter for party list

core/apps/accounts/serializers/user.py

@@ -8,6 +8,7 @@ from core.apps.accounts.models.role import Role
 
 class UserProfileSerializer(serializers.ModelSerializer):
     permissions = serializers.SerializerMethodField(method_name='get_permissions')
+    role = serializers.SerializerMethodField(method_name='get_role')
 
     class Meta:
         model = User
@@ -16,6 +17,12 @@ class UserProfileSerializer(serializers.ModelSerializer):
         ]
         extra_kwargs = {'role': {'read_only': True}, "permissions": {'read_only': True}}
 
+    def get_role(self, obj):
+        return {
+            'id': obj.role.id,
+            'name': obj.role.name,
+        } if obj.role else None
+
     def get_permissions(self, obj):
         if obj.role:
             return obj.role.permissions.values_list('code', flat=True)

core/apps/finance/admin/__init__.py

@@ -6,3 +6,5 @@ from .expence_type import *
 from .expence import *
 from .expence_contract import *
 from .income_contract import *
+from .expence_chat import *
+from .income_chat import *

core/apps/finance/admin/expence_chat.py

@@ -0,0 +1,13 @@
+from django.contrib import admin 
+
+from core.apps.finance.models.expence_chat import ExpenceChat, ExpenceMessage
+
+
+@admin.register(ExpenceChat)
+class ExpenceChatAmin(admin.ModelAdmin):
+    list_display = ['id', 'expence']
+
+
+@admin.register(ExpenceMessage)
+class ExpenceChatAmin(admin.ModelAdmin):
+    list_display = ['id', 'user', 'chat']

core/apps/finance/admin/income_chat.py

@@ -0,0 +1,13 @@
+from django.contrib import admin 
+
+from core.apps.finance.models.income_chat import IncomeChat, IncomeMessage
+
+
+@admin.register(IncomeChat)
+class IncomeChatAmin(admin.ModelAdmin):
+    list_display = ['id', 'income']
+
+
+@admin.register(IncomeMessage)
+class IncomeMessageAmin(admin.ModelAdmin):
+    list_display = ['id', 'user', 'chat']

core/apps/finance/apps.py

@@ -4,3 +4,6 @@ from django.apps import AppConfig
 class FinanceConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'core.apps.finance'
+
+    def ready(self):
+        from . import signals

core/apps/finance/migrations/0029_expencechat_expencemessage.py

@@ -0,0 +1,46 @@
+# Generated by Django 5.2.4 on 2025-09-25 18:16
+
+import django.db.models.deletion
+import uuid
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0028_income_is_deleted'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ExpenceChat',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('expence', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='expence_chats', to='finance.expence')),
+            ],
+            options={
+                'verbose_name': 'Chiqim chat',
+                'verbose_name_plural': 'Chiqim chatlari',
+            },
+        ),
+        migrations.CreateModel(
+            name='ExpenceMessage',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('file', models.FileField(blank=True, null=True, upload_to='finanice/expence/message/')),
+                ('message', models.CharField(blank=True, max_length=250, null=True)),
+                ('chat', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='expence_messages', to='finance.expencechat')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='expence_messages', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'Chiqim xabari',
+                'verbose_name_plural': 'Chiqim xabarlari',
+            },
+        ),
+    ]

core/apps/finance/migrations/0030_incomechat_incomemessage.py

@@ -0,0 +1,46 @@
+# Generated by Django 5.2.4 on 2025-09-25 18:57
+
+import django.db.models.deletion
+import uuid
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0029_expencechat_expencemessage'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='IncomeChat',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('income', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='income_chat', to='finance.income')),
+            ],
+            options={
+                'verbose_name': 'Kirim chat',
+                'verbose_name_plural': 'Kirim chatlari',
+            },
+        ),
+        migrations.CreateModel(
+            name='IncomeMessage',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('file', models.FileField(blank=True, null=True, upload_to='finanice/income/message/')),
+                ('message', models.CharField(blank=True, max_length=250, null=True)),
+                ('chat', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='income_messages', to='finance.incomechat')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='income_messages', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'Chiqim xabari',
+                'verbose_name_plural': 'Chiqim xabarlari',
+            },
+        ),
+    ]

core/apps/finance/models/__init__.py

@@ -6,3 +6,5 @@ from .expence_type import *
 from .expence import *
 from .income_contract import *
 from .expence_contract import *
+from .expence_chat import *
+from .income_chat import *

core/apps/finance/models/expence_chat.py

@@ -0,0 +1,30 @@
+from django.db import models
+
+from core.apps.shared.models import BaseModel
+from core.apps.finance.models import Expence
+from core.apps.accounts.models import User
+
+
+class ExpenceChat(BaseModel):
+    expence = models.OneToOneField(Expence, on_delete=models.CASCADE, related_name='expence_chats')
+
+    def __str__(self):
+        return f'{self.expence} chat'
+    
+    class Meta:
+        verbose_name = 'Chiqim chat'
+        verbose_name_plural = 'Chiqim chatlari'
+
+
+class ExpenceMessage(BaseModel):
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='expence_messages')
+    chat = models.ForeignKey(ExpenceChat, on_delete=models.CASCADE, related_name='expence_messages')
+    file = models.FileField(upload_to='finanice/expence/message/', null=True, blank=True)
+    message = models.CharField(max_length=250, null=True, blank=True)
+    
+    def __str__(self):
+        return f'message from {self.user} for {self.chat}'
+    
+    class Meta:
+        verbose_name = 'Chiqim xabari'
+        verbose_name_plural = 'Chiqim xabarlari'

core/apps/finance/models/income_chat.py

@@ -0,0 +1,30 @@
+from django.db import models
+
+from core.apps.shared.models import BaseModel
+from core.apps.finance.models import Income
+from core.apps.accounts.models import User
+
+
+class IncomeChat(BaseModel):
+    income = models.OneToOneField(Income, on_delete=models.CASCADE, related_name='income_chat')
+
+    def __str__(self):
+        return f'{self.income} chat'
+    
+    class Meta:
+        verbose_name = 'Kirim chat'
+        verbose_name_plural = 'Kirim chatlari'
+
+
+class IncomeMessage(BaseModel):
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='income_messages')
+    chat = models.ForeignKey(IncomeChat, on_delete=models.CASCADE, related_name='income_messages')
+    file = models.FileField(upload_to='finanice/income/message/', null=True, blank=True)
+    message = models.CharField(max_length=250, null=True, blank=True)
+    
+    def __str__(self):
+        return f'message from {self.user} for {self.chat}'
+    
+    class Meta:
+        verbose_name = 'Chiqim xabari'
+        verbose_name_plural = 'Chiqim xabarlari'

core/apps/finance/serializers/expence.py

@@ -89,7 +89,7 @@ class ExpenceListSerializer(serializers.ModelSerializer):
         fields = [
             'id', 'cash_transaction', 'payment_type', 'project_folder', 'project', 'expence_type',
             'counterparty', 'price', 'exchange_rate', 'currency', 'date', 'comment', 'audit', 'file',
-            'user'
+            'user', 'expence_chats',
         ]
     
     def get_user(self, obj):
@@ -168,11 +168,11 @@ class ExpenceUpdateSerializer(serializers.ModelSerializer):
                 if instance.currency == 'uzs':
                     cash_transaction.expence_balance_uzs -= (old_price - validated_data.get('price'))
                     cash_transaction.total_balance_uzs -= (old_price - validated_data.get('price'))
-                    payment_type.total_uzs -= (old_price - validated_data.get('price'))
+                    payment_type.total_uzs -= (old_price - validated_data.get('price')) if payment_type.total_uzs > (old_price - validated_data.get('price')) else 0
                 else:
                     cash_transaction.expence_balance_usd -= (old_price - validated_data.get('price'))
                     cash_transaction.total_balance_usd -= (old_price - validated_data.get('price'))
-                    payment_type.total_usd -= (old_price - validated_data.get('price'))
+                    payment_type.total_usd -= (old_price - validated_data.get('price')) if payment_type.total_usd > (old_price - validated_data.get('price')) else 0
 
             elif old_price < validated_data.get('price'):
                 if instance.currency == 'uzs':

core/apps/finance/serializers/expence_chat.py

@@ -0,0 +1,40 @@
+from django.db import transaction
+
+from rest_framework import serializers
+
+from core.apps.finance.models import Expence, ExpenceChat, ExpenceMessage
+
+
+class ExpenceMessageListSerializer(serializers.ModelSerializer):
+    user = serializers.SerializerMethodField(method_name='get_user')
+
+    class Meta:
+        model = ExpenceMessage
+        fields = [
+            'id', 'user', 'message', 'file', 'created_at'
+        ]
+    
+    def get_user(self, obj):
+        return {
+            'id': obj.user.id,
+            'full_name': obj.user.full_name,
+            'profile_image': obj.user.profile_image.url if obj.user.profile_image else None,
+        }
+
+
+class ExpenceMessageCreateSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ExpenceMessage
+        fields = [
+            'message', 'file', 'chat'
+        ]
+    
+    def create(self, validated_data):
+        with transaction.atomic():
+            return ExpenceMessage.objects.create(
+                message=validated_data.get('message'),
+                file=validated_data.get('file'),
+                user=self.context.get('user'),
+                chat=validated_data.get('chat'),
+            )
+            

core/apps/finance/serializers/income.py

@@ -19,7 +19,7 @@ class IncomeListSerializer(serializers.ModelSerializer):
         fields = [
             'id', 'cash_transaction', 'payment_type', 'project_folder', 'project',
             'counterparty', 'type_income', 'currency', 'price', 'exchange_rate', 'date',
-            'comment', 'file', 'audit', 'user'
+            'comment', 'file', 'audit', 'user', 'income_chat'
         ]
     
     def get_cash_transaction(self, obj):
@@ -166,11 +166,11 @@ class IncomeUpdateSerializer(serializers.ModelSerializer):
                 if instance.currency == 'uzs':
                     cash_transaction.income_balance_uzs -= (old_price - validated_data.get('price'))
                     cash_transaction.total_balance_uzs -= (old_price - validated_data.get('price'))
-                    payment_type.total_uzs -= (old_price - validated_data.get('price'))
+                    payment_type.total_uzs -= (old_price - validated_data.get('price')) if payment_type.total_uzs > (old_price - validated_data.get('price')) else 0
                 else:
                     cash_transaction.income_balance_usd -= (old_price - validated_data.get('price'))
                     cash_transaction.total_balance_usd -= (old_price - validated_data.get('price'))
-                    payment_type.total_usd -= (old_price - validated_data.get('price'))
+                    payment_type.total_usd -= (old_price - validated_data.get('price')) if payment_type.total_usd > (old_price - validated_data.get('price')) else 0
 
             elif old_price < validated_data.get('price'):
                 if instance.currency == 'uzs':

core/apps/finance/serializers/income_chat.py

@@ -0,0 +1,40 @@
+from django.db import transaction
+
+from rest_framework import serializers
+
+from core.apps.finance.models import IncomeMessage
+
+
+class IncomeMessageListSerializer(serializers.ModelSerializer):
+    user = serializers.SerializerMethodField(method_name='get_user')
+
+    class Meta:
+        model = IncomeMessage
+        fields = [
+            'id', 'user', 'message', 'file', 'created_at'
+        ]
+    
+    def get_user(self, obj):
+        return {
+            'id': obj.user.id,
+            'full_name': obj.user.full_name,
+            'profile_image': obj.user.profile_image.url if obj.user.profile_image else None,
+        }
+
+
+class IncomeMessageCreateSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = IncomeMessage
+        fields = [
+            'message', 'file', 'chat'
+        ]
+    
+    def create(self, validated_data):
+        with transaction.atomic():
+            return IncomeMessage.objects.create(
+                message=validated_data.get('message'),
+                file=validated_data.get('file'),
+                user=self.context.get('user'),
+                chat=validated_data.get('chat'),
+            )
+            

core/apps/finance/signals/__init__.py

@@ -0,0 +1,2 @@
+from .expence import *
+from .income import *

core/apps/finance/urls.py

@@ -9,6 +9,8 @@ from core.apps.finance.views import expence_type as ex_views
 from core.apps.finance.views import expence as expence_views
 from core.apps.finance.views import income_contract as ic_views
 from core.apps.finance.views import expence_contract as ec_views
+from core.apps.finance.views import expence_chat as ex_chat_views
+from core.apps.finance.views import income_chat as in_chat_views
 
 
 urlpatterns = [
@@ -87,5 +89,25 @@ urlpatterns = [
             path('statistics/', ec_views.ExpenceContractStatisticsApiView.as_view()),
             path('<uuid:id>/calculate_price/', ec_views.ExpenceContractCalculatePriceApiView.as_view()),
         ]
-    ))
+    )),
+    path('expence_chat/', include(
+        [   
+            path('<uuid:id>/messages/', ex_chat_views.ExpenceMessageListApiView.as_view()),
+            path('message/', include(
+                [
+                    path('create/', ex_chat_views.ExpenceMessageCreateApiView.as_view()),
+                ]
+            )),
+        ]
+    )),
+    path('income_chat/', include(
+        [   
+            path('<uuid:id>/messages/', in_chat_views.IncomeMessageListApiView.as_view()),
+            path('message/', include(
+                [
+                    path('create/', in_chat_views.IncomeMessageCreateApiView.as_view()),
+                ]
+            )),
+        ]
+    )),
 ]

core/apps/finance/views/expence_chat.py

@@ -0,0 +1,52 @@
+from django.shortcuts import get_object_or_404
+
+from rest_framework import generics, views
+from rest_framework.response import Response
+
+from core.apps.finance.models import ExpenceChat, ExpenceMessage, Expence
+from core.apps.finance.serializers import expence_chat as serializers
+from core.apps.accounts.permissions.permissions import HasRolePermission
+
+
+class ExpenceMessageCreateApiView(generics.GenericAPIView):
+    serializer_class = serializers.ExpenceMessageCreateSerializer
+    queryset = ExpenceMessage.objects.all()
+    permission_classes = [HasRolePermission]
+
+    def post(self, request):
+        serializer = self.serializer_class(data=request.data, context={'user': request.user})
+        if serializer.is_valid(raise_exception=True):
+            serializer.save()
+            return Response(
+                {
+                    'success': True,
+                    'message': 'created'
+                }, status=201
+            )
+        return Response(
+            {
+                'success': False,
+                'message': serializer.errors,
+            }, status=400
+        )
+
+
+class ExpenceMessageListApiView(generics.GenericAPIView):
+    serializer_class = serializers.ExpenceMessageListSerializer
+    queryset = ExpenceMessage.objects.select_related('user')
+    permission_classes = [HasRolePermission]
+
+    def get(self, request, id):
+        expence = get_object_or_404(Expence, id=id)
+        chat, created = ExpenceChat.objects.get_or_create(expence=expence)
+        messages = self.queryset.filter(chat=chat)
+        serializer = self.serializer_class(messages, many=True)
+        return Response(
+            {
+                'chat': {
+                    'id': chat.id,
+                    'expence': chat.expence.id
+                },
+                'messages': serializer.data
+            }, status=200
+        )

core/apps/finance/views/income_chat.py

@@ -0,0 +1,53 @@
+from django.shortcuts import get_object_or_404
+
+from rest_framework import generics
+from rest_framework.response import Response
+
+from core.apps.finance.models import IncomeMessage, IncomeChat, Income
+from core.apps.finance.serializers import income_chat as serializers
+from core.apps.accounts.permissions.permissions import HasRolePermission
+
+
+class IncomeMessageCreateApiView(generics.GenericAPIView):
+    serializer_class = serializers.IncomeMessageCreateSerializer
+    queryset = IncomeMessage.objects.all()
+    permission_classes = [HasRolePermission]
+
+    def post(self, request):
+        serializer = self.serializer_class(data=request.data, context={'user': request.user})
+        if serializer.is_valid(raise_exception=True):
+            serializer.save()
+            return Response(
+                {
+                    'success': True,
+                    'message': 'created'
+                }, status=201
+            )
+        return Response(
+            {
+                'success': False,
+                'message': serializer.errors,
+            }, status=400
+        )
+
+
+class IncomeMessageListApiView(generics.GenericAPIView):
+    serializer_class = serializers.IncomeMessageListSerializer
+    queryset = IncomeMessage.objects.select_related('user')
+    permission_classes = [HasRolePermission]
+    pagination_class = None
+
+    def get(self, request, id):
+        income = get_object_or_404(Income, id=id)
+        chat, created = IncomeChat.objects.get_or_create(income=income)
+        messages = self.queryset.filter(chat=chat)
+        serializer = self.serializer_class(messages, many=True)
+        return Response(
+            {
+                'chat': {
+                    'id': chat.id,
+                    'income': chat.income.id
+                },
+                'messages': serializer.data
+            }, status=200
+        )

core/apps/orders/filters/party.py

@@ -33,14 +33,39 @@ class PartyFilter(django_filters.FilterSet):
     order_start_date = django_filters.DateFilter(field_name='order_date', lookup_expr='gte')
     order_end_date = django_filters.DateFilter(field_name='order_date', lookup_expr='lte')
 
+    # total price filter (range) 
+    min_price = django_filters.NumberFilter(field_name='party_amount__total_price', lookup_expr='gte')
+    max_price = django_filters.NumberFilter(field_name='party_amount__total_price', lookup_expr='lte')
+    
+    # qqs and discount
+    qqs = django_filters.BooleanFilter(method='filter_by_qqs')
+    discount = django_filters.BooleanFilter(method='filter_by_discount')
+
+    # payment_type
+    payment_type = django_filters.UUIDFilter(field_name='expences__payment_type')
+
     class Meta:
         model = Party
         fields = [
             'status', 'payment_status', 'confirmation',
             'orders__wherehouse', 'orders__project', 'orders__project_folder',
-            'mediator', 'orders__counterparty',
+            'mediator', 'orders__counterparty', 'min_price', 'max_price',
+            'qqs', 'discount', 'payment_type'
         ]
     
+    def filter_by_qqs(self, queryset, name, value):
+        if value == True:
+            queryset = queryset.filter(orders__qqs__isnull=True)
+            return queryset
+        else:
+            return queryset
+    
+    def filter_by_discount(self, queryset, name, value):
+        if value == True:
+            return queryset.filter(discount__isnull=True)
+        else:
+            return queryset
+
     def filter_by_delivery_date(self, queryset, name, value):
         today = now().date()
 

core/apps/orders/migrations/0026_alter_order_qqs_alter_order_qqs_price_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.2.4 on 2025-09-29 14:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('orders', '0025_alter_offer_status'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='order',
+            name='qqs',
+            field=models.PositiveBigIntegerField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='order',
+            name='qqs_price',
+            field=models.PositiveBigIntegerField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='party',
+            name='discount',
+            field=models.PositiveBigIntegerField(blank=True, null=True),
+        ),
+    ]

core/apps/orders/models/order.py

@@ -44,9 +44,9 @@ class Order(BaseModel):
         choices=[('uzs', 'uzs'), ('usd', 'usd')], default='uzs', null=True, blank=True, max_length=3
     )
     total_price = models.PositiveBigIntegerField(default=0, null=True, blank=True)
-    qqs_price = models.PositiveBigIntegerField(default=0, null=True, blank=True)
+    qqs_price = models.PositiveBigIntegerField(null=True, blank=True)
     amount = models.PositiveBigIntegerField(default=0, null=True, blank=True)
-    qqs = models.PositiveBigIntegerField(default=0, null=True, blank=True)
+    qqs = models.PositiveBigIntegerField(null=True, blank=True)
 
     def __str__(self):
         return f"{self.product} {self.unity} quantity order"

core/apps/orders/models/party.py

@@ -50,7 +50,7 @@ class Party(BaseModel):
         null=True, blank=True
     )
     audit_comment = models.TextField(null=True, blank=True)
-    discount = models.PositiveBigIntegerField(default=0, null=True, blank=True)
+    discount = models.PositiveBigIntegerField(null=True, blank=True)
     discount_currency = models.CharField(
         max_length=3, choices=[('uzs', 'uzs'), ('usd', 'usd')], default='uzs', null=True, blank=True
     )

core/apps/wherehouse/serializers/wherehouse.py

@@ -56,6 +56,7 @@ class WhereHouseUpdateSerializer(serializers.ModelSerializer):
 
         users = validated_data.pop('users', None)
         if users is not None:
+            instance.users.clear()
             instance.users.set(users)
         instance.save()
         return instance