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 site locked email
Uku Tahta2d0244315fe
diff --git a/config/test.exs b/config/test.exsindex c88e6c8ca4..f7a38be932 100644--- a/config/test.exs+++ b/config/test.exs@@ -18,6 +18,8 @@ config :plausible,paddle_api: Plausible.PaddleApi.Mock,google_api: Plausible.Google.Api.Mock+config :bamboo, :refute_timeout, 10+config :geolix,databases: [%{diff --git a/lib/plausible/auth/user.ex b/lib/plausible/auth/user.exindex 3a9021c421..52a21dc5a1 100644--- a/lib/plausible/auth/user.ex+++ b/lib/plausible/auth/user.ex@@ -10,6 +10,7 @@ defmodule Plausible.Auth.GracePeriod doembedded_schema dofield :end_date, :datefield :allowance_required, :integer+ field :is_over, :booleanendend@@ -92,12 +93,17 @@ defmodule Plausible.Auth.User dodef start_grace_period(user, allowance_required) dograce_period = %Plausible.Auth.GracePeriod{end_date: Timex.today() |> Timex.shift(days: 7),- allowance_required: allowance_required+ allowance_required: allowance_required,+ is_over: false}change(user, grace_period: grace_period)end+ def end_grace_period(user) do+ change(user, grace_period: %{is_over: true})+ end+def remove_grace_period(user) dochange(user, grace_period: nil)enddiff --git a/lib/plausible/billing/site_locker.ex b/lib/plausible/billing/site_locker.exindex 986a15f859..fe858c6fc8 100644--- a/lib/plausible/billing/site_locker.ex+++ b/lib/plausible/billing/site_locker.ex@@ -5,7 +5,11 @@ defmodule Plausible.Billing.SiteLocker docase Plausible.Billing.needs_to_upgrade?(user) do{true, :grace_period_ended} ->set_lock_status_for(user, true)- send_grace_period_end_email(user)++ if !user.grace_period.is_over do+ send_grace_period_end_email(user)+ Plausible.Auth.User.end_grace_period(user) |> Repo.update()+ end{true, _} ->set_lock_status_for(user, true)@@ -36,7 +40,7 @@ defmodule Plausible.Billing.SiteLocker dodefp send_grace_period_end_email(user) do{_, last_cycle} = Plausible.Billing.last_two_billing_cycles(user){_, last_cycle_usage} = Plausible.Billing.last_two_billing_months_usage(user)- suggested_plan = Plausible.Billing.Plans.suggested_plan(user, last_cycle)+ suggested_plan = Plausible.Billing.Plans.suggested_plan(user, last_cycle_usage)template =PlausibleWeb.Email.dashboard_locked(diff --git a/test/plausible/billing/site_locker_test.exs b/test/plausible/billing/site_locker_test.exsindex 8b92304f9e..8c6007a526 100644--- a/test/plausible/billing/site_locker_test.exs+++ b/test/plausible/billing/site_locker_test.exs@@ -124,6 +124,33 @@ defmodule Plausible.Billing.SiteLockerTest do)end+ test "does not send grace period email if site is already locked" do+ user =+ insert(:user,+ grace_period: %Plausible.Auth.GracePeriod{+ end_date: Timex.shift(Timex.today(), days: -1),+ allowance_required: 10_000,+ is_over: false+ }+ )++ insert(:subscription, status: "active", user: user)+ user = Repo.preload(user, :subscription)+ insert(:site, members: [user])++ SiteLocker.check_sites_for(user)++ assert_email_delivered_with(+ to: [user],+ subject: "[Action required] Your Plausible dashboard is now locked"+ )++ user = Repo.reload!(user) |> Repo.preload(:subscription)+ SiteLocker.check_sites_for(user)++ assert_no_emails_delivered()+ end+test "locks all sites if user has no trial or active subscription" douser =insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: -1))