Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

Merge branch 'main' into improvement/billing-dunning

Blue Mouse552a80105bdb
diff --cc backend/apps/cloud/src/mailer/mailer.service.ts
index 4f13ab9c3,82d9961c2..303ea1b23
--- a/backend/apps/cloud/src/mailer/mailer.service.ts
+++ b/backend/apps/cloud/src/mailer/mailer.service.ts
@@@ -93,24 -118,9 +118,24 @@@ const metaInfoJson =
},
[LetterTemplate.TrialEndingCancelled]: {
subject: {
- en: () => 'Your Swetrix trial ends in 48 hours — action needed',
+ en: () => 'Your Swetrix trial access ends tomorrow',
},
},
+ [LetterTemplate.SubscriptionPaymentFailed]: {
+ subject: {
+ en: () => 'Action required: your Swetrix payment failed',
+ },
+ },
+ [LetterTemplate.SubscriptionPaymentFinalWarning]: {
+ subject: {
+ en: () => 'Final reminder: update your Swetrix payment details',
+ },
+ },
+ [LetterTemplate.SubscriptionPaymentRecovered]: {
+ subject: {
+ en: () => 'Your Swetrix payment was recovered',
+ },
+ },
[LetterTemplate.ProjectSubscriberInvitation]: {
subject: {
en: () => 'You have been invited to join the project',
diff --cc backend/apps/cloud/src/task-manager/task-manager.service.ts
index c1c576b7f,a04fe8189..148d1ea6b
--- a/backend/apps/cloud/src/task-manager/task-manager.service.ts
+++ b/backend/apps/cloud/src/task-manager/task-manager.service.ts
@@@ -122,8 -127,15 +131,16 @@@ const checkQueryCondition =
const CHUNK_SIZE = 5000
const REPORTS_USERS_CONCURRENCY = 3
const REPORTS_PROJECTS_CONCURRENCY = 5
+ const TRIAL_LIFECYCLE_STEPS_CONCURRENCY = 1
+ const TRIAL_LIFECYCLE_EMAILS_CONCURRENCY = 3
const NO_EVENTS_REMINDER_DELAY_DAYS = 2
+const BILLING_URL = 'https://swetrix.com/user-settings?tab=billing'
+ const TRIAL_LIFECYCLE_EMAIL_URLS = {
+ dashboardUrl: 'https://swetrix.com/dashboard',
- billingUrl: 'https://swetrix.com/user-settings?tab=billing',
++ billingUrl: BILLING_URL,
+ setupGuideUrl: 'https://swetrix.com/docs',
+ dataImportDocsUrl: 'https://swetrix.com/docs/data-import',
+ }
const CAPTCHA_PASS_CONDITION =
"type = 'captcha' AND if(indexOf(`meta.key`, 'captcha_event') = 0, 'pass', arrayElement(`meta.value`, indexOf(`meta.key`, 'captcha_event'))) = 'pass'"
const TELEGRAM_MARKDOWN_URL_KEYS = new Set(['dashboard_url', 'errors_url'])