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 invalid subscription preload in SiteLocker email submission routine (#3400)
Adrian Gruntkowski842bbb799554
diff --git a/lib/plausible/billing/site_locker.ex b/lib/plausible/billing/site_locker.exindex cb4802287c..2b8317be85 100644--- a/lib/plausible/billing/site_locker.ex+++ b/lib/plausible/billing/site_locker.ex@@ -68,7 +68,6 @@ defmodule Plausible.Billing.SiteLocker do@spec send_grace_period_end_email(Plausible.Auth.User.t()) :: Plausible.Mailer.result()def send_grace_period_end_email(user) do- user = Repo.preload(user, :subscription){_, 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.suggest(user, last_cycle_usage)diff --git a/lib/plausible/site/memberships/accept_invitation.ex b/lib/plausible/site/memberships/accept_invitation.exindex 95043cd8f1..bf9f0346df 100644--- a/lib/plausible/site/memberships/accept_invitation.ex+++ b/lib/plausible/site/memberships/accept_invitation.ex@@ -40,7 +40,8 @@ defmodule Plausible.Site.Memberships.AcceptInvitation docase Repo.transaction(multi) do{:ok, changes} ->if changes[:site_locker] == {:locked, :grace_period_ended_now} do- Billing.SiteLocker.send_grace_period_end_email(changes.user)+ user = Plausible.Users.with_subscription(changes.user)+ Billing.SiteLocker.send_grace_period_end_email(user)endnotify_invitation_accepted(invitation)