Skip to content

Feat: replace billing address component for JH

Wu Jeremy requested to merge gitlab-jh/jh-team/gitlab:feat/replace-billing-address-for-jh into master

What does this MR do and why?

The current version of billing address which contains country and state informations, for JH we do not need country and state instead we need province, so in this MR we replace the component -- BillingAddress to make one of JH's own billing address component.

This MR solves: https://gitlab.com/gitlab-jh/gitlab/-/issues/452

The whole change here is about allowing JH to override EE when running under JH environment, so that the country list will not be displayed here on the page because JH only serves China mainland, HongKong SAR China, Macau SAR China, the country list here is misleading for our users.

Describe in detail what your merge request does and why.

Screenshots or screen recordings

image These are strongly recommended to assist reviewers and reduce the time to merge your change.

How to set up and validate locally

I think you will need to download the other repo to get JH edition you can find the repo here, after you clone the repo, checkout to main-jh branch.

Then you need to do two things:

  1. Change jh/lib/jh/gitlab/saas.rb.com_url to your local address
  2. Set up your local CustomDot and change the jh/lib/jh/gitlab/subscription_portal.rb.default_subscription_url to your local customdot endpoint.

After all this you will have to change the code in ee/app/assets/javascripts/subscriptions/buy_addons_shared/components/checkout.vue as my change here to allow path to be override by JH

You should be able to observe the screenshot page that I uploaded above by:

  1. Create a new account
  2. Create a new group
  3. Setup trial for the group
  4. Go to the newly created group, then click the left sidebar Settings/Administration > Usage Quotas > Pipelines > Buy additional minutes.

You should see the page.

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Wu Jeremy

Merge request reports