(core) Billing updates

Summary:
- Adding confirmation dialog when user doesn't want to cancel site
- Changing `Cancel subscription` to `Cancel plan`
- Removing `Pro` from upgrade header on pricing modal
- Better handling situation when there is no default price
- Removing mentions about sprouts program
- Removing cache for stripe plans

Test Plan: Updated tests

Reviewers: georgegevoian

Reviewed By: georgegevoian

Differential Revision: https://phab.getgrist.com/D4273
pull/1091/head
Jarosław Sadziński 3 months ago
parent 3082fe0f01
commit 7f28aee79c

@ -83,7 +83,6 @@ function makeViewerTeamSiteIntro(homeModel: HomeModel) {
} }
function makeTeamSiteIntro(homeModel: HomeModel) { function makeTeamSiteIntro(homeModel: HomeModel) {
const sproutsProgram = cssLink({href: commonUrls.sproutsProgram, target: '_blank'}, t("Sprouts Program"));
return [ return [
css.docListHeader( css.docListHeader(
t("Welcome to {{- orgName}}", {orgName: homeModel.app.currentOrgName}), t("Welcome to {{- orgName}}", {orgName: homeModel.app.currentOrgName}),
@ -94,8 +93,8 @@ function makeTeamSiteIntro(homeModel: HomeModel) {
(!isFeatureEnabled('helpCenter') ? null : (!isFeatureEnabled('helpCenter') ? null :
cssIntroLine( cssIntroLine(
t( t(
'Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.', 'Learn more in our {{helpCenterLink}}.',
{helpCenterLink: helpCenterLink(), sproutsProgram} {helpCenterLink: helpCenterLink()}
), ),
testId('welcome-text') testId('welcome-text')
) )

@ -93,7 +93,6 @@ export const commonUrls = {
contactSupport: getContactSupportUrl(), contactSupport: getContactSupportUrl(),
termsOfService: getTermsOfServiceUrl(), termsOfService: getTermsOfServiceUrl(),
plans: "https://www.getgrist.com/pricing", plans: "https://www.getgrist.com/pricing",
sproutsProgram: "https://www.getgrist.com/sprouts-program",
contact: "https://www.getgrist.com/contact", contact: "https://www.getgrist.com/contact",
templates: 'https://www.getgrist.com/templates', templates: 'https://www.getgrist.com/templates',
community: 'https://community.getgrist.com', community: 'https://community.getgrist.com',

@ -499,7 +499,7 @@
"Sign in": "Вписване", "Sign in": "Вписване",
"To use Grist, please either sign up or sign in.": "За да използвате Grist, моля, регистрирайте се или се впишете.", "To use Grist, please either sign up or sign in.": "За да използвате Grist, моля, регистрирайте се или се впишете.",
"Visit our {{link}} to learn more about Grist.": "Посетете {{link}}, за да научите повече за Grist.", "Visit our {{link}} to learn more about Grist.": "Посетете {{link}}, за да научите повече за Grist.",
"Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Научете повече в нашия {{helpCenterLink}} или намерете експерт чрез нашата {{sproutsProgram}}.", "Learn more in our {{helpCenterLink}}.": "Научете повече в нашия {{helpCenterLink}}.",
"Get started by creating your first Grist document.": "Започнете, като създадете първия си Grist документ.", "Get started by creating your first Grist document.": "Започнете, като създадете първия си Grist документ.",
"Get started by exploring templates, or creating your first Grist document.": "Започнете, като проучите образците или създадете първия си Grist документ.", "Get started by exploring templates, or creating your first Grist document.": "Започнете, като проучите образците или създадете първия си Grist документ.",
"Invite Team Members": "Поканете членове на екипа", "Invite Team Members": "Поканете членове на екипа",

@ -555,7 +555,7 @@
"Visit our {{link}} to learn more about Grist.": "Besuchen Sie unsere {{link}}, um mehr über Grist zu erfahren.", "Visit our {{link}} to learn more about Grist.": "Besuchen Sie unsere {{link}}, um mehr über Grist zu erfahren.",
"Sign in": "Anmelden", "Sign in": "Anmelden",
"To use Grist, please either sign up or sign in.": "Um Grist zu nutzen, melden Sie sich bitte an oder registrieren Sie sich.", "To use Grist, please either sign up or sign in.": "Um Grist zu nutzen, melden Sie sich bitte an oder registrieren Sie sich.",
"Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Erfahren Sie mehr in unserem {{helpCenterLink}}, oder finden Sie einen Experten über unser {{sproutsProgram}}." "Learn more in our {{helpCenterLink}}.": "Erfahren Sie mehr in unserem {{helpCenterLink}}."
}, },
"HomeLeftPane": { "HomeLeftPane": {
"Access Details": "Zugangsdetails", "Access Details": "Zugangsdetails",

@ -523,7 +523,7 @@
"Sign in": "Sign in", "Sign in": "Sign in",
"To use Grist, please either sign up or sign in.": "To use Grist, please either sign up or sign in.", "To use Grist, please either sign up or sign in.": "To use Grist, please either sign up or sign in.",
"Visit our {{link}} to learn more about Grist.": "Visit our {{link}} to learn more about Grist.", "Visit our {{link}} to learn more about Grist.": "Visit our {{link}} to learn more about Grist.",
"Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}." "Learn more in our {{helpCenterLink}}.": "Learn more in our {{helpCenterLink}}."
}, },
"HomeLeftPane": { "HomeLeftPane": {
"Access Details": "Access Details", "Access Details": "Access Details",

@ -471,7 +471,7 @@
"Visit our {{link}} to learn more about Grist.": "Visita nuestra {{link}} para obtener más información sobre Grist.", "Visit our {{link}} to learn more about Grist.": "Visita nuestra {{link}} para obtener más información sobre Grist.",
"Sign in": "Iniciar sesión", "Sign in": "Iniciar sesión",
"To use Grist, please either sign up or sign in.": "Para utilizar Grist, regístrate o inicia sesión.", "To use Grist, please either sign up or sign in.": "Para utilizar Grist, regístrate o inicia sesión.",
"Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Obtenga más información en nuestro {{helpCenterLink}}, o busque un experto a través de nuestro {{sproutsProgram}}." "Learn more in our {{helpCenterLink}}.": "Obtenga más información en nuestro {{helpCenterLink}}."
}, },
"HomeLeftPane": { "HomeLeftPane": {
"Access Details": "Detalles de Acceso", "Access Details": "Detalles de Acceso",

@ -520,7 +520,7 @@
"Visit our {{link}} to learn more about Grist.": "Visitez notre {{link}} pour en savoir plus sur Grist.", "Visit our {{link}} to learn more about Grist.": "Visitez notre {{link}} pour en savoir plus sur Grist.",
"Sign in": "Connexion", "Sign in": "Connexion",
"To use Grist, please either sign up or sign in.": "Pour utiliser Grist, connectez-vous ou créez-vous un compte.", "To use Grist, please either sign up or sign in.": "Pour utiliser Grist, connectez-vous ou créez-vous un compte.",
"Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Pour en savoir plus, consultez notre {{helpCenterLink}}, ou trouvez un expert via notre {{sproutsProgram}}." "Learn more in our {{helpCenterLink}}.": "Pour en savoir plus, consultez notre {{helpCenterLink}}."
}, },
"HomeLeftPane": { "HomeLeftPane": {
"All Documents": "Tous les documents", "All Documents": "Tous les documents",

@ -25,7 +25,7 @@
"Visit our {{link}} to learn more about Grist.": "Vai a {{link}} per saperne di più su Grist.", "Visit our {{link}} to learn more about Grist.": "Vai a {{link}} per saperne di più su Grist.",
"Sign in": "Accedi", "Sign in": "Accedi",
"To use Grist, please either sign up or sign in.": "Per usare Grist, iscriviti o accedi.", "To use Grist, please either sign up or sign in.": "Per usare Grist, iscriviti o accedi.",
"Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Approfondisci nel nostro {{helpCenterLink}}, o trova un esperto con il nostro {{sproutsProgram}}." "Learn more in our {{helpCenterLink}}.": "Approfondisci nel nostro {{helpCenterLink}}."
}, },
"HomeLeftPane": { "HomeLeftPane": {
"Manage Users": "Gestisci gli utenti", "Manage Users": "Gestisci gli utenti",

@ -555,7 +555,7 @@
"Visit our {{link}} to learn more about Grist.": "Visite nosso site {{link}} para saber mais sobre o Grist.", "Visit our {{link}} to learn more about Grist.": "Visite nosso site {{link}} para saber mais sobre o Grist.",
"Sign in": "Entrar", "Sign in": "Entrar",
"To use Grist, please either sign up or sign in.": "Para usar o Grist, inscreva-se ou faça login.", "To use Grist, please either sign up or sign in.": "Para usar o Grist, inscreva-se ou faça login.",
"Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Saiba mais em nosso {{helpCenterLink}}, ou encontre um especialista através do nosso {{sproutsProgram}}." "Learn more in our {{helpCenterLink}}.": "Saiba mais em nosso {{helpCenterLink}}."
}, },
"HomeLeftPane": { "HomeLeftPane": {
"Access Details": "Detalhes de Acesso", "Access Details": "Detalhes de Acesso",

@ -922,7 +922,7 @@
"Visit our {{link}} to learn more about Grist.": "Obiščite našo spletno stran {{link}} da izveste več o Grisstu.", "Visit our {{link}} to learn more about Grist.": "Obiščite našo spletno stran {{link}} da izveste več o Grisstu.",
"Sign in": "Prijavi se", "Sign in": "Prijavi se",
"To use Grist, please either sign up or sign in.": "Če želiš uporabljati Grist, se prijavi ali prvič prijavi.", "To use Grist, please either sign up or sign in.": "Če želiš uporabljati Grist, se prijavi ali prvič prijavi.",
"Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Izvedi več v našem {{helpCenterLink}} ali poišči strokovnjaka prek našega {{sproutsProgram}}." "Learn more in our {{helpCenterLink}}.": "Izvedi več v našem {{helpCenterLink}}."
}, },
"WelcomeSitePicker": { "WelcomeSitePicker": {
"You have access to the following Grist sites.": "Imate dostop do naslednjih Grist spletnih mest .", "You have access to the following Grist sites.": "Imate dostop do naslednjih Grist spletnih mest .",

@ -87,7 +87,7 @@ describe('HomeIntro', function() {
// Check message specific to logged-in user and an empty team site. // Check message specific to logged-in user and an empty team site.
assert.match(await driver.find('.test-welcome-title').getText(), new RegExp(`Welcome.* ${session.orgName}`)); assert.match(await driver.find('.test-welcome-title').getText(), new RegExp(`Welcome.* ${session.orgName}`));
assert.match(await driver.find('.test-welcome-text').getText(), /Learn more.*find an expert/); assert.match(await driver.find('.test-welcome-text').getText(), /Learn more/);
assert.notMatch(await driver.find('.test-welcome-text').getText(), /sign up/); assert.notMatch(await driver.find('.test-welcome-text').getText(), /sign up/);
}); });

Loading…
Cancel
Save