Yuyu-billing/yuyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- add currency on overview API

Browse source
This commit is contained in:
Setyo Nugroho 2022-09-20 06:07:23 +07:00
parent bd611ef448
commit f5be3a8c3c
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
api/views.py
View file

@ -252,11 +252,11 @@ class AdminOverviewViewSet(viewsets.ViewSet):
'data': [], 'data': [],
} }
for k, v in INVOICE_COMPONENT_MODEL.items(): for k, v in INVOICE_COMPONENT_MODEL.items():
sum_of_price = sum([q.price_charged.amount for q in sum_of_price = sum([q.price_charged for q in
v.objects.filter(invoice__state=Invoice.InvoiceState.IN_PROGRESS).all()]) v.objects.filter(invoice__state=Invoice.InvoiceState.IN_PROGRESS).all()])
data['label'].append(k) data['label'].append(k + ' (' + str(sum_of_price.currency) + ')')
data['data'].append(sum_of_price) data['data'].append(sum_of_price.amount)
return Response(data) return Response(data)
@ -267,11 +267,11 @@ class AdminOverviewViewSet(viewsets.ViewSet):
'data': [], 'data': [],
} }
for k, v in INVOICE_COMPONENT_MODEL.items(): for k, v in INVOICE_COMPONENT_MODEL.items():
sum_of_price = sum([q.price_charged.amount for q in sum_of_price = sum([q.price_charged for q in
v.objects.filter(invoice__state=Invoice.InvoiceState.IN_PROGRESS, end_date=None).all()]) v.objects.filter(invoice__state=Invoice.InvoiceState.IN_PROGRESS, end_date=None).all()])
data['label'].append(k) data['label'].append(k + ' (' + str(sum_of_price.currency) + ')')
data['data'].append(sum_of_price) data['data'].append(sum_of_price.amount)
return Response(data) return Response(data)
@ -341,12 +341,12 @@ class ProjectOverviewViewSet(viewsets.ViewSet):
'data': [], 'data': [],
} }
for k, v in INVOICE_COMPONENT_MODEL.items(): for k, v in INVOICE_COMPONENT_MODEL.items():
sum_of_price = sum([q.price_charged.amount for q in sum_of_price = sum([q.price_charged for q in
v.objects.filter(invoice__project=project, v.objects.filter(invoice__project=project,
invoice__state=Invoice.InvoiceState.IN_PROGRESS).all()]) invoice__state=Invoice.InvoiceState.IN_PROGRESS).all()])
data['label'].append(k) data['label'].append(k + ' (' + str(sum_of_price.currency) + ')')
data['data'].append(sum_of_price) data['data'].append(sum_of_price.amount)
return Response(data) return Response(data)
@ -359,12 +359,12 @@ class ProjectOverviewViewSet(viewsets.ViewSet):
'data': [], 'data': [],
} }
for k, v in INVOICE_COMPONENT_MODEL.items(): for k, v in INVOICE_COMPONENT_MODEL.items():
sum_of_price = sum([q.price_charged.amount for q in sum_of_price = sum([q.price_charged for q in
v.objects.filter(invoice__project=project, v.objects.filter(invoice__project=project,
invoice__state=Invoice.InvoiceState.IN_PROGRESS, end_date=None).all()]) invoice__state=Invoice.InvoiceState.IN_PROGRESS, end_date=None).all()])
data['label'].append(k) data['label'].append(k + ' (' + str(sum_of_price.currency) + ')')
data['data'].append(sum_of_price) data['data'].append(sum_of_price.amount)
return Response(data) return Response(data)