Merge pull request #20 from xoliqberdiyev/test

Test

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 = [

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.profile_image else None
         } if obj.user else None