From e5fae1722bba9cc31a36a89bfd85ddfce0903688 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Fri, 11 Sep 2020 14:04:34 +0300 Subject: [PATCH] Fix trial information being included for subscribed users --- lib/plausible/billing/billing.ex | 5 ++++- test/plausible/billing/billing_test.exs | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.ex index 96201db31..d09662e61 100644 --- a/lib/plausible/billing/billing.ex +++ b/lib/plausible/billing/billing.ex @@ -109,7 +109,10 @@ defmodule Plausible.Billing do defp subscription_is_active?(_), do: false - def on_trial?(user), do: trial_days_left(user) >= 0 + def on_trial?(user) do + user = Repo.preload(user, :subscription) + !subscription_is_active?(user.subscription) && trial_days_left(user) >= 0 + end def trial_days_left(user) do Timex.diff(user.trial_expiry_date, Timex.today(), :days) diff --git a/test/plausible/billing/billing_test.exs b/test/plausible/billing/billing_test.exs index c1b41124a..9b91e3e49 100644 --- a/test/plausible/billing/billing_test.exs +++ b/test/plausible/billing/billing_test.exs @@ -43,6 +43,12 @@ defmodule Plausible.BillingTest do refute Billing.on_trial?(user) end + + test "is false if user has subscription" do + user = insert(:user, subscription: build(:subscription)) + + refute Billing.on_trial?(user) + end end describe "needs_to_upgrade?" do