paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

stripe: Rename remote_server_legacy_plan param in initial upgrade.

Browse Source 
Renames the remote_server_legacy_plan parameter in
process_initial_upgrade to instead be complimentary_access_plan,
as well as some relevant code comments in that function.
This commit is contained in:
Lauryn Menard
2024-12-13 19:49:49 +01:00
committed by Tim Abbott
parent 7a0626aede
commit 1f2f0af257
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
corporate/lib/stripe.py
View File

@@ -1782,7 +1782,7 @@ class BillingSession(ABC):
billing_schedule: int, billing_schedule: int,
charge_automatically: bool, charge_automatically: bool,
free_trial: bool, free_trial: bool,
remote_server_legacy_plan: CustomerPlan | None = None, complimentary_access_plan: CustomerPlan | None = None,
should_schedule_upgrade_for_legacy_remote_server: bool = False, should_schedule_upgrade_for_legacy_remote_server: bool = False,
stripe_invoice_paid: bool = False, stripe_invoice_paid: bool = False,
) -> None: ) -> None:
@@ -1794,12 +1794,13 @@ class BillingSession(ABC):
self.ensure_current_plan_is_upgradable(customer, plan_tier) self.ensure_current_plan_is_upgradable(customer, plan_tier)
billing_cycle_anchor = None billing_cycle_anchor = None
if remote_server_legacy_plan is not None: if complimentary_access_plan is not None:
# Legacy servers don't get an additional free trial. # Customers on a complimentary access plan don't get
# an additional free trial.
free_trial = False free_trial = False
if should_schedule_upgrade_for_legacy_remote_server: if should_schedule_upgrade_for_legacy_remote_server:
assert remote_server_legacy_plan is not None assert complimentary_access_plan is not None
billing_cycle_anchor = remote_server_legacy_plan.end_date billing_cycle_anchor = complimentary_access_plan.end_date
fixed_price_plan_offer = get_configured_fixed_price_plan_offer(customer, plan_tier) fixed_price_plan_offer = get_configured_fixed_price_plan_offer(customer, plan_tier)
if fixed_price_plan_offer is not None: if fixed_price_plan_offer is not None:
@@ -1867,14 +1868,14 @@ class BillingSession(ABC):
event_time = billing_cycle_anchor event_time = billing_cycle_anchor
if should_schedule_upgrade_for_legacy_remote_server: if should_schedule_upgrade_for_legacy_remote_server:
# In this code path, we are currently on a legacy plan # In this code path, the customer is currently on a
# and are scheduling an upgrade to a non-legacy plan # complimentary access plan and is scheduling an
# that should occur when the legacy plan expires. # upgrade to a paid plan, which should occur when
# the complimentary access plan ends.
# #
# We will create a new NEVER_STARTED plan for the # A new NEVER_STARTED plan for the customer is created,
# customer, scheduled to start when the current one # and scheduled to start when the current one ends.
# expires. assert complimentary_access_plan is not None
assert remote_server_legacy_plan is not None
if charge_automatically: if charge_automatically:
# Ensure customers not paying via invoice have a default payment method set. # Ensure customers not paying via invoice have a default payment method set.
assert customer.stripe_customer_id is not None # for mypy assert customer.stripe_customer_id is not None # for mypy
@@ -1897,9 +1898,9 @@ class BillingSession(ABC):
event_time = timezone_now().replace(microsecond=0) event_time = timezone_now().replace(microsecond=0)
# Schedule switching to the new plan at plan end date. # Schedule switching to the new plan at plan end date.
assert remote_server_legacy_plan.end_date == billing_cycle_anchor assert complimentary_access_plan.end_date == billing_cycle_anchor
last_ledger_entry = ( last_ledger_entry = (
LicenseLedger.objects.filter(plan=remote_server_legacy_plan) LicenseLedger.objects.filter(plan=complimentary_access_plan)
.order_by("-id") .order_by("-id")
.first() .first()
) )
@@ -1907,11 +1908,14 @@ class BillingSession(ABC):
assert last_ledger_entry is not None assert last_ledger_entry is not None
last_ledger_entry.licenses_at_next_renewal = billable_licenses last_ledger_entry.licenses_at_next_renewal = billable_licenses
last_ledger_entry.save(update_fields=["licenses_at_next_renewal"]) last_ledger_entry.save(update_fields=["licenses_at_next_renewal"])
remote_server_legacy_plan.status = CustomerPlan.SWITCH_PLAN_TIER_AT_PLAN_END complimentary_access_plan.status = CustomerPlan.SWITCH_PLAN_TIER_AT_PLAN_END
remote_server_legacy_plan.save(update_fields=["status"]) complimentary_access_plan.save(update_fields=["status"])
elif remote_server_legacy_plan is not None: # nocoverage elif complimentary_access_plan is not None: # nocoverage
remote_server_legacy_plan.status = CustomerPlan.ENDED # In this code path, the customer is currently on a
remote_server_legacy_plan.save(update_fields=["status"]) # complimentary access plan, and has chosen to upgrade
# to a paid plan immediately.
complimentary_access_plan.status = CustomerPlan.ENDED
complimentary_access_plan.save(update_fields=["status"])
if fixed_price_plan_offer is not None: if fixed_price_plan_offer is not None:
# Manual license management is not available for fixed price plan. # Manual license management is not available for fixed price plan.

6
corporate/lib/stripe_event_handler.py
View File

@@ -153,7 +153,7 @@ def handle_invoice_paid_event(stripe_invoice: stripe.Invoice, invoice: Invoice)
billing_schedule=CustomerPlan.BILLING_SCHEDULE_ANNUAL, billing_schedule=CustomerPlan.BILLING_SCHEDULE_ANNUAL,
charge_automatically=False, charge_automatically=False,
free_trial=False, free_trial=False,
remote_server_legacy_plan=complimentary_access_plan, complimentary_access_plan=complimentary_access_plan,
stripe_invoice_paid=True, stripe_invoice_paid=True,
) )
else: else:
@@ -183,7 +183,7 @@ def handle_invoice_paid_event(stripe_invoice: stripe.Invoice, invoice: Invoice)
billing_schedule=billing_schedule, billing_schedule=billing_schedule,
charge_automatically=charge_automatically, charge_automatically=charge_automatically,
free_trial=False, free_trial=False,
remote_server_legacy_plan=complimentary_access_plan, complimentary_access_plan=complimentary_access_plan,
stripe_invoice_paid=True, stripe_invoice_paid=True,
) )
return return
@@ -207,6 +207,6 @@ def handle_invoice_paid_event(stripe_invoice: stripe.Invoice, invoice: Invoice)
billing_schedule=billing_schedule, billing_schedule=billing_schedule,
charge_automatically=charge_automatically, charge_automatically=charge_automatically,
free_trial=False, free_trial=False,
remote_server_legacy_plan=complimentary_access_plan, complimentary_access_plan=complimentary_access_plan,
stripe_invoice_paid=True, stripe_invoice_paid=True,
) )