Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

billing: Refactor initial_upgrade to use REQ.

This commit is contained in:
PIG208 2021-07-30 01:01:59 +08:00 committed by Tim Abbott
parent 6a61dc2de2
commit bf86649f4d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
corporate/views/upgrade.py
View File

@ -36,7 +36,7 @@ from zerver.lib.actions import do_make_user_billing_admin
from zerver.lib.request import REQ, has_request_variables from zerver.lib.request import REQ, has_request_variables
from zerver.lib.response import json_success from zerver.lib.response import json_success
from zerver.lib.send_email import FromAddress, send_email from zerver.lib.send_email import FromAddress, send_email
from zerver.lib.validator import check_int, check_string_in from zerver.lib.validator import check_bool, check_int, check_string_in
from zerver.models import Realm, UserProfile, get_org_type_display_name, get_realm from zerver.models import Realm, UserProfile, get_org_type_display_name, get_realm
billing_logger = logging.getLogger("corporate.stripe") billing_logger = logging.getLogger("corporate.stripe")
@ -141,7 +141,10 @@ def upgrade(
@zulip_login_required @zulip_login_required
def initial_upgrade(request: HttpRequest) -> HttpResponse: @has_request_variables
def initial_upgrade(
request: HttpRequest, onboarding: bool = REQ(default=False, json_validator=check_bool)
) -> HttpResponse:
user = request.user user = request.user
assert user.is_authenticated assert user.is_authenticated
@ -154,7 +157,7 @@ def initial_upgrade(request: HttpRequest) -> HttpResponse:
if customer is not None and ( if customer is not None and (
get_current_plan_by_customer(customer) is not None or customer.sponsorship_pending get_current_plan_by_customer(customer) is not None or customer.sponsorship_pending
): ):
if request.GET.get("onboarding") is not None: if onboarding:
billing_page_url = f"{billing_page_url}?onboarding=true" billing_page_url = f"{billing_page_url}?onboarding=true"
return HttpResponseRedirect(billing_page_url) return HttpResponseRedirect(billing_page_url)
@ -178,7 +181,7 @@ def initial_upgrade(request: HttpRequest) -> HttpResponse:
"default_invoice_days_until_due": DEFAULT_INVOICE_DAYS_UNTIL_DUE, "default_invoice_days_until_due": DEFAULT_INVOICE_DAYS_UNTIL_DUE,
"plan": "Zulip Standard", "plan": "Zulip Standard",
"free_trial_days": settings.FREE_TRIAL_DAYS, "free_trial_days": settings.FREE_TRIAL_DAYS,
"onboarding": request.GET.get("onboarding") is not None, "onboarding": onboarding,
"page_params": { "page_params": {
"seat_count": seat_count, "seat_count": seat_count,
"annual_price": 8000, "annual_price": 8000,