paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-24 16:43:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

sponsorship: Remove free_trial from sponsorship page context.

Browse Source 
Being on a free trial also means that the billing entity is on a
paid plan.

If they are on a sponsored plan, then they are not on a free trial.
If they have a pending sponsorship request, then they will be
redirected to the billing page. Otherwise, they will be shown the
form to request a sponsored/discounted plan, which does not use
the free_trial boolean.
This commit is contained in:
Lauryn Menard
2024-12-10 18:03:46 +01:00
committed by Tim Abbott
parent 93c10fccb4
commit 18686e06bb
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
corporate/lib/stripe.py
View File

@@ -3415,7 +3415,6 @@ class BillingSession(ABC):
plan = get_current_plan_by_customer(customer) plan = get_current_plan_by_customer(customer)
if plan is not None: if plan is not None:
context["plan_name"] = plan.name context["plan_name"] = plan.name
context["free_trial"] = plan.is_free_trial()
context["is_server_on_legacy_plan"] = ( context["is_server_on_legacy_plan"] = (
plan.tier == CustomerPlan.TIER_SELF_HOSTED_LEGACY plan.tier == CustomerPlan.TIER_SELF_HOSTED_LEGACY
) )

2
templates/corporate/billing/sponsorship.html
View File

@@ -54,8 +54,6 @@
<div id="sponsored-org-current-plan" class="not-editable-realm-field"> <div id="sponsored-org-current-plan" class="not-editable-realm-field">
{% if is_sponsored %} {% if is_sponsored %}
<a href="{{ billing_base_url }}/plans/">{{ sponsorship_plan_name }}</a> <a href="{{ billing_base_url }}/plans/">{{ sponsorship_plan_name }}</a>
{% elif free_trial %}
<a href="{{ billing_base_url }}/plans/">{{ plan_name }}</a> <i>(free trial)</i>
{% elif is_server_on_legacy_plan %} {% elif is_server_on_legacy_plan %}
<a href="{{ billing_base_url }}/plans/">{{ plan_name.replace(" (legacy plan)", "") }}</a> <i>(legacy plan)</i> <a href="{{ billing_base_url }}/plans/">{{ plan_name.replace(" (legacy plan)", "") }}</a> <i>(legacy plan)</i>
{% else %} {% else %}