un-cancel a subscription

squarelet/organizations/models/payment.py

@@ -1,5 +1,6 @@
 # Django
 from django.conf import settings
+from django.core.exceptions import ValidationError
 from django.db import models, transaction
 from django.db.models import Q
 from django.urls import reverse
@@ -467,6 +468,32 @@ def cancel(self):
         # Slack notification for cancellation
         self.send_slack_notification("cancelled")
 
+    def uncancel(self):
+        """Re-enable renewal for a subscription that was pending cancellation.
+
+        Clears the cancelled flag and cancel_at date locally, and removes
+        cancel_at_period_end on the Stripe subscription so it auto-renews.
+        """
+        customer = self.organization.customer()
+        if not customer.stripe_payment_method_id:
+            raise ValidationError(
+                _(
+                    "No payment method on file. "
+                    "Please add a payment method before re-subscribing."
+                )
+            )
+        if self.stripe_subscription:
+            updated = (
+                get_payment_provider()
+                .get_subscription_service()
+                .uncancel(self.stripe_subscription)
+            )
+            if updated:
+                self.cache_stripe_subscription_fields(updated)
+        self.cancelled = False
+        self.cancel_at = None
+        self.save()
+
     def modify(self, plan):
         """Modify an existing plan
         Note - this should never be used to switch from a MR to a PP plan or vice versa

squarelet/organizations/payments/base.py

@@ -103,6 +103,15 @@ def cancel_at_period_end(self, stripe_subscription):
         ``cancel_at`` timestamp when cancellation is scheduled.
         """
 
+    @abstractmethod
+    def uncancel(self, stripe_subscription):
+        """Re-enable a subscription that was set to cancel at period end.
+
+        Clears both ``cancel_at_period_end`` and any ``cancel_at`` timestamp,
+        so the subscription will auto-renew as normal.
+        Returns the updated Stripe subscription object.
+        """
+
     @abstractmethod
     def delete(self, stripe_subscription):
         """Immediately cancel and delete a subscription."""

squarelet/organizations/payments/providers/stripe_modern.py

@@ -184,6 +184,13 @@ def cancel_at_period_end(self, stripe_subscription):
             cancel_at_period_end=True,
         )
 
+    def uncancel(self, stripe_subscription):
+        return stripe.Subscription.modify(
+            stripe_subscription.id,
+            cancel_at_period_end=False,
+            cancel_at="",
+        )
+
     def delete(self, stripe_subscription):
         stripe_subscription.delete()
 

squarelet/organizations/urls.py

@@ -43,6 +43,11 @@
         view=RedirectView.as_view(pattern_name="organizations:subscriptions"),
         name="payment",
     ),
+    path(
+        "<slug:slug>/resubscribe/<int:pk>/",
+        view=views.Resubscribe.as_view(),
+        name="resubscribe",
+    ),
     path("<slug:slug>/update/", view=views.Update.as_view(), name="update"),
     path(
         "<slug:slug>/request-profile-change/",

squarelet/organizations/views/__init__.py

@@ -19,6 +19,7 @@
     PaymentsList,
     PDFChargeDetail,
     RemoveCard,
+    Resubscribe,
     UpdateCard,
     UpdateReceiptEmail,
     UpdateSubscription,
@@ -33,6 +34,7 @@
     # Subscription views
     "ManageSubscriptions",
     "UpdateSubscription",
+    "Resubscribe",
     "UpdateCard",
     "RemoveCard",
     "UpdateReceiptEmail",

squarelet/organizations/views/subscription.py

@@ -56,6 +56,7 @@
     BaseManageSubscriptions,
     BasePaymentsList,
     BaseRemoveCard,
+    BaseResubscribe,
     BaseUpdateCard,
     BaseUpdateReceiptEmail,
 )
@@ -201,6 +202,10 @@ class CancelSubscription(OrgSubscriptionView, BaseCancelSubscription):
     pass
 
 
+class Resubscribe(OrgSubscriptionView, BaseResubscribe):
+    pass
+
+
 class PaymentsList(PermissionRequiredMixin, BasePaymentsList):
     subject = "organizations"
     individual = False

squarelet/payments/views.py

@@ -3,6 +3,7 @@
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.views import redirect_to_login
+from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.http import Http404, JsonResponse
 from django.shortcuts import get_object_or_404, redirect
@@ -748,6 +749,39 @@ def get_context_data(self, **kwargs):
         return context
 
 
+class BaseResubscribe(SubscriptionObjectMixin, View):
+    """Resubscribe to a cancelled subscription."""
+
+    def _is_ajax(self):
+        return self.request.headers.get("X-Requested-With") == "XMLHttpRequest"
+
+    def _error(self, message, redirect_url="subscriptions"):
+        """Return the error as JSON for AJAX callers, else flash and redirect."""
+        if self._is_ajax():
+            return JsonResponse({"error": str(message)}, status=400)
+        messages.error(self.request, message)
+        return redirect(self.reverse_subject(redirect_url))
+
+    def post(self, request, *args, **kwargs):
+        organization = self.get_object()
+        redirect_url = self.reverse_subject("subscriptions")
+        subscription = organization.subscriptions.filter(id=self.kwargs["pk"]).first()
+        print(subscription)
+        try:
+            subscription.uncancel()
+        except ValidationError as exc:
+            return self._error(exc.message, "update-card")
+        except stripe.StripeError as exc:
+            return self._error(f"Stripe error: {format_stripe_error(exc)}")
+
+        self.log_staff_action("uncancelled subscription")
+        success_msg = _(f"Resubscribed to {subscription.plan.name}")
+        if self._is_ajax():
+            return JsonResponse({"redirect": redirect_url, "message": str(success_msg)})
+        messages.success(request, success_msg)
+        return redirect(redirect_url)
+
+
 def get_subscription_next_date(subscription):
     stripe_sub = subscription.stripe_subscription
     if stripe_sub:

squarelet/templates/subscriptions/manage_subscriptions.html

@@ -111,6 +111,15 @@ <h3 class="{% if subject == "organizations" %}organization{% else %}professional
                 {% icon "x-circle" %}
                 {% trans "Cancel plan" %}
               </a>
+            {% else %}
+              {% url subject|add:':resubscribe' subject_slug subscription.id as resubscribe_url %}
+              <form method="post" action="{{ resubscribe_url }}">
+                {% csrf_token %}
+                <button type="submit" class="btn ghost primary small">
+                  {% icon "arrow-loop" %}
+                  {% trans "Resubscribe" %}
+                </button>
+              </form>
             {% endif %}
           </div>
         </main>

squarelet/users/urls.py

@@ -60,6 +60,11 @@
         view=views.CancelSubscription.as_view(),
         name="cancel-subscription",
     ),
+    path(
+        "<str:username>/resubscribe/<int:pk>/",
+        view=views.Resubscribe.as_view(),
+        name="resubscribe",
+    ),
     path(
         "<str:username>/receipt-email/",
         view=views.UpdateReceiptEmail.as_view(),

squarelet/users/views.py

@@ -56,6 +56,7 @@
     BaseManageSubscriptions,
     BasePaymentsList,
     BaseRemoveCard,
+    BaseResubscribe,
     BaseUpdateCard,
     BaseUpdateReceiptEmail,
 )
@@ -693,6 +694,10 @@ class CancelSubscription(IndividualSubscriptionView, BaseCancelSubscription):
     pass
 
 
+class Resubscribe(IndividualSubscriptionView, BaseResubscribe):
+    pass
+
+
 class UpdateCard(IndividualSubscriptionView, BaseUpdateCard):
     pass