From f006be0cdf5d68dc6f074d58dbe96d627386c240 Mon Sep 17 00:00:00 2001 From: Aman Agrawal Date: Thu, 23 Nov 2023 08:31:46 +0000 Subject: [PATCH] initial_upgrade: Rename to upgrade_page. Replaced for "(initial_upgrade)", " initial_upgrade" `'initial_upgrade'` and `"initial_upgrade"`. --- corporate/lib/stripe.py | 2 +- corporate/urls.py | 4 ++-- corporate/views/billing_page.py | 8 ++++---- corporate/views/upgrade.py | 2 +- zerver/views/auth.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/corporate/lib/stripe.py b/corporate/lib/stripe.py index f0592e606b..401617e88c 100644 --- a/corporate/lib/stripe.py +++ b/corporate/lib/stripe.py @@ -2384,7 +2384,7 @@ def downgrade_small_realms_behind_on_payments_as_needed() -> None: billing_session.downgrade_now_without_creating_additional_invoices() void_all_open_invoices(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, } send_email_to_billing_admins_and_realm_owners( diff --git a/corporate/urls.py b/corporate/urls.py index c76bdd0902..5ba8cc366e 100644 --- a/corporate/urls.py +++ b/corporate/urls.py @@ -27,7 +27,7 @@ from corporate.views.session import ( start_card_update_stripe_session_for_realm_upgrade, ) 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 zerver.lib.rest import rest_path from zerver.lib.url_redirects import LANDING_PAGE_REDIRECTS @@ -40,7 +40,7 @@ i18n_urlpatterns: Any = [ # Billing path("billing/", billing_home, name="billing_home"), 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("billing/event_status/", event_status_page, name="event_status_page"), path("stripe/webhook/", stripe_webhook, name="stripe_webhook"), diff --git a/corporate/views/billing_page.py b/corporate/views/billing_page.py index 6a23770052..dff65ebbe0 100644 --- a/corporate/views/billing_page.py +++ b/corporate/views/billing_page.py @@ -105,14 +105,14 @@ def billing_home( return HttpResponseRedirect(reverse("plans")) 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(): - 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) main_context = billing_session.get_billing_page_context() diff --git a/corporate/views/upgrade.py b/corporate/views/upgrade.py index 55f68124d6..53a6dba4bd 100644 --- a/corporate/views/upgrade.py +++ b/corporate/views/upgrade.py @@ -78,7 +78,7 @@ def upgrade( @zulip_login_required @has_request_variables -def initial_upgrade( +def upgrade_page( request: HttpRequest, manual_license_management: bool = REQ(default=False, json_validator=check_bool), ) -> HttpResponse: diff --git a/zerver/views/auth.py b/zerver/views/auth.py index 0d5b53898a..46ae4439c3 100644 --- a/zerver/views/auth.py +++ b/zerver/views/auth.py @@ -394,7 +394,7 @@ def login_or_register_remote_user(request: HttpRequest, result: ExternalAuthResu from corporate.lib.stripe import 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) return HttpResponseRedirect(redirect_to)