Merge branch 'vslobodin/user-settings-billings-impr' into 'master'

Add the Upgrade button to the User Billings page

Closes customers-gitlab-com#518

See merge request gitlab-org/gitlab-ee!15075

ee/app/assets/javascripts/billings/stores/modules/subscription/mock_data_subscription.json

-{
-  "plan": {
-    "name": "Gold",
-    "code": "gold",
-    "trial": false
-  },
-  "usage": {
-    "seats_in_subscription": 100,
-    "seats_in_use": 98,
-    "max_seats_used": 104,
-    "seats_owed": 4
-  },
-  "billing": {
-    "subscription_start_date": "2018-07-11",
-    "subscription_end_date": "2019-07-11",
-    "last_invoice": "2018-09-01",
-    "next_invoice": "2018-10-01"
-  }
-}

ee/app/assets/stylesheets/pages/billings.scss

 .billing-plan-header {
   border-bottom: 0;
+  padding-bottom: 0;
 
   .billing-plan-logo svg {
     height: 100px;
@@ -18,10 +19,6 @@
   }
 }
 
-.billing-plans-alert {
-  margin: 0;
-}
-
 .billing-plans {
   display: flex;
   flex-direction: row;

ee/app/helpers/billing_plans_helper.rb

@@ -13,10 +13,6 @@ module BillingPlansHelper
     plan.purchase_link&.action == 'current_plan'
   end
 
-  def has_plan_purchase_link?(plans_data)
-    plans_data.any? { |plan| plan.purchase_link&.href }
-  end
-
   def plan_purchase_link(href, link_text)
     if href
       link_to link_text, href, class: 'btn btn-primary btn-inverted'

ee/app/models/ee/namespace.rb

@@ -69,7 +69,7 @@ module EE
       validate :validate_plan_name
       validate :validate_shared_runner_minutes_support
 
-      delegate :trial?, :trial_ends_on, to: :gitlab_subscription, allow_nil: true
+      delegate :trial?, :trial_ends_on, :upgradable?, to: :gitlab_subscription, allow_nil: true
 
       before_create :sync_membership_lock_with_parent
 

ee/app/views/ci_minutes_usage_mailer/notify.html.haml

@@ -3,4 +3,4 @@
 %p
   Click #{link_to('here', EE::SUBSCRIPTIONS_PLANS_URL)} to purchase more minutes.
 %p
-  If you need assistance, please contact #{link_to('GitLab support', 'https://support.gitlab.com')}.
+  If you need assistance, please contact #{link_to('GitLab support', EE::CUSTOMER_SUPPORT_URL)}.

ee/app/views/ci_minutes_usage_mailer/notify.text.erb

@@ -2,4 +2,4 @@ This is an automated notification to let you know that your CI Runner Minutes qu
 
 Please visit <%= EE::SUBSCRIPTIONS_PLANS_URL %> to purchase more minutes.
 
-If you need assistance, please contact GitLab support (https://support.gitlab.com).
+If you need assistance, please contact GitLab support (<%= EE::CUSTOMER_SUPPORT_URL %>).

ee/app/views/ci_minutes_usage_mailer/notify_limit.html.haml

@@ -3,4 +3,4 @@
 %p
   Click #{link_to('here', EE::SUBSCRIPTIONS_PLANS_URL)} to purchase more minutes.
 %p
-  If you need assistance, please contact #{link_to('GitLab support', 'https://support.gitlab.com')}.
+  If you need assistance, please contact #{link_to('GitLab support', EE::CUSTOMER_SUPPORT_URL)}.

ee/app/views/ci_minutes_usage_mailer/notify_limit.text.erb

@@ -3,4 +3,4 @@ quota for "<%= @namespace_name %>" is below <%= @percentage_of_available_mins %>
 
 Please visit <%= EE::SUBSCRIPTIONS_PLANS_URL %> to purchase more minutes.
 
-If you need assistance, please contact GitLab support (https://support.gitlab.com).
+If you need assistance, please contact GitLab support (<%= EE::CUSTOMER_SUPPORT_URL %>).

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

-- current_plan = subscription_plan_info(@plans_data, @group.actual_plan_name)
 - page_title "Billing"
+- current_plan = subscription_plan_info(@plans_data, @group.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
 
 - if @top_most_group
   - top_most_group_plan = subscription_plan_info(@plans_data, @top_most_group.actual_plan_name)
@@ -11,6 +13,4 @@
 
 - if @group.actual_plan
   .center
-    - support_link = link_to s_("BillingPlans|Contact Support"), "https://support.gitlab.com"
-
-    = s_("BillingPlans|If you would like to downgrade your plan please %{support_link}.").html_safe % { support_link: support_link }
+    = s_('BillingPlans|If you would like to downgrade your plan please contact %{support_link_start}Customer Support%{support_link_end}.').html_safe % { support_link_start: support_link_start, support_link_end: support_link_end }

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

@@ -16,7 +16,7 @@
   %h4
     - plan_link = plan.about_page_href ? link_to(plan.code.titleize, plan.about_page_href) : plan.name
     - if namespace == current_user.namespace
-      = s_("BillingPlans|@%{user_name} you are currently on the %{plan_link} plan.").html_safe % { user_name: current_user.username, plan_link: plan_link }
+      = s_("BillingPlans|@%{user_name} you are currently using the %{plan_link} plan.").html_safe % { user_name: current_user.username, plan_link: plan_link }
     - else
       = s_("BillingPlans|%{group_name} is currently using the %{plan_link} plan.").html_safe % { group_name: namespace.full_name, plan_link: plan_link }
 

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
 
 - if current_plan
   = render 'shared/billings/billing_plan_header', namespace: namespace, plan: current_plan
 
-  - unless has_plan_purchase_link?(plans_data)
-    .billing-plans-alert.card.prepend-top-10
-      .card-header.bg-warning.text-white
-        = s_("BillingPlans|Automatic downgrade and upgrade to some plans is currently not available.")
-        - customer_support_url = 'https://about.gitlab.com/sales/';
-        - customer_support_link = link_to s_("BillingPlans|Customer Support"), customer_support_url
-        = s_("BillingPlans|Please contact %{customer_support_link} in that case.").html_safe % { customer_support_link: customer_support_link }
+- unless namespace.gold_plan?
+  - if namespace.upgradable?
+    .gl-p-4.center
+      = link_to s_('BillingPlan|Upgrade plan'), plan_upgrade_url(namespace, current_plan), class: 'btn btn-success'
 
-.billing-plans
+  - else
+    .billing-plans
       - plans_data.each do |plan|
         = render 'shared/billings/billing_plan', namespace: namespace, plan: plan
+
+- if namespace.actual_plan
+  .center
+    &= s_('BillingPlans|If you would like to downgrade your plan please contact %{support_link_start}Customer Support%{support_link_end}.').html_safe % { support_link_start: support_link_start, support_link_end: support_link_end }

ee/changelogs/unreleased/vslobodin-user-settings-billings-impr.yml

+---
+title: Add Upgrade button to the User Billing page
+merge_request: 15075
+author: 
+type: added

ee/lib/ee.rb

@@ -4,4 +4,5 @@ module EE
   SUBSCRIPTIONS_URL = 'https://customers.gitlab.com'.freeze
   SUBSCRIPTIONS_PLANS_URL = "#{SUBSCRIPTIONS_URL}/plans".freeze
   SUBSCRIPTIONS_MORE_MINUTES_URL = "#{SUBSCRIPTIONS_URL}/buy_pipeline_minutes".freeze
+  CUSTOMER_SUPPORT_URL = 'https://support.gitlab.com'.freeze
 end

ee/spec/features/billings/billing_plans_spec.rb

 require 'spec_helper'
 
 describe 'Billing plan pages', :feature do
+  include StubRequests
+
   let(:user) { create(:user) }
+  let(:namespace) { user.namespace }
+  let(:free_plan) { create(:free_plan) }
   let(:bronze_plan) { create(:bronze_plan) }
+  let(:gold_plan) { create(:gold_plan) }
   let(:plans_data) do
-    [
-      {
-        name: "Free",
-        price_per_month: 0,
-        free: true,
-        code: "free",
-        price_per_year: 0,
-        purchase_link: {
-          action: "downgrade",
-          href: nil
-        },
-        features: []
-      },
-      {
-        name: "Bronze",
-        price_per_month: 4,
-        free: false,
-        code: "bronze",
-        price_per_year: 48,
-        purchase_link: {
-          action: "current_plan",
-          href: nil
-        },
-        features: []
-      },
-      {
-        name: "Silver",
-        price_per_month: 19,
-        free: false,
-        code: "silver",
-        price_per_year: 228,
-        purchase_link: {
-          action: "upgrade",
-          href: nil
-        },
-        features: []
-      },
-      {
-        name: "Gold",
-        price_per_month: 99,
-        free: false,
-        code: "gold",
-        price_per_year: 1188,
-        purchase_link: {
-          action: "upgrade",
-          href: nil
-        },
-        features: []
-      }
-    ]
+    JSON.parse(File.read(Rails.root.join('ee/spec/fixtures/gitlab_com_plans.json'))).map do |data|
+      data.deep_symbolize_keys
+    end
+  end
+
+  before do
+    stub_full_request("#{EE::SUBSCRIPTIONS_URL}/gitlab_plans?plan=#{plan}")
+      .to_return(status: 200, body: plans_data.to_json)
+    stub_application_setting(check_namespace_plan: true)
+    allow(Gitlab).to receive(:com?) { true }
+    gitlab_sign_in(user)
+  end
+
+  def external_upgrade_url(namespace, plan)
+    if Plan::PAID_HOSTED_PLANS.include?(plan.name)
+      "#{EE::SUBSCRIPTIONS_URL}/gitlab/namespaces/#{namespace.id}/upgrade/#{plan.name}-external-id"
+    end
+  end
+
+  context 'users profile billing page' do
+    let(:page_path) { profile_billings_path }
+
+    it_behaves_like 'billings gold trial callout'
+
+    context 'on free' do
+      let(:plan) { free_plan.name }
+
+      let!(:subscription) do
+        create(:gitlab_subscription, namespace: namespace, hosted_plan: nil, seats: 15)
+      end
+
+      before do
+        visit page_path
       end
 
-  shared_examples 'displays all plans and correct actions' do
       it 'displays all plans' do
         page.within('.billing-plans') do
           panels = page.all('.card')
@@ -86,62 +73,88 @@ describe 'Billing plan pages', :feature do
             expect(action).to have_css('.disabled')
           when 'upgrade'
             expect(action).to have_content('Upgrade')
-          expect(action).to have_css('.disabled')
+            expect(action).not_to have_css('.disabled')
           end
         end
       end
     end
 
+    context 'on bronze' do
+      let(:plan) { bronze_plan.name }
+
+      let!(:subscription) do
+        create(:gitlab_subscription, namespace: namespace, hosted_plan: bronze_plan, seats: 15)
+      end
+
       before do
-    expect(Gitlab::HTTP).to receive(:get).and_return(double(body: plans_data.to_json))
-    stub_application_setting(check_namespace_plan: true)
-    allow(Gitlab).to receive(:com?) { true }
-    gitlab_sign_in(user)
+        visit page_path
       end
 
-  context 'users profile billing page' do
-    let(:page_path) { profile_billings_path }
+      it 'displays header and actions' do
+        page.within('.billing-plan-header') do
+          expect(page).to have_content("#{user.username} you are currently using the Bronze plan.")
 
-    it_behaves_like 'billings gold trial callout'
+          expect(page).to have_css('.billing-plan-logo img')
+        end
 
-    context 'on bronze' do
-      before do
-        allow_any_instance_of(EE::Namespace).to receive(:plan).and_return(bronze_plan)
+        page.within('.content') do
+          expect(page).to have_link('Upgrade plan', href: external_upgrade_url(namespace, bronze_plan))
+          expect(page).to have_content('downgrade your plan')
+          expect(page).to have_link('Customer Support', href: EE::CUSTOMER_SUPPORT_URL)
+        end
+      end
+    end
 
-        visit page_path
+    context 'on gold' do
+      let(:plan) { gold_plan.name }
+
+      let!(:subscription) do
+        create(:gitlab_subscription, namespace: namespace, hosted_plan: gold_plan, seats: 15)
       end
 
-      include_examples 'displays all plans and correct actions'
+      before do
+        visit page_path
+      end
 
-      it 'displays plan header' do
+      it 'displays header and actions' do
         page.within('.billing-plan-header') do
-          expect(page).to have_content("@#{user.username} you are currently on the Bronze")
+          expect(page).to have_content("#{user.username} you are currently using the Gold plan.")
 
           expect(page).to have_css('.billing-plan-logo img')
         end
+
+        page.within('.content') do
+          expect(page).not_to have_link('Upgrade plan')
+          expect(page).to have_content('downgrade your plan')
+          expect(page).to have_link('Customer Support', href: EE::CUSTOMER_SUPPORT_URL)
+        end
       end
     end
   end
 
   context 'group billing page' do
-    let(:group) { create(:group) }
-    let!(:group_member) { create(:group_member, :owner, group: group, user: user) }
+    let(:namespace) { create(:group) }
+    let!(:group_member) { create(:group_member, :owner, group: namespace, user: user) }
 
     context 'top-most group' do
-      let(:page_path) { group_billings_path(group) }
+      let(:page_path) { group_billings_path(namespace) }
 
       it_behaves_like 'billings gold trial callout'
 
       context 'on bronze' do
-        before do
-          expect_any_instance_of(EE::Group).to receive(:plan).at_least(:once).and_return(bronze_plan)
+        let(:plan) { bronze_plan.name }
+
+        let!(:subscription) do
+          create(:gitlab_subscription, namespace: namespace, hosted_plan: bronze_plan, seats: 15)
+        end
 
+        before do
           visit page_path
         end
 
         it 'displays plan header' do
           page.within('.billing-plan-header') do
-            expect(page).to have_content("#{group.name} is currently using the Bronze plan")
+            expect(page).to have_content("#{namespace.name} is currently using the Bronze plan")
 
             expect(page).to have_css('.billing-plan-logo .identicon')
           end
@@ -168,10 +181,17 @@ describe 'Billing plan pages', :feature do
     let(:subgroup2) { create(:group, parent: subgroup1) }
     let!(:subgroup2_member) { create(:group_member, :owner, group: subgroup2, user: user3) }
     let(:page_path) { group_billings_path(subgroup2) }
+    let(:namespace) { group }
 
     it_behaves_like 'billings gold trial callout'
 
     context 'on bronze' do
+      let(:plan) { bronze_plan.name }
+
+      let!(:subscription) do
+        create(:gitlab_subscription, namespace: namespace, hosted_plan: bronze_plan, seats: 15)
+      end
+
       before do
         visit page_path
       end
@@ -189,6 +209,8 @@ describe 'Billing plan pages', :feature do
   end
 
   context 'with unexpected JSON' do
+    let(:plan) { 'free' }
+
     let(:plans_data) do
       [
         {

ee/spec/models/namespace_spec.rb

@@ -21,6 +21,7 @@ describe Namespace do
   it { is_expected.to delegate_method(:shared_runners_seconds_last_reset).to(:namespace_statistics) }
   it { is_expected.to delegate_method(:trial?).to(:gitlab_subscription) }
   it { is_expected.to delegate_method(:trial_ends_on).to(:gitlab_subscription) }
+  it { is_expected.to delegate_method(:upgradable?).to(:gitlab_subscription) }
 
   context 'scopes' do
     describe '.with_plan' do

ee/spec/support/shared_examples/gold_trial_callout_shared_examples.rb

@@ -60,11 +60,13 @@ end
 
 shared_examples 'billings gold trial callout' do
   context 'on a free plan' do
-    let(:plan) { nil }
+    let(:plan) { 'free' }
 
-    before do
-      allow_any_instance_of(EE::Namespace).to receive(:plan).and_return(plan)
+    let!(:subscription) do
+      create(:gitlab_subscription, namespace: namespace, hosted_plan: nil, seats: 15)
+    end
 
+    before do
       visit page_path
     end
 
@@ -80,11 +82,13 @@ shared_examples 'billings gold trial callout' do
     where(case_names: ->(plan_type) {"like #{plan_type}"}, plan_type: [:bronze, :silver])
 
     with_them do
-      let(:plan) { plans[plan_type] }
+      let(:plan) { plan_type }
 
-      before do
-        allow_any_instance_of(EE::Namespace).to receive(:plan).and_return(plan)
+      let!(:subscription) do
+        create(:gitlab_subscription, namespace: namespace, hosted_plan: plans[plan_type], seats: 15)
+      end
 
+      before do
         visit page_path
       end
 
@@ -99,11 +103,13 @@ shared_examples 'billings gold trial callout' do
   end
 
   context 'on a gold plan' do
-    set(:plan) { create(:gold_plan) }
+    let(:plan) { gold_plan.name }
 
-    before do
-      allow_any_instance_of(EE::Namespace).to receive(:plan).and_return(plan)
+    let!(:subscription) do
+      create(:gitlab_subscription, namespace: namespace, hosted_plan: gold_plan, seats: 15)
+    end
 
+    before do
       visit page_path
     end
 

locale/gitlab.pot

@@ -2224,25 +2224,16 @@ msgstr ""
 msgid "BillingPlans|%{group_name} is currently using the %{plan_link} plan."
 msgstr ""
 
-msgid "BillingPlans|@%{user_name} you are currently on the %{plan_link} plan."
-msgstr ""
-
-msgid "BillingPlans|Automatic downgrade and upgrade to some plans is currently not available."
-msgstr ""
-
-msgid "BillingPlans|Contact Support"
+msgid "BillingPlans|@%{user_name} you are currently using the %{plan_link} plan."
 msgstr ""
 
 msgid "BillingPlans|Current plan"
 msgstr ""
 
-msgid "BillingPlans|Customer Support"
-msgstr ""
-
 msgid "BillingPlans|Downgrade"
 msgstr ""
 
-msgid "BillingPlans|If you would like to downgrade your plan please %{support_link}."
+msgid "BillingPlans|If you would like to downgrade your plan please contact %{support_link_start}Customer Support%{support_link_end}."
 msgstr ""
 
 msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}, or start a free 30-day trial of GitLab.com Gold."
@@ -2254,9 +2245,6 @@ msgstr ""
 msgid "BillingPlans|Manage plan"
 msgstr ""
 
-msgid "BillingPlans|Please contact %{customer_support_link} in that case."
-msgstr ""
-
 msgid "BillingPlans|Pricing page"
 msgstr ""
 
@@ -2293,6 +2281,9 @@ msgstr ""
 msgid "BillingPlans|per user"
 msgstr ""
 
+msgid "BillingPlan|Upgrade plan"
+msgstr ""
+
 msgid "Bitbucket Server Import"
 msgstr ""