diff --git a/.env.local b/.env.local index 63983c1..4ff1bc4 100644 --- a/.env.local +++ b/.env.local @@ -7,7 +7,7 @@ ENV_NAME=DEV # Database secrets DB_HOST=31.7.78.133 DB_PORT=14352 -DB_NAME=Production +DB_NAME=Development DB_USERNAME=postgres DB_PASSWORD=pfLIVXupbDetvFMt2gUvxLXUL9b4HIOHaPcKXsBEZ1i8zl0iLUjmhUfXlGfJKcTV 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 88dbf98..9140d3d 100644 --- a/apps/product/pos/api/v1/viewsets/quota_distribution_api.py +++ b/apps/product/pos/api/v1/viewsets/quota_distribution_api.py @@ -62,11 +62,9 @@ class QuotaDistributionViewSet(viewsets.ModelViewSet, DynamicSearchMixin, POSDev # get distributions with open quota distributions = self.queryset.filter( - Q(assigned_organization=organization), - Q(quota__is_closed=False), - ( - Q(pre_sale=True) | Q(free_sale=True) | Q(warehouse_entry__gt=0) - ) + assigned_organization=organization, + quota__is_closed=False, + warehouse_entry__gt=0 ).order_by('-create_date') queryset = self.filter_query(distributions) # return by search param or all objects @@ -93,9 +91,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') # check quota distributions for rancher