Commit 5630e49b authored by Alper Akgun's avatar Alper Akgun

Rename plan name for upgrading purposes

parent 19cf1313
...@@ -8,7 +8,7 @@ class Groups::BillingsController < Groups::ApplicationController ...@@ -8,7 +8,7 @@ class Groups::BillingsController < Groups::ApplicationController
def index def index
@top_most_group = @group.root_ancestor if @group.has_parent? @top_most_group = @group.root_ancestor if @group.has_parent?
current_plan = (@top_most_group || @group).actual_plan_name_for_subscription current_plan = (@top_most_group || @group).plan_name_for_upgrading
@plans_data = FetchSubscriptionPlansService.new(plan: current_plan).execute @plans_data = FetchSubscriptionPlansService.new(plan: current_plan).execute
end end
end end
...@@ -5,7 +5,7 @@ class Profiles::BillingsController < Profiles::ApplicationController ...@@ -5,7 +5,7 @@ class Profiles::BillingsController < Profiles::ApplicationController
def index def index
@plans_data = FetchSubscriptionPlansService @plans_data = FetchSubscriptionPlansService
.new(plan: current_user.namespace.actual_plan_name_for_subscription) .new(plan: current_user.namespace.plan_name_for_upgrading)
.execute .execute
end end
end end
...@@ -170,7 +170,7 @@ module EE ...@@ -170,7 +170,7 @@ module EE
actual_plan&.name || Plan::FREE actual_plan&.name || Plan::FREE
end end
def actual_plan_name_for_subscription def plan_name_for_upgrading
return Plan::FREE if trial_active? return Plan::FREE if trial_active?
actual_plan_name actual_plan_name
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment