diff --git a/apps/product/pos/api/v1/viewsets/quota_distribution_api.py b/apps/product/pos/api/v1/viewsets/quota_distribution_api.py index 6d2ffa6..88dbf98 100644 --- a/apps/product/pos/api/v1/viewsets/quota_distribution_api.py +++ b/apps/product/pos/api/v1/viewsets/quota_distribution_api.py @@ -1,4 +1,5 @@ from django.db import transaction +from django.db.models import Q from rest_framework import status from rest_framework import viewsets from rest_framework.decorators import action @@ -61,9 +62,11 @@ class QuotaDistributionViewSet(viewsets.ModelViewSet, DynamicSearchMixin, POSDev # get distributions with open quota distributions = self.queryset.filter( - assigned_organization=organization, - quota__is_closed=False, - warehouse_entry__gt=0 + Q(assigned_organization=organization), + Q(quota__is_closed=False), + ( + Q(pre_sale=True) | Q(free_sale=True) | Q(warehouse_entry__gt=0) + ) ).order_by('-create_date') queryset = self.filter_query(distributions) # return by search param or all objects