diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js index 024002a7e4..82aa41c127 100644 --- a/services/web/app/src/Features/Project/ProjectController.js +++ b/services/web/app/src/Features/Project/ProjectController.js @@ -772,6 +772,11 @@ const _ProjectController = { isOverleafAssistBundleEnabled && (await ProjectController._getAddonPrices(req, res)) + let planCode = subscription?.planCode + if (!planCode && !userInNonIndividualSub) { + planCode = 'free' + } + res.render(template, { title: project.name, priority_title: true, @@ -801,6 +806,9 @@ const _ProjectController = { labsProgram: user.labsProgram, inactiveTutorials: TutorialHandler.getInactiveTutorials(user), isAdmin: hasAdminAccess(user), + planCode, + isMemberOfGroupSubscription: userIsMemberOfGroupSubscription, + hasInstitutionLicence: userHasInstitutionLicence, }, userSettings: { mode: user.ace.mode, @@ -876,7 +884,6 @@ const _ProjectController = { isOverleafAssistBundleEnabled, paywallPlans, addonPrices, - planCode: subscription?.planCode, }) timer.done() } catch (err) { diff --git a/services/web/app/views/project/editor/_meta.pug b/services/web/app/views/project/editor/_meta.pug index dce630f76a..8622f625d1 100644 --- a/services/web/app/views/project/editor/_meta.pug +++ b/services/web/app/views/project/editor/_meta.pug @@ -48,7 +48,6 @@ if(isPaywallChangeCompileTimeoutEnabled) if(isOverleafAssistBundleEnabled) //- expose plans info to show prices in paywall-change-compile-timeout test meta(name="ol-addonPrices", data-type="json" content=addonPrices) - meta(name="ol-planCode", data-type="string" content=planCode) // translations for the loading page, before i18n has loaded in the client meta(name="ol-loadingText", data-type="string" content=translate("loading")) meta(name="ol-translationIoNotLoaded", data-type="string" content=translate("could_not_connect_to_websocket_server")) diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index 50809a721c..bc6e387aac 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -85,6 +85,8 @@ "add_ons_are": "", "add_or_remove_project_from_tag": "", "add_overleaf_assist": "", + "add_overleaf_assist_to_your_group_subscription": "", + "add_overleaf_assist_to_your_institution": "", "add_overleaf_assist_to_your_plan": "", "add_people": "", "add_role_and_department": "", diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 4e92fda61f..06917e7e94 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -98,6 +98,8 @@ "add_ons_are": "Add-ons: __addOnName__", "add_or_remove_project_from_tag": "Add or remove project from tag __tagName__", "add_overleaf_assist": "Add Overleaf Assist", + "add_overleaf_assist_to_your_group_subscription": "Add Overleaf Assist to your group subscription", + "add_overleaf_assist_to_your_institution": "Add Overleaf Assist to your institution", "add_overleaf_assist_to_your_plan": "Add Overelaf assist to your __planName__ plan", "add_people": "Add people", "add_role_and_department": "Add role and department", diff --git a/services/web/types/user.ts b/services/web/types/user.ts index 6a433d6c77..d87eb6ab80 100644 --- a/services/web/types/user.ts +++ b/services/web/types/user.ts @@ -58,6 +58,9 @@ export type User = { enabled: boolean } featureUsage?: FeatureUsage + planCode?: string + isMemberOfGroupSubscription?: boolean + hasInstitutionLicence?: boolean } export type LoggedOutUser = {