diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 892ee424..009ceab5 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -124,16 +124,6 @@ class ApplicationController < ActionController::Base QueryRoles.user_has_role?(current_user.id, role_names, host_id) end - def current_plan_tier(npo_id = nil) - return 0 if !npo_id && !administered_nonprofit - - npo_id ||= administered_nonprofit.id - return 2 if current_role?(:super_admin) - - key = "plan_tier_user_#{current_user_id}_nonprofit_#{npo_id}" - administered_nonprofit ? QueryBillingSubscriptions.plan_tier(npo_id) : 0 - end - def administered_nonprofit return nil unless current_user diff --git a/app/controllers/nonprofits/supporters_controller.rb b/app/controllers/nonprofits/supporters_controller.rb index 250202e2..92aa169a 100644 --- a/app/controllers/nonprofits/supporters_controller.rb +++ b/app/controllers/nonprofits/supporters_controller.rb @@ -6,7 +6,6 @@ module Nonprofits include Controllers::NonprofitHelper before_action :authenticate_nonprofit_user!, except: %i[new create] - # before_action(except: [:create, :mailchimp_landing]){authenticate_min_nonprofit_plan(2)} # get /nonprofit/:nonprofit_id/supporters def index diff --git a/app/views/common/_onboarding_modals.html.erb b/app/views/common/_onboarding_modals.html.erb deleted file mode 100644 index e0adb149..00000000 --- a/app/views/common/_onboarding_modals.html.erb +++ /dev/null @@ -1,42 +0,0 @@ -<%- # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later -%> - - -<%= render 'billing_subscriptions/new_modal' %> - -<%= render 'nonprofits/new_modal' unless current_role?(:nonprofit_associate) || current_role?(:nonprofit_admin) %> - -