mirror of
https://github.com/zulip/zulip.git
synced 2025-11-04 22:13:26 +00:00
remote_billing: Make "plan management" always available.
Just shows a config error page if the bouncer is not enabled. Uses a new endpoint for this so that it can work nicely for both browser and desktop app clients. It's necessary, because the desktop app expects to get a json response with either an error or billing_access_url to redirect to. Showing a nice config error page can't be done via the json error mechanism, so instead we just serve a redirect to the new error page, which the app will open in the browser in a new window or tab.
This commit is contained in:
committed by
Tim Abbott
parent
d5fb3f3176
commit
e39f400f94
@@ -16,7 +16,6 @@ from zerver.lib.i18n import (
|
||||
get_language_translation_data,
|
||||
)
|
||||
from zerver.lib.narrow_helpers import NarrowTerm
|
||||
from zerver.lib.push_notifications import uses_notification_bouncer
|
||||
from zerver.lib.realm_description import get_realm_rendered_description
|
||||
from zerver.lib.request import RequestNotes
|
||||
from zerver.models import Message, Realm, Stream, UserProfile
|
||||
@@ -82,8 +81,13 @@ def get_billing_info(user_profile: Optional[UserProfile]) -> BillingInfo:
|
||||
show_billing = False
|
||||
show_plans = False
|
||||
sponsorship_pending = False
|
||||
|
||||
# We want to always show the remote billing option as long as the user is authorized,
|
||||
# except on zulipchat.com where it's not applicable.
|
||||
show_remote_billing = (
|
||||
user_profile is not None and user_profile.has_billing_access and uses_notification_bouncer()
|
||||
(not settings.CORPORATE_ENABLED)
|
||||
and user_profile is not None
|
||||
and user_profile.has_billing_access
|
||||
)
|
||||
|
||||
# This query runs on home page load, so we want to avoid
|
||||
|
||||
Reference in New Issue
Block a user