watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2025-12-06 01:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev' into dev

Browse source 
# Conflicts:
#	pnpm-lock.yaml
This commit is contained in:
Mike Cao 2025-11-28 00:34:12 -08:00
commit 3379cc6e89
5 changed files with 68 additions and 434 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/queries/sql/reports/getRevenue.ts
View file

@ -62,7 +62,7 @@ async function relationalQuery(
${joinSessionQuery}
where revenue.website_id = {{websiteId::uuid}}
and revenue.created_at between {{startDate}} and {{endDate}}
and revenue.currency ilike {{currency}}
and revenue.currency = upper({{currency}})
${filterQuery}
group by x, t
order by t
@ -83,7 +83,7 @@ async function relationalQuery(
${cohortQuery}
where revenue.website_id = {{websiteId::uuid}}
and revenue.created_at between {{startDate}} and {{endDate}}
and revenue.currency ilike {{currency}}
and revenue.currency = upper({{currency}})
${filterQuery}
group by session.country
`,
@ -102,7 +102,7 @@ async function relationalQuery(
${joinSessionQuery}
where revenue.website_id = {{websiteId::uuid}}
and revenue.created_at between {{startDate}} and {{endDate}}
and revenue.currency ilike {{currency}}
and revenue.currency = upper({{currency}})
${filterQuery}
`,
queryParams,
@ -154,7 +154,7 @@ async function clickhouseQuery(
${cohortQuery}
where website_revenue.website_id = {websiteId:UUID}
and website_revenue.created_at between {startDate:DateTime64} and {endDate:DateTime64}
and website_revenue.currency = {currency:String}
and website_revenue.currency = upper({currency:String})
${filterQuery}
group by x, t
order by t
@ -182,7 +182,7 @@ async function clickhouseQuery(
${cohortQuery}
where website_revenue.website_id = {websiteId:UUID}
and website_revenue.created_at between {startDate:DateTime64} and {endDate:DateTime64}
and website_revenue.currency = {currency:String}
and website_revenue.currency = upper({currency:String})
${filterQuery}
group by website_event.country
order by value desc
@ -205,7 +205,7 @@ async function clickhouseQuery(
${cohortQuery}
where website_revenue.website_id = {websiteId:UUID}
and website_revenue.created_at between {startDate:DateTime64} and {endDate:DateTime64}
and website_revenue.currency = {currency:String}
and website_revenue.currency = upper({currency:String})
${filterQuery}
`,
queryParams,