Skip to content

Commit c39e1e8

Browse files
committed
Update incomplete donation reminder email
Only use donor donate URL as payment session may be expired.
1 parent d9ac902 commit c39e1e8

1 file changed

Lines changed: 13 additions & 7 deletions

File tree

fragdenstaat_de/fds_donation/services.py

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from froide.account.services import AccountService
1717
from froide.helper.auth import is_crew
1818
from froide.helper.email_sending import mail_registry
19+
from froide.helper.utils import update_query_params
1920

2021
from fragdenstaat_de.fds_newsletter.utils import subscribe_to_default_newsletter
2122

@@ -107,10 +108,7 @@
107108
"salutation",
108109
"donor",
109110
"donation",
110-
"payment",
111-
"order",
112111
"donate_url",
113-
"payment_url",
114112
),
115113
)
116114

@@ -621,17 +619,25 @@ def send_incomplete_donation_reminder(donation):
621619
if not donor.email:
622620
return
623621

622+
params = {
623+
"initial_amount": str(donation.amount),
624+
}
625+
if donation.payment and donation.payment.order:
626+
if donation.payment.order.subscription:
627+
params["initial_interval"] = str(
628+
donation.payment.order.subscription.plan.interval
629+
)
630+
631+
donate_url = update_query_params(donor.get_donate_url(), params)
632+
624633
context = {
625634
"name": donor.get_full_name(),
626635
"first_name": donor.first_name,
627636
"last_name": donor.last_name,
628637
"salutation": donor.get_salutation(),
629-
"payment": donation.payment,
630-
"order": donation.payment.order if donation.payment else None,
631638
"donor": donor,
632639
"donation": donation,
633-
"donate_url": donor.get_donate_url(),
634-
"payment_url": settings.SITE_URL + donation.payment.get_absolute_payment_url(),
640+
"donate_url": donate_url,
635641
}
636642

637643
incomplete_donation_reminder_email.send(

0 commit comments

Comments
 (0)