diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 90de7ae15..ac4ff69db 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -406,7 +406,6 @@ def get_sum_billing_units(billing_units, month=None): def get_free_paid_breakdown_for_billable_units(year, free_sms_fragment_limit, billing_units): cumulative = 0 - letter_cumulative = 0 sms_units = [x for x in billing_units if x['notification_type'] == 'sms'] letter_units = [x for x in billing_units if x['notification_type'] == 'letter'] for month in get_months_for_financial_year(year): @@ -424,11 +423,9 @@ def get_free_paid_breakdown_for_billable_units(year, free_sms_fragment_limit, bi letter_total = 0 for x in letter_billing: letter_total += x.cost - letter_cumulative += letter_total yield { 'name': month, 'letter_total': letter_total, - 'letter_cumulative': letter_cumulative, 'paid': breakdown['paid'], 'free': breakdown['free'], 'letters': letter_billing diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 8939ae9d3..d61101f96 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -1595,18 +1595,18 @@ def test_get_free_paid_breakdown_for_billable_units(now, expected_number_of_mont ] ) assert list(billing_units) == [ - {'free': 100000, 'name': 'April', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, - {'free': 100000, 'name': 'May', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, - {'free': 50000, 'name': 'June', 'paid': 50000, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, - {'free': 0, 'name': 'July', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, - {'free': 0, 'name': 'August', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, - {'free': 0, 'name': 'September', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, - {'free': 0, 'name': 'October', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, - {'free': 0, 'name': 'November', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, - {'free': 0, 'name': 'December', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, - {'free': 0, 'name': 'January', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, - {'free': 0, 'name': 'February', 'paid': 2000, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}, - {'free': 0, 'name': 'March', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0} + {'free': 100000, 'name': 'April', 'paid': 0, 'letter_total': 0, 'letters': []}, + {'free': 100000, 'name': 'May', 'paid': 0, 'letter_total': 0, 'letters': []}, + {'free': 50000, 'name': 'June', 'paid': 50000, 'letter_total': 0, 'letters': []}, + {'free': 0, 'name': 'July', 'paid': 0, 'letter_total': 0, 'letters': []}, + {'free': 0, 'name': 'August', 'paid': 0, 'letter_total': 0, 'letters': []}, + {'free': 0, 'name': 'September', 'paid': 0, 'letter_total': 0, 'letters': []}, + {'free': 0, 'name': 'October', 'paid': 0, 'letter_total': 0, 'letters': []}, + {'free': 0, 'name': 'November', 'paid': 0, 'letter_total': 0, 'letters': []}, + {'free': 0, 'name': 'December', 'paid': 0, 'letter_total': 0, 'letters': []}, + {'free': 0, 'name': 'January', 'paid': 0, 'letter_total': 0, 'letters': []}, + {'free': 0, 'name': 'February', 'paid': 2000, 'letter_total': 0, 'letters': []}, + {'free': 0, 'name': 'March', 'paid': 0, 'letter_total': 0, 'letters': []} ][:expected_number_of_months]