Add donor events to recurrence upgrade process

Author: stefanw

fragdenstaat_de/fds_donation/cms_plugins.py

@@ -19,6 +19,7 @@
     DonationGiftFormCMSPlugin,
     DonationProgressBarCMSPlugin,
     Donor,
+    DonorEvent,
     EmailDonationButtonCMSPlugin,
     RemoteDonationFormCMSPlugin,
     UpgradeRecurrenceFormCMSPlugin,
@@ -74,10 +75,21 @@ def render(self, context, instance, placeholder):
         context["next_url"] = instance.next_url or "/"
 
         if context["donor"]:
+            DonorEvent.objects.create(
+                donor=context["donor"],
+                reference=context["request"].GET.get("pk_campaign", ""),
+                kind=DonorEvent.Kind.PROMPT_UPGRADE_RECURRENCE,
+            )
             active_recurrence = context["donor"].get_current_recurrence()
-            if active_recurrence:
+            if active_recurrence and active_recurrence.should_upgrade(
+                instance.days_since
+            ):
                 context["form"] = RecurrenceUpgradeForm(
-                    recurrence=active_recurrence, choice_count=instance.choice_count
+                    recurrence=active_recurrence,
+                    choice_count=instance.choice_count,
+                    initial={
+                        "reference": context["request"].GET.get("pk_campaign", "")
+                    },
                 )
 
         return context

fragdenstaat_de/fds_donation/forms.py

@@ -7,6 +7,7 @@
 from django.conf import settings
 from django.contrib.admin.widgets import ForeignKeyRawIdWidget
 from django.core.validators import MinValueValidator
+from django.utils import timezone
 from django.utils.html import format_html
 from django.utils.translation import gettext_lazy as _
 
@@ -969,6 +970,8 @@ def send_login_link(self):
 
 
 class RecurrenceUpgradeForm(forms.Form):
+    reference = forms.CharField(widget=forms.HiddenInput, required=False)
+
     def __init__(self, recurrence=None, choice_count=3, *args, **kwargs):
         self.recurrence: Recurrence | None = recurrence
         super().__init__(*args, **kwargs)
@@ -1038,5 +1041,5 @@ def modify_subscription(self, subscription):
             interval=subscription.plan.interval,
         )
         if result:
-            self.recurrence.update_from_subscription()
+            self.recurrence.update_from_subscription(last_upgrade=timezone.now())
         return result

fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/upgrade_recurrence.html

@@ -11,6 +11,7 @@
               class="ajaxified ajax-parent">
             {% csrf_token %}
             <input type="hidden" name="next" value="{{ next_url }}" />
+            {{ form.reference }}
             {{ form.recurrence }}
             <label class="fw-bold" for="{{ form.upgrade_amount.auto_id }}">{{ form.upgrade_amount.label }}</label>
             <div class="row">
@@ -21,4 +22,11 @@
             </div>
         </form>
     </div>
+{% elif request.toolbar.edit_mode_active %}
+    <div style="outline: 1px solid red; min-height: 2rem">
+        {% for plugin in instance.child_plugin_instances %}
+            {% render_plugin plugin %}
+        {% endfor %}
+        <p>{{ instance }}</p>
+    </div>
 {% endif %}

fragdenstaat_de/fds_donation/views.py

@@ -30,7 +30,7 @@
     RecurrenceUpgradeForm,
     SimpleDonationForm,
 )
-from .models import DonationFormViewCount, Donor
+from .models import DonationFormViewCount, Donor, DonorEvent
 from .services import confirm_donor_email
 from .utils import (
     DONOR_SESSION_KEY,
@@ -114,7 +114,27 @@ def handle_upgrade(request) -> bool | None:
     form = RecurrenceUpgradeForm(recurrence=recurrence, data=request.POST)
     if not form.is_valid():
         return
-    return form.save()
+    previous_amount = recurrence.amount
+    previous_amount_per_month = recurrence.amount_per_month
+    result = form.save()
+    if result:
+        DonorEvent.objects.create(
+            donor=donor,
+            kind=DonorEvent.Kind.UPGRADE_RECURRENCE,
+            reference=form.cleaned_data["reference"],
+            context={
+                "previous_amount": float(previous_amount),
+                "previous_amount_decimal": str(previous_amount),
+                "previous_amount_per_month": float(previous_amount_per_month),
+                "previous_amount_per_month_decimal": str(previous_amount_per_month),
+                "new_amount": float(recurrence.amount),
+                "new_amount_decimal": str(recurrence.amount),
+                "new_amount_per_month": float(recurrence.amount_per_month),
+                "new_amount_per_month_decimal": str(recurrence.amount_per_month),
+                "request": dict(request.GET),
+            },
+        )
+    return result
 
 
 class DonationView(FormView):