darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 10:59:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4137 from alphagov/rename_column_in_billing_report

Browse Source 
Rename sms_fragments to sms_chargeable_units
This commit is contained in:
Pea Tyczynska
2022-02-01 17:01:03 +00:00
committed by GitHub
parent 41e74d249c 9862acd7ee
commit ffb8549a21
4 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/forms.py
View File

@@ -1962,6 +1962,11 @@ class RequiredDateFilterForm(StripWhitespaceForm):
end_date = GovukDateField("End Date")
class BillingReportDateFilterForm(StripWhitespaceForm):
start_date = GovukDateField("First day covered by report")
end_date = GovukDateField("Last day covered by report")
class SearchByNameForm(StripWhitespaceForm):
search = GovukSearchField(

13
app/main/views/platform_admin.py
View File

@@ -18,6 +18,7 @@ from app import (
from app.extensions import redis_client
from app.main import main
from app.main.forms import (
BillingReportDateFilterForm,
ClearCacheForm,
DateFilterForm,
RequiredDateFilterForm,
@@ -272,15 +273,15 @@ def notifications_sent_by_service():
@main.route("/platform-admin/reports/usage-for-all-services", methods=['GET', 'POST'])
@user_is_platform_admin
def get_billing_report():
form = RequiredDateFilterForm()
form = BillingReportDateFilterForm()
if form.validate_on_submit():
start_date = form.start_date.data
end_date = form.end_date.data
headers = [
"organisation_id", "organisation_name", "service_id", "service_name",
"sms_cost", "sms_fragments", "total_letters", "letter_cost", "letter_breakdown", "purchase_order_number",
"contact_names", "contact_email_addresses", "billing_reference"
"sms_cost", "sms_chargeable_units", "total_letters", "letter_cost", "letter_breakdown",
"purchase_order_number", "contact_names", "contact_email_addresses", "billing_reference"
]
try:
result = billing_api_client.get_data_for_billing_report(start_date, end_date)
@@ -294,9 +295,9 @@ def get_billing_report():
rows = [
[
r["organisation_id"], r["organisation_name"], r["service_id"], r["service_name"],
r["sms_cost"], r["sms_fragments"], r["total_letters"], r["letter_cost"], r["letter_breakdown"].strip(),
r.get("purchase_order_number"), r.get("contact_names"), r.get("contact_email_addresses"),
r.get("billing_reference")
r["sms_cost"], r["sms_chargeable_units"], r["total_letters"], r["letter_cost"],
r["letter_breakdown"].strip(), r.get("purchase_order_number"), r.get("contact_names"),
r.get("contact_email_addresses"), r.get("billing_reference")
]
for r in result
]