Merge branch 'jh-update_reconciliation_banner' into 'master'

Update upcoming reconciliation banner copy

See merge request gitlab-org/gitlab!69256

doc/subscriptions/quarterly_reconciliation.md

@@ -18,3 +18,31 @@ pay 25% of what you would have paid previously. This results in substantial savi
 
 If it's not possible for you to participate in quarterly reconciliations, you can opt out of the
 process by using a contract amendment. In that case, you default to the annual review.
+
+## Timeline for invoicing and payment
+
+At the end of each subscription quarter, GitLab notifies you about overages.
+The date you're notified about the overage is not the same as the date
+you are billed.
+
+### GitLab SaaS
+
+Group owners receive an email **on the reconciliation date**.
+The email communicates the [overage seat quantity](gitlab_com/index.md#seats-owed-example)
+and expected invoice amount.
+
+**Seven days later**, the subscription is updated to include the additional
+seats, and an invoice is generated for a prorated amount. If a credit card
+is on file, a payment is automatically applied. Otherwise, an invoice is
+sent and subject to your terms.
+
+### Self-managed instances
+
+Admins receive an email **six days after the reconciliation date**.
+This email communicates the [overage seat quantity](self_managed/index.md#users-over-license)
+and expected invoice amount.
+
+**Seven days later**, the subscription is updated to include the additional
+seats, and an invoice is generated for a prorated amount. If a credit card
+is on file, a payment is automatically applied. Otherwise, an invoice is
+sent and subject to your payment terms.

ee/app/assets/javascripts/billings/qrtly_reconciliation/constants.js

@@ -6,18 +6,14 @@ const qrtlyReconciliationHelpPageUrl = helpPagePath('subscriptions/quarterly_rec
 export const i18n = {
   title: s__('Admin|Quarterly reconciliation will occur on %{qrtlyDate}'),
   description: {
-    ee: s__(`Admin|The number of maximum users for your instance
-is currently exceeding the number of users in license.
-On %{qrtlyDate}, GitLab will process a quarterly reconciliation
-and automatically bill you a prorated amount for the overage.
-There is no action needed from you. If you have a credit card on file,
-it will be charged. Otherwise, you will receive an invoice.`),
-    usesNamespacePlan: s__(`Admin|The number of max seats used for your namespace is currently
-exceeding the number of seats in your subscription.
-On %{qrtlyDate}, GitLab will process a quarterly reconciliation and
-automatically bill you a prorated amount for the overage.
-There is no action needed from you. If you have a credit card on file, it will be charged.
-Otherwise, you will receive an invoice.`),
+    ee: s__(`Admin|The number of max users in your instance exceeds the number of users in your license.
+On %{qrtlyDate}, quarterly reconciliation occurs and you are automatically billed a prorated amount
+for the overage. No action is needed from you. If you have a credit card on file, it will be charged.
+Otherwise, you will receive an invoice. For more information about the timing of the invoicing process, view the documentation.`),
+    usesNamespacePlan: s__(`Admin|The number of max seats in your namespace exceeds the number of seats in your subscription.
+On %{qrtlyDate}, quarterly reconciliation occurs and you are automatically billed a prorated amount
+for the overage. No action is needed from you. If you have a credit card on file, it will be charged.
+Otherwise, you will receive an invoice. For more information about the timing of the invoicing process, view the documentation.`),
   },
   buttons: {
     primary: {

locale/gitlab.pot

@@ -2872,10 +2872,10 @@ msgstr ""
 msgid "Admin|Quarterly reconciliation will occur on %{qrtlyDate}"
 msgstr ""
 
-msgid "Admin|The number of max seats used for your namespace is currently exceeding the number of seats in your subscription. On %{qrtlyDate}, GitLab will process a quarterly reconciliation and automatically bill you a prorated amount for the overage. There is no action needed from you. If you have a credit card on file, it will be charged. Otherwise, you will receive an invoice."
+msgid "Admin|The number of max seats in your namespace exceeds the number of seats in your subscription. On %{qrtlyDate}, quarterly reconciliation occurs and you are automatically billed a prorated amount for the overage. No action is needed from you. If you have a credit card on file, it will be charged. Otherwise, you will receive an invoice. For more information about the timing of the invoicing process, view the documentation."
 msgstr ""
 
-msgid "Admin|The number of maximum users for your instance is currently exceeding the number of users in license. On %{qrtlyDate}, GitLab will process a quarterly reconciliation and automatically bill you a prorated amount for the overage. There is no action needed from you. If you have a credit card on file, it will be charged. Otherwise, you will receive an invoice."
+msgid "Admin|The number of max users in your instance exceeds the number of users in your license. On %{qrtlyDate}, quarterly reconciliation occurs and you are automatically billed a prorated amount for the overage. No action is needed from you. If you have a credit card on file, it will be charged. Otherwise, you will receive an invoice. For more information about the timing of the invoicing process, view the documentation."
 msgstr ""
 
 msgid "Admin|View pending user approvals"