diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.ex index ef28e5e87..ad0762ee9 100644 --- a/lib/plausible/billing/billing.ex +++ b/lib/plausible/billing/billing.ex @@ -2,8 +2,23 @@ defmodule Plausible.Billing do use Plausible.Repo alias Plausible.Billing.Subscription + @spec active_subscription_for(integer()) :: Subscription.t() | nil def active_subscription_for(user_id) do - Repo.get_by(Subscription, user_id: user_id, status: "active") + user_id |> active_subscription_query() |> Repo.one() + end + + @spec has_active_subscription?(integer()) :: boolean() + def has_active_subscription?(user_id) do + user_id |> active_subscription_query() |> Repo.exists?() + end + + defp active_subscription_query(user_id) do + from( + s in Subscription, + where: s.user_id == ^user_id and s.status == "active", + order_by: [desc: s.inserted_at], + limit: 1 + ) end def subscription_created(params) do diff --git a/lib/plausible_web/controllers/billing_controller.ex b/lib/plausible_web/controllers/billing_controller.ex index 22dacba70..ccd8cd2f9 100644 --- a/lib/plausible_web/controllers/billing_controller.ex +++ b/lib/plausible_web/controllers/billing_controller.ex @@ -6,6 +6,11 @@ defmodule PlausibleWeb.BillingController do plug PlausibleWeb.RequireAccountPlug + def ping_subscription(%Plug.Conn{} = conn, _params) do + subscribed? = Billing.has_active_subscription?(conn.assigns.current_user.id) + json(conn, %{is_subscribed: subscribed?}) + end + def upgrade(conn, _params) do user = conn.assigns[:current_user] diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex index 8328d16f0..d86049d50 100644 --- a/lib/plausible_web/router.ex +++ b/lib/plausible_web/router.ex @@ -172,6 +172,7 @@ defmodule PlausibleWeb.Router do get "/billing/upgrade/enterprise/:plan_id", BillingController, :upgrade_enterprise_plan get "/billing/change-plan/enterprise/:plan_id", BillingController, :change_enterprise_plan get "/billing/upgrade-success", BillingController, :upgrade_success + get "/billing/subscription/ping", BillingController, :ping_subscription get "/sites", SiteController, :index get "/sites/new", SiteController, :new diff --git a/lib/plausible_web/templates/billing/upgrade_success.html.eex b/lib/plausible_web/templates/billing/upgrade_success.html.eex index 4990bbacf..524226e3e 100644 --- a/lib/plausible_web/templates/billing/upgrade_success.html.eex +++ b/lib/plausible_web/templates/billing/upgrade_success.html.eex @@ -1,18 +1,51 @@
+ Thank you for upgrading your subscription! We're still working on + upgrading your account, and you'll be automatically redirected in a few + seconds. +
+ ++ Your subscription is taking longer than usual to upgrade. If you're not + redirected soon, please contact hello@plausible.io. +