Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Consolidated Views: flip CTA flow, ask to upgrade first (#5905)
Adam Rutkowski6d5951fffdea
diff --git a/extra/lib/plausible/consolidated_view.ex b/extra/lib/plausible/consolidated_view.exindex 82bd8a08e2..3c9e5aa4f3 100644--- a/extra/lib/plausible/consolidated_view.ex+++ b/extra/lib/plausible/consolidated_view.ex@@ -86,10 +86,15 @@ defmodule Plausible.ConsolidatedView do@spec enable(Team.t()) ::{:ok, Site.t()} | {:error, :no_sites | :team_not_setup | :upgrade_required}def enable(%Team{} = team) do+ availability_check = Plausible.Billing.Feature.ConsolidatedView.check_availability(team)+cond donot has_sites_to_consolidate?(team) ->{:error, :no_sites}+ availability_check != :ok ->+ availability_check+not Teams.setup?(team) ->{:error, :team_not_setup}@@ -97,10 +102,7 @@ defmodule Plausible.ConsolidatedView do{:error, :unavailable}true ->- case Plausible.Billing.Feature.ConsolidatedView.check_availability(team) do- :ok -> do_enable(team)- error -> error- end+ do_enable(team)endenddiff --git a/test/plausible/consolidated_view_test.exs b/test/plausible/consolidated_view_test.exsindex 1960838e4b..07f5dc9d47 100644--- a/test/plausible/consolidated_view_test.exs+++ b/test/plausible/consolidated_view_test.exs@@ -85,6 +85,19 @@ defmodule Plausible.ConsolidatedViewTest doassert s1.domain == s2.domainend+ test "returns {:error, :upgrade_required} before :team_not_setup", %{team: team} do+ # we want to ask the user to upgrade first, before making them create a team they might not need+ new_site(team: team)+ new_site(team: team)++ team =+ team+ |> Plausible.Teams.Team.end_trial()+ |> Plausible.Repo.update!()++ assert {:error, :upgrade_required} = ConsolidatedView.enable(team)+ end+test "returns {:error, :upgrade_required} for ineligible subscription", %{team: team,user: user