📈 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!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
Support subscirption payments
Blue Mouseae31f8919fe6
diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.tsindex 44abf7cd0..5672d0971 100644--- a/backend/apps/cloud/src/analytics/analytics.service.ts+++ b/backend/apps/cloud/src/analytics/analytics.service.ts@@ -6429,7 +6429,17 @@ export class AnalyticsService {SELECTtype,- COALESCE(toString(product_name), toString(product_id), if(type = 'refund', 'Refund', 'Sale')) AS value,+ COALESCE(+ toString(product_name),+ toString(product_id),+ multiIf(+ type = 'refund',+ 'Refund',+ type = 'subscription',+ 'Subscription',+ 'Sale'+ )+ ) AS value,toTimeZone(created, {timezone:String}) AS created,pid,toString(session_id) AS psid,@@ -6458,7 +6468,7 @@ export class AnalyticsService {pid = {pid:FixedString(12)}AND session_id IS NOT NULLAND toString(session_id) = {psid:String}- AND revenue.type IN ('sale', 'refund')+ AND revenue.type IN ('sale', 'subscription', 'refund')GROUP BY pid, session_id, transaction_id))@@ -6508,7 +6518,11 @@ export class AnalyticsService {const querySessionRevenue = `SELECT- toFloat64(sum(CASE WHEN type = 'sale' THEN amount ELSE 0 END) - sum(CASE WHEN type = 'refund' THEN abs(amount) ELSE 0 END)) AS revenue,+ toFloat64(+ sum(+ CASE WHEN type IN ('sale', 'subscription') THEN amount ELSE 0 END+ ) - sum(CASE WHEN type = 'refund' THEN abs(amount) ELSE 0 END)+ ) AS revenue,toFloat64(sum(CASE WHEN type = 'refund' THEN abs(amount) ELSE 0 END)) AS refundsFROM (SELECT@@ -6519,7 +6533,7 @@ export class AnalyticsService {pid = {pid:FixedString(12)}AND session_id IS NOT NULLAND toString(session_id) = {psid:String}- AND revenue.type IN ('sale', 'refund')+ AND revenue.type IN ('sale', 'subscription', 'refund')GROUP BY pid, session_id, transaction_id)`@@ -6768,7 +6782,9 @@ export class AnalyticsService {SELECTpsidCasted,pid,- sum(CASE WHEN type = 'sale' THEN amount ELSE 0 END) - sum(CASE WHEN type = 'refund' THEN abs(amount) ELSE 0 END) as revenue,+ sum(+ CASE WHEN type IN ('sale', 'subscription') THEN amount ELSE 0 END+ ) - sum(CASE WHEN type = 'refund' THEN abs(amount) ELSE 0 END) as revenue,sum(CASE WHEN type = 'refund' THEN abs(amount) ELSE 0 END) as refundsFROM (SELECT@@ -6779,7 +6795,7 @@ export class AnalyticsService {FROM revenueWHERE pid = {pid:FixedString(12)} AND session_id IS NOT NULLAND created BETWEEN {groupFrom:String} AND {groupTo:String}- AND revenue.type IN ('sale', 'refund')+ AND revenue.type IN ('sale', 'subscription', 'refund')GROUP BY psidCasted, pid, transaction_id)GROUP BY psidCasted, pid@@ -7034,7 +7050,9 @@ export class AnalyticsService {SELECTpsidCasted,pid,- sum(CASE WHEN type = 'sale' THEN amount ELSE 0 END) - sum(CASE WHEN type = 'refund' THEN abs(amount) ELSE 0 END) as revenue,+ sum(+ CASE WHEN type IN ('sale', 'subscription') THEN amount ELSE 0 END+ ) - sum(CASE WHEN type = 'refund' THEN abs(amount) ELSE 0 END) as revenue,sum(CASE WHEN type = 'refund' THEN abs(amount) ELSE 0 END) as refundsFROM (SELECT@@ -7045,7 +7063,7 @@ export class AnalyticsService {FROM revenueWHERE pid = {pid:FixedString(12)} AND session_id IS NOT NULLAND created BETWEEN {groupFrom:String} AND {groupTo:String}- AND revenue.type IN ('sale', 'refund')+ AND revenue.type IN ('sale', 'subscription', 'refund')GROUP BY psidCasted, pid, transaction_id)GROUP BY psidCasted, pid@@ -7549,7 +7567,6 @@ export class AnalyticsService {AND type IN ('pageview', 'custom_event', 'error')`- // Query for total revenue from profile (only sales, not refunds)const queryRevenue = `SELECTsum(amount) AS totalRevenue,@@ -7561,7 +7578,7 @@ export class AnalyticsService {FROM revenueWHERE pid = {pid:FixedString(12)}AND profile_id = {profileId:String}- AND type = 'sale'+ AND type IN ('sale', 'subscription')AND status = 'completed'GROUP BY transaction_id)@@ -7791,7 +7808,17 @@ export class AnalyticsService {SELECTtype,- COALESCE(toString(product_name), toString(product_id), if(type = 'refund', 'Refund', 'Sale')) AS value,+ COALESCE(+ toString(product_name),+ toString(product_id),+ multiIf(+ type = 'refund',+ 'Refund',+ type = 'subscription',+ 'Subscription',+ 'Sale'+ )+ ) AS value,toTimeZone(created, {timezone:String}) AS created,toString(session_id) AS psid,[@@ -7820,7 +7847,7 @@ export class AnalyticsService {AND session_id IS NOT NULLAND toString(session_id) IN {psids:Array(String)}AND revenue.created BETWEEN {groupFrom:String} AND {groupTo:String}- AND revenue.type IN ('sale', 'refund')+ AND revenue.type IN ('sale', 'subscription', 'refund')GROUP BY session_id, transaction_id))diff --git a/backend/apps/cloud/src/revenue/revenue.service.ts b/backend/apps/cloud/src/revenue/revenue.service.tsindex e7e8224b4..8f9de1c3a 100644--- a/backend/apps/cloud/src/revenue/revenue.service.ts+++ b/backend/apps/cloud/src/revenue/revenue.service.ts@@ -238,8 +238,12 @@ export class RevenueService {// Get current period statsconst statsQuery = `SELECT- sum(CASE WHEN type = 'sale' THEN amount ELSE 0 END) as totalRevenue,- count(CASE WHEN type = 'sale' THEN 1 ELSE NULL END) as salesCount,+ sum(+ CASE WHEN type IN ('sale', 'subscription') THEN amount ELSE 0 END+ ) as totalRevenue,+ count(+ CASE WHEN type IN ('sale', 'subscription') THEN 1 ELSE NULL END+ ) as salesCount,count(CASE WHEN type = 'refund' THEN 1 ELSE NULL END) as refundsCount,sum(CASE WHEN type = 'refund' THEN abs(amount) ELSE 0 END) as refundsAmount,sum(CASE WHEN type = 'subscription' THEN amount ELSE 0 END) as subscriptionRevenue@@ -349,8 +353,12 @@ export class RevenueService {const chartQuery = `SELECT${selector},- sum(CASE WHEN type = 'sale' THEN amount ELSE 0 END) as revenue,- count(CASE WHEN type = 'sale' THEN 1 ELSE NULL END) as salesCount,+ sum(+ CASE WHEN type IN ('sale', 'subscription') THEN amount ELSE 0 END+ ) as revenue,+ count(+ CASE WHEN type IN ('sale', 'subscription') THEN 1 ELSE NULL END+ ) as salesCount,sum(CASE WHEN type = 'refund' THEN abs(amount) ELSE 0 END) as refundsAmountFROM (SELECT