From 396e158ecd19d717da628639ba0e9b1c21de704d Mon Sep 17 00:00:00 2001 From: Olzhas Askar Date: Tue, 28 Apr 2026 13:41:49 +0200 Subject: [PATCH] Merge pull request #31991 from overleaf/oa-rename-student-plans [web] Rename Individual plan names GitOrigin-RevId: f0133fc4e06542d7c68e0a0211a2ecc32afa733d --- .../config/settings.test.defaults.js | 4 +-- .../features/subscription/fixtures/plans.ts | 32 +++++++++---------- .../subscription/fixtures/subscriptions.ts | 28 ++++++++-------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/services/web/test/acceptance/config/settings.test.defaults.js b/services/web/test/acceptance/config/settings.test.defaults.js index 7b196d85a5..bdbc76b1ec 100644 --- a/services/web/test/acceptance/config/settings.test.defaults.js +++ b/services/web/test/acceptance/config/settings.test.defaults.js @@ -194,13 +194,13 @@ module.exports = { }, { planCode: 'collaborator', - name: 'Collaborator', + name: 'Standard monthly', price_in_cents: 1500, features: features.collaborator, }, { planCode: 'professional', - name: 'Professional', + name: 'Pro monthly', price_in_cents: 3000, features: features.professional, }, diff --git a/services/web/test/frontend/features/subscription/fixtures/plans.ts b/services/web/test/frontend/features/subscription/fixtures/plans.ts index b2588f145d..a14a164ba4 100644 --- a/services/web/test/frontend/features/subscription/fixtures/plans.ts +++ b/services/web/test/frontend/features/subscription/fixtures/plans.ts @@ -75,14 +75,14 @@ const features = { const studentAccounts: Array = [ { planCode: 'student', - name: 'Student', + name: 'Student monthly', price_in_cents: 1000, features: features.student, featureDescription: [], }, { planCode: 'student-annual', - name: 'Student Annual', + name: 'Student annual', price_in_cents: 9900, annual: true, features: features.student, @@ -90,7 +90,7 @@ const studentAccounts: Array = [ }, { planCode: 'student_free_trial', - name: 'Student', + name: 'Student monthly', price_in_cents: 800, features: features.student, hideFromUsers: true, @@ -98,7 +98,7 @@ const studentAccounts: Array = [ }, { planCode: 'student_free_trial_7_days', - name: 'Student', + name: 'Student monthly', price_in_cents: 1000, features: features.student, hideFromUsers: true, @@ -116,7 +116,7 @@ const individualMonthlyPlans: Array = [ }, { planCode: 'paid-personal_free_trial_7_days', - name: 'Personal (Hidden)', + name: 'Personal (hidden)', price_in_cents: 1500, features: features.personal, featureDescription: [], @@ -124,21 +124,21 @@ const individualMonthlyPlans: Array = [ }, { planCode: 'collaborator', - name: 'Standard', + name: 'Standard monthly', price_in_cents: 2300, features: features.collaborator, featureDescription: [], }, { planCode: 'professional', - name: 'Professional', + name: 'Pro monthly', price_in_cents: 4500, features: features.professional, featureDescription: [], }, { planCode: 'collaborator_free_trial', - name: 'Standard (Hidden)', + name: 'Standard monthly (hidden)', price_in_cents: 1900, features: features.collaborator, hideFromUsers: true, @@ -146,7 +146,7 @@ const individualMonthlyPlans: Array = [ }, { planCode: 'collaborator_free_trial_14_days', - name: 'Standard (Hidden)', + name: 'Standard monthly (hidden)', price_in_cents: 1900, features: features.collaborator, hideFromUsers: true, @@ -154,7 +154,7 @@ const individualMonthlyPlans: Array = [ }, { planCode: 'collaborator_free_trial_7_days', - name: 'Standard (Hidden)', + name: 'Standard monthly (hidden)', price_in_cents: 2300, features: features.collaborator, hideFromUsers: true, @@ -162,7 +162,7 @@ const individualMonthlyPlans: Array = [ }, { planCode: 'collaborator-annual_free_trial', - name: 'Standard Annual (Hidden)', + name: 'Standard annual (hidden)', price_in_cents: 18000, features: features.collaborator, hideFromUsers: true, @@ -170,7 +170,7 @@ const individualMonthlyPlans: Array = [ }, { planCode: 'professional_free_trial', - name: 'Professional (Hidden)', + name: 'Pro monthly (hidden)', price_in_cents: 3000, features: features.professional, hideFromUsers: true, @@ -178,7 +178,7 @@ const individualMonthlyPlans: Array = [ }, { planCode: 'professional_free_trial_7_days', - name: 'Professional (Hidden)', + name: 'Pro monthly (hidden)', price_in_cents: 4500, features: features.professional, hideFromUsers: true, @@ -189,7 +189,7 @@ const individualMonthlyPlans: Array = [ const individualAnnualPlans: Array = [ { planCode: 'paid-personal-annual', - name: 'Personal Annual', + name: 'Personal annual', price_in_cents: 13900, annual: true, features: features.personal, @@ -197,7 +197,7 @@ const individualAnnualPlans: Array = [ }, { planCode: 'collaborator-annual', - name: 'Standard Annual', + name: 'Standard annual', price_in_cents: 21900, annual: true, features: features.collaborator, @@ -205,7 +205,7 @@ const individualAnnualPlans: Array = [ }, { planCode: 'professional-annual', - name: 'Professional Annual', + name: 'Pro annual', price_in_cents: 42900, annual: true, features: features.professional, diff --git a/services/web/test/frontend/features/subscription/fixtures/subscriptions.ts b/services/web/test/frontend/features/subscription/fixtures/subscriptions.ts index 02ade6aa60..b7b2009e66 100644 --- a/services/web/test/frontend/features/subscription/fixtures/subscriptions.ts +++ b/services/web/test/frontend/features/subscription/fixtures/subscriptions.ts @@ -27,7 +27,7 @@ export const annualActiveSubscription: PaidSubscription = { planCode: 'collaborator-annual', plan: { planCode: 'collaborator-annual', - name: 'Standard Annual', + name: 'Standard annual', price_in_cents: 21900, annual: true, featureDescription: [], @@ -71,7 +71,7 @@ export const annualActiveSubscriptionWithCoupons: PaidSubscription = { planCode: 'collaborator-annual', plan: { planCode: 'collaborator-annual', - name: 'Standard Annual', + name: 'Standard annual', price_in_cents: 21900, annual: true, featureDescription: [], @@ -118,7 +118,7 @@ export const pendingPausedSubscription: PaidSubscription = { planCode: 'collaborator-annual', plan: { planCode: 'collaborator-annual', - name: 'Standard Annual', + name: 'Standard annual', price_in_cents: 21900, annual: true, featureDescription: [], @@ -163,7 +163,7 @@ export const pausedSubscription: PaidSubscription = { planCode: 'collaborator-annual', plan: { planCode: 'collaborator-annual', - name: 'Standard Annual', + name: 'Standard annual', price_in_cents: 21900, annual: true, featureDescription: [], @@ -208,7 +208,7 @@ export const annualActiveSubscriptionWithAddons: PaidSubscription = { planCode: 'collaborator-annual', plan: { planCode: 'collaborator-annual', - name: 'Standard Annual', + name: 'Standard annual', price_in_cents: 21900, annual: true, featureDescription: [], @@ -255,7 +255,7 @@ export const annualActiveSubscriptionEuro: PaidSubscription = { planCode: 'collaborator-annual', plan: { planCode: 'collaborator-annual', - name: 'Standard Annual', + name: 'Standard annual', price_in_cents: 21900, annual: true, featureDescription: [], @@ -299,7 +299,7 @@ export const annualActiveSubscriptionPro: PaidSubscription = { planCode: 'professional', plan: { planCode: 'professional', - name: 'Professional', + name: 'Pro monthly', price_in_cents: 4500, featureDescription: [], canUseFlexibleLicensing: false, @@ -342,7 +342,7 @@ export const pastDueExpiredSubscription: PaidSubscription = { planCode: 'collaborator-annual', plan: { planCode: 'collaborator-annual', - name: 'Standard Annual', + name: 'Standard annual', price_in_cents: 21900, annual: true, featureDescription: [], @@ -386,7 +386,7 @@ export const canceledSubscription: PaidSubscription = { planCode: 'collaborator-annual', plan: { planCode: 'collaborator-annual', - name: 'Standard Annual', + name: 'Standard annual', price_in_cents: 21900, annual: true, featureDescription: [], @@ -430,7 +430,7 @@ export const pendingAddOnChange: PaidSubscription = { planCode: 'collaborator-annual', plan: { planCode: 'collaborator-annual', - name: 'Standard Annual', + name: 'Standard annual', price_in_cents: 21900, annual: true, featureDescription: [], @@ -469,7 +469,7 @@ export const pendingAddOnChange: PaidSubscription = { }, pendingPlan: { planCode: 'collaborator-annual', - name: 'Standard Annual', + name: 'Standard annual', price_in_cents: 21900, annual: true, featureDescription: [], @@ -488,7 +488,7 @@ export const pendingSubscriptionChange: PaidSubscription = { planCode: 'collaborator-annual', plan: { planCode: 'collaborator-annual', - name: 'Standard Annual', + name: 'Standard annual', price_in_cents: 21900, annual: true, featureDescription: [], @@ -520,7 +520,7 @@ export const pendingSubscriptionChange: PaidSubscription = { }, pendingPlan: { planCode: 'professional-annual', - name: 'Professional Annual', + name: 'Pro annual', price_in_cents: 42900, annual: true, featureDescription: [], @@ -739,7 +739,7 @@ export const customSubscription: CustomSubscription = { planCode: 'collaborator-annual', plan: { planCode: 'collaborator-annual', - name: 'Standard Annual', + name: 'Standard annual', price_in_cents: 21900, annual: true, featureDescription: [],