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
CRM: Handle "unlimited" team members + fix defaults + price estimations (#5428)
hq1825e5a73e596
diff --git a/extra/lib/plausible/customer_support/enterprise_plan.ex b/extra/lib/plausible/customer_support/enterprise_plan.exindex 17824adff3..23dd366a2e 100644--- a/extra/lib/plausible/customer_support/enterprise_plan.ex+++ b/extra/lib/plausible/customer_support/enterprise_plan.ex@@ -20,11 +20,28 @@ defmodule Plausible.CustomerSupport.EnterprisePlan doapi_calls_limit,features) do+ pv_rate =+ pv_rate(kind, pageviews_per_month)++ sites_rate =+ sites_rate(sites_limit)++ team_members_rate =+ team_members_rate(team_members_limit)++ api_calls_rate =+ api_calls_rate(api_calls_limit)++ features_rate =+ features_rate(features)+cost_per_month =Decimal.from_float(- pv_rate(kind, pageviews_per_month) + sites_rate(sites_limit) +- team_members_rate(team_members_limit) + api_calls_rate(api_calls_limit) +- features_rate(features)+ pv_rate ++ sites_rate ++ team_members_rate ++ api_calls_rate ++ features_rate)|> Decimal.round(2)@@ -35,6 +52,14 @@ defmodule Plausible.CustomerSupport.EnterprisePlan doendend+ def pv_rate(:growth, pvs) when pvs <= 10_000, do: 9+ def pv_rate(:growth, pvs) when pvs <= 100_000, do: 19+ def pv_rate(:growth, pvs) when pvs <= 200_000, do: 29+ def pv_rate(:growth, pvs) when pvs <= 500_000, do: 49+ def pv_rate(:growth, pvs) when pvs <= 1_000_000, do: 69+ def pv_rate(:growth, pvs) when pvs <= 2_000_000, do: 89+ def pv_rate(:growth, pvs) when pvs <= 5_000_000, do: 129+ def pv_rate(:growth, pvs) when pvs <= 10_000_000, do: 169def pv_rate(:growth, pvs) when pvs <= 20_000_000, do: 319def pv_rate(:growth, pvs) when pvs <= 50_000_000, do: 689def pv_rate(:growth, pvs) when pvs <= 100_000_000, do: 1029@@ -45,6 +70,14 @@ defmodule Plausible.CustomerSupport.EnterprisePlan dodef pv_rate(:growth, pvs) when pvs <= 1_000_000_000, do: 7219def pv_rate(:growth, _), do: 7219+ def pv_rate(:business, pvs) when pvs <= 10_000, do: 19+ def pv_rate(:business, pvs) when pvs <= 100_000, do: 39+ def pv_rate(:business, pvs) when pvs <= 200_000, do: 59+ def pv_rate(:business, pvs) when pvs <= 500_000, do: 99+ def pv_rate(:business, pvs) when pvs <= 1_000_000, do: 139+ def pv_rate(:business, pvs) when pvs <= 2_000_000, do: 179+ def pv_rate(:business, pvs) when pvs <= 5_000_000, do: 259+ def pv_rate(:business, pvs) when pvs <= 10_000_000, do: 339def pv_rate(:business, pvs) when pvs <= 20_000_000, do: 639def pv_rate(:business, pvs) when pvs <= 50_000_000, do: 1379def pv_rate(:business, pvs) when pvs <= 100_000_000, do: 2059@@ -55,13 +88,14 @@ defmodule Plausible.CustomerSupport.EnterprisePlan dodef pv_rate(:business, pvs) when pvs <= 1_000_000_000, do: 14_439def pv_rate(:business, _), do: 14_439+ def sites_rate(n) when n <= 10, do: 0def sites_rate(n), do: n * 0.1- def team_members_rate(n), do: n * 5+ def team_members_rate(n) when n > 10, do: (n - 10) * 5+ def team_members_rate(_), do: 0- def api_calls_rate(n) when n <= 1_000, do: 100- def api_calls_rate(n) when n <= 2_000, do: 200- def api_calls_rate(_), do: 300+ def api_calls_rate(n) when n <= 600, do: 0+ def api_calls_rate(n) when n > 600, do: round(n / 1_000) * 100def features_rate(f) doif "sites_api" in f, do: 99, else: 0diff --git a/extra/lib/plausible_web/live/customer_support/live/team.ex b/extra/lib/plausible_web/live/customer_support/live/team.exindex a37b673000..a5e7e1f28e 100644--- a/extra/lib/plausible_web/live/customer_support/live/team.ex+++ b/extra/lib/plausible_web/live/customer_support/live/team.ex@@ -55,7 +55,13 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team doEnum.map(features, &to_string(&1.name()))end)else- %{site_limit: "10,000"}+ %{+ monthly_pageview_limit: "10,000",+ hourly_api_request_limit: "600",+ site_limit: "50",+ team_member_limit: "10",+ features: Plausible.Billing.Feature.list()+ }endplan_form =@@ -74,7 +80,7 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team doshow_plan_form?: false,tab: "billing",cost_estimate: 0,- cost_estimate_tier: Map.get(plan || %{}, :kind, :business)+ cost_estimate_tier: :business)}end@@ -296,9 +302,8 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team doautocomplete="off"/><.input- x-on:input="numberFormatCallback(event)"field={f[:team_member_limit]}- label="Team Member Limit"+ label="Team Member Limit (-1/unlimited for unlimited)"autocomplete="off"/><.input@@ -330,7 +335,7 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team doid="cost-estimate-tier"name="enterprise_plan[cost-estimate-tier]"options={[{"business", "business"}, {"growth", "growth"}]}- label="Tier"+ label="Plan"value={@cost_estimate_tier}/>@@ -603,7 +608,10 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team doenddef handle_event("save-plan", %{"enterprise_plan" => params}, socket) do- params = params |> update_features_to_list() |> sanitize_params()+ params =+ params+ |> update_features_to_list()+ |> sanitize_params()changeset = EnterprisePlan.changeset(%EnterprisePlan{team_id: socket.assigns.team.id}, params)@@ -787,6 +795,10 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team do)end+ defp number_format(unlimited) when unlimited in [-1, "unlimited", :unlimited] do+ "unlimited"+ end+defp number_format(number) when is_integer(number) doCldr.Number.to_string!(number)end@@ -810,13 +822,17 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team doenddefp clear_param({key, value}) when key in @numeric_fields do- value =- value- |> to_string()- |> String.replace(~r/[^0-9-]/, "")- |> String.trim()+ if value in ["unlimited", "-1"] do+ {key, value}+ else+ value =+ value+ |> to_string()+ |> String.replace(~r/[^0-9-]/, "")+ |> String.trim()- {key, value}+ {key, value}+ endenddefp clear_param({key, value}) when is_binary(value) do@@ -830,7 +846,11 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team dodefp get_int_param(params, key) doparam = Map.get(params, key)param = if param in ["", nil], do: "0", else: param- String.to_integer(param)++ case Integer.parse(param) do+ {integer, ""} -> integer+ _ -> 0+ endenddefp update_features_to_list(params) dodiff --git a/test/plausible/customer_support/enterprise_plan_test.exs b/test/plausible/customer_support/enterprise_plan_test.exsindex 358b6f7332..ccf2856536 100644--- a/test/plausible/customer_support/enterprise_plan_test.exs+++ b/test/plausible/customer_support/enterprise_plan_test.exs@@ -19,7 +19,22 @@ defmodule Plausible.CustomerSupport.EnterprisePlanTest do["sites_api"])- assert result == Decimal.new("1088.00")+ assert result == Decimal.new("1038.00")+ end++ test "Bogdan's example (https://3.basecamp.com/5308029/buckets/26383192/card_tables/cards/8506177450#__recording_8689686259)" do+ result =+ EnterprisePlan.estimate(+ :business,+ "monthly",+ 10_000,+ 500,+ 15,+ 600,+ []+ )++ assert result == Decimal.new("94.00")endtest "calculates cost for business plan with yearly billing" do@@ -34,12 +49,20 @@ defmodule Plausible.CustomerSupport.EnterprisePlanTest do["sites_api"])- assert result == Decimal.new("10880.00")+ assert result == Decimal.new("10380.00")endenddescribe "pv_rate/2" dotest "returns correct rate for growth plan" do+ assert EnterprisePlan.pv_rate(:growth, 10_000) == 9+ assert EnterprisePlan.pv_rate(:growth, 100_000) == 19+ assert EnterprisePlan.pv_rate(:growth, 200_000) == 29+ assert EnterprisePlan.pv_rate(:growth, 500_000) == 49+ assert EnterprisePlan.pv_rate(:growth, 1_000_000) == 69+ assert EnterprisePlan.pv_rate(:growth, 2_000_000) == 89+ assert EnterprisePlan.pv_rate(:growth, 5_000_000) == 129+ assert EnterprisePlan.pv_rate(:growth, 10_000_000) == 169assert EnterprisePlan.pv_rate(:growth, 20_000_000) == 319assert EnterprisePlan.pv_rate(:growth, 50_000_000) == 689assert EnterprisePlan.pv_rate(:growth, 100_000_000) == 1029@@ -52,6 +75,14 @@ defmodule Plausible.CustomerSupport.EnterprisePlanTest doendtest "returns correct rate for business plan" do+ assert EnterprisePlan.pv_rate(:business, 10_000) == 19+ assert EnterprisePlan.pv_rate(:business, 100_000) == 39+ assert EnterprisePlan.pv_rate(:business, 200_000) == 59+ assert EnterprisePlan.pv_rate(:business, 500_000) == 99+ assert EnterprisePlan.pv_rate(:business, 1_000_000) == 139+ assert EnterprisePlan.pv_rate(:business, 2_000_000) == 179+ assert EnterprisePlan.pv_rate(:business, 5_000_000) == 259+ assert EnterprisePlan.pv_rate(:business, 10_000_000) == 339assert EnterprisePlan.pv_rate(:business, 20_000_000) == 639assert EnterprisePlan.pv_rate(:business, 50_000_000) == 1379assert EnterprisePlan.pv_rate(:business, 100_000_000) == 2059@@ -66,25 +97,31 @@ defmodule Plausible.CustomerSupport.EnterprisePlanTest dodescribe "sites_rate/1" dotest "calculates rate based on number of sites" do- assert EnterprisePlan.sites_rate(10) == 1.0+ assert EnterprisePlan.sites_rate(10) == 0+ assert EnterprisePlan.sites_rate(15) == 1.5assert EnterprisePlan.sites_rate(20) == 2.0endenddescribe "team_members_rate/1" dotest "calculates rate based on number of team members" do- assert EnterprisePlan.team_members_rate(5) == 25- assert EnterprisePlan.team_members_rate(10) == 50+ assert EnterprisePlan.team_members_rate(5) == 0+ assert EnterprisePlan.team_members_rate(10) == 0+ assert EnterprisePlan.team_members_rate(15) == 25+ assert EnterprisePlan.team_members_rate(20) == 50endenddescribe "api_calls_rate/1" dotest "returns correct rate for API calls" do- assert EnterprisePlan.api_calls_rate(500) == 100+ assert EnterprisePlan.api_calls_rate(500) == 0+ assert EnterprisePlan.api_calls_rate(600) == 0+ assert EnterprisePlan.api_calls_rate(700) == 100assert EnterprisePlan.api_calls_rate(1_500) == 200assert EnterprisePlan.api_calls_rate(2_000) == 200assert EnterprisePlan.api_calls_rate(3_000) == 300- assert EnterprisePlan.api_calls_rate(3_500) == 300+ assert EnterprisePlan.api_calls_rate(3_400) == 300+ assert EnterprisePlan.api_calls_rate(3_700) == 400endenddiff --git a/test/plausible_web/live/customer_support/teams_test.exs b/test/plausible_web/live/customer_support/teams_test.exsindex 00ebcf2d09..aba652d12b 100644--- a/test/plausible_web/live/customer_support/teams_test.exs+++ b/test/plausible_web/live/customer_support/teams_test.exs@@ -85,7 +85,7 @@ defmodule PlausibleWeb.Live.CustomerSupport.TeamsTest do})html = render(lv)- assert text_of_attr(html, ~s|#cost-estimate|, "value") == "10880.00"+ assert text_of_attr(html, ~s|#cost-estimate|, "value") == "10380.00"endtest "saves custom plan", %{conn: conn, user: user} do@@ -141,6 +141,33 @@ defmodule PlausibleWeb.Live.CustomerSupport.TeamsTest do] = Plausible.Repo.all(Plausible.Billing.EnterprisePlan)end+ test "handles unlimited team members", %{conn: conn, user: user} do+ user |> subscribe_to_enterprise_plan(team_member_limit: :unlimited)+ lv = open_custom_plan(conn, team_of(user))++ html = render(lv)++ assert text_of_attr(html, ~s|input[name="enterprise_plan[team_member_limit]"]|, "value") ==+ "unlimited"++ lv+ |> element(~s|form#save-plan|)+ |> render_change(%{+ "enterprise_plan" => %{+ "paddle_plan_id" => "1111",+ "billing_interval" => "yearly",+ "monthly_pageview_limit" => "20,000,000",+ "site_limit" => "1,000",+ "team_member_limit" => "unlimited",+ "hourly_api_request_limit" => "1,000"+ }+ })++ lv |> element("form#save-plan") |> render_submit()+ html = render(lv)+ assert text(html) =~ "Plan saved"+ end+defp open_custom_plan(conn, team) do{:ok, lv, _html} = live(conn, open_team(team.id, tab: :billing))render(lv)