paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 17:07:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

upgrade: Fix allowed free trails for ended legacy plans on server.

Browse Source 
If the remote realm registered after the legacy plan on server
ENDED, we never migrate the plan to the remote realm. So, we need
to check the server of remote realm whenever we are check remote
realm for legacy plan.
This commit is contained in:
Aman Agrawal
2024-03-15 02:03:11 +00:00
committed by Tim Abbott
parent ef5cdff9d9
commit e10f81197f
4 changed files with 114 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
corporate/lib/stripe.py
View File

@@ -51,7 +51,6 @@ from corporate.models import (
get_customer_by_realm,
get_customer_by_remote_realm,
get_customer_by_remote_server,
is_legacy_customer,
)
from zerver.lib.exceptions import JsonableError
from zerver.lib.logging_util import log_to_file
@@ -761,6 +760,32 @@ class BillingSession(ABC):
def org_name(self) -> str:
pass
def is_legacy_customer(self) -> bool:
if isinstance(self, RealmBillingSession):
return False
customers_to_check = []
if isinstance(self, RemoteRealmBillingSession):
customer = self.get_customer()
if customer is not None:
customers_to_check.append(customer)
# Also, check if server for a remote realm was ever on a legacy plan.
# We don't migrate ENDED legacy plans from server to remote realm, so we can end
# in this state if the first time they registered with us was after the legacy plan.
server_customer = get_customer_by_remote_server(self.remote_realm.server)
if server_customer is not None:
customers_to_check.append(server_customer)
if isinstance(self, RemoteServerBillingSession):
customer = self.get_customer()
if customer is not None:
customers_to_check.append(customer)
return CustomerPlan.objects.filter(
customer__in=customers_to_check, tier=CustomerPlan.TIER_SELF_HOSTED_LEGACY
).exists()
def get_past_invoices_session_url(self) -> str:
headline = "List of past invoices"
customer = self.get_customer()
@@ -1860,9 +1885,9 @@ class BillingSession(ABC):
if fixed_price_plan_offer is not None:
free_trial = False
if is_legacy_customer(customer):
# Free trial is not available for legacy customers.
free_trial = False
if self.is_legacy_customer():
# Free trial is not available for legacy customers.
free_trial = False
remote_server_legacy_plan = self.get_remote_server_legacy_plan(customer)
should_schedule_upgrade_for_legacy_remote_server = (
@@ -2454,7 +2479,7 @@ class BillingSession(ABC):
is_self_hosted_billing = not isinstance(self, RealmBillingSession)
if fixed_price is None and remote_server_legacy_plan_end_date is None:
free_trial_days = get_free_trial_days(is_self_hosted_billing, tier)
if customer is not None and is_legacy_customer(customer):
if self.is_legacy_customer():
# Free trial is not available for legacy customers.
free_trial_days = None
if free_trial_days is not None: