Merge branch 'pass-current-plan-all-the-way-down' into 'master'

Pass current_plan all the way down partial chain

See merge request gitlab-org/gitlab!38868

ee/app/views/groups/billings/index.html.haml

@@ -5,7 +5,7 @@
   - top_most_group_plan = subscription_plan_info(@plans_data, @top_most_group.actual_plan_name)
   = render 'shared/billings/billing_plan_header', namespace: @group, plan: top_most_group_plan, parent_group: @top_most_group
 - else
-  = render 'shared/billings/billing_plans', plans_data: @plans_data, namespace: @group
+  = render 'shared/billings/billing_plans', plans_data: @plans_data, namespace: @group, current_plan: current_plan
 
 
   #js-billing-plans{ data: subscription_plan_data_attributes(@group, current_plan) }

ee/app/views/profiles/billings/index.html.haml

 - page_title _('Billing')
 - current_plan = subscription_plan_info(@plans_data, current_user.namespace.actual_plan_name)
 
-= render 'shared/billings/billing_plans', plans_data: @plans_data, namespace: current_user.namespace
+= render 'shared/billings/billing_plans', plans_data: @plans_data, namespace: current_user.namespace, current_plan: current_plan
 
 #js-billing-plans{ data: subscription_plan_data_attributes(current_user.namespace, current_plan) }

ee/app/views/shared/billings/_billing_plan.html.haml

 - purchase_link = plan.purchase_link
-- is_current_plan = plan.code == namespace.actual_plan_name
+- is_current_plan = plan.code == current_plan&.code
 
 .col-md-6.col-lg-3
   .card.mb-5{ class: ("card-active" if is_current_plan) }

ee/app/views/shared/billings/_billing_plans.html.haml

-- current_plan       = subscription_plan_info(plans_data, namespace.actual_plan_name)
 - support_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: EE::CUSTOMER_SUPPORT_URL }
 - support_link_end   = '</a>'.html_safe
 

ee/changelogs/unreleased/pass-current-plan-all-the-way-down.yml

+---
+title: Pass current_plan all the way down the partial chain
+merge_request: 38868
+author:
+type: changed