Merge pull request #450 from renderbox:bugfix-billing-dates

Bugfix-billing-dates

pyproject.toml

@@ -7,7 +7,7 @@ universal = true
 
 [project]
 name = "django-vendor"
-version = "0.4.13"
+version = "0.4.14"
 
 authors = [
   { name="Grant Viklund", email="[email protected]" },

src/vendor/models/profile.py

@@ -210,24 +210,42 @@ def get_active_subscriptions(self):
         return self.subscriptions.filter(status=SubscriptionStatus.ACTIVE)
 
     def get_next_billing_date(self):
+        '''Returns the next billing date for the customers subscriptions'''
         next_billing_dates = []
 
         if not self.subscriptions.filter(status=SubscriptionStatus.ACTIVE).count():
             return None
 
         next_billing_dates = [subscription.get_next_billing_date() for subscription in self.get_active_subscriptions()]
+
+        if not next_billing_dates:
+            return None
+
+        filtered_dates = [date for date in next_billing_dates if date is not None]
+
+        if not filtered_dates:
+            return None
 
-        return sorted(next_billing_dates)[0]
+        return sorted(filtered_dates)[0]
 
     def get_last_payment_date(self):
+        '''Returns the last payment date made form the customer subscriptions'''
         last_payment_dates = []
 
         if not self.subscriptions.count():
             return None
 
         last_payment_dates = [subscription.get_last_payment_date() for subscription in self.subscriptions.all()]
 
-        return sorted(last_payment_dates)[-1]
+        if not last_payment_dates:
+            return None
+
+        filtered_dates = [date for date in last_payment_dates if date is not None]
+
+        if not filtered_dates:
+            return None
+
+        return sorted(filtered_dates)[-1]
 
     def get_payment_counts(self):
         return self.payments.filter(deleted=False, status=PurchaseStatus.SETTLED).count()

src/vendor/models/subscription.py

@@ -81,20 +81,36 @@ def cancel(self):
         self.save()
 
     def get_next_billing_date(self):
-        receipts = self.receipts.filter(Q(deleted=False), Q(end_date__gte=timezone.now()) | Q(end_date=None)).order_by('end_date')
+        '''Returns the next billing date
+        
+        Function returns the next billing date which is the last receipt.end_date for the subscription.'''
+        receipts = self.receipts.filter(Q(deleted=False), Q(end_date__gte=timezone.now())).order_by('end_date')
 
         if not receipts.count():
             return None
 
         return receipts.first().end_date
 
     def get_last_payment_date(self):
+        '''Return the payments related reciept start date.
+
+        Instead of returning payments.create DateTime field it return the releated payments reciept.start_date
+        because that field can be edited to match an actual payment date if necessary. 
+        
+        Returns:
+            None or DateTime
+        '''
         payment = self.payments.filter(deleted=False, status__lte=PurchaseStatus.SETTLED).order_by('-created').first()
 
         if not payment:
             return None
+
+        receipt = payment.get_receipt()
+
+        if receipt is None or not receipt.start_date:
+            return None
 
-        return payment.get_receipt().start_date
+        return receipt.start_date
 
     def is_on_trial(self):
         if not self.receipts.filter(deleted=False).count():

src/vendor/processors/authorizenet.py

@@ -73,7 +73,6 @@ class AuthorizeNetProcessor(PaymentProcessorBase):
     def __str__(self):
         return 'Authorize.Net'
 
-
     def processor_setup(self, site):
         """
         Merchant Information needed to aprove the transaction.

src/vendor/tests/test_authorizenet.py

@@ -1046,5 +1046,3 @@ def test_update_payment_success(self):
 
         payment.refresh_from_db()
         self.assertEqual(payment.status, PurchaseStatus.SETTLED)
-
-