diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 9e0dba73d..1aa5c1c37 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -435,8 +435,12 @@ def get_free_paid_breakdown_for_billable_units(year, free_sms_fragment_limit, bi free_sms_fragment_limit, cumulative, previous_cumulative, [billing_month for billing_month in sms_units if billing_month['month'] == month] ) - letter_billing = [(x['billing_units'], x['rate'], (x['billing_units'] * x['rate'])) + letter_billing = [(x['billing_units'], x['rate'], (x['billing_units'] * x['rate']), x['postage']) for x in letter_units if x['month'] == month] + + if letter_billing: + letter_billing.sort(key=lambda x: (x[3], x[1])) + letter_total = 0 for x in letter_billing: letter_total += x[2] diff --git a/app/templates/views/usage-with-letters.html b/app/templates/views/usage-with-letters.html index 7d26976d6..ebda8c463 100644 --- a/app/templates/views/usage-with-letters.html +++ b/app/templates/views/usage-with-letters.html @@ -113,7 +113,7 @@