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

billing: Move billing related templates from zilencer to corporate.

This commit is contained in:
Vishnu Ks 2018-09-25 16:00:17 +05:30 committed by Rishi Gupta
parent 6914ee126c
commit daf3b46262
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
corporate/views.py
View File

@ -82,7 +82,7 @@ def initial_upgrade(request: HttpRequest) -> HttpResponse:
'cloud_annual_price': 80, 'cloud_annual_price': 80,
'cloud_annual_price_per_month': 6.67, 'cloud_annual_price_per_month': 6.67,
} # type: Dict[str, Any] } # type: Dict[str, Any]
response = render(request, 'zilencer/upgrade.html', context=context) response = render(request, 'corporate/upgrade.html', context=context)
response['error_description'] = error_description response['error_description'] = error_description
return response return response
@ -102,7 +102,7 @@ def billing_home(request: HttpRequest) -> HttpResponse:
if not user.is_realm_admin and not user.is_billing_admin: if not user.is_realm_admin and not user.is_billing_admin:
context = {'admin_access': False} # type: Dict[str, Any] context = {'admin_access': False} # type: Dict[str, Any]
return render(request, 'zilencer/billing.html', context=context) return render(request, 'corporate/billing.html', context=context)
context = {'admin_access': True} context = {'admin_access': True}
stripe_customer = stripe_get_customer(customer.stripe_customer_id) stripe_customer = stripe_get_customer(customer.stripe_customer_id)
@ -147,7 +147,7 @@ def billing_home(request: HttpRequest) -> HttpResponse:
'stripe_email': stripe_customer.email, 'stripe_email': stripe_customer.email,
}) })
return render(request, 'zilencer/billing.html', context=context) return render(request, 'corporate/billing.html', context=context)
def downgrade(request: HttpRequest, user: UserProfile) -> HttpResponse: def downgrade(request: HttpRequest, user: UserProfile) -> HttpResponse:
if not user.is_realm_admin and not user.is_billing_admin: if not user.is_realm_admin and not user.is_billing_admin:

0
templates/zilencer/billing.html → templates/corporate/billing.html
View File

0
templates/zilencer/upgrade.html → templates/corporate/upgrade.html
View File

6
tools/linter_lib/custom_check.py
View File

@ -626,8 +626,8 @@ def build_custom_checkers(by_lang):
'bad_lines': ['<button aria-label="foo"></button>']}, 'bad_lines': ['<button aria-label="foo"></button>']},
{'pattern': 'script src="http', {'pattern': 'script src="http',
'description': "Don't directly load dependencies from CDNs. See docs/subsystems/front-end-build-process.md", 'description': "Don't directly load dependencies from CDNs. See docs/subsystems/front-end-build-process.md",
'exclude': set(["templates/zilencer/billing.html", "templates/zerver/hello.html", 'exclude': set(["templates/corporate/billing.html", "templates/zerver/hello.html",
"templates/zilencer/upgrade.html"]), "templates/corporate/upgrade.html"]),
'good_lines': ["{{ render_bundle('landing-page') }}"], 'good_lines': ["{{ render_bundle('landing-page') }}"],
'bad_lines': ['<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>']}, 'bad_lines': ['<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>']},
{'pattern': "title='[^{]", {'pattern': "title='[^{]",
@ -701,7 +701,7 @@ def build_custom_checkers(by_lang):
'templates/zerver/app/home.html', 'templates/zerver/app/home.html',
'templates/zerver/features.html', 'templates/zerver/features.html',
'templates/zerver/portico-header.html', 'templates/zerver/portico-header.html',
'templates/zilencer/billing.html', 'templates/corporate/billing.html',
# Miscellaneous violations to be cleaned up # Miscellaneous violations to be cleaned up
'static/templates/user_info_popover_title.handlebars', 'static/templates/user_info_popover_title.handlebars',