Commit ba26e370 authored by Corinna Wiesner's avatar Corinna Wiesner

Remove #active? from License model

Remove the #active? method from the License model to avoid confusion
between the terms of current and active license.
parent dea72e1a
...@@ -416,10 +416,6 @@ class License < ApplicationRecord ...@@ -416,10 +416,6 @@ class License < ApplicationRecord
restricted_attr(:trial) restricted_attr(:trial)
end end
def active?
!expired?
end
def exclude_guests_from_active_count? def exclude_guests_from_active_count?
plan == License::ULTIMATE_PLAN plan == License::ULTIMATE_PLAN
end end
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
Expired: Expired:
- else - else
Expires: Expires:
- if @license.will_expire? && @license.active? - if @license.will_expire? && !@license.expired?
- if @license.trial? - if @license.trial?
%strong.has-tooltip{ title: @license.expires_at.to_formatted_s(:long), data: { placement: 'top' } } %strong.has-tooltip{ title: @license.expires_at.to_formatted_s(:long), data: { placement: 'top' } }
Free trial will expire in #{pluralize(@license.remaining_days, 'day')} Free trial will expire in #{pluralize(@license.remaining_days, 'day')}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment