From f798b72dbc738705589b1f71c15901e9fd593e3b Mon Sep 17 00:00:00 2001 From: Mojtaba-z Date: Mon, 2 Feb 2026 10:36:35 +0330 Subject: [PATCH] fix --> bug of transaction dashboard on free visibility scope --- apps/warehouse/web/api/v1/api.py | 43 ++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/apps/warehouse/web/api/v1/api.py b/apps/warehouse/web/api/v1/api.py index 74164ac..d9afa8c 100644 --- a/apps/warehouse/web/api/v1/api.py +++ b/apps/warehouse/web/api/v1/api.py @@ -280,25 +280,30 @@ class InventoryQuotaSaleTransactionViewSet( transaction_status = query_param.get('status') if 'status' in query_param.keys() else None org = get_organization_by_user(request.user) - # if org.free_visibility_by_scope: - # tr_objects = self.get_queryset(visibility_by_org_scope=True) - # tr_item_objects = InventoryQuotaSaleItemViewSet().get_queryset(visibility_by_org_scope=True) - # transaction_dashboard_data = self.get_dashboard( - # org, - # free_visibility_tr_objects=tr_objects, - # free_visibility_tr_item_objects=tr_item_objects, - # start_date=start_date, - # end_date=end_date, - # status=transaction_status, - # ) - # else: - # filer by date & transaction status - transaction_dashboard_data = self.get_dashboard( - org, - start_date=start_date, - end_date=end_date, - status=transaction_status, - ) + if org.free_visibility_by_scope: + + tr_objects = self.get_queryset(visibility_by_org_scope=True) + + tr_item_view = InventoryQuotaSaleItemViewSet() + tr_item_view.request = request + tr_item_objects = tr_item_view.get_queryset(visibility_by_org_scope=True) + + transaction_dashboard_data = self.get_dashboard( + org, + free_visibility_tr_objects=tr_objects, + free_visibility_tr_item_objects=tr_item_objects, + start_date=start_date, + end_date=end_date, + status=transaction_status, + ) + else: + # filer by date & transaction status + transaction_dashboard_data = self.get_dashboard( + org, + start_date=start_date, + end_date=end_date, + status=transaction_status, + ) return Response(transaction_dashboard_data, status=status.HTTP_200_OK)