🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Update translations and modify trial plan messaging (#906)
Goldflagc43a0a1bb23b
diff --git a/.gitignore b/.gitignoreindex 7245dc5f0..f57590d63 100644--- a/.gitignore+++ b/.gitignore@@ -45,4 +45,6 @@ coverage/.cursor/-.claude/\ No newline at end of file+.claude/++.agents/\ No newline at end of filediff --git a/client/messages/cs.json b/client/messages/cs.jsonindex 325df0e85..b0790f056 100644--- a/client/messages/cs.json+++ b/client/messages/cs.json@@ -876,7 +876,7 @@"HJ5o5M": "4 měsíce zdarma","psz0YH": "Pro osobní projekty a malé weby","2qOt5n": "Pouze do 250 tis.",- "/aBLH2": "Začít",+ "KV7xeN": "","DZY1mp": "Vše, co potřebuješ pro začátek jako malá firma","WnQ/AZ": "Kontaktuj nás","C9TNnE": "Pokročilé funkce pro profesionální týmy",@@ -884,7 +884,7 @@"CnmIg8": "Předplatit ($1)","5dX7fM": "Pokročilé funkce pro firemní týmy","5Wwopw": "Ceník",- "bxWfZS": "Vyzkoušej Rybbit ještě dnes bez rizika s naší 30denní zárukou vrácení peněz.",+ "vYmJVk": "","UHF9uv": "Tvé zkušební využití","blVqkQ": "Aktuální využití","O/w//A": "{count} událostí",@@ -1136,13 +1136,6 @@"kdqPM0": "Máš vlastní plán s až {limit} zobrazeními stránek měsíčně.","kTH3Q2": "Překročil jsi měsíční limit událostí. Pro pomoc prosím kontaktuj podporu.","ni0MP6": "Blížíš se k měsíčnímu limitu událostí. Pokud potřebuješ více kapacity, kontaktuj prosím podporu.",- "couCg5": "Zkušební plán",- "jGorUz": "Aktuálně máš 14denní zkušební verzi s až 1 000 000 událostmi.",- "tSjtK2": "Stav zkušební verze",- "eRPjFw": "Tvá zkušební verze končí za",- "GSvWJl": "{daysRemaining} dní",- "mzGohi": "dne {date}",- "e4rtdl": "Tvá zkušební verze končí dnes. Pro pokračování sledování návštěv se přihlas k odběru.","OtO9EF": "Přidej štítky pro organizaci a filtrování tvých webů.","ACKiA3": "Zatím žádné štítky","B1SDE1": "Napiš nový štítek...",diff --git a/client/messages/de.json b/client/messages/de.jsonindex ff546a3aa..4a16957be 100644--- a/client/messages/de.json+++ b/client/messages/de.json@@ -593,8 +593,8 @@"zINlao": "Inhaber","iHN12u": "Administrator","7L86Z5": "Mitglied",- "Nvr5Ce": "Wird hinzugefügt...","v+BwPW": "Zur Organisation hinzufügen",+ "Nvr5Ce": "Wird hinzugefügt...","Msn3jj": "Nach E-Mail filtern...","gO9HzB": "Nach Rolle filtern","9nrF+x": "Alle Rollen",@@ -876,7 +876,7 @@"HJ5o5M": "4 Monate gratis","psz0YH": "Für persönliche Projekte und kleine Websites","2qOt5n": "Nur bis zu 250k",- "/aBLH2": "Loslegen",+ "KV7xeN": "","DZY1mp": "Alles, was Sie als kleines Unternehmen brauchen","WnQ/AZ": "Kontaktieren Sie uns","C9TNnE": "Erweiterte Funktionen für professionelle Teams",@@ -884,7 +884,7 @@"CnmIg8": "Abonnieren (1 $)","5dX7fM": "Erweiterte Funktionen für Unternehmensteams","5Wwopw": "Preise",- "bxWfZS": "Testen Sie Rybbit heute risikofrei mit unserer 30-Tage-Geld-zurück-Garantie.",+ "vYmJVk": "","UHF9uv": "Ihre Testnutzung","blVqkQ": "Aktuelle Nutzung","O/w//A": "{count} Events",@@ -1136,13 +1136,6 @@"kdqPM0": "Sie haben einen individuellen Plan mit bis zu {limit} Seitenaufrufen pro Monat.","kTH3Q2": "Sie haben Ihr monatliches Event-Limit überschritten. Bitte kontaktieren Sie den Support.","ni0MP6": "Sie nähern sich Ihrem monatlichen Event-Limit. Bitte kontaktieren Sie den Support, falls Sie mehr Kapazität benötigen.",- "couCg5": "Testplan",- "jGorUz": "Sie sind derzeit in einer 14-tägigen kostenlosen Testphase mit bis zu 1.000.000 Events.",- "tSjtK2": "Teststatus",- "eRPjFw": "Ihre Testphase endet in",- "GSvWJl": "{daysRemaining} Tagen",- "mzGohi": "am {date}",- "e4rtdl": "Ihre Testphase endet heute. Abonnieren Sie, um weiterhin Besuche zu verfolgen.","OtO9EF": "Fügen Sie Tags hinzu, um Ihre Websites zu organisieren und zu filtern.","ACKiA3": "Noch keine Tags hinzugefügt","B1SDE1": "Neuen Tag eingeben...",diff --git a/client/messages/en.json b/client/messages/en.jsonindex bc3f3ba76..da0a3f0d6 100644--- a/client/messages/en.json+++ b/client/messages/en.json@@ -593,8 +593,8 @@"zINlao": "Owner","iHN12u": "Admin","7L86Z5": "Member",- "Nvr5Ce": "Adding...","v+BwPW": "Add to Organization",+ "Nvr5Ce": "Adding...","Msn3jj": "Filter by email...","gO9HzB": "Filter by role","9nrF+x": "All Roles",@@ -876,7 +876,7 @@"HJ5o5M": "4 months free","psz0YH": "For personal projects and small sites","2qOt5n": "Up to 250k only",- "/aBLH2": "Get started",+ "KV7xeN": "Start free trial","DZY1mp": "Everything you need to get started as a small business","WnQ/AZ": "Contact us","C9TNnE": "Advanced features for professional teams",@@ -884,7 +884,7 @@"CnmIg8": "Subscribe ($1)","5dX7fM": "Advanced features for enterprise teams","5Wwopw": "Pricing",- "bxWfZS": "Try Rybbit today risk-free with our 30-day money-back guarantee.",+ "vYmJVk": "Start your 7-day free trial — no credit card charges until the trial ends.","UHF9uv": "Your Trial Usage","blVqkQ": "Current Usage","O/w//A": "{count} events",@@ -1136,13 +1136,6 @@"kdqPM0": "You have a custom plan with up to {limit} pageviews per month.","kTH3Q2": "You have exceeded your monthly event limit. Please contact support for assistance.","ni0MP6": "You are approaching your monthly event limit. Please contact support if you need more capacity.",- "couCg5": "Trial Plan",- "jGorUz": "You are currently on a 14-day free trial with up to 1,000,000 events.",- "tSjtK2": "Trial Status",- "eRPjFw": "Your trial ends in",- "GSvWJl": "{daysRemaining} days",- "mzGohi": "on {date}",- "e4rtdl": "Your trial ends today. Subscribe to continue tracking visits again.","OtO9EF": "Add tags to organize and filter your sites.","ACKiA3": "No tags added yet","B1SDE1": "Type a new tag...",diff --git a/client/messages/es.json b/client/messages/es.jsonindex f7e3f2488..ab1f46295 100644--- a/client/messages/es.json+++ b/client/messages/es.json@@ -593,8 +593,8 @@"zINlao": "Propietario","iHN12u": "Administrador","7L86Z5": "Miembro",- "Nvr5Ce": "Añadiendo...","v+BwPW": "Añadir a la organización",+ "Nvr5Ce": "Añadiendo...","Msn3jj": "Filtrar por correo electrónico...","gO9HzB": "Filtrar por rol","9nrF+x": "Todos los roles",@@ -876,7 +876,7 @@"HJ5o5M": "4 meses gratis","psz0YH": "Para proyectos personales y sitios pequeños","2qOt5n": "Solo hasta 250k",- "/aBLH2": "Comenzar",+ "KV7xeN": "","DZY1mp": "Todo lo que necesitas para empezar como una pequeña empresa","WnQ/AZ": "Contáctanos","C9TNnE": "Funciones avanzadas para equipos profesionales",@@ -884,7 +884,7 @@"CnmIg8": "Suscribirse ($1)","5dX7fM": "Funciones avanzadas para equipos de la empresa","5Wwopw": "Precios",- "bxWfZS": "Prueba Rybbit hoy sin riesgos con nuestra garantía de devolución de dinero de 30 días.",+ "vYmJVk": "","UHF9uv": "Uso de tu prueba","blVqkQ": "Uso actual","O/w//A": "{count} eventos",@@ -1136,13 +1136,6 @@"kdqPM0": "Tienes un plan personalizado con hasta {limit} visitas por mes.","kTH3Q2": "Has excedido tu límite mensual de eventos. Por favor, contacta con soporte para obtener ayuda.","ni0MP6": "Te estás acercando a tu límite mensual de eventos. Por favor, contacta con soporte si necesitas más capacidad.",- "couCg5": "Plan de Prueba",- "jGorUz": "Actualmente estás en una prueba gratuita de 14 días con hasta 1,000,000 de eventos.",- "tSjtK2": "Estado de la prueba",- "eRPjFw": "Tu prueba termina en",- "GSvWJl": "{daysRemaining} días",- "mzGohi": "el {date}",- "e4rtdl": "Tu prueba termina hoy. Suscríbete para continuar rastreando visitas nuevamente.","OtO9EF": "Añade etiquetas para organizar y filtrar tus sitios.","ACKiA3": "No se han añadido etiquetas todavía","B1SDE1": "Escribe una nueva etiqueta...",diff --git a/client/messages/fr.json b/client/messages/fr.jsonindex 3d41c45e5..b7d3974bf 100644--- a/client/messages/fr.json+++ b/client/messages/fr.json@@ -593,8 +593,8 @@"zINlao": "Propriétaire","iHN12u": "Administrateur","7L86Z5": "Membre",- "Nvr5Ce": "Ajout en cours...","v+BwPW": "Ajouter à l'organisation",+ "Nvr5Ce": "Ajout en cours...","Msn3jj": "Filtrer par e-mail...","gO9HzB": "Filtrer par rôle","9nrF+x": "Tous les rôles",@@ -876,7 +876,7 @@"HJ5o5M": "4 mois gratuits","psz0YH": "Pour les projets personnels et petits sites","2qOt5n": "Jusqu'à 250k uniquement",- "/aBLH2": "Commencer",+ "KV7xeN": "","DZY1mp": "Tout ce dont vous avez besoin pour démarrer en tant que petite entreprise","WnQ/AZ": "Contactez-nous","C9TNnE": "Fonctionnalités avancées pour les équipes professionnelles",@@ -884,7 +884,7 @@"CnmIg8": "S'abonner (1 $)","5dX7fM": "Fonctionnalités avancées pour les équipes entreprise","5Wwopw": "Tarifs",- "bxWfZS": "Essayez Rybbit dès aujourd'hui sans risque avec notre garantie de remboursement de 30 jours.",+ "vYmJVk": "","UHF9uv": "Votre utilisation d'essai","blVqkQ": "Utilisation actuelle","O/w//A": "{count} événements",@@ -1136,13 +1136,6 @@"kdqPM0": "Vous avez un plan personnalisé avec jusqu'à {limit} pages vues par mois.","kTH3Q2": "Vous avez dépassé votre limite mensuelle d'événements. Veuillez contacter le support.","ni0MP6": "Vous approchez de votre limite mensuelle d'événements. Veuillez contacter le support si vous avez besoin de plus de capacité.",- "couCg5": "Plan d'essai",- "jGorUz": "Vous êtes actuellement en essai gratuit de 14 jours avec jusqu'à 1 000 000 d'événements.",- "tSjtK2": "Statut de l'essai",- "eRPjFw": "Votre essai se termine dans",- "GSvWJl": "{daysRemaining} jours",- "mzGohi": "le {date}",- "e4rtdl": "Votre essai se termine aujourd'hui. Abonnez-vous pour continuer à suivre les visites.","OtO9EF": "Ajoutez des tags pour organiser et filtrer vos sites.","ACKiA3": "Aucun tag ajouté pour le moment","B1SDE1": "Saisir un nouveau tag...",diff --git a/client/messages/it.json b/client/messages/it.jsonindex 22020fc65..4f04f1bdc 100644--- a/client/messages/it.json+++ b/client/messages/it.json@@ -593,8 +593,8 @@"zINlao": "Proprietario","iHN12u": "Amministratore","7L86Z5": "Membro",- "Nvr5Ce": "Aggiunta in corso...","v+BwPW": "Aggiungi all'Organizzazione",+ "Nvr5Ce": "Aggiunta in corso...","Msn3jj": "Filtra per email...","gO9HzB": "Filtra per ruolo","9nrF+x": "Tutti i Ruoli",@@ -876,7 +876,7 @@"HJ5o5M": "4 mesi gratuiti","psz0YH": "Per progetti personali e piccoli siti","2qOt5n": "Solo fino a 250k",- "/aBLH2": "Inizia",+ "KV7xeN": "","DZY1mp": "Tutto il necessario per iniziare come piccola impresa","WnQ/AZ": "Contattaci","C9TNnE": "Funzionalità avanzate per team professionali",@@ -884,7 +884,7 @@"CnmIg8": "Abbonati (1$)","5dX7fM": "Funzionalità avanzate per team aziendali","5Wwopw": "Prezzi",- "bxWfZS": "Prova Rybbit oggi senza rischi con la nostra garanzia di rimborso di 30 giorni.",+ "vYmJVk": "","UHF9uv": "Utilizzo in Prova","blVqkQ": "Utilizzo Attuale","O/w//A": "{count} eventi",@@ -1136,13 +1136,6 @@"kdqPM0": "Hai un piano personalizzato con fino a {limit} visualizzazioni di pagina al mese.","kTH3Q2": "Hai superato il tuo limite di eventi mensili. Contatta il supporto per assistenza.","ni0MP6": "Ti stai avvicinando al tuo limite di eventi mensili. Contatta il supporto se hai bisogno di maggiore capacità.",- "couCg5": "Piano di Prova",- "jGorUz": "Sei attualmente in una prova gratuita di 14 giorni con fino a 1.000.000 di eventi.",- "tSjtK2": "Stato della Prova",- "eRPjFw": "La tua prova termina tra",- "GSvWJl": "{daysRemaining} giorni",- "mzGohi": "il {date}",- "e4rtdl": "La tua prova termina oggi. Abbonati per continuare a tracciare di nuovo le visite.","OtO9EF": "Aggiungi tag per organizzare e filtrare i tuoi siti.","ACKiA3": "Nessun tag aggiunto ancora","B1SDE1": "Digita un nuovo tag...",diff --git a/client/messages/ja.json b/client/messages/ja.jsonindex 25c04ac99..f58bdd6c6 100644--- a/client/messages/ja.json+++ b/client/messages/ja.json@@ -593,8 +593,8 @@"zINlao": "オーナー","iHN12u": "管理者","7L86Z5": "メンバー",- "Nvr5Ce": "追加中...","v+BwPW": "組織に追加",+ "Nvr5Ce": "追加中...","Msn3jj": "メールでフィルター...","gO9HzB": "ロールでフィルター","9nrF+x": "すべてのロール",@@ -876,7 +876,7 @@"HJ5o5M": "4ヶ月分無料","psz0YH": "個人プロジェクトや小規模サイト向け","2qOt5n": "25万まで",- "/aBLH2": "始める",+ "KV7xeN": "","DZY1mp": "小規模ビジネスの開始に必要なすべて","WnQ/AZ": "お問い合わせ","C9TNnE": "プロフェッショナルチーム向けの高度な機能",@@ -884,7 +884,7 @@"CnmIg8": "サブスクリプション($1)","5dX7fM": "エンタープライズチーム向けの高度な機能","5Wwopw": "料金",- "bxWfZS": "30日間の返金保証付きで、今すぐRybbitをリスクなしでお試しください。",+ "vYmJVk": "","UHF9uv": "トライアル使用量","blVqkQ": "現在の使用量","O/w//A": "{count}イベント",@@ -1136,13 +1136,6 @@"kdqPM0": "カスタムプランで月{limit}ページビューまでご利用いただけます。","kTH3Q2": "月間イベント上限を超えました。サポートにお問い合わせください。","ni0MP6": "月間イベント上限に近づいています。容量を増やす必要がある場合はサポートにお問い合わせください。",- "couCg5": "トライアルプラン",- "jGorUz": "現在14日間の無料トライアル中で、最大1,000,000イベントまでご利用いただけます。",- "tSjtK2": "トライアルステータス",- "eRPjFw": "トライアル終了まで",- "GSvWJl": "残り{daysRemaining}日",- "mzGohi": "{date}に終了",- "e4rtdl": "トライアルは本日終了します。訪問の追跡を再開するにはサブスクリプションしてください。","OtO9EF": "タグを追加してサイトを整理・フィルターしましょう。","ACKiA3": "タグがまだ追加されていません","B1SDE1": "新しいタグを入力...",diff --git a/client/messages/ko.json b/client/messages/ko.jsonindex 864a5697f..092dd1697 100644--- a/client/messages/ko.json+++ b/client/messages/ko.json@@ -593,8 +593,8 @@"zINlao": "소유자","iHN12u": "관리자","7L86Z5": "멤버",- "Nvr5Ce": "추가 중...","v+BwPW": "조직에 추가",+ "Nvr5Ce": "추가 중...","Msn3jj": "이메일로 필터...","gO9HzB": "역할로 필터","9nrF+x": "모든 역할",@@ -876,7 +876,7 @@"HJ5o5M": "4개월 무료","psz0YH": "개인 프로젝트 및 소규모 사이트용","2qOt5n": "최대 25만까지만",- "/aBLH2": "시작하기",+ "KV7xeN": "","DZY1mp": "소규모 비즈니스를 위한 모든 것","WnQ/AZ": "문의하기","C9TNnE": "전문 팀을 위한 고급 기능",@@ -884,7 +884,7 @@"CnmIg8": "구독 ($1)","5dX7fM": "엔터프라이즈 팀을 위한 고급 기능","5Wwopw": "요금제",- "bxWfZS": "30일 환불 보장으로 오늘 Rybbit을 부담 없이 시작하세요.",+ "vYmJVk": "","UHF9uv": "체험판 사용량","blVqkQ": "현재 사용량","O/w//A": "{count}개 이벤트",@@ -1136,13 +1136,6 @@"kdqPM0": "월 최대 {limit}개 페이지뷰의 사용자 정의 플랜입니다.","kTH3Q2": "월별 이벤트 한도를 초과했습니다. 지원팀에 문의해 주세요.","ni0MP6": "월별 이벤트 한도에 근접하고 있습니다. 더 많은 용량이 필요하시면 지원팀에 문의해 주세요.",- "couCg5": "체험 플랜",- "jGorUz": "현재 최대 1,000,000개 이벤트의 14일 무료 체험 중입니다.",- "tSjtK2": "체험 상태",- "eRPjFw": "체험이 종료되기까지",- "GSvWJl": "{daysRemaining}일",- "mzGohi": "{date}에",- "e4rtdl": "체험이 오늘 종료됩니다. 방문 추적을 계속하려면 구독하세요.","OtO9EF": "사이트를 정리하고 필터링하기 위해 태그를 추가하세요.","ACKiA3": "아직 추가된 태그 없음","B1SDE1": "새 태그 입력...",diff --git a/client/messages/pl.json b/client/messages/pl.jsonindex 330d5f5b6..230bcc202 100644--- a/client/messages/pl.json+++ b/client/messages/pl.json@@ -593,8 +593,8 @@"zINlao": "Właściciel","iHN12u": "Administrator","7L86Z5": "Członek",- "Nvr5Ce": "Dodawanie...","v+BwPW": "Dodaj do organizacji",+ "Nvr5Ce": "Dodawanie...","Msn3jj": "Filtruj po e-mailu...","gO9HzB": "Filtruj po roli","9nrF+x": "Wszystkie role",@@ -876,7 +876,7 @@"HJ5o5M": "4 miesiące gratis","psz0YH": "Dla projektów osobistych i małych stron","2qOt5n": "Tylko do 250 tys.",- "/aBLH2": "Rozpocznij",+ "KV7xeN": "","DZY1mp": "Wszystko, czego potrzebujesz, aby rozpocząć jako mały biznes","WnQ/AZ": "Skontaktuj się z nami","C9TNnE": "Zaawansowane funkcje dla profesjonalnych zespołów",@@ -884,7 +884,7 @@"CnmIg8": "Subskrybuj ($1)","5dX7fM": "Zaawansowane funkcje dla zespołów korporacyjnych","5Wwopw": "Cennik",- "bxWfZS": "Wypróbuj Rybbit już dziś bez ryzyka z naszą 30-dniową gwarancją zwrotu pieniędzy.",+ "vYmJVk": "","UHF9uv": "Twoje wykorzystanie wersji próbnej","blVqkQ": "Bieżące wykorzystanie","O/w//A": "{count} zdarzeń",@@ -1136,13 +1136,6 @@"kdqPM0": "Masz niestandardowy plan z limitem do {limit} odsłon miesięcznie.","kTH3Q2": "Przekroczyłeś swój miesięczny limit zdarzeń. Skontaktuj się z pomocą techniczną.","ni0MP6": "Zbliżasz się do miesięcznego limitu zdarzeń. Skontaktuj się z pomocą techniczną, jeśli potrzebujesz większej pojemności.",- "couCg5": "Plan próbny",- "jGorUz": "Jesteś obecnie na 14-dniowej darmowej wersji próbnej z limitem do 1 000 000 zdarzeń.",- "tSjtK2": "Status wersji próbnej",- "eRPjFw": "Twoja wersja próbna kończy się za",- "GSvWJl": "{daysRemaining} dni",- "mzGohi": "dnia {date}",- "e4rtdl": "Twoja wersja próbna kończy się dzisiaj. Subskrybuj, aby ponownie śledzić odwiedziny.","OtO9EF": "Dodaj tagi, aby organizować i filtrować swoje strony.","ACKiA3": "Brak dodanych tagów","B1SDE1": "Wpisz nowy tag...",diff --git a/client/messages/pt.json b/client/messages/pt.jsonindex 8582b1a65..7726001e7 100644--- a/client/messages/pt.json+++ b/client/messages/pt.json@@ -593,8 +593,8 @@"zINlao": "Proprietário","iHN12u": "Administrador","7L86Z5": "Membro",- "Nvr5Ce": "Adicionando...","v+BwPW": "Adicionar à Organização",+ "Nvr5Ce": "Adicionando...","Msn3jj": "Filtrar por email...","gO9HzB": "Filtrar por papel","9nrF+x": "Todos os Papéis",@@ -876,7 +876,7 @@"HJ5o5M": "4 meses grátis","psz0YH": "Para projetos pessoais e sites pequenos","2qOt5n": "Até 250 mil apenas",- "/aBLH2": "Começar",+ "KV7xeN": "","DZY1mp": "Tudo que você precisa para começar como pequena empresa","WnQ/AZ": "Fale conosco","C9TNnE": "Recursos avançados para equipes profissionais",@@ -884,7 +884,7 @@"CnmIg8": "Assinar ($1)","5dX7fM": "Recursos avançados para equipes empresariais","5Wwopw": "Preços",- "bxWfZS": "Experimente o Rybbit hoje sem risco com nossa garantia de reembolso de 30 dias.",+ "vYmJVk": "","UHF9uv": "Seu Uso no Teste","blVqkQ": "Uso Atual","O/w//A": "{count} eventos",@@ -1136,13 +1136,6 @@"kdqPM0": "Você tem um plano personalizado com até {limit} visualizações de página por mês.","kTH3Q2": "Você excedeu seu limite mensal de eventos. Por favor, entre em contato com o suporte para assistência.","ni0MP6": "Você está se aproximando do seu limite mensal de eventos. Por favor, entre em contato com o suporte se precisar de mais capacidade.",- "couCg5": "Plano de Teste",- "jGorUz": "Você está atualmente em um teste gratuito de 14 dias com até 1.000.000 de eventos.",- "tSjtK2": "Status do Teste",- "eRPjFw": "Seu teste termina em",- "GSvWJl": "{daysRemaining} dias",- "mzGohi": "em {date}",- "e4rtdl": "Seu teste termina hoje. Assine para continuar rastreando visitas novamente.","OtO9EF": "Adicione tags para organizar e filtrar seus sites.","ACKiA3": "Nenhuma tag adicionada ainda","B1SDE1": "Digite uma nova tag...",diff --git a/client/messages/zh.json b/client/messages/zh.jsonindex bb92bdb33..f38418f2e 100644--- a/client/messages/zh.json+++ b/client/messages/zh.json@@ -593,8 +593,8 @@"zINlao": "所有者","iHN12u": "管理员","7L86Z5": "成员",- "Nvr5Ce": "正在添加...","v+BwPW": "添加到组织",+ "Nvr5Ce": "正在添加...","Msn3jj": "按电子邮件过滤...","gO9HzB": "按角色过滤","9nrF+x": "所有角色",@@ -876,7 +876,7 @@"HJ5o5M": "免费 4 个月","psz0YH": "适合个人项目和小型网站","2qOt5n": "最多仅 25 万次",- "/aBLH2": "开始使用",+ "KV7xeN": "","DZY1mp": "作为小型企业入门所需的一切","WnQ/AZ": "联系我们","C9TNnE": "面向专业团队的高级功能",@@ -884,7 +884,7 @@"CnmIg8": "订阅 ($1)","5dX7fM": "面向企业团队的高级功能","5Wwopw": "定价",- "bxWfZS": "今天即可零风险体验 Rybbit,我们提供 30 天退款保证。",+ "vYmJVk": "","UHF9uv": "您的试用版使用情况","blVqkQ": "当前使用量","O/w//A": "{count} 个事件",@@ -1136,13 +1136,6 @@"kdqPM0": "您拥有一个定制计划,每月最高可达 {limit} 次页面浏览量。","kTH3Q2": "您已超出每月的事件限制。请联系支持以获得帮助。","ni0MP6": "您正在接近每月的事件限制。如果您需要更多容量,请联系支持。",- "couCg5": "试用计划",- "jGorUz": "您目前正在享受为期 14 天的免费试用,包含高达 1,000,000 个事件。",- "tSjtK2": "试用状态",- "eRPjFw": "您的试用将在",- "GSvWJl": "{daysRemaining} 天后结束",- "mzGohi": "于 {date}",- "e4rtdl": "您的试用在今天结束。请订阅以继续追踪访问情况。","OtO9EF": "添加标签以组织和过滤您的网站。","ACKiA3": "尚未添加标签","B1SDE1": "输入新标签...",diff --git a/client/package.json b/client/package.jsonindex 6a2fc073f..1521613c4 100644--- a/client/package.json+++ b/client/package.json@@ -6,6 +6,7 @@"dev": "next dev -p 3002","build": "next build","start": "next start -p 3002",+ "extract": "node scripts/extract-messages.mjs","lint": "eslint .","knip": "knip","format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",diff --git a/client/src/app/[site]/replay/components/EnableSessionReplay.tsx b/client/src/app/[site]/replay/components/EnableSessionReplay.tsxindex 253305fd2..f6e43d78a 100644--- a/client/src/app/[site]/replay/components/EnableSessionReplay.tsx+++ b/client/src/app/[site]/replay/components/EnableSessionReplay.tsx@@ -8,14 +8,19 @@ import { updateSiteConfig } from "../../../../api/admin/endpoints";import { useGetSite } from "../../../../api/admin/hooks/useSites";import { Alert, AlertDescription, AlertTitle } from "../../../../components/ui/alert";import { Button } from "../../../../components/ui/button";+import { useStripeSubscription } from "../../../../lib/subscription/useStripeSubscription";+import { IS_CLOUD } from "../../../../lib/const";export function EnableSessionReplay() {const t = useExtracted();const params = useParams();const siteId = Number(params.site);const { data: siteMetadata, isLoading, refetch } = useGetSite(siteId);+ const { data: subscription } = useStripeSubscription();- if (isLoading || siteMetadata?.sessionReplay) return null;+ const canEnableReplay = !IS_CLOUD || (!!subscription?.planName.includes("pro") && !(subscription?.isTrial && (subscription?.eventLimit ?? 0) >= 500_000));++ if (isLoading || siteMetadata?.sessionReplay || !canEnableReplay) return null;return (<Alert className="p-4 bg-neutral-50/50 border-amber-200/50 dark:bg-neutral-800/25 dark:border-amber-600/80">diff --git a/client/src/app/admin/components/organizations/OrganizationsTable.tsx b/client/src/app/admin/components/organizations/OrganizationsTable.tsxindex 7a101337d..abed04c99 100644--- a/client/src/app/admin/components/organizations/OrganizationsTable.tsx+++ b/client/src/app/admin/components/organizations/OrganizationsTable.tsx@@ -54,7 +54,7 @@ export function OrganizationsTable({ organizations, isLoading, searchQuery }: Orconst formatSubscriptionStatus = (subscription: AdminOrganizationData["subscription"]) => {const statusColor =- subscription.status === "active" ? "default" : subscription.status === "canceled" ? "destructive" : "secondary";+ subscription.status === "active" || subscription.status === "trialing" ? "default" : subscription.status === "canceled" ? "destructive" : "secondary";return <Badge variant={statusColor}>{subscription.planName}</Badge>;};@@ -265,9 +265,9 @@ export function OrganizationsTable({ organizations, isLoading, searchQuery }: Ordata={table.getRowModel().rows.length > 0? {- items: table.getRowModel().rows,- total: table.getRowModel().rows.length,- }+ items: table.getRowModel().rows,+ total: table.getRowModel().rows.length,+ }: undefined}pagination={pagination}diff --git a/client/src/app/admin/components/sites/Sites.tsx b/client/src/app/admin/components/sites/Sites.tsxindex b76631b11..c349cd3a8 100644--- a/client/src/app/admin/components/sites/Sites.tsx+++ b/client/src/app/admin/components/sites/Sites.tsx@@ -108,7 +108,7 @@ export function Sites() {cell: ({ row }) => {const subscription = row.original.subscription;const statusColor =- subscription.status === "active"+ subscription.status === "active" || subscription.status === "trialing"? "default": subscription.status === "canceled"? "destructive"diff --git a/client/src/app/settings/organization/subscription/page.tsx b/client/src/app/settings/organization/subscription/page.tsxindex 291cf28d8..d31b20faf 100644--- a/client/src/app/settings/organization/subscription/page.tsx+++ b/client/src/app/settings/organization/subscription/page.tsx@@ -5,7 +5,6 @@ import { Skeleton } from "@/components/ui/skeleton";import { PaidPlan } from "../../../../components/subscription/PaidPlain/PaidPlan";import { useStripeSubscription } from "../../../../lib/subscription/useStripeSubscription";import { NoOrganization } from "../../../../components/NoOrganization";-import { TrialPlan } from "../../../../components/subscription/TrialPlan";import { ExpiredTrialPlan } from "../../../../components/subscription/ExpiredTrialPlan";import { useSetPageTitle } from "../../../../hooks/useSetPageTitle";import { FreePlan } from "../../../../components/subscription/FreePlan";@@ -71,10 +70,6 @@ export default function OrganizationSubscriptionPage() {return <FreePlan />;}- if (activeSubscription.isTrial) {- return <TrialPlan />;- }-if (activeSubscription.planName.startsWith("appsumo")) {return <AppSumoPlan />;}diff --git a/client/src/app/subscribe/components/PricingCards.tsx b/client/src/app/subscribe/components/PricingCards.tsxindex 64271cb4e..410b71909 100644--- a/client/src/app/subscribe/components/PricingCards.tsx+++ b/client/src/app/subscribe/components/PricingCards.tsx@@ -257,7 +257,7 @@ export function PricingCards({ isLoggedIn }: { isLoggedIn: boolean }) {isAnnual={isAnnual}isCustomTier={!isBasicAvailable}customPriceLabel="-"- buttonText={!isBasicAvailable ? t("Up to 250k only") : isLoading ? t("Processing...") : t("Get started")}+ buttonText={!isBasicAvailable ? t("Up to 250k only") : isLoading ? t("Processing...") : t("Start free trial")}features={BASIC_FEATURES}onClick={() => handleSubscribe("basic")}disabled={isLoading || !isBasicAvailable}@@ -270,7 +270,7 @@ export function PricingCards({ isLoggedIn }: { isLoggedIn: boolean }) {annualPrice={standardAnnualPrice}isAnnual={isAnnual}isCustomTier={isCustomTier}- buttonText={isLoading ? t("Processing...") : isCustomTier ? t("Contact us") : t("Get started")}+ buttonText={isLoading ? t("Processing...") : isCustomTier ? t("Contact us") : t("Start free trial")}features={STANDARD_FEATURES}onClick={() => handleSubscribe("standard")}disabled={isLoading}@@ -282,7 +282,7 @@ export function PricingCards({ isLoggedIn }: { isLoggedIn: boolean }) {monthlyPrice={proMonthlyPrice}annualPrice={proAnnualPrice}isAnnual={isAnnual}- buttonText={isLoading ? t("Processing...") : isCustomTier ? t("Contact us") : t("Get started")}+ buttonText={isLoading ? t("Processing...") : isCustomTier ? t("Contact us") : t("Start free trial")}features={PRO_FEATURES}recommended={true}onClick={() => handleSubscribe("pro")}diff --git a/client/src/app/subscribe/components/PricingHeader.tsx b/client/src/app/subscribe/components/PricingHeader.tsxindex df692c12d..bcec751cd 100644--- a/client/src/app/subscribe/components/PricingHeader.tsx+++ b/client/src/app/subscribe/components/PricingHeader.tsx@@ -8,7 +8,7 @@ export function PricingHeader() {<h1 className="text-4xl md:text-5xl font-bold tracking-tight pb-4 text-transparent bg-clip-text bg-linear-to-b from-neutral-900 via-neutral-700 to-neutral-500 dark:from-white dark:via-gray-200 dark:to-gray-400">{t("Pricing")}</h1>- <p className="text-lg text-neutral-600 dark:text-neutral-300 mb-6">{t("Try Rybbit today risk-free with our 30-day money-back guarantee.")}</p>+ <p className="text-lg text-neutral-600 dark:text-neutral-300 mb-6">{t("Start your 7-day free trial — no credit card charges until the trial ends.")}</p></div>);}diff --git a/client/src/app/subscribe/page.tsx b/client/src/app/subscribe/page.tsxindex b09f271a1..7defc2db0 100644--- a/client/src/app/subscribe/page.tsx+++ b/client/src/app/subscribe/page.tsx@@ -1,7 +1,6 @@"use client";import { authClient } from "@/lib/auth";-import { DateTime } from "luxon";import { useExtracted } from "next-intl";import { useRouter } from "next/navigation";import { Suspense } from "react";@@ -21,17 +20,13 @@ function SubscribeContent() {const [siteId, setSiteId] = useQueryState("siteId");// Redirect if already subscribed- // if (subscription?.status === "active") {+ // if (subscription?.status === "active" || subscription?.status === "trialing") {// router.push("/settings/organization/subscription");// }// Get the active organization IDconst organizationId = activeOrg?.id;- // Get last 30 days of data- const endDate = DateTime.now().toISODate();- const startDate = DateTime.now().minus({ days: 30 }).toISODate();-if (siteId) {return (<StandardPage>@@ -53,7 +48,7 @@ function SubscribeContent() {{/* Usage Stats and Chart */}{organizationId && (<div className="max-w-4xl mx-auto mt-6 bg-white dark:bg-neutral-900/80 rounded-xl border border-neutral-100 dark:border-neutral-850 p-6">- <UsageChart organizationId={organizationId} startDate={startDate} endDate={endDate} />+ <UsageChart organizationId={organizationId} /></div>)}</div>diff --git a/client/src/components/AppSidebar.tsx b/client/src/components/AppSidebar.tsxindex fd07a2a67..a1af690bd 100644--- a/client/src/components/AppSidebar.tsx+++ b/client/src/components/AppSidebar.tsx@@ -66,7 +66,7 @@ function AppSidebarContent() {expanded={isExpanded}/>{- IS_CLOUD && subscription?.status === "active" && <SidebarLink+ IS_CLOUD && (subscription?.status === "active" || subscription?.status === "trialing") && <SidebarLinkhref="mailto:[email protected]"icon={<HelpCircle className="w-5 h-5" />}label={t("Email Support")}diff --git a/client/src/components/CreateOrganizationDialog.tsx b/client/src/components/CreateOrganizationDialog.tsxindex 4028d8e1f..d7eb248ac 100644--- a/client/src/components/CreateOrganizationDialog.tsx+++ b/client/src/components/CreateOrganizationDialog.tsx@@ -161,7 +161,7 @@ export function CreateOrganizationDialog({ open, onOpenChange, onSuccess, trigge<AlertDescription>{error}</AlertDescription></Alert>)}- {subscription?.status === "active" && (+ {subscription?.status === "active" || subscription?.status === "trialing" && (<Alert variant="warning"><AlertTriangle className="h-4 w-4" /><AlertTitle>{t("Subscription Will Not Carry Over")}</AlertTitle>diff --git a/client/src/components/SiteSettings/SiteConfiguration.tsx b/client/src/components/SiteSettings/SiteConfiguration.tsxindex 69c673952..a0fb6afad 100644--- a/client/src/components/SiteSettings/SiteConfiguration.tsx+++ b/client/src/components/SiteSettings/SiteConfiguration.tsx@@ -187,7 +187,7 @@ export function SiteConfiguration({ siteMetadata, disabled = false, onClose }: Sconst { data: subscription, isLoading: isSubscriptionLoading } = useStripeSubscription();- const sessionReplayDisabled = !subscription?.planName.includes("pro") && IS_CLOUD;+ const sessionReplayDisabled = (!subscription?.planName.includes("pro") || (!!subscription?.isTrial && (subscription?.eventLimit ?? 0) >= 500_000)) && IS_CLOUD;const standardFeaturesDisabled = !subscription?.planName.includes("standard") && !subscription?.planName.includes("pro") && !subscription?.planName.includes("appsumo") && IS_CLOUD;// Configuration for analytics feature togglesdiff --git a/client/src/components/UsageChart.tsx b/client/src/components/UsageChart.tsxindex d48580773..f9d660589 100644--- a/client/src/components/UsageChart.tsx+++ b/client/src/components/UsageChart.tsx@@ -27,8 +27,6 @@ function getPeriodDates(period: PeriodValue): { startDate?: string; endDate?: stinterface UsageChartProps {organizationId: string;- startDate?: string;- endDate?: string;timeZone?: string;}diff --git a/client/src/components/subscription/AppSumoPlan.tsx b/client/src/components/subscription/AppSumoPlan.tsxindex b3dc4b15b..57d3287d8 100644--- a/client/src/components/subscription/AppSumoPlan.tsx+++ b/client/src/components/subscription/AppSumoPlan.tsx@@ -1,6 +1,5 @@import { authClient } from "@/lib/auth";import { AlertTriangle, ArrowRight } from "lucide-react";-import { DateTime } from "luxon";import { useExtracted } from "next-intl";import { useRouter } from "next/navigation";import { DEFAULT_EVENT_LIMIT } from "../../lib/subscription/constants";@@ -20,10 +19,6 @@ export function AppSumoPlan() {// Get the active organization IDconst organizationId = activeOrg?.id;- // Get last 30 days of data for the chart- const endDate = DateTime.now().toISODate();- const startDate = DateTime.now().minus({ days: 30 }).toISODate();-if (!subscription) return null;const currentUsage = subscription?.monthlyEventCount || 0;@@ -80,7 +75,7 @@ export function AppSumoPlan() {</div></div>- {organizationId && <UsageChart organizationId={organizationId} startDate={startDate} endDate={endDate} />}+ {organizationId && <UsageChart organizationId={organizationId} />}</div></CardContent><CardFooter>diff --git a/client/src/components/subscription/FreePlan.tsx b/client/src/components/subscription/FreePlan.tsxindex 911f87c32..449233e4d 100644--- a/client/src/components/subscription/FreePlan.tsx+++ b/client/src/components/subscription/FreePlan.tsx@@ -1,6 +1,5 @@import { authClient } from "@/lib/auth";import { AlertTriangle, ArrowRight } from "lucide-react";-import { DateTime } from "luxon";import { useExtracted } from "next-intl";import { useRouter } from "next/navigation";import { DEFAULT_EVENT_LIMIT } from "../../lib/subscription/constants";@@ -20,10 +19,6 @@ export function FreePlan() {// Get the active organization IDconst organizationId = activeOrg?.id;- // Get last 30 days of data for the chart- const endDate = DateTime.now().toISODate();- const startDate = DateTime.now().minus({ days: 30 }).toISODate();-if (!subscription) return null;const currentUsage = subscription?.monthlyEventCount || 0;@@ -80,7 +75,7 @@ export function FreePlan() {</div></div>- {organizationId && <UsageChart organizationId={organizationId} startDate={startDate} endDate={endDate} />}+ {organizationId && <UsageChart organizationId={organizationId} />}</div></CardContent><CardFooter>diff --git a/client/src/components/subscription/OverridePlan.tsx b/client/src/components/subscription/OverridePlan.tsxindex e7680af11..a46c23f6f 100644--- a/client/src/components/subscription/OverridePlan.tsx+++ b/client/src/components/subscription/OverridePlan.tsx@@ -1,6 +1,5 @@import { authClient } from "@/lib/auth";import { AlertTriangle, Shield } from "lucide-react";-import { DateTime } from "luxon";import { useExtracted } from "next-intl";import { DEFAULT_EVENT_LIMIT } from "../../lib/subscription/constants";import { useStripeSubscription } from "../../lib/subscription/useStripeSubscription";@@ -17,9 +16,6 @@ export function OverridePlan() {const organizationId = activeOrg?.id;- const endDate = DateTime.now().toISODate();- const startDate = DateTime.now().minus({ days: 30 }).toISODate();-if (!subscription) return null;const currentUsage = subscription?.monthlyEventCount || 0;@@ -89,7 +85,7 @@ export function OverridePlan() {</div></div>- {organizationId && <UsageChart organizationId={organizationId} startDate={startDate} endDate={endDate} />}+ {organizationId && <UsageChart organizationId={organizationId} />}</div></CardContent></Card>diff --git a/client/src/components/subscription/PaidPlain/PaidPlan.tsx b/client/src/components/subscription/PaidPlain/PaidPlan.tsxindex a09254b26..b271b25ab 100644--- a/client/src/components/subscription/PaidPlain/PaidPlan.tsx+++ b/client/src/components/subscription/PaidPlain/PaidPlan.tsx@@ -1,8 +1,7 @@-import { Shield } from "lucide-react";+import { Clock, Shield } from "lucide-react";import { useState } from "react";import { toast } from "@/components/ui/sonner";-import { DateTime } from "luxon";-import { Alert } from "../../ui/alert";+import { Alert, AlertDescription, AlertTitle } from "../../ui/alert";import { Button } from "../../ui/button";import { Card, CardContent } from "../../ui/card";import { Progress } from "../../ui/progress";@@ -18,18 +17,15 @@ export function PaidPlan() {const { data: activeSubscription, isLoading, error: subscriptionError, refetch } = useStripeSubscription();const { data: activeOrg } = authClient.useActiveOrganization();-- // Get the active organization IDconst organizationId = activeOrg?.id;- // Get last 30 days of data for the chart- const endDate = DateTime.now().toISODate();- const startDate = DateTime.now().minus({ days: 30 }).toISODate();-const [isProcessing, setIsProcessing] = useState(false);const [actionError, setActionError] = useState<string | null>(null);const [showPlanDialog, setShowPlanDialog] = useState(false);+ const isTrial = !!activeSubscription?.isTrial;+ const trialDaysRemaining = activeSubscription?.trialDaysRemaining || 0;+const eventLimit = activeSubscription?.eventLimit || 0;const currentUsage = activeSubscription?.monthlyEventCount || 0;const usagePercentage = eventLimit > 0 ? Math.min((currentUsage / eventLimit) * 100, 100) : 0;@@ -45,35 +41,6 @@ export function PaidPlan() {name: planType,price: `$${stripePlan?.price}`,interval: stripePlan?.interval,- description: planType === "Pro"- ? "Premium features for professional teams"- : planType === "Basic"- ? "Core analytics for personal projects"- : "Advanced analytics for growing projects",- features: planType === "Pro"- ? [- "5+ year data retention",- "Session replays",- "Unlimited team members",- "Unlimited websites",- "Priority support",- ]- : planType === "Basic"- ? [- "1 website",- "1 team member",- "Web analytics dashboard",- "Goals & custom events",- "2 year data retention",- "Email support",- ]- : ["2 year data retention", "Up to 5 websites", "Up to 3 team members", "Email support"],- color: planType === "Pro"- ? "bg-linear-to-br from-purple-50 to-indigo-100 dark:from-purple-800 dark:to-indigo-800"- : planType === "Basic"- ? "bg-linear-to-br from-blue-50 to-sky-100 dark:from-blue-800 dark:to-sky-800"- : "bg-linear-to-br from-green-50 to-emerald-100 dark:from-green-800 dark:to-emerald-800",- icon: <Shield className="h-5 w-5" />,}: null;@@ -135,6 +102,9 @@ export function PaidPlan() {if (activeSubscription.cancelAtPeriodEnd) {return `Cancels on ${formattedDate}`;}+ if (activeSubscription.status === "trialing") {+ return `Trial ends on ${formattedDate}`;+ }if (activeSubscription.status === "active") {return isAnnualPlan ? `Renews annually on ${formattedDate}` : `Renews monthly on ${formattedDate}`;}@@ -208,9 +178,23 @@ export function PaidPlan() {</div></div>- {organizationId && <UsageChart organizationId={organizationId} startDate={startDate} endDate={endDate} />}+ {organizationId && <UsageChart organizationId={organizationId} />}++ {isTrial && (+ <Alert className="bg-blue-50 dark:bg-blue-900/20 border-blue-200 dark:border-blue-800">+ <Clock className="h-4 w-4 text-blue-500 dark:text-blue-400" />+ <AlertTitle>Trial Status</AlertTitle>+ <AlertDescription>+ {trialDaysRemaining > 0 ? (+ <>Your trial ends in <strong>{trialDaysRemaining} days</strong> on {formatDate(activeSubscription.currentPeriodEnd)}.</>+ ) : (+ <>Your trial ends today. Upgrade to continue tracking.</>+ )}+ </AlertDescription>+ </Alert>+ )}- {isAnnualPlan && (+ {isAnnualPlan && !isTrial && (<div className="pt-2 pb-0 px-3 bg-emerald-50 dark:bg-emerald-900/20 rounded-md border border-emerald-100 dark:border-emerald-800"><p className="text-sm text-emerald-700 dark:text-emerald-300 py-2"><strong>Annual Billing:</strong> You're on annual billing which saves you money compared to monthly@@ -228,7 +212,7 @@ export function PaidPlan() {size="sm"className="dark:hover:bg-red-700/60">- Cancel Subscription+ {isTrial ? "Cancel Trial" : "Cancel Subscription"}</Button></div></div>diff --git a/client/src/components/subscription/TrialPlan.tsx b/client/src/components/subscription/TrialPlan.tsxdeleted file mode 100644index 5c05919db..000000000--- a/client/src/components/subscription/TrialPlan.tsx+++ /dev/null@@ -1,74 +0,0 @@-import { ArrowRight, Clock } from "lucide-react";-import { useExtracted } from "next-intl";-import { useRouter } from "next/navigation";-import { Alert, AlertDescription, AlertTitle } from "../ui/alert";-import { Button } from "../ui/button";-import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "../ui/card";-import { Progress } from "../ui/progress";-import { TRIAL_EVENT_LIMIT } from "../../lib/subscription/constants";-import { formatDate } from "../../lib/subscription/planUtils";-import { useStripeSubscription } from "../../lib/subscription/useStripeSubscription";--export function TrialPlan() {- const t = useExtracted();- const { data: activeSubscription, isLoading, error: subscriptionError } = useStripeSubscription();-- const router = useRouter();-- if (!activeSubscription) return null;-- const currentUsage = activeSubscription?.monthlyEventCount || 0;- const daysRemaining = activeSubscription?.trialDaysRemaining || 0;- const trialEndDate = activeSubscription?.currentPeriodEnd ? new Date(activeSubscription.currentPeriodEnd) : null;-- return (- <div className="space-y-6">- <Card>- <CardHeader>- <CardTitle className="flex items-center">- {t("Trial Plan")} <Clock className="ml-2 h-5 w-5 text-blue-500" />- </CardTitle>- <CardDescription>{t("You are currently on a 14-day free trial with up to 1,000,000 events.")}</CardDescription>- </CardHeader>- <CardContent>- <div className="space-y-6 p-2">- <Alert className="bg-blue-50 dark:bg-blue-900/20 border-blue-200 dark:border-blue-800">- <Clock className="h-4 w-4 text-blue-500 dark:text-blue-400" />- <AlertTitle>{t("Trial Status")}</AlertTitle>- <AlertDescription>- {daysRemaining > 0 ? (- <>- {t("Your trial ends in")} <strong>{t("{daysRemaining} days", { daysRemaining: String(daysRemaining) })}</strong>- {trialEndDate && <> {t("on {date}", { date: formatDate(trialEndDate) })}</>}- </>- ) : (- <>{t("Your trial ends today. Subscribe to continue tracking visits again.")}</>- )}- </AlertDescription>- </Alert>-- <div className="space-y-2">- <h3 className="font-medium mb-2">{t("Usage")}</h3>- <div className="space-y-4">- <div>- <div className="flex justify-between mb-1">- <span className="text-sm">{t("Events")}</span>- <span className="text-sm">- {currentUsage.toLocaleString()} / {TRIAL_EVENT_LIMIT.toLocaleString()}- </span>- </div>- <Progress value={Math.min((currentUsage / TRIAL_EVENT_LIMIT) * 100, 100)} />- </div>- </div>- </div>- </div>- </CardContent>- <CardFooter>- <Button onClick={() => router.push("/subscribe")} variant={"success"}>- {t("Upgrade To Pro")} <ArrowRight className="ml-2 h-4 w-4" />- </Button>- </CardFooter>- </Card>- </div>- );-}diff --git a/server/src/api/stripe/createCheckoutSession.ts b/server/src/api/stripe/createCheckoutSession.tsindex dee6c2367..f17eae293 100644--- a/server/src/api/stripe/createCheckoutSession.ts+++ b/server/src/api/stripe/createCheckoutSession.ts@@ -111,6 +111,8 @@ export async function createCheckoutSession(metadata: {organizationId: organizationId,},+ // 7-day free trial before charging+ subscription_data: { trial_period_days: 7 },// Allow promotion codesallow_promotion_codes: true,// Enable automatic tax calculation if configured in Stripe Tax settingsdiff --git a/server/src/api/stripe/getSubscription.ts b/server/src/api/stripe/getSubscription.tsindex ed3e6bbb4..5b5e07a0c 100644--- a/server/src/api/stripe/getSubscription.ts+++ b/server/src/api/stripe/getSubscription.ts@@ -67,6 +67,25 @@ export async function getSubscriptionInner(organizationId: string) {}if (subscription.source === "stripe") {+ if (subscription.status === "trialing") {+ const trialDaysRemaining = subscription.trialEnd+ ? Math.max(0, Math.ceil(DateTime.fromJSDate(subscription.trialEnd).diff(DateTime.now(), "days").days))+ : 0;+ return {+ id: subscription.subscriptionId,+ planName: subscription.planName,+ status: subscription.status,+ createdAt: subscription.createdAt,+ currentPeriodStart: DateTime.fromISO(subscription.periodStart).toJSDate(),+ currentPeriodEnd: subscription.trialEnd ?? subscription.currentPeriodEnd,+ cancelAtPeriodEnd: subscription.cancelAtPeriodEnd,+ eventLimit: subscription.eventLimit,+ monthlyEventCount: org.monthlyEventCount || 0,+ interval: subscription.interval,+ isTrial: true,+ trialDaysRemaining,+ };+ }return {id: subscription.subscriptionId,planName: subscription.planName,diff --git a/server/src/lib/subscriptionUtils.ts b/server/src/lib/subscriptionUtils.tsindex 48cade732..fa0ab8a4a 100644--- a/server/src/lib/subscriptionUtils.ts+++ b/server/src/lib/subscriptionUtils.ts@@ -30,6 +30,7 @@ export interface StripeSubscriptionInfo {interval: string;cancelAtPeriodEnd: boolean;createdAt: Date;+ trialEnd?: Date;}export interface FreeSubscriptionInfo {@@ -174,11 +175,26 @@ export async function getStripeSubscription(stripeCustomerId: string | null): Prexpand: ["data.plan.product"],});+ let subscription: Stripe.Subscription;+ let isTrial = false;+if (subscriptions.data.length === 0) {- return null;+ // Check for trialing subscriptions+ const trialSubs = await (stripe as Stripe).subscriptions.list({+ customer: stripeCustomerId,+ status: "trialing",+ limit: 1,+ expand: ["data.plan.product"],+ });+ if (trialSubs.data.length === 0) {+ return null;+ }+ subscription = trialSubs.data[0];+ isTrial = true;+ } else {+ subscription = subscriptions.data[0];}- const subscription = subscriptions.data[0];const subscriptionItem = subscription.items.data[0];const priceId = subscriptionItem.price.id;@@ -205,6 +221,7 @@ export async function getStripeSubscription(stripeCustomerId: string | null): Printerval: subscriptionItem.price.recurring?.interval ?? "unknown",cancelAtPeriodEnd: subscription.cancel_at_period_end,createdAt: new Date(subscription.created * 1000),+ ...(isTrial && subscription.trial_end ? { trialEnd: new Date(subscription.trial_end * 1000) } : {}),};}@@ -228,6 +245,7 @@ export async function getStripeSubscription(stripeCustomerId: string | null): Printerval: subscriptionItem.price.recurring?.interval ?? "unknown",cancelAtPeriodEnd: subscription.cancel_at_period_end,createdAt: new Date(subscription.created * 1000),+ ...(isTrial && subscription.trial_end ? { trialEnd: new Date(subscription.trial_end * 1000) } : {}),};} catch (error) {console.error("Error fetching Stripe subscription:", error);diff --git a/server/src/services/admin/subscriptionService.ts b/server/src/services/admin/subscriptionService.tsindex 6069bc9b4..ff0e55b2e 100644--- a/server/src/services/admin/subscriptionService.ts+++ b/server/src/services/admin/subscriptionService.ts@@ -32,12 +32,13 @@ async function fetchSubscriptionsForCustomers(}try {+ for (const status of ["active", "trialing"] as const) {let hasMore = true;let startingAfter: string | undefined;while (hasMore) {const subscriptions = await stripe.subscriptions.list({- status: "active",+ status,limit: 100,expand: ["data.plan.product"],...(startingAfter && { starting_after: startingAfter }),@@ -82,6 +83,7 @@ async function fetchSubscriptionsForCustomers(await new Promise(resolve => setTimeout(resolve, 50));}}+ } // end for (status)} catch (error) {console.error("Error fetching subscriptions from Stripe:", error);}