fucking changes
This commit is contained in:
@@ -237,7 +237,7 @@ class PartyStatisticsApiView(generics.GenericAPIView):
|
|||||||
queryset = self.filter_queryset(self.queryset)
|
queryset = self.filter_queryset(self.queryset)
|
||||||
today = now().date()
|
today = now().date()
|
||||||
|
|
||||||
usd = queryset.filter(currency='usd').aggregate(
|
usd = queryset.filter(currency='usd', is_deleted=False).aggregate(
|
||||||
total_price_usd=Sum('party_amount__calculated_amount'),
|
total_price_usd=Sum('party_amount__calculated_amount'),
|
||||||
cost_amount_usd=Sum('party_amount__cost_amount'),
|
cost_amount_usd=Sum('party_amount__cost_amount'),
|
||||||
calculated_amount_usd=Sum('party_amount__calculated_amount'),
|
calculated_amount_usd=Sum('party_amount__calculated_amount'),
|
||||||
@@ -249,7 +249,7 @@ class PartyStatisticsApiView(generics.GenericAPIView):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
uzs = queryset.filter(currency='uzs').aggregate(
|
uzs = queryset.filter(currency='uzs', is_deleted=False).aggregate(
|
||||||
total_price_uzs=Sum('party_amount__calculated_amount'),
|
total_price_uzs=Sum('party_amount__calculated_amount'),
|
||||||
cost_amount_uzs=Sum('party_amount__cost_amount'),
|
cost_amount_uzs=Sum('party_amount__cost_amount'),
|
||||||
calculated_amount_uzs=Sum('party_amount__calculated_amount'),
|
calculated_amount_uzs=Sum('party_amount__calculated_amount'),
|
||||||
|
|||||||
Reference in New Issue
Block a user