darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 07:35:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Monthly billing has been updated to populate for letters.

Browse Source
This commit is contained in:
Rebecca Law
2017-12-12 15:54:59 +00:00
parent d9db4691a1
commit 4ea79d9eb1
6 changed files with 73 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/dao/notification_usage_dao.py
View File

@@ -50,6 +50,11 @@ def get_billing_data_for_month(service_id, start_date, end_date, notification_ty
)
)
if notification_type == LETTER_TYPE:
results.extend(billing_letter_data_per_month_query(
service_id=service_id, start_date=start_date, end_date=end_date)
)
return results
@@ -165,10 +170,11 @@ def billing_letter_data_per_month_query(service_id, start_date, end_date):
NotificationHistory.notification_type,
month,
NotificationHistory.rate_multiplier,
NotificationHistory.international
NotificationHistory.international,
LetterRate.rate
).order_by(
month,
rate_multiplier()
).all()
return results
return results