Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Update subscription pricing and improve subscription handling

Bill Yange1adb3a2a319
diff --git a/client/src/app/settings/subscription/components/ProPlan.tsx b/client/src/app/settings/subscription/components/ProPlan.tsx
index 88ff7ff8a..4e97672f3 100644
--- a/client/src/app/settings/subscription/components/ProPlan.tsx
+++ b/client/src/app/settings/subscription/components/ProPlan.tsx
@@ -101,7 +101,7 @@ export function ProPlan() {
const formattedDate = formatDate(activeSubscription.currentPeriodEnd);
if (activeSubscription.cancelAtPeriodEnd) {
- return `Ends on ${formattedDate}`;
+ return `Cancels on ${formattedDate}`;
}
if (activeSubscription.status === "active") {
return isAnnualPlan
diff --git a/client/src/app/settings/subscription/utils/useStripeSubscription.ts b/client/src/app/settings/subscription/utils/useStripeSubscription.ts
index c8acf6d65..beff04e7a 100644
--- a/client/src/app/settings/subscription/utils/useStripeSubscription.ts
+++ b/client/src/app/settings/subscription/utils/useStripeSubscription.ts
@@ -9,7 +9,7 @@ interface SubscriptionData {
monthlyEventCount: number;
eventLimit: number;
interval: string;
- cancelAtPeriodEnd?: boolean;
+ cancelAtPeriodEnd: boolean;
isTrial?: boolean;
trialDaysRemaining?: number;
message?: string; // For expired trial message
diff --git a/client/src/lib/stripe.ts b/client/src/lib/stripe.ts
index 590ff074b..1b925aaeb 100644
--- a/client/src/lib/stripe.ts
+++ b/client/src/lib/stripe.ts
@@ -91,8 +91,8 @@ export const STRIPE_PRICES = [
},
{
name: "pro5m",
- priceId: "price_1R2kybDFVprnAny21Mo1Wjuz",
- price: 129,
+ priceId: "price_1RKuYJDFVprnAny2apEXvkde",
+ price: 149,
interval: "month",
limits: {
events: 5_000_000,
@@ -100,8 +100,8 @@ export const STRIPE_PRICES = [
},
{
name: "pro5m-annual",
- priceId: "price_1RE1ebDFVprnAny2BbHtnuko",
- price: 1290,
+ priceId: "price_1RKuYaDFVprnAny2xEoejLRR",
+ price: 1490,
interval: "year",
limits: {
events: 5_000_000,
@@ -109,8 +109,8 @@ export const STRIPE_PRICES = [
},
{
name: "pro10m",
- priceId: "price_1R2kzxDFVprnAny2wdMx2Npp",
- price: 169,
+ priceId: "price_1RKuX5DFVprnAny20UMfh10N",
+ price: 249,
interval: "month",
limits: {
events: 10_000_000,
@@ -118,8 +118,8 @@ export const STRIPE_PRICES = [
},
{
name: "pro10m-annual",
- priceId: "price_1RE1fHDFVprnAny2SKY4gFCA",
- price: 1690,
+ priceId: "price_1RKuXODFVprnAny2JUjrCSyY",
+ price: 2490,
interval: "year",
limits: {
events: 10_000_000,
diff --git a/docs/src/app/components/PricingSection.jsx b/docs/src/app/components/PricingSection.jsx
index 879bdd0c3..4c4ab55d5 100644
--- a/docs/src/app/components/PricingSection.jsx
+++ b/docs/src/app/components/PricingSection.jsx
@@ -29,8 +29,8 @@ function getFormattedPrice(eventLimit, isAnnual) {
else if (eventLimit <= 500_000) monthlyPrice = 49;
else if (eventLimit <= 1_000_000) monthlyPrice = 69;
else if (eventLimit <= 2_000_000) monthlyPrice = 99;
- else if (eventLimit <= 5_000_000) monthlyPrice = 129;
- else monthlyPrice = 169; // 10M events
+ else if (eventLimit <= 5_000_000) monthlyPrice = 149;
+ else monthlyPrice = 249; // 10M events
// Annual prices are 10x monthly (2 months free)
const annualPrice = monthlyPrice * 10;
diff --git a/server/src/api/sites/getSites.ts b/server/src/api/sites/getSites.ts
index 660b28d6a..04ec94164 100644
--- a/server/src/api/sites/getSites.ts
+++ b/server/src/api/sites/getSites.ts
@@ -7,7 +7,7 @@ import { getSubscriptionInner } from "../stripe/getSubscription.js";
import { IS_CLOUD } from "../../lib/const.js";
// Default event limit for users without an active subscription
-const DEFAULT_EVENT_LIMIT = 10_000;
+const DEFAULT_EVENT_LIMIT = 100_000;
export async function getSites(req: FastifyRequest, reply: FastifyReply) {
try {
diff --git a/server/src/api/stripe/getSubscription.ts b/server/src/api/stripe/getSubscription.ts
index 712b518e8..c80ebebf3 100644
--- a/server/src/api/stripe/getSubscription.ts
+++ b/server/src/api/stripe/getSubscription.ts
@@ -67,6 +67,7 @@ export async function getSubscriptionInner(userId: string) {
planName: "Unknown Plan", // Indicate missing details
status: sub.status,
currentPeriodEnd: new Date(sub.current_period_end * 1000),
+ cancelAtPeriodEnd: sub.cancel_at_period_end,
eventLimit: 0, // Unknown limit
monthlyEventCount: user.monthlyEventCount,
interval: sub.items.data[0]?.price.recurring?.interval ?? "unknown",
@@ -78,7 +79,8 @@ export async function getSubscriptionInner(userId: string) {
id: sub.id,
planName: planDetails.name,
status: sub.status,
- currentPeriodEnd: new Date(sub.current_period_end * 1000), // Convert Unix timestamp to Date
+ currentPeriodEnd: new Date(sub.current_period_end * 1000),
+ cancelAtPeriodEnd: sub.cancel_at_period_end,
eventLimit: planDetails.limits.events,
monthlyEventCount: user.monthlyEventCount,
interval: sub.items.data[0]?.price.recurring?.interval ?? "unknown",
diff --git a/server/src/lib/const.ts b/server/src/lib/const.ts
index d3fb3aeb9..7f43ee0a7 100644
--- a/server/src/lib/const.ts
+++ b/server/src/lib/const.ts
@@ -103,7 +103,7 @@ export const STRIPE_PRICES: StripePlan[] = [
},
{
name: "pro5m",
- priceId: "price_1R2kybDFVprnAny21Mo1Wjuz",
+ priceId: "price_1RKuYJDFVprnAny2apEXvkde",
interval: "month",
limits: {
events: 5_000_000,
@@ -111,7 +111,7 @@ export const STRIPE_PRICES: StripePlan[] = [
},
{
name: "pro5m-annual",
- priceId: "price_1RE1ebDFVprnAny2BbHtnuko",
+ priceId: "price_1RKuYaDFVprnAny2xEoejLRR",
interval: "year",
limits: {
events: 5_000_000,
@@ -119,7 +119,7 @@ export const STRIPE_PRICES: StripePlan[] = [
},
{
name: "pro10m",
- priceId: "price_1R2kzxDFVprnAny2wdMx2Npp",
+ priceId: "price_1RKuX5DFVprnAny20UMfh10N",
interval: "month",
limits: {
events: 10_000_000,
@@ -127,7 +127,7 @@ export const STRIPE_PRICES: StripePlan[] = [
},
{
name: "pro10m-annual",
- priceId: "price_1RE1fHDFVprnAny2SKY4gFCA",
+ priceId: "price_1RKuXODFVprnAny2JUjrCSyY",
interval: "year",
limits: {
events: 10_000_000,