paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

corporate: Update self-hosted complimentary access plan name.

Browse Source 
Updates the name for the self-hosted complimentary access plan
to "Zulip Basic (complimentary)" instead of "Free (legacy plan)".

Since these plans are never billed in Stripe, we don't need to
hold to the 22 character limit for the plan name.
This commit is contained in:
Lauryn Menard
2025-01-13 21:09:35 +01:00
committed by Tim Abbott
parent 261333c37f
commit 8d638363da
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
corporate/models.py
View File

@@ -451,10 +451,12 @@ class CustomerPlan(AbstractCustomerPlan):
CustomerPlan.TIER_CLOUD_STANDARD: "Zulip Cloud Standard",
CustomerPlan.TIER_CLOUD_PLUS: "Zulip Cloud Plus",
CustomerPlan.TIER_CLOUD_ENTERPRISE: "Zulip Enterprise",
CustomerPlan.TIER_SELF_HOSTED_LEGACY: "Free (legacy plan)",
CustomerPlan.TIER_SELF_HOSTED_BASIC: "Zulip Basic",
CustomerPlan.TIER_SELF_HOSTED_BUSINESS: "Zulip Business",
CustomerPlan.TIER_SELF_HOSTED_COMMUNITY: "Community",
# Complimentary access plans should never be billed through Stripe,
# so the tier name can exceed the 22 character limit noted above.
CustomerPlan.TIER_SELF_HOSTED_LEGACY: "Zulip Basic (complimentary)",
}[tier]
@property

12
corporate/tests/test_support_views.py
View File

@@ -286,11 +286,11 @@ class TestRemoteServerSupportEndpoint(ZulipTestCase):
result,
)
def check_legacy_plan_with_upgrade(result: "TestHttpResponse") -> None:
def check_complimentary_access_plan_with_upgrade(result: "TestHttpResponse") -> None:
self.assert_in_success_response(
[
"Current plan information:",
"<b>Plan name</b>: Free (legacy plan)<br />",
"<b>Plan name</b>: Zulip Basic (complimentary)<br />",
"<b>Status</b>: New plan scheduled<br />",
"<b>End date</b>: 01 February 2050<br />",
"⏱️ Next plan information:",
@@ -305,11 +305,11 @@ class TestRemoteServerSupportEndpoint(ZulipTestCase):
result,
)
def check_legacy_plan_without_upgrade(result: "TestHttpResponse") -> None:
def check_complimentary_access_plan_without_upgrade(result: "TestHttpResponse") -> None:
self.assert_in_success_response(
[
"Current plan information:",
"<b>Plan name</b>: Free (legacy plan)<br />",
"<b>Plan name</b>: Zulip Basic (complimentary)<br />",
"<b>Status</b>: Active<br />",
"<b>End date</b>: 01 February 2050<br />",
],
@@ -414,14 +414,14 @@ class TestRemoteServerSupportEndpoint(ZulipTestCase):
assert_server_details_in_response(result, f"zulip-{server}.example.com")
assert_realm_details_in_response(result, f"realm-name-{server}", f"realm-host-{server}")
check_no_sponsorship_request(result)
check_legacy_plan_with_upgrade(result)
check_complimentary_access_plan_with_upgrade(result)
server = 5
result = self.client_get("/activity/remote/support", {"q": f"zulip-{server}.example.com"})
assert_server_details_in_response(result, f"zulip-{server}.example.com")
assert_realm_details_in_response(result, f"realm-name-{server}", f"realm-host-{server}")
check_no_sponsorship_request(result)
check_legacy_plan_without_upgrade(result)
check_complimentary_access_plan_without_upgrade(result)
# search for UUIDs
remote_server = RemoteZulipServer.objects.get(hostname=f"zulip-{server}.example.com")

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

@@ -50,7 +50,7 @@
</a>
{% elif complimentary_access_plan %}
<a href="{{ billing_base_url }}/plans/">
Zulip Basic
{{ plan_name.replace(" (complimentary)", "") -}}
</a>
<i>(complimentary access)</i>
{% else %}