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

Revert "[views] migrate subscription templates to meta tags"

GitOrigin-RevId: 8ab3dae6e3aa359b6d7aa69df70a1b1eb2405dfd

services/web/app/views/subscriptions/dashboard.pug

@@ -2,12 +2,6 @@ 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

@@ -1,3 +1,8 @@
+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

@@ -1,12 +1,11 @@
 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

@@ -6,9 +6,11 @@ include _plans_page_tables
 block vars
 	- metadata = { viewport: true }
 
-block append meta
+block head-scripts
-	meta(name="ol-recomendedCurrency" content=recomendedCurrency)
+	script(type="text/javascript", nonce=scriptNonce).
-	meta(name="ol-groupPlans" data-type="json" content=groupPlans)
+		window.recomendedCurrency = '#{recomendedCurrency}';
+		window.abCurrencyFlag = '#{abCurrencyFlag}';
+		window.groupPlans = !{StringHelper.stringifyJsonForScript(groupPlans)};
 
 block content
 	.content.content-alt

services/web/app/views/subscriptions/successful_subscription.pug

@@ -28,3 +28,9 @@ 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

@@ -1,8 +1,10 @@
 extends ../../layout
 
-block append meta
+block head-scripts
-	meta(name="ol-hasIndividualRecurlySubscription" data-type="boolean" content=hasIndividualRecurlySubscription)
+	script(type="text/javascript", nonce=scriptNonce).
-	meta(name="ol-inviteToken" content=inviteToken)
+		window.teamId = '#{teamId}'
+		window.hasIndividualRecurlySubscription = #{hasIndividualRecurlySubscription}
+		window.inviteToken = '#{inviteToken}'
 
 block content
 	main.content.content-alt.team-invite

services/web/frontend/js/main/new-subscription.js

@@ -6,7 +6,6 @@ import _ from 'lodash'
 */
 /* global recurly */
 import App from '../base'
-import getMeta from '../utils/meta'
 
 export default App.controller('NewSubscriptionController', function(
   $scope,
@@ -68,7 +67,7 @@ export default App.controller('NewSubscriptionController', function(
     city: '',
     company: '',
     vat_number: '',
-    country: getMeta('ol-countryCode'),
+    country: window.countryCode,
     coupon: window.couponCode
   }
 
@@ -85,7 +84,7 @@ export default App.controller('NewSubscriptionController', function(
   )
 
   recurly.configure({
-    publicKey: getMeta('ol-recurlyApiKey'),
+    publicKey: window.recurlyApiKey,
     style: {
       all: {
         fontFamily: '"Open Sans", sans-serif',

services/web/frontend/js/main/plans.js

@@ -3,9 +3,8 @@
     max-len
 */
 import App from '../base'
-import getMeta from '../utils/meta'
 App.factory('MultiCurrencyPricing', function() {
-  const currencyCode = getMeta('ol-recomendedCurrency')
+  const currencyCode = window.recomendedCurrency
 
   return {
     currencyCode,
@@ -385,12 +384,11 @@ App.controller('GroupPlansModalPurchaseController', function(
     ]
   }
 
-  $scope.prices = getMeta('ol-groupPlans')
+  $scope.prices = window.groupPlans
 
   let currency = 'USD'
-  const recomendedCurrency = getMeta('ol-recomendedCurrency')
+  if (['USD', 'GBP', 'EUR'].includes(window.recomendedCurrency)) {
-  if (['USD', 'GBP', 'EUR'].includes(recomendedCurrency)) {
+    currency = window.recomendedCurrency
-    currency = recomendedCurrency
   }
 
   // default selected

services/web/frontend/js/main/subscription-dashboard.js

@@ -18,14 +18,13 @@ import _ from 'lodash'
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 import App from '../base'
-import getMeta from '../utils/meta'
 const SUBSCRIPTION_URL = '/user/subscription/update'
 
 const ensureRecurlyIsSetup = _.once(() => {
   if (typeof recurly === 'undefined' || !recurly) {
     return false
   }
-  recurly.configure(getMeta('ol-recurlyApiKey'))
+  recurly.configure(window.recurlyApiKey)
   return true
 })
 
@@ -107,8 +106,7 @@ App.controller('ChangePlanFormController', function(
   $scope.$watch('plan', function(plan) {
     if (!plan) return
     const planCode = plan.planCode
-    const subscription = getMeta('ol-subscription')
+    const { currency, taxRate } = window.subscription.recurly
-    const { currency, taxRate } = subscription.recurly
     $scope.price = '...' // Placeholder while we talk to recurly
     RecurlyPricing.loadDisplayPriceWithTax(planCode, currency, taxRate).then(
       price => {
@@ -175,11 +173,10 @@ App.controller('GroupMembershipController', function($scope, $modal) {
 
 App.controller('RecurlySubscriptionController', function($scope) {
   const recurlyIsSetup = ensureRecurlyIsSetup()
-  const subscription = getMeta('ol-subscription')
+  $scope.showChangePlanButton = recurlyIsSetup && !window.subscription.groupPlan
-  $scope.showChangePlanButton = recurlyIsSetup && !subscription.groupPlan
   if (
-    subscription.recurly.account.has_past_due_invoice &&
+    window.subscription.recurly.account.has_past_due_invoice &&
-    subscription.recurly.account.has_past_due_invoice._ === 'true'
+    window.subscription.recurly.account.has_past_due_invoice._ === 'true'
   ) {
     $scope.showChangePlanButton = false
   }
@@ -208,7 +205,7 @@ App.controller('RecurlyCancellationController', function(
   $http
 ) {
   if (!ensureRecurlyIsSetup()) return
-  const subscription = getMeta('ol-subscription')
+  const subscription = window.subscription
   const sevenDaysTime = new Date()
   sevenDaysTime.setDate(sevenDaysTime.getDate() + 7)
   const freeTrialEndDate = new Date(subscription.recurly.trial_ends_at)
@@ -229,7 +226,7 @@ App.controller('RecurlyCancellationController', function(
     $scope.showBasicCancel = true
   }
 
-  const { currency, taxRate } = subscription.recurly
+  const { currency, taxRate } = window.subscription.recurly
   $scope.studentPrice = '...' // Placeholder while we talk to recurly
   RecurlyPricing.loadDisplayPriceWithTax('student', currency, taxRate).then(
     price => {

services/web/frontend/js/main/subscription/team-invite-controller.js

@@ -10,15 +10,11 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 import App from '../../base'
-import getMeta from '../../utils/meta'
 
 export default App.controller('TeamInviteController', function($scope, $http) {
   $scope.inflight = false
-  const hasIndividualRecurlySubscription = getMeta(
-    'ol-hasIndividualRecurlySubscription'
-  )
 
-  if (hasIndividualRecurlySubscription) {
+  if (window.hasIndividualRecurlySubscription) {
     $scope.view = 'hasIndividualRecurlySubscription'
   } else {
     $scope.view = 'teamInvite'
@@ -44,8 +40,7 @@ export default App.controller('TeamInviteController', function($scope, $http) {
 
   return ($scope.joinTeam = function() {
     $scope.inflight = true
-    const inviteToken = getMeta('ol-inviteToken')
+    const request = $http.put(`/subscription/invites/${window.inviteToken}/`, {
-    const request = $http.put(`/subscription/invites/${inviteToken}/`, {
       _csrf: window.csrfToken
     })
     request.then(function(response) {