Fix invalid subscription preload in SiteLocker email submission routine (#3400)

pull/3402/head r2023.10.09-203
Adrian Gruntkowski 3 years ago committed by GitHub
parent 0007c0c108
commit 842bbb7995
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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)

@ -40,7 +40,8 @@ defmodule Plausible.Site.Memberships.AcceptInvitation do
case 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)
end
notify_invitation_accepted(invitation)

Loading…
Cancel
Save