From 0875c81da6cbb0b85c1cd95d0c758a2a284dfa5e Mon Sep 17 00:00:00 2001 From: behruz-dev Date: Fri, 10 Oct 2025 15:22:01 +0500 Subject: [PATCH 1/4] fix payment api --- core/apps/orders/serializers/party.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/apps/orders/serializers/party.py b/core/apps/orders/serializers/party.py index 23d5bdc..574ad1c 100644 --- a/core/apps/orders/serializers/party.py +++ b/core/apps/orders/serializers/party.py @@ -503,5 +503,5 @@ class PartyPaymentHistorySerializer(serializers.ModelSerializer): return { 'id': obj.user.id, 'full_name': obj.user.full_name, - 'profile_image': obj.user.profile_image, + 'profile_image': obj.user.profile_image.url, } if obj.user else None \ No newline at end of file From 808f716019472a2863da3f12f50ca220c9af5059 Mon Sep 17 00:00:00 2001 From: behruz-dev Date: Fri, 10 Oct 2025 16:18:50 +0500 Subject: [PATCH 2/4] fix --- core/apps/orders/serializers/party.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/apps/orders/serializers/party.py b/core/apps/orders/serializers/party.py index 574ad1c..010ad08 100644 --- a/core/apps/orders/serializers/party.py +++ b/core/apps/orders/serializers/party.py @@ -503,5 +503,5 @@ class PartyPaymentHistorySerializer(serializers.ModelSerializer): return { 'id': obj.user.id, 'full_name': obj.user.full_name, - 'profile_image': obj.user.profile_image.url, + 'profile_image': obj.user.profile_image.url if obj.user.profile_image.url else None } if obj.user else None \ No newline at end of file From c97e3479fa3444251abddf7fbc04e0296d008044 Mon Sep 17 00:00:00 2001 From: behruz-dev Date: Fri, 10 Oct 2025 16:20:49 +0500 Subject: [PATCH 3/4] fix --- core/apps/orders/serializers/party.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/apps/orders/serializers/party.py b/core/apps/orders/serializers/party.py index 010ad08..48b22e9 100644 --- a/core/apps/orders/serializers/party.py +++ b/core/apps/orders/serializers/party.py @@ -503,5 +503,5 @@ class PartyPaymentHistorySerializer(serializers.ModelSerializer): return { 'id': obj.user.id, 'full_name': obj.user.full_name, - 'profile_image': obj.user.profile_image.url if obj.user.profile_image.url else None + 'profile_image': obj.user.profile_image.url if obj.user.profile_image else None } if obj.user else None \ No newline at end of file From 1b64dec1f70b3132bdfdd957e245f07aed23c46c Mon Sep 17 00:00:00 2001 From: behruz-dev Date: Fri, 10 Oct 2025 16:26:49 +0500 Subject: [PATCH 4/4] change order list filter --- core/apps/orders/filters/order.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/core/apps/orders/filters/order.py b/core/apps/orders/filters/order.py index b06287e..f30d909 100644 --- a/core/apps/orders/filters/order.py +++ b/core/apps/orders/filters/order.py @@ -1,9 +1,24 @@ import django_filters from core.apps.orders.models.order import Order +from core.apps.wherehouse.models import WhereHouse +from core.apps.projects.models import Project, ProjectFolder class OrderFilter(django_filters.FilterSet): + wherehouse = django_filters.ModelMultipleChoiceFilter( + field_name='wherehouse', + queryset=WhereHouse.objects.all() + ) + project = django_filters.ModelMultipleChoiceFilter( + field_name='project', + queryset=Project.objects.all() + ) + project_folder = django_filters.ModelMultipleChoiceFilter( + field_name='project_folder', + queryset=ProjectFolder.objects.all() + ) + class Meta: model = Order fields = [