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

initial_upgrade: Rename to upgrade_page.

Browse Source 
Replaced for "(initial_upgrade)", " initial_upgrade"
`'initial_upgrade'` and `"initial_upgrade"`.
This commit is contained in:
Aman Agrawal
2023-11-23 08:31:46 +00:00
committed by Tim Abbott
parent 1089e13529
commit f006be0cdf
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
corporate/lib/stripe.py
View File

@@ -2384,7 +2384,7 @@ def downgrade_small_realms_behind_on_payments_as_needed() -> None:
billing_session.downgrade_now_without_creating_additional_invoices() billing_session.downgrade_now_without_creating_additional_invoices()
void_all_open_invoices(realm) void_all_open_invoices(realm)
context: Dict[str, Union[str, Realm]] = { context: Dict[str, Union[str, Realm]] = {
"upgrade_url": f"{realm.uri}{reverse('initial_upgrade')}", "upgrade_url": f"{realm.uri}{reverse('upgrade_page')}",
"realm": realm, "realm": realm,
} }
send_email_to_billing_admins_and_realm_owners( send_email_to_billing_admins_and_realm_owners(

4
corporate/urls.py
View File

@@ -27,7 +27,7 @@ from corporate.views.session import (
start_card_update_stripe_session_for_realm_upgrade, start_card_update_stripe_session_for_realm_upgrade,
) )
from corporate.views.support import support_request from corporate.views.support import support_request
from corporate.views.upgrade import initial_upgrade, sponsorship, upgrade from corporate.views.upgrade import sponsorship, upgrade, upgrade_page
from corporate.views.webhook import stripe_webhook from corporate.views.webhook import stripe_webhook
from zerver.lib.rest import rest_path from zerver.lib.rest import rest_path
from zerver.lib.url_redirects import LANDING_PAGE_REDIRECTS from zerver.lib.url_redirects import LANDING_PAGE_REDIRECTS
@@ -40,7 +40,7 @@ i18n_urlpatterns: Any = [
# Billing # Billing
path("billing/", billing_home, name="billing_home"), path("billing/", billing_home, name="billing_home"),
path("sponsorship/", sponsorship_request, name="sponsorship_request"), path("sponsorship/", sponsorship_request, name="sponsorship_request"),
path("upgrade/", initial_upgrade, name="initial_upgrade"), path("upgrade/", upgrade_page, name="upgrade_page"),
path("support/", support_request), path("support/", support_request),
path("billing/event_status/", event_status_page, name="event_status_page"), path("billing/event_status/", event_status_page, name="event_status_page"),
path("stripe/webhook/", stripe_webhook, name="stripe_webhook"), path("stripe/webhook/", stripe_webhook, name="stripe_webhook"),

8
corporate/views/billing_page.py
View File

@@ -105,14 +105,14 @@ def billing_home(
return HttpResponseRedirect(reverse("plans")) return HttpResponseRedirect(reverse("plans"))
if customer is None: if customer is None:
from corporate.views.upgrade import initial_upgrade from corporate.views.upgrade import upgrade_page
return HttpResponseRedirect(reverse(initial_upgrade)) return HttpResponseRedirect(reverse(upgrade_page))
if not CustomerPlan.objects.filter(customer=customer).exists(): if not CustomerPlan.objects.filter(customer=customer).exists():
from corporate.views.upgrade import initial_upgrade from corporate.views.upgrade import upgrade_page
return HttpResponseRedirect(reverse(initial_upgrade)) return HttpResponseRedirect(reverse(upgrade_page))
billing_session = RealmBillingSession(user=None, realm=user.realm) billing_session = RealmBillingSession(user=None, realm=user.realm)
main_context = billing_session.get_billing_page_context() main_context = billing_session.get_billing_page_context()

2
corporate/views/upgrade.py
View File

@@ -78,7 +78,7 @@ def upgrade(
@zulip_login_required @zulip_login_required
@has_request_variables @has_request_variables
def initial_upgrade( def upgrade_page(
request: HttpRequest, request: HttpRequest,
manual_license_management: bool = REQ(default=False, json_validator=check_bool), manual_license_management: bool = REQ(default=False, json_validator=check_bool),
) -> HttpResponse: ) -> HttpResponse:

2
zerver/views/auth.py
View File

@@ -394,7 +394,7 @@ def login_or_register_remote_user(request: HttpRequest, result: ExternalAuthResu
from corporate.lib.stripe import is_free_trial_offer_enabled from corporate.lib.stripe import is_free_trial_offer_enabled
if is_free_trial_offer_enabled(): if is_free_trial_offer_enabled():
redirect_to = reverse("initial_upgrade") redirect_to = reverse("upgrade_page")
redirect_to = get_safe_redirect_to(redirect_to, user_profile.realm.uri) redirect_to = get_safe_redirect_to(redirect_to, user_profile.realm.uri)
return HttpResponseRedirect(redirect_to) return HttpResponseRedirect(redirect_to)