Add separate setting for formatting unit costs.

praekeltfoundation · Jun 24, 2015 · 5f7cfcd · 5f7cfcd
1 parent 9e7f9a1
commit 5f7cfcd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/go/billing/settings.py b/go/billing/settings.py
@@ -11,6 +11,9 @@
 DOLLAR_DECIMAL_PLACES = getattr(
     settings, 'BILLING_DOLLAR_DECIMAL_PLACES', 3)
 
+UNIT_COST_DOLLAR_DECIMAL_PLACES = getattr(
+    settings, 'BILLING_UNIT_COST_DOLLAR_DECIMAL_PLACES', 5)
+
 # 10 credits = 1 US cent
 CREDIT_CONVERSION_FACTOR = getattr(
     settings, 'BILLING_CREDIT_CONVERSION_FACTOR', Decimal('10.00'))

diff --git a/go/billing/templates/billing/invoice.html b/go/billing/templates/billing/invoice.html
@@ -62,7 +62,7 @@ <h2>{{ biller.name }}{% if biller.channel_type != None %} ({{ biller.channel_typ
                             <td>{% if item.description != None %}{{ item.description }}{% endif %}</th>
                             <td>{{ item.units }}</th>
                             <td>{% if item.credits != None %}{{ item.credits|format_credits }}{% endif %}</th>
-                            <td>{{ item.unit_cost|format_cents }}</th>
+                            <td>{{ item.unit_cost|format_unit_cost_cents }}</th>
                             <td>{{ item.cost|format_cents }}
                         </tr>
                     {% endfor %}

diff --git a/go/billing/templatetags/billing_tags.py b/go/billing/templatetags/billing_tags.py
@@ -19,6 +19,15 @@ def format_cents(v):
     return format_currency(v, places=settings.DOLLAR_DECIMAL_PLACES)
 
 
+@register.filter
+def format_unit_cost_cents(v):
+    """A version of ``format_cents`` tailored to format small fractions of cents
+    for displaying unit costs.
+    """
+    v = v / Decimal('100.0')
+    return format_currency(v, places=settings.UNIT_COST_DOLLAR_DECIMAL_PLACES)
+
+
 @register.filter
 def format_credits(v):
     """Returns a formatted string representation of a number in credits from a

diff --git a/go/billing/tests/test_views.py b/go/billing/tests/test_views.py
@@ -105,15 +105,15 @@ def test_statement_description_nones(self):
     def test_statement_costs(self):
         statement = self.mk_statement(items=[{
             'credits': Decimal('200.0'),
-            'unit_cost': Decimal('123.456'),
+            'unit_cost': Decimal('123.45678'),
             'cost': Decimal('679.012'),
         }])
 
         user = self.user_helper.get_django_user()
         response = self.get_statement(user, statement)
 
         self.assertContains(response, '>200.00<')
-        self.assertContains(response, '>1.234<')
+        self.assertContains(response, '>1.23456<')
         self.assertContains(response, '>6.790<')
 
     def test_statement_cost_nones(self):