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
Redirect to correct change plan page for enterprise customers
Uku Taht3d231fc09402
diff --git a/lib/plausible_web/controllers/billing_controller.ex b/lib/plausible_web/controllers/billing_controller.exindex c22f41f4b5..e54109446d 100644--- a/lib/plausible_web/controllers/billing_controller.ex+++ b/lib/plausible_web/controllers/billing_controller.ex@@ -62,7 +62,14 @@ defmodule PlausibleWeb.BillingController dosubscription = Billing.active_subscription_for(user.id)cond do- subscription && user.enterprise_plan ->+ subscription && user.enterprise_plan &&+ subscription.paddle_plan_id !== user.enterprise_plan.paddle_plan_id ->+ redirect(conn,+ to: Routes.billing_path(conn, :change_enterprise_plan, user.enterprise_plan.id)+ )++ subscription && user.enterprise_plan &&+ subscription.paddle_plan_id == user.enterprise_plan.paddle_plan_id ->render(conn, "change_enterprise_plan_contact_us.html",user: user,plan: user.enterprise_plan,diff --git a/test/plausible_web/controllers/billing_controller_test.exs b/test/plausible_web/controllers/billing_controller_test.exsindex 3a8a348f7e..d193b0954d 100644--- a/test/plausible_web/controllers/billing_controller_test.exs+++ b/test/plausible_web/controllers/billing_controller_test.exs@@ -68,10 +68,21 @@ defmodule PlausibleWeb.BillingControllerTest doassert redirected_to(conn) == "/billing/upgrade"end+ test "redirects to enterprise upgrade page if user is due for an enteprise plan upgrade",+ %{conn: conn, user: user} do+ insert(:subscription, user: user, paddle_plan_id: "standard-plan-id")+ enterprise_plan = insert(:enterprise_plan, user: user, paddle_plan_id: "new-custom-id")++ conn = get(conn, "/billing/change-plan")++ assert redirected_to(conn) == "/billing/change-plan/enterprise/#{enterprise_plan.id}"+ end+test "prompts to contact us if user has enterprise plan and existing subscription",%{conn: conn, user: user} do- insert(:subscription, user: user)- insert(:enterprise_plan, user: user)+ insert(:subscription, user: user, paddle_plan_id: "enterprise-plan-id")+ insert(:enterprise_plan, user: user, paddle_plan_id: "enterprise-plan-id")+conn = get(conn, "/billing/change-plan")assert html_response(conn, 200) =~ "please contact us"