Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

stripe: Skip invoice overdue mail for free plans with no next plan. 

Earlier, if a free plan (say legacy plan) with no next plan scheduled
was invoiced, we used to send an invoice overdue email if the last
audit log update is stale.

Actually, we don't need this data as the invoice step is just going
to downgrade the current plan. We should not wait for customer to
start uploading data in this case. Skip the email sending step and
invoice the plan to downgrade.
This commit is contained in:
Prakhar Pratyush 2024-03-28 17:29:15 +05:30 committed by Tim Abbott
parent 36b8462796
commit a0cec2c378
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
corporate/lib/stripe.py
View File

@ -4932,8 +4932,11 @@ def invoice_plans_as_needed(event_time: Optional[datetime] = None) -> None:
plan.reminder_to_review_plan_email_sent = True
plan.save(update_fields=["reminder_to_review_plan_email_sent"])
free_plan_with_no_next_plan = not plan.is_paid() and plan.status == CustomerPlan.ACTIVE
last_audit_log_update = remote_server.last_audit_log_update
if last_audit_log_update is None or plan.next_invoice_date > last_audit_log_update:
if not free_plan_with_no_next_plan and (
last_audit_log_update is None or plan.next_invoice_date > last_audit_log_update
):
if (
last_audit_log_update is None
or plan.next_invoice_date - last_audit_log_update >= timedelta(days=1)

20
corporate/tests/test_stripe.py
View File

@ -9079,11 +9079,14 @@ class TestRemoteServerBillingFlow(StripeTestCase, RemoteServerTestCase):
self.remote_server.plan_type, RemoteZulipServer.PLAN_TYPE_SELF_MANAGED_LEGACY
)
with mock.patch("stripe.Invoice.create") as invoice_create, time_machine.travel(
plan_end_date, tick=False
):
send_server_data_to_push_bouncer(consider_usage_statistics=False)
with mock.patch("stripe.Invoice.create") as invoice_create, mock.patch(
"corporate.lib.stripe.send_email"
) as send_email, time_machine.travel(plan_end_date, tick=False):
invoice_plans_as_needed()
# Verify that for legacy plan with no next plan scheduled,
# invoice overdue email is not sent even if the last audit log
# update was 3 months ago.
send_email.assert_not_called()
# The legacy plan is downgraded, no invoice created.
invoice_create.assert_not_called()
@ -9143,6 +9146,15 @@ class TestRemoteServerBillingFlow(StripeTestCase, RemoteServerTestCase):
)
licenses = max(min_licenses, server_user_count)
with mock.patch("stripe.Invoice.create") as invoice_create, mock.patch(
"corporate.lib.stripe.send_email"
) as send_email, time_machine.travel(end_date, tick=False):
invoice_plans_as_needed()
# Verify that for legacy plan with next plan scheduled, invoice
# overdue email is sent if the last audit log is stale.
send_email.assert_called()
invoice_create.assert_not_called()
with time_machine.travel(end_date, tick=False):
send_server_data_to_push_bouncer(consider_usage_statistics=False)
invoice_plans_as_needed()