diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb index da691b916..40bd1f9e1 100644 --- a/ruby/lib/jam_ruby/models/user.rb +++ b/ruby/lib/jam_ruby/models/user.rb @@ -2864,19 +2864,12 @@ module JamRuby def has_support? # early exit if in trial (excepting credit card and no Admin Override) - return false if (!subscription_trial_ended? || subscription_sync_code == 'in_trial') && - recurly_subscription_id.nil? && - admin_override_plan_code.nil? + return true if !subscription_trial_ended? || subscription_sync_code == 'in_trial' # let admins test feature without subscription return true if admin - # if still in trial, use their desired plan rather than actual plan, because actual will always say gold while in trial - if !subscription_trial_ended? || subscription_sync_code == 'in_trial' - SubscriptionDefinitions.rules(self.desired_plan_code)[:has_support] - else - SubscriptionDefinitions.rules(self.subscription_plan_code)[:has_support] - end + SubscriptionDefinitions.rules(self.subscription_plan_code)[:has_support] end def subscription_rules(dynamic_definitions = true) diff --git a/web/app/assets/javascripts/support/react-components/SupportPage.js.jsx b/web/app/assets/javascripts/support/react-components/SupportPage.js.jsx index b3e9f81d1..090560843 100644 --- a/web/app/assets/javascripts/support/react-components/SupportPage.js.jsx +++ b/web/app/assets/javascripts/support/react-components/SupportPage.js.jsx @@ -28,7 +28,7 @@ window.SupportPage = React.createClass({ support_space=
The functionality on this page is disabled because you are currently in the free trial period and are not eligible for support.

You can change your plan here.
} else { - support_space=
The functionality on this page is disabled because you must have a Platinum or Gold plan to use support.

You can change your plan here.
+ support_space=
The functionality on this page is disabled because you must either be in trial, or have a Platinum or Gold plan to use support.

You can change your plan here.
} } diff --git a/web/app/controllers/supports_controller.rb b/web/app/controllers/supports_controller.rb index 50b489a94..37df40973 100644 --- a/web/app/controllers/supports_controller.rb +++ b/web/app/controllers/supports_controller.rb @@ -12,7 +12,7 @@ class SupportsController < ApplicationController gon.plan_code = current_user.subscription_plan_code @title = "Help Desk" - @description = "The JamKazam help desk offers 1:1 help desk support only to our Gold and Platinum plan subscribers." + @description = "The JamKazam help desk offers 1:1 help desk support only to in-trial and Gold and Platinum plan subscribers." render 'show', :layout => 'support' end