seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

let trials in

This commit is contained in:
Seth Call 2021-01-05 08:55:37 -06:00
parent 185d3e0b16
commit 0841409e50
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruby/lib/jam_ruby/models/user.rb
View File

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

2
web/app/assets/javascripts/support/react-components/SupportPage.js.jsx
View File

@ -28,7 +28,7 @@ window.SupportPage = React.createClass({
support_space=<div className="support-warning">The functionality on this page is disabled because you are currently in the free trial period and are not eligible for support.<br/><br/>You can <a href="/client#/account/subscription">change your plan</a> here.</div>
}
else {
support_space=<div className="support-warning">The functionality on this page is disabled because you must have a Platinum or Gold plan to use support.<br/><br/>You can <a href="/client#/account/subscription">change your plan</a> here.</div>
support_space=<div className="support-warning">The functionality on this page is disabled because you must either be in trial, or have a Platinum or Gold plan to use support.<br/><br/>You can <a href="/client#/account/subscription">change your plan</a> here.</div>
}
}

2
web/app/controllers/supports_controller.rb
View File

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