rename price attributes to price_in_cents or price_in_unit

GitOrigin-RevId: 8045472c96862078583fcb522099ad78926281dc

services/web/app/src/Features/Subscription/GroupPlansData.js

@@ -43,7 +43,7 @@ for (const [usage, planData] of Object.entries(groups)) {
           planCode
         )} - Group Account (${size} licenses) - ${capitalize(usage)}`,
         hideFromUsers: true,
-        price: groups[usage][planCode].USD[size],
+        price_in_cents: groups[usage][planCode].USD[size].price_in_unit * 100,
         annual: true,
         features: Settings.features[planCode],
         groupPlan: true,

services/web/app/src/Features/Subscription/PlansLocator.js

@@ -3,10 +3,17 @@ const logger = require('@overleaf/logger')
 
 function ensurePlansAreSetupCorrectly() {
   Settings.plans.forEach(plan => {
-    if (typeof plan.price !== 'number') {
+    if (
+      typeof plan.price_in_unit !== 'number' &&
+      typeof plan.price_in_cents !== 'number'
+    ) {
       logger.fatal({ plan }, 'missing price on plan')
       process.exit(1)
     }
+    if (plan.price) {
+      logger.fatal({ plan }, 'unclear price attribute on plan')
+      process.exit(1)
+    }
   })
 }
 

services/web/app/src/Features/Subscription/SubscriptionHelper.js

@@ -3,17 +3,17 @@
  * This is to avoid unintended/artifical credits on users Recurly accounts.
  */
 function shouldPlanChangeAtTermEnd(oldPlan, newPlan) {
-  return getPlanPrice(oldPlan) > getPlanPrice(newPlan)
+  return getPlanPriceInCents(oldPlan) > getPlanPriceInCents(newPlan)
 }
 
 /**
  * Group plans have their price in dollars, but individual plans store the price in cents
  */
-function getPlanPrice(plan) {
-  if (plan.groupPlan) {
-    return plan.price * 100
+function getPlanPriceInCents(plan) {
+  if (plan.price_in_unit) {
+    return plan.price_in_unit * 100
   }
-  return plan.price
+  return plan.price_in_cents
 }
 
 module.exports = {

services/web/config/settings.defaults.js

@@ -319,7 +319,7 @@ module.exports = {
     {
       planCode: 'personal',
       name: 'Personal',
-      price: 0,
+      price_in_cents: 0,
       features: defaultFeatures,
     },
   ],

services/web/frontend/js/features/plans/group-plan-modal/index.js

@@ -16,16 +16,16 @@ function getFormValues() {
 }
 
 function updateGroupPlanView() {
-  const prices = getMeta('ol-groupPlans')
+  const groupPlans = getMeta('ol-groupPlans')
   const currencySymbols = getMeta('ol-currencySymbols')
 
   const modalEl = document.querySelector('[data-ol-group-plan-modal]')
   const { planCode, size, currency, usage } = getFormValues()
 
-  const price = prices[usage][planCode][currency][size]
+  const priceInUnit = groupPlans[usage][planCode][currency][size].price_in_unit
   const currencySymbol = currencySymbols[currency]
-  const displayPrice = `${currencySymbol}${price}`
-  const perUserPrice = parseFloat((price / size).toFixed(2))
+  const displayPrice = `${currencySymbol}${priceInUnit}`
+  const perUserPrice = parseFloat((priceInUnit / size).toFixed(2))
 
   modalEl.querySelectorAll('[data-ol-group-plan-plan-code]').forEach(el => {
     el.hidden = el.getAttribute('data-ol-group-plan-plan-code') !== planCode

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

@@ -161,10 +161,11 @@ App.controller(
       let perUserDisplayPricePlaceholder = '...'
       const currencySymbol = $scope.options.currencySymbols[currency]
       if (taxRate === 0) {
-        const basePrice = $scope.groupPlans[usage][plan_code][currency][size]
-        recurlyPricePlaceholder.total = `${currencySymbol}${basePrice}`
+        const basePriceInUnit =
+          $scope.groupPlans[usage][plan_code][currency][size].price_in_unit
+        recurlyPricePlaceholder.total = `${currencySymbol}${basePriceInUnit}`
         perUserDisplayPricePlaceholder = getPricePerUser(
-          basePrice,
+          basePriceInUnit,
           currencySymbol,
           size
         )

services/web/scripts/recurly/get_recurly_group_prices.js

@@ -23,7 +23,7 @@ async function getRecurlyGroupPrices() {
         prices[usage] = prices[usage] || {}
         prices[usage][type] = prices[usage][type] || {}
         prices[usage][type][currency] = prices[usage][type][currency] || {}
-        prices[usage][type][currency][size] = unitAmount
+        prices[usage][type][currency][size] = { price_in_unit: unitAmount }
       })
     }
   }

services/web/test/acceptance/config/settings.test.defaults.js

@@ -121,25 +121,25 @@ module.exports = {
     {
       planCode: 'v1_free',
       name: 'V1 Free',
-      price: 0,
+      price_in_cents: 0,
       features: features.v1_free,
     },
     {
       planCode: 'personal',
       name: 'Personal',
-      price: 0,
+      price_in_cents: 0,
       features: features.personal,
     },
     {
       planCode: 'collaborator',
       name: 'Collaborator',
-      price: 1500,
+      price_in_cents: 1500,
       features: features.collaborator,
     },
     {
       planCode: 'professional',
       name: 'Professional',
-      price: 3000,
+      price_in_cents: 3000,
       features: features.professional,
     },
   ],

services/web/test/unit/src/Subscription/PlansLocatorTests.js

@@ -6,21 +6,21 @@ const plans = [
   {
     planCode: 'first',
     name: '1st',
-    price: 800,
+    price_in_cents: 800,
     features: {},
     featureDescription: {},
   },
   {
     planCode: 'second',
     name: '2nd',
-    price: 1500,
+    price_in_cents: 1500,
     features: {},
     featureDescription: {},
   },
   {
     planCode: 'third',
     name: '3rd',
-    price: 3000,
+    price_in_cents: 3000,
     features: {},
     featureDescription: {},
   },
@@ -41,7 +41,7 @@ describe('PlansLocator', function () {
     it('should return the found plan', function () {
       const plan = this.PlansLocator.findLocalPlanInSettings('second')
       expect(plan).to.have.property('name', '2nd')
-      expect(plan).to.have.property('price', 1500)
+      expect(plan).to.have.property('price_in_cents', 1500)
     })
     it('should return null if no matching plan is found', function () {
       const plan = this.PlansLocator.findLocalPlanInSettings('gibberish')

services/web/test/unit/src/Subscription/SubscriptionHelperTests.js

@@ -6,24 +6,24 @@ const modulePath =
 const plans = {
   expensive: {
     planCode: 'expensive',
-    price: 1500,
+    price_in_cents: 1500,
   },
   cheaper: {
     planCode: 'cheaper',
-    price: 500,
+    price_in_cents: 500,
   },
   alsoCheap: {
     plancode: 'also-cheap',
-    price: 500,
+    price_in_cents: 500,
   },
   expensiveGroup: {
     plancode: 'group_expensive',
-    price: 495,
+    price_in_unit: 495,
     groupPlan: true,
   },
   cheapGroup: {
     plancode: 'group_cheap',
-    price: 10,
+    price_in_unit: 10,
     groupPlan: true,
   },
   bad: {},