alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3834 from overleaf/tm-meta-tags-billing

Browse Source 
[views] migrate subscription templates to meta tags

GitOrigin-RevId: 4e81e81380048436a011467c230cc54c02e0c423
This commit is contained in:
Jessica Lawshe
2021-04-09 02:05:29 +00:00
committed by Copybot
parent 5220198991
commit e697064f16
10 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/views/subscriptions/dashboard.pug
+6
View File
@@ -2,6 +2,12 @@ extends ../layout
include ./dashboard/_team_name_mixin
block append meta
if (personalSubscription)
meta(name="ol-recurlyApiKey" content=settings.apis.recurly.publicKey)
meta(name="ol-subscription" data-type="json" content=personalSubscription)
meta(name="ol-recomendedCurrency" content=personalSubscription.recurly.currency)
block head-scripts
script(type="text/javascript", nonce=scriptNonce, src="https://js.recurly.com/v4/recurly.js")
services/web/app/views/subscriptions/dashboard/_personal_subscription_recurly.pug
-5
View File
@@ -1,8 +1,3 @@
script(type="text/javascript", nonce=scriptNonce).
window.recurlyApiKey = "!{settings.apis.recurly.publicKey}"
window.subscription = !{StringHelper.stringifyJsonForScript(personalSubscription)}
window.recomendedCurrency = "#{personalSubscription.recurly.currency}"
div(ng-controller="RecurlySubscriptionController")
div(ng-show="!showCancellation")
if (personalSubscription.recurly.account.has_past_due_invoice && personalSubscription.recurly.account.has_past_due_invoice._ == 'true')
services/web/app/views/subscriptions/new.pug
+5 -4
View File
@@ -1,11 +1,12 @@
extends ../layout
block append meta
meta(name="ol-countryCode" content=countryCode)
meta(name="ol-recurlyApiKey" content=settings.apis.recurly.publicKey)
meta(name="ol-recomendedCurrency" content=String(currency).slice(0,3))
block head-scripts
script(type="text/javascript", nonce=scriptNonce, src="https://js.recurly.com/v4/recurly.js")
script(type="text/javascript", nonce=scriptNonce).
window.countryCode = !{StringHelper.stringifyJsonForScript(countryCode || '')}
window.recurlyApiKey = "!{settings.apis.recurly.publicKey}"
window.recomendedCurrency = !{StringHelper.stringifyJsonForScript(String(currency).slice(0,3))}
block content
main.content.content-alt
services/web/app/views/subscriptions/plans.pug
+3 -5
View File
@@ -6,11 +6,9 @@ include _plans_page_tables
block vars
- metadata = { viewport: true }
block head-scripts
script(type="text/javascript", nonce=scriptNonce).
window.recomendedCurrency = '#{recomendedCurrency}';
window.abCurrencyFlag = '#{abCurrencyFlag}';
window.groupPlans = !{StringHelper.stringifyJsonForScript(groupPlans)};
block append meta
meta(name="ol-recomendedCurrency" content=recomendedCurrency)
meta(name="ol-groupPlans" data-type="json" content=groupPlans)
block content
.content.content-alt
services/web/app/views/subscriptions/successful_subscription.pug
-6
View File
@@ -28,9 +28,3 @@ block content
| The #{settings.appName} Team
p
a.btn.btn-primary(href="/project") < #{translate("back_to_your_projects")}
script(type="text/javascript", nonce=scriptNonce).
window.ab = [
{step:1, bucket:"student_control", testName:"editor_plan"},
{step:1, bucket:"collab_test", testName:"editor_plan"},
]
services/web/app/views/subscriptions/team/invite.pug
+3 -5
View File
@@ -1,10 +1,8 @@
extends ../../layout
block head-scripts
script(type="text/javascript", nonce=scriptNonce).
window.teamId = '#{teamId}'
window.hasIndividualRecurlySubscription = #{hasIndividualRecurlySubscription}
window.inviteToken = '#{inviteToken}'
block append meta
meta(name="ol-hasIndividualRecurlySubscription" data-type="boolean" content=hasIndividualRecurlySubscription)
meta(name="ol-inviteToken" content=inviteToken)
block content
main.content.content-alt.team-invite