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
Fix subscription_interval for enterprise plans
Uku Taht07af25ffc31d
diff --git a/lib/plausible/billing/plans.ex b/lib/plausible/billing/plans.exindex 7501bc4f4e..7de5c317a2 100644--- a/lib/plausible/billing/plans.ex+++ b/lib/plausible/billing/plans.ex@@ -38,18 +38,19 @@ defmodule Plausible.Billing.Plans doend)end- def subscription_interval("free_10k"), do: "N/A"+ def subscription_interval(%Plausible.Billing.Subscription{paddle_plan_id: "free_10k"}),+ do: "N/A"- def subscription_interval(product_id) do- case for_product_id(product_id) do+ def subscription_interval(subscription) do+ case for_product_id(subscription.paddle_plan_id) donil ->enterprise_plan =- Repo.get_by(Plausible.Billing.EnterprisePlan, paddle_plan_id: product_id)+ Repo.get_by(Plausible.Billing.EnterprisePlan, user_id: subscription.user_id)enterprise_plan && enterprise_plan.billing_intervalplan ->- if product_id == plan[:monthly_product_id] do+ if subscription.paddle_plan_id == plan[:monthly_product_id] do"monthly"else"yearly"diff --git a/lib/plausible_web/views/auth_view.ex b/lib/plausible_web/views/auth_view.exindex 0298381ab6..dc442e2df2 100644--- a/lib/plausible_web/views/auth_view.ex+++ b/lib/plausible_web/views/auth_view.ex@@ -19,7 +19,7 @@ defmodule PlausibleWeb.AuthView doenddef subscription_interval(subscription) do- Plans.subscription_interval(subscription.paddle_plan_id)+ Plans.subscription_interval(subscription)enddef delimit_integer(number) dodiff --git a/test/plausible/billing/plans_test.exs b/test/plausible/billing/plans_test.exsindex 1ed1811141..8e94702ea1 100644--- a/test/plausible/billing/plans_test.exs+++ b/test/plausible/billing/plans_test.exs@@ -44,4 +44,29 @@ defmodule Plausible.Billing.PlansTest doassert Plans.allowance(subscription) == 100_000endend++ describe "subscription_interval" do+ test "is based on the plan if user is on a standard plan" do+ user = insert(:user, subscription: build(:subscription, paddle_plan_id: @v1_plan_id))++ assert Plans.subscription_interval(user.subscription) == "monthly"+ end++ test "is N/A for free plan" do+ user = insert(:user, subscription: build(:subscription, paddle_plan_id: "free_10k"))++ assert Plans.subscription_interval(user.subscription) == "N/A"+ end++ test "is based on the enterprise plan if user is on an enterprise plan" do+ user = insert(:user)++ enterprise_plan = insert(:enterprise_plan, user_id: user.id, billing_interval: :yearly)++ subscription =+ insert(:subscription, user_id: user.id, paddle_plan_id: enterprise_plan.paddle_plan_id)++ assert Plans.subscription_interval(subscription) == :yearly+ end+ endend