From 95a4eb4ec809ba44f28c9523b454af3caee0fb6a Mon Sep 17 00:00:00 2001 From: Seth Call Date: Fri, 1 Jan 2021 10:00:38 -0600 Subject: [PATCH] better help desk check --- ruby/lib/jam_ruby/models/user.rb | 2 +- web/app/controllers/supports_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb index dd72cd714..7507f4e5a 100644 --- a/ruby/lib/jam_ruby/models/user.rb +++ b/ruby/lib/jam_ruby/models/user.rb @@ -2863,7 +2863,7 @@ module JamRuby end def has_support? - return false if !subscription_trial_ended? + 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] end diff --git a/web/app/controllers/supports_controller.rb b/web/app/controllers/supports_controller.rb index 85df22675..defa295bf 100644 --- a/web/app/controllers/supports_controller.rb +++ b/web/app/controllers/supports_controller.rb @@ -8,7 +8,7 @@ class SupportsController < ApplicationController end gon.has_support = current_user.has_support? gon.email = current_user.email - gon.in_trial = !current_user.subscription_trial_ended? + gon.in_trial = !current_user.subscription_trial_ended? || subscription_sync_code == 'in_trial' gon.plan_code = current_user.subscription_plan_code @title = "Help Desk"