From 88fd84bbdba5be1efa8dc05fe62936a4796feab3 Mon Sep 17 00:00:00 2001 From: bobbyvish Date: Wed, 14 Aug 2024 12:53:44 +0530 Subject: [PATCH] fix: filter to get active user subscriptions --- manage_subscriptions/models.py | 10 +++++----- manage_subscriptions/views.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manage_subscriptions/models.py b/manage_subscriptions/models.py index 5e3686c..b353ead 100644 --- a/manage_subscriptions/models.py +++ b/manage_subscriptions/models.py @@ -146,23 +146,23 @@ class PrincipalSubscription(BaseModel): return cls.objects.filter( principal=principal, is_paid=True, - cancelled=False, + # cancelled=False, deleted=False, active=True, - status=SubscriptionStatus.ACTIVE, + # status=SubscriptionStatus.ACTIVE, grace_period_end_date__gt=timezone.now().date(), ) - # need to improve this + @classmethod def get_principal_subscription(cls, principal): return cls.objects.filter( principal=principal, is_paid=True, - cancelled=False, + # cancelled=False, deleted=False, active=True, - status=SubscriptionStatus.ACTIVE, + # status=SubscriptionStatus.ACTIVE, ).order_by("-grace_period_end_date").first() diff --git a/manage_subscriptions/views.py b/manage_subscriptions/views.py index 6bcecde..ee5cd54 100644 --- a/manage_subscriptions/views.py +++ b/manage_subscriptions/views.py @@ -723,7 +723,7 @@ class CancelSubscriptionView(LoginRequiredMixin, generic.View): # Updating subscription status in the local database subscription.status = SubscriptionStatus.INACTIVE subscription.cancelled = True - subscription.active = False + subscription.auto_renew = False subscription.cancelled_date_time = timezone.now() subscription.save()