diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb index 7507f4e5a..431e163c1 100644 --- a/ruby/lib/jam_ruby/models/user.rb +++ b/ruby/lib/jam_ruby/models/user.rb @@ -2865,7 +2865,13 @@ module JamRuby def has_support? return false if (!subscription_trial_ended? || subscription_sync_code == 'in_trial') && recurly_subscription_id.nil? return true if admin - SubscriptionDefinitions.rules(self.subscription_plan_code)[:has_support] + 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 + + end def subscription_rules(dynamic_definitions = true)