MNPC/RasadDam_Backend
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix - dashboard quota filter by date

Browse Source
This commit is contained in:
Mojtaba-z
2025-12-08 14:36:24 +03:30
parent 12dccc624a
commit c8174a7674
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/warehouse/web/api/v1/api.py
View File

@@ -24,6 +24,8 @@ class InventoryEntryViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet,
search_fields = [
"distribution__distribution_id",
"organization__name",
"org_quota_stat__quota__product__name",
"delivery_address",
"weight",
"balance",
"lading_number",
@@ -128,7 +130,7 @@ class InventoryEntryViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet,
organization=org,
quota_id=pk
)
queryset = self.filter_query(entries) # return by search param or all objects
queryset = self.filter_query(self.filter_queryset(entries)) # return by search param or all objects
# paginate & response
page = self.paginate_queryset(queryset)
@@ -150,7 +152,7 @@ class InventoryEntryViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet,
entries = self.get_queryset(
visibility_by_org_scope=True
) if org.free_visibility_by_scope else self.get_queryset().filter(organization=org)
queryset = self.filter_query(entries) # return by search param or all objects
queryset = self.filter_query(self.filter_queryset(entries)) # return by search param or all objects
# paginate & response
page = self.paginate_queryset(queryset)