Added overage count if there are overage charges. Closes #210

nadine/models/payment.py

@@ -52,8 +52,12 @@ class Bill(models.Model):
     new_member_deposit = models.BooleanField(default=False, blank=False, null=False)
     paid_by = models.ForeignKey(User, blank=True, null=True, related_name='guest_bills')
 
+    @property
     def overage_days(self):
-        return self.dropins.count() - self.membership.dropin_allowance
+        days = self.dropins.count() + self.guest_dropins.count()
+        if self.membership and self.membership.dropin_allowance < days:
+            return days - self.membership.dropin_allowance
+        return 0
 
     class Meta:
         app_label = 'nadine'

staff/templates/staff/bills.html

@@ -83,6 +83,11 @@ <h4>
 								Deposit: ${{ bill.new_member_deposit }}
 							</div>
 							{% endif %}
+							{% if bill.overage_days %}
+							<div class="bill-info">
+								Overage: {{ bill.overage_days }} day{{ bill.overage_days|pluralize }}
+							</div>
+							{% endif %}
 							{% if bill.dropins.all %}
 							<div class="bill-info">Dropins ({{ bill.dropins.count }}):
 								{% for dropin in bill.dropins.all %}

staff/tests/test_billing.py

@@ -196,7 +196,7 @@ def test_drop_in_on_billing_date_is_associated_with_correct_bill(self):
         self.assertEqual(may_20_overage.membership.membership_plan, self.pt5Plan)
         self.assertEqual(date(2010, 6, 19), may_20_overage.bill_date)
         self.assertEqual(9, may_20_overage.dropins.count())
-        self.assertEqual(4, may_20_overage.overage_days())
+        self.assertEqual(4, may_20_overage.overage_days)
         self.assertEqual(80, may_20_overage.amount)
 
         # Third bill is for the new Basic membership