Update change bill day to check for default

nadineproject · Aug 11, 2017 · c68a9f9 · c68a9f9
1 parent 8e471aa
commit c68a9f9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/nadine/models/membership.py b/nadine/models/membership.py
@@ -329,7 +329,9 @@ def set_to_package(self, package, start_date=None, end_date=None, paid_by=None,
 
         # Save the package
         if bill_day:
-            self.bill_day = bill_day
+            last_sub = ResourceSubscription.objects.filter(membership=self).order_by('end_date').last()
+            if last_sub and ((start_date - last_sub.end_date).days != 1) and settings.DEFAULT_BILLING_DAY == 0:
+                self.change_bill_day(bill_day)
         self.save()
 
         # Add subscriptions for each of the defaults

diff --git a/nadine/tests/test_membership.py b/nadine/tests/test_membership.py
@@ -585,7 +585,7 @@ def test_bill_day_for_long_absent_member(self):
         self.assertTrue(membership.active_subscriptions().count() == 0)
 
         # Set new membership package of PT5 starting today
-        membership.set_to_package(self.pt5Package, start_date=today)
+        membership.set_to_package(self.pt5Package, start_date=today, bill_day=today)
         self.assertTrue(membership.active_subscriptions().count() == 1)
 
         # Since there had been no active_subscriptions, bill day should be today.day