Fix trial information being included for subscribed users

pull/318/head
Uku Taht 6 years ago
parent f871aaa195
commit e5fae1722b

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

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

Loading…
Cancel
Save