From 5385f21b917fd497973f01681457a82d0b5b5cc8 Mon Sep 17 00:00:00 2001 From: Felicity Chapman Date: Tue, 2 Dec 2025 10:28:14 +0000 Subject: [PATCH] Create reusables for repeated process steps in billing (#58645) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../create-as-csp-partner.md | 4 +-- .../create-client-enterprise.md | 4 +-- .../manage-for-client/create-client-org.md | 2 +- .../manage-user-licenses.md | 6 ++-- .../pay-third-parties/cancel-sponsorship.md | 2 +- .../downgrade-marketplace-app.md | 4 +-- .../upgrade-marketplace-app.md | 4 +-- .../how-tos/products/buy-advanced-security.md | 22 +++--------- .../how-tos/products/download-license-use.md | 11 ++---- content/billing/how-tos/products/index.md | 1 - .../how-tos/products/manage-ghas-licenses.md | 15 +++----- .../how-tos/products/use-cost-centers.md | 5 ++- .../how-tos/products/view-ghas-committers.md | 6 ++-- .../products/view-productlicense-use.md | 9 ++--- .../add-sales-tax-certificate.md | 10 ++---- .../set-up-payment/connect-azure-sub.md | 36 +++++-------------- .../tutorials/control-costs-at-scale.md | 9 +++-- content/billing/tutorials/gather-insights.md | 4 +-- content/billing/tutorials/set-up-budgets.md | 15 +++----- .../billing/access-billing-sidebar.md | 1 + .../billing/access-org-or-ent-page.md | 3 ++ .../billing/azure-accept-permissions.md | 1 + .../billing/azure-select-subscription.md | 1 + .../reusables/billing/budget-create-button.md | 1 + data/reusables/billing/click-licensing.md | 1 + data/reusables/billing/click-payment-info.md | 1 + .../billing/client-billing-yearly.md | 1 + .../billing/cost-center-click-new.md | 2 ++ .../billing/cost-center-create-button.md | 1 + .../billing/enterprise-create-button.md | 1 + .../billing/ghas-site-admin-committers.md | 2 ++ .../billing/marketplace-find-app-downgrade.md | 3 ++ .../billing/marketplace-find-app-upgrade.md | 3 ++ data/reusables/billing/nav-to-ent.md | 1 + data/reusables/billing/nav-to-org-or-ent.md | 1 + src/data-directory/lib/data-schemas/ctas.ts | 2 +- 36 files changed, 74 insertions(+), 121 deletions(-) create mode 100644 data/reusables/billing/access-billing-sidebar.md create mode 100644 data/reusables/billing/access-org-or-ent-page.md create mode 100644 data/reusables/billing/azure-accept-permissions.md create mode 100644 data/reusables/billing/azure-select-subscription.md create mode 100644 data/reusables/billing/budget-create-button.md create mode 100644 data/reusables/billing/click-licensing.md create mode 100644 data/reusables/billing/click-payment-info.md create mode 100644 data/reusables/billing/client-billing-yearly.md create mode 100644 data/reusables/billing/cost-center-click-new.md create mode 100644 data/reusables/billing/cost-center-create-button.md create mode 100644 data/reusables/billing/enterprise-create-button.md create mode 100644 data/reusables/billing/ghas-site-admin-committers.md create mode 100644 data/reusables/billing/marketplace-find-app-downgrade.md create mode 100644 data/reusables/billing/marketplace-find-app-upgrade.md create mode 100644 data/reusables/billing/nav-to-ent.md create mode 100644 data/reusables/billing/nav-to-org-or-ent.md diff --git a/content/billing/how-tos/manage-for-client/create-as-csp-partner.md b/content/billing/how-tos/manage-for-client/create-as-csp-partner.md index fbd9767048..2e0e358ebf 100644 --- a/content/billing/how-tos/manage-for-client/create-as-csp-partner.md +++ b/content/billing/how-tos/manage-for-client/create-as-csp-partner.md @@ -35,7 +35,7 @@ As a Microsoft CSP partner, you can get started with {% data variables.product.p 1. Select **Get started with {% data variables.product.prodname_enterprise %}**. 1. Choose an enterprise type. To help you decide which choice is best for the enterprise, see [AUTOTITLE](/admin/identity-and-access-management/understanding-iam-for-enterprises/choosing-an-enterprise-type-for-github-enterprise-cloud). 1. Complete the form with your client's information. -1. Click **Create your enterprise**. +{% data reusables.billing.enterprise-create-button %} ## Step 2: Purchase {% data variables.product.prodname_enterprise %} @@ -45,7 +45,7 @@ At any time during the trial, you can purchase {% data variables.product.prodnam 1. At the top of the page, in the blue banner, click **Activate Enterprise**. 1. Click **Add Azure subscription**. 1. To sign in to your Microsoft account, follow the prompts. -1. Review the "Permissions requested" prompt. If you agree with the terms, click **Accept**. +{% data reusables.billing.azure-accept-permissions %} If you don't see a "Permissions requested" prompt, and instead see a message indicating that you need admin approval, see [AUTOTITLE](/billing/how-tos/troubleshooting/azure-sub-connection). diff --git a/content/billing/how-tos/manage-for-client/create-client-enterprise.md b/content/billing/how-tos/manage-for-client/create-client-enterprise.md index 619fb25b7d..715a993400 100644 --- a/content/billing/how-tos/manage-for-client/create-client-enterprise.md +++ b/content/billing/how-tos/manage-for-client/create-client-enterprise.md @@ -43,7 +43,7 @@ If you already have a personal account on {% data variables.product.prodname_dot 1. Complete the form with your client's information. If you chose Enterprise managed users, define your data hosting requirements [AUTOTITLE](/admin/data-residency/about-github-enterprise-cloud-with-data-residency). -1. Click **Create your enterprise**. +{% data reusables.billing.enterprise-create-button %} ## Step 3: Upgrade the enterprise to a yearly paid subscription @@ -51,7 +51,7 @@ If you already have a personal account on {% data variables.product.prodname_dot {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.billing-tab %} 1. At the top of the page, click **Buy Enterprise**. -1. Under "How often do you want to be billed?", select **Pay yearly**. +{% data reusables.billing.client-billing-yearly %} 1. Under "How many seats do you want to include?", type the number of seats your client wants. 1. Under "Payment method", input your payment details. 1. Click **Complete {% data variables.product.prodname_enterprise %} purchase**. diff --git a/content/billing/how-tos/manage-for-client/create-client-org.md b/content/billing/how-tos/manage-for-client/create-client-org.md index fa833745b6..99111c1f98 100644 --- a/content/billing/how-tos/manage-for-client/create-client-org.md +++ b/content/billing/how-tos/manage-for-client/create-client-org.md @@ -61,7 +61,7 @@ If you already have a personal account on {% data variables.product.prodname_dot {% data reusables.profile.org_settings %} {% data reusables.organizations.billing_plans_or_licensing %} {% data reusables.dotcom_billing.upgrade_org %} -1. Under "How often do you want to be billed?", select **Pay yearly** to pay for the organization yearly. +{% data reusables.billing.client-billing-yearly %} 1. Under "How many seats do you want to include?", define the number of seats you require. {% data reusables.dotcom_billing.enter-payment-info %} 1. Review the information, then click **Save** to confirm the changes. diff --git a/content/billing/how-tos/manage-plan-and-licenses/manage-user-licenses.md b/content/billing/how-tos/manage-plan-and-licenses/manage-user-licenses.md index ba064e66fa..8d54cc1074 100644 --- a/content/billing/how-tos/manage-plan-and-licenses/manage-user-licenses.md +++ b/content/billing/how-tos/manage-plan-and-licenses/manage-user-licenses.md @@ -28,7 +28,7 @@ If you're the **owner** or **billing manager** of an organization on a {% data v {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.billing.org-billing-menu %} -1. Click **Licensing**. +{% data reusables.billing.click-licensing %} 1. In the {% data variables.product.prodname_team %} banner, click **Edit** and select **Add seats** or **Remove seats**. 1. Define the number of new seats you require. The details of the prorated cost for the remainder of the billing cycle and the total for your next bill are updated automatically. 1. Click **Add seats** or **Remove seats**. @@ -55,8 +55,8 @@ To add or remove licenses from your enterprise account: Enterprise **owners** or **billing managers** can add or remove user licenses. -1. Navigate to your enterprise account. +{% data reusables.billing.nav-to-ent %} {% data reusables.billing.enterprise-billing-menu %} -1. In the left sidebar, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing**. +{% data reusables.billing.click-licensing %} 1. Next to "Enterprise Cloud", click **{% octicon "kebab-horizontal" aria-hidden="true" aria-label="kebab-horizontal" %}**, then click **Manage licenses**. 1. Choose your number of licenses, then click **Confirm licenses**. diff --git a/content/billing/how-tos/pay-third-parties/cancel-sponsorship.md b/content/billing/how-tos/pay-third-parties/cancel-sponsorship.md index ac003715cb..c5e2f0c099 100644 --- a/content/billing/how-tos/pay-third-parties/cancel-sponsorship.md +++ b/content/billing/how-tos/pay-third-parties/cancel-sponsorship.md @@ -28,7 +28,7 @@ Organizations that pay for {% data variables.product.prodname_sponsors %} by inv {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing**. +{% data reusables.billing.access-billing-sidebar %} 1. Under "{% data variables.product.prodname_sponsors %}", in the yellow banner with the start date, click **Undo**. 1. Review the alert about undoing the activation of the sponsorship, then click **OK**. diff --git a/content/billing/how-tos/pay-third-parties/downgrade-marketplace-app.md b/content/billing/how-tos/pay-third-parties/downgrade-marketplace-app.md index 95412224c9..2ba63ad6ed 100644 --- a/content/billing/how-tos/pay-third-parties/downgrade-marketplace-app.md +++ b/content/billing/how-tos/pay-third-parties/downgrade-marketplace-app.md @@ -55,9 +55,7 @@ contentType: how-tos {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.billing-tab %} -1. In the "Marketplace apps" tab, find the app you want to downgrade. -1. Next to the organization where you want to downgrade the app, select **{% octicon "kebab-horizontal" aria-label="More" %}** and then click **Change plan**. -1. Select the **Edit your plan** dropdown and click an account's plan to edit. +{% data reusables.billing.marketplace-find-app-downgrade %} {% data reusables.marketplace.choose-new-plan %} {% data reusables.marketplace.choose-new-quantity %} {% data reusables.marketplace.issue-plan-changes %} diff --git a/content/billing/how-tos/pay-third-parties/upgrade-marketplace-app.md b/content/billing/how-tos/pay-third-parties/upgrade-marketplace-app.md index a9fbd4b858..93d0fb83fe 100644 --- a/content/billing/how-tos/pay-third-parties/upgrade-marketplace-app.md +++ b/content/billing/how-tos/pay-third-parties/upgrade-marketplace-app.md @@ -53,9 +53,7 @@ contentType: how-tos {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.billing-tab %} -1. In the "Marketplace apps" tab, find the app you want to upgrade. -1. Next to the organization where you want to upgrade the app, select **{% octicon "kebab-horizontal" aria-label="More" %}** and then click **Change plan**. -1. Select the **Edit your plan** dropdown and click an account's plan to edit. +{% data reusables.billing.marketplace-find-app-upgrade %} {% data reusables.marketplace.choose-new-plan %} {% data reusables.marketplace.choose-new-quantity %} {% data reusables.marketplace.issue-plan-changes %} diff --git a/content/billing/how-tos/products/buy-advanced-security.md b/content/billing/how-tos/products/buy-advanced-security.md index 965043ab36..c9bf34ff10 100644 --- a/content/billing/how-tos/products/buy-advanced-security.md +++ b/content/billing/how-tos/products/buy-advanced-security.md @@ -22,15 +22,8 @@ contentType: how-tos You must use a {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plan before you can enable {% data variables.product.prodname_GH_cs_or_sp %} on private repositories. -1. In the upper-right corner of any page on {% data variables.product.github %}, click your profile picture. - -1. Select the account you want to view and then access the "Billing & Licensing" pages: - - * **Organizations**: Click **Your organizations**, then next to the organization, click **Settings**. In the organization sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. - - * **Enterprises**: Click **Your enterprises**, then click the enterprise name. Click the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** tab at the top of the page. - -1. From the list of "Billing & licensing" pages, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** to display the licensing page. +{% data reusables.billing.nav-to-org-or-ent %} +{% data reusables.billing.click-licensing %} Your current plan is shown with any options to upgrade to a different plan. @@ -44,15 +37,8 @@ The most effective way to control and enable these features is using security co If you use volume/subscription billing, then you will need to purchase licenses before you can start using {% data variables.product.prodname_GH_cs_or_sp %} on private or internal repositories. -1. In the upper-right corner of any page on {% data variables.product.github %}, click your profile picture. - -1. Select the account you want to view and then access the "Billing & Licensing" pages: - - * **Organizations**: Click **Your organizations**, then next to the organization, click **Settings**. In the organization sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. - - * **Enterprises**: Click **Your enterprises**, then click the enterprise name. Click the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** tab at the top of the page. - -1. From the list of "Billing & licensing" pages, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** to display the licensing page. +{% data reusables.billing.nav-to-org-or-ent %} +{% data reusables.billing.click-licensing %} 1. To the right of "{% data variables.product.prodname_GHAS %}", click **Buy {% data variables.product.prodname_AS %}**. diff --git a/content/billing/how-tos/products/download-license-use.md b/content/billing/how-tos/products/download-license-use.md index 83c362e2f1..8a75d021eb 100644 --- a/content/billing/how-tos/products/download-license-use.md +++ b/content/billing/how-tos/products/download-license-use.md @@ -23,15 +23,8 @@ For more detailed reports on usage of all paid products, see [AUTOTITLE](/billin ## On {% data variables.product.prodname_ghe_cloud %} -1. In the upper-right corner of any page on {% data variables.product.github %}, click your profile picture. - -1. Select the account you want to view and then access the "Billing & Licensing" pages: - - * **Organizations**: Click **Your organizations**, then next to the organization, click **Settings**. In the organization sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. - - * **Enterprises**: Click **Your enterprises**, then click the enterprise name. Click the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** tab at the top of the page. - -1. From the list of "Billing & licensing" pages, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** to display the licensing page. +{% data reusables.billing.nav-to-ent %} +{% data reusables.billing.click-licensing %} 1. In the license area of interest, click **Download CSV report**. If offered a choice, choose your preferred report. diff --git a/content/billing/how-tos/products/index.md b/content/billing/how-tos/products/index.md index 1d6a5edf24..b25806e3de 100644 --- a/content/billing/how-tos/products/index.md +++ b/content/billing/how-tos/products/index.md @@ -31,4 +31,3 @@ children: - /view-ghas-committers contentType: how-tos --- - diff --git a/content/billing/how-tos/products/manage-ghas-licenses.md b/content/billing/how-tos/products/manage-ghas-licenses.md index 98667d2459..17a74c9861 100644 --- a/content/billing/how-tos/products/manage-ghas-licenses.md +++ b/content/billing/how-tos/products/manage-ghas-licenses.md @@ -23,15 +23,8 @@ For information about using policies to control use of licenses in your enterpri ## Changing the size of your license -1. In the upper-right corner of any page on {% data variables.product.github %}, click your profile picture. - -1. Select the account you want to view and then access the "Billing & Licensing" pages: - - * **Organizations**: Click **Your organizations**, then next to the organization, click **Settings**. In the organization sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. - - * **Enterprises**: Click **Your enterprises**, then click the enterprise name. Click the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** tab at the top of the page. - -1. From the list of "Billing & licensing" pages, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** to display the licensing page. +{% data reusables.billing.nav-to-org-or-ent %} +{% data reusables.billing.click-licensing %} ![Screenshot of the {% data variables.product.prodname_AS %} licensing screen. The "Manage licenses" button is outlined in orange.](/assets/images/help/enterprises/ghas-licenses-dropdown.png) @@ -44,7 +37,7 @@ For information about using policies to control use of licenses in your enterpri ## Canceling your {% data variables.product.prodname_AS %} subscription -1. Navigate to the "Billing & licensing" pages for your enterprise or organization. -1. Click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** to display the licensing page. +{% data reusables.billing.nav-to-org-or-ent %} +{% data reusables.billing.click-licensing %} 1. To the right of "{% data variables.product.prodname_AS %}", select {% octicon "kebab-horizontal" aria-label="Open menu" %}, then click **Cancel subscription**. 1. To confirm your cancellation, click **I understand, cancel {% data variables.product.prodname_AS %}**. diff --git a/content/billing/how-tos/products/use-cost-centers.md b/content/billing/how-tos/products/use-cost-centers.md index b8dc9902eb..e5070c75fb 100644 --- a/content/billing/how-tos/products/use-cost-centers.md +++ b/content/billing/how-tos/products/use-cost-centers.md @@ -30,15 +30,14 @@ When you create a cost center, you can add **organizations**, **repositories**, {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.billing.enterprise-billing-menu %} -1. Click **Cost centers**. -1. Click **New cost center** in the upper-right corner. +{% data reusables.billing.cost-center-click-new %} 1. In the text box under "Name", enter a name for your cost center. 1. If your account is billed to Azure, you have the option to add an Azure ID. Your credentials will be verified against Azure to ensure the Azure IDs associated to your account are available. 1. Under **Resources**, select the organizations, repositories, and/or users that will be a part of the cost center. >[!NOTE] A resource (organization, repository, or user) can only be assigned to one cost center at a time. If you add a resource that belongs to a different cost center, it will be moved to the new cost center and you will be notified. -1. Click **Create cost center**. +{% data reusables.billing.cost-center-create-button %} ## Adding a budget to a cost center diff --git a/content/billing/how-tos/products/view-ghas-committers.md b/content/billing/how-tos/products/view-ghas-committers.md index e77295181e..9946265bee 100644 --- a/content/billing/how-tos/products/view-ghas-committers.md +++ b/content/billing/how-tos/products/view-ghas-committers.md @@ -28,8 +28,7 @@ For more information about billing for {% data variables.product.prodname_AS %}, ## Viewing committer information -1. In the upper-right corner of any page, click {% octicon "rocket" aria-label="Site admin" %} to display the "Site admin" pages. -1. In the left sidebar, click **Advanced Security Committers**. If this option is not displayed, at the top of the page, click {% octicon "rocket" aria-hidden="true" aria-label="Site admin" %} **Site admin** to show the top-level "Site admin" page. +{% data reusables.billing.ghas-site-admin-committers %} The page shows the number of licenses currently being used and the number of licenses you would use if you enabled {% data variables.product.prodname_AS %} for all repositories. @@ -37,8 +36,7 @@ The page shows the number of licenses currently being used and the number of lic Under "Calculate Additional Advanced Licenses", you can calculate how many more new or additional licenses will be used if you enable {% data variables.product.prodname_cs_or_sp %} for specific organizations and repositories. -1. In the upper-right corner of any page, click {% octicon "rocket" aria-label="Site admin" %} to display the "Site admin" pages. -1. In the left sidebar, click **Advanced Security Committers**. If this option is not displayed, at the top of the page, click {% octicon "rocket" aria-hidden="true" aria-label="Site admin" %} **Site admin** to show the top-level "Site admin" page. +{% data reusables.billing.ghas-site-admin-committers %} 1. Under "Organizations and Repositories", enter or paste a list of organizations and repositories, with one organization or repository per line. For example: ```text diff --git a/content/billing/how-tos/products/view-productlicense-use.md b/content/billing/how-tos/products/view-productlicense-use.md index 9e1ad6c67f..7db6879cc7 100644 --- a/content/billing/how-tos/products/view-productlicense-use.md +++ b/content/billing/how-tos/products/view-productlicense-use.md @@ -66,13 +66,8 @@ The options available to you vary according to your role and {% data variables.p ### Organization and enterprise accounts -1. Display the settings for the organization or enterprise account you want to view data for. For example, using the context switcher shown on all personal and organization account settings pages. - - ![Screenshot of the "Public profile" settings for The Octocat. Next to "Your personal profile," a "Switch settings context" link is outlined in orange.](/assets/images/help/settings/context-switcher-button.png) - -1. Click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** to display the billing and licensing overview for the account: - * **Organization** accounts: under "Access" in the sidebar for settings. - * **Enterprise** accounts: a separate tab at the top of the page. +{% data reusables.billing.nav-to-org-or-ent %} +{% data reusables.billing.access-org-or-ent-page %} ## Exploring usage data in more detail diff --git a/content/billing/how-tos/set-up-payment/add-sales-tax-certificate.md b/content/billing/how-tos/set-up-payment/add-sales-tax-certificate.md index ca12dda94c..47798ed7d1 100644 --- a/content/billing/how-tos/set-up-payment/add-sales-tax-certificate.md +++ b/content/billing/how-tos/set-up-payment/add-sales-tax-certificate.md @@ -24,14 +24,8 @@ If you're a {% data variables.product.github %} customer in the United States, y Enterprise owners, organization owners, and billing managers can upload a sales tax exemption certificate to an enterprise account if the account uses the {% data variables.product.company_short %} Customer Agreement. -1. In the upper-right corner of any page on {% data variables.product.github %}, click your profile picture. - -1. Select the account you want to view and then access the "Billing & Licensing" pages: - - * **Organizations**: Click **Your organizations**, then next to the organization, click **Settings**. In the organization sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. - * For **enterprises**, click **Your enterprises**, then click the enterprise name. Click the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** tab at the top of the page. - -1. From the list of "Billing & licensing" pages, click **Payment information**. +{% data reusables.billing.nav-to-org-or-ent %} +{% data reusables.billing.click-payment-info %} 1. Review your "Billing information" and update any incorrect data. You must ensure that the address fields are correct and that the "City" and "Postal/Zip code" fields are accepted. If there is any missing information or any errors are reported, the option to upload a sales tax certificate is hidden. 1. At the bottom of the page in the "Sales Tax" section, click **Upload certificate**, and select the certificate file you want to upload. If "Sales Tax" is missing, check that your billing information defines your country as "United States of America." diff --git a/content/billing/how-tos/set-up-payment/connect-azure-sub.md b/content/billing/how-tos/set-up-payment/connect-azure-sub.md index fd49728417..9f8796e99d 100644 --- a/content/billing/how-tos/set-up-payment/connect-azure-sub.md +++ b/content/billing/how-tos/set-up-payment/connect-azure-sub.md @@ -31,37 +31,19 @@ You can pay for metered usage of {% data variables.product.github %} features th * You must be logged into Azure as a user who is able to provide tenant-wide admin consent or arrange to work with an Azure AD global administrator to configure an admin consent workflow. See [AUTOTITLE](/billing/concepts/azure-subscriptions). -## Connecting your Azure subscription to your organization account +## Connecting your Azure subscription to an organization or enterprise account -{% data reusables.profile.access_org %} -{% data reusables.profile.org_settings %} +{% data reusables.billing.nav-to-org-or-ent %} +{% data reusables.billing.access-org-or-ent-page %} +{% data reusables.billing.click-payment-info %} -1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing**. -1. Under "Payment Information", to the right of "Metered billing via Azure", click **Add Azure Subscription**. +1. Scroll to the bottom of the page, to the right of "Metered billing via Azure", click **Add Azure Subscription**. 1. Sign in to your Microsoft account. -1. Review the "Permissions requested" prompt. If you agree with the terms, click **Accept**. +{% data reusables.billing.azure-accept-permissions %} {% data reusables.enterprise-accounts.azure-admin-approval-required-message %} -1. Under "Select a subscription", select the Azure Subscription ID that you want to connect to your organization. - {% data reusables.enterprise-accounts.connect-azure %} - - {% data reusables.enterprise-accounts.tenant-app-permissions %} - -## Connecting your Azure subscription to your enterprise account - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.billing.enterprise-billing-menu %} -{% data reusables.enterprise-accounts.payment-information-tab-both-platforms %} - -1. Under "Payment Information", click **Add Azure Subscription**. -1. To sign in to your Microsoft account, follow the prompts. -1. Review the "Permissions requested" prompt. If you agree with the terms, click **Accept**. - - {% data reusables.enterprise-accounts.azure-admin-approval-required-message %} - -1. Under "Select a subscription", select the Azure subscription ID that you want to connect to your enterprise. - +{% data reusables.billing.azure-select-subscription %} {% data reusables.enterprise-accounts.connect-azure %} {% data reusables.enterprise-accounts.tenant-app-permissions %} @@ -70,7 +52,7 @@ You can pay for metered usage of {% data variables.product.github %} features th If you disconnect your Azure subscription from your account, your usage can no longer exceed the amounts included with your plan. -1. Under "Billing Management", then under "Metered billing via Azure", to the right of the subscription ID you want change. +1. On the "Payment information" page, to the right of the subscription ID you want change. * **Edit the subscription**: Click {% octicon "pencil" aria-label="Edit Azure Subscription" %} to edit your subscription. * **Disconnect the subscription** Click {% octicon "trash" aria-label="Delete Azure Subscription" %} to remove the connection. @@ -79,7 +61,7 @@ If you disconnect your Azure subscription from your account, your usage can no l To connect an Azure subscription, you'll need appropriate access permissions on both {% data variables.product.github %} and the Azure billing portal. This may require coordination between two different people. -To see a demo of the process from beginning to end, see [Billing GitHub consumption through an Azure subscription](https://www.youtube.com/watch?v=Y-f7JKJ4_8Y) on {% data variables.product.company_short %}'s YouTube channel. This video demonstrates the process for an enterprise account. If you're connecting a subscription to an organization account, see [Connecting your Azure subscription to your organization account](/free-pro-team@latest/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription#connecting-your-azure-subscription-to-your-organization-account). +To see a demo of the process from beginning to end, see [Billing GitHub consumption through an Azure subscription](https://www.youtube.com/watch?v=Y-f7JKJ4_8Y) on {% data variables.product.company_short %}'s YouTube channel. This video demonstrates the process for an enterprise account. ## Further reading diff --git a/content/billing/tutorials/control-costs-at-scale.md b/content/billing/tutorials/control-costs-at-scale.md index d70f0e0741..4fcb6d2d63 100644 --- a/content/billing/tutorials/control-costs-at-scale.md +++ b/content/billing/tutorials/control-costs-at-scale.md @@ -47,14 +47,13 @@ Follow these steps to plan your cost centers: Now you'll create your first cost center using the user interface (UI) to familiarize yourself with how cost centers work. Choose one of the cost centers you've identified as an example—it's best to start with a small financial entity. -1. Navigate to your enterprise. For example, from [https://github.com/settings/enterprises](https://github.com/settings/enterprises?ref_product=ghec&ref_type=engagement&ref_style=text). +{% data reusables.billing.nav-to-ent %} {% data reusables.billing.enterprise-billing-menu %} -1. Click **Cost centers**. -1. Click **New cost center** in the upper-right corner. +{% data reusables.billing.cost-center-click-new %} 1. In the text box under "Name", enter the name of the financial entity you want to track costs for. 1. Optionally, if this financial entity has a separate Azure subscription, you can add the Azure subscription to the cost center to charge usage directly to it. The credentials will be verified against Azure to ensure the Azure ID associated with the account is available. 1. Under **Resources**, select the users, organizations, and repositories to track as part of this cost center. -1. Click **Create cost center**. +{% data reusables.billing.cost-center-create-button %} Your new cost center is now active and usage will begin to attribute to the cost center immediately. Future billing reports will include this cost center with an entry in the `cost_center_name` column for usage allocated to it. You'll also be able to filter usage charts by this cost center. @@ -98,7 +97,7 @@ Create one budget for each product, SKU, or group of SKUs that you want to contr Under "Alert Recipients", select any additional recipients to receive the alerts. -1. Click **Create budget**. +{% data reusables.billing.budget-create-button %} ### Review existing budgets for conflicts diff --git a/content/billing/tutorials/gather-insights.md b/content/billing/tutorials/gather-insights.md index e08182235a..16fb6b2662 100644 --- a/content/billing/tutorials/gather-insights.md +++ b/content/billing/tutorials/gather-insights.md @@ -29,7 +29,7 @@ The new billing platform provides you with the tools to: You can view the usage of your personal account and download the usage data for further analysis. {% data reusables.user-settings.access_settings %} -1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. +{% data reusables.billing.access-billing-sidebar %} 1. Click **Usage**. 1. To search or filter the graph, click the search bar. Then click the filter you want to use. 1. To further filter the graph, use the dropdown menus. @@ -114,7 +114,7 @@ You can also view your active {% data variables.product.prodname_enterprise %} i {% endif %} -1. Click **Licensing**. +{% data reusables.billing.click-licensing %} 1. To download a CSV report of the license usage, click {% octicon "kebab-horizontal" aria-label="Licensing dropdown" %} to the right of the usage you want to download, then click **{% octicon "download" aria-hidden="true" aria-label="download" %} CSV report**. ## Further reading diff --git a/content/billing/tutorials/set-up-budgets.md b/content/billing/tutorials/set-up-budgets.md index a80ff04c13..2522688bd8 100644 --- a/content/billing/tutorials/set-up-budgets.md +++ b/content/billing/tutorials/set-up-budgets.md @@ -64,14 +64,14 @@ You can set budgets and receive alerts when your usage of a product reaches 75%, >[!IMPORTANT] If you do not select **Stop usage when budget limit is reached**, you will be notified by email if you exceed your budget, but usage **will not** be stopped. 1. To receive an alert if your budget has reached 75%, 90% and 100% thresholds, select **Receive budget threshold alerts** under "Alerts". When the budget has reached the specific threshold, you will be notified via email and a banner on {% data variables.product.github %}. You may opt out at any time. -1. Click **Create budget**. +{% data reusables.billing.budget-create-button %} To edit or delete a budget, on the "Budget and alerts" page, click **Edit** or **Delete** next to the budget you want to edit or delete. Follow the prompts. ## Managing budgets for your organization or enterprise > [!IMPORTANT] -> * {% data reusables.billing.pru-sku-split-notice %} +> * {% data reusables.billing.pru-sku-split-notice %} > * Existing {% data variables.product.prodname_copilot_short %} premium request budgets will automatically migrate to a **bundled premium requests budget** on November 1, 2025. This ensures that your budget continues to account for all of your premium request usage. You can set budgets and receive alerts when your usage of a product or license type reaches 75%, 90%, or 100% of a defined budget. For budgets that control metered use of a product, you can also block further use when the budget is exhausted. Each budget has a scope. @@ -85,13 +85,8 @@ You can set budgets and receive alerts when your usage of a product or license t If you are an organization owner, enterprise owner, or billing manager, any account-level budget is listed at the top of the "Budgets and alerts" page, followed by budgets for smaller scopes. -1. Display the settings for the organization or enterprise account you want to view data for. For example, using the context switcher shown on all personal and organization account settings pages. - - ![Screenshot of the "Public profile" settings for The Octocat. Next to "Your personal profile," a "Switch settings context" link is outlined in orange.](/assets/images/help/settings/context-switcher-button.png) - -1. Click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** to display the billing and licensing overview for the account: - * **Organization** accounts: under "Access" in the sidebar for settings. - * **Enterprise** accounts: a separate tab at the top of the page. +{% data reusables.billing.nav-to-org-or-ent %} +{% data reusables.billing.access-org-or-ent-page %} 1. Click **Budgets and alerts**. 1. Optionally, in the enterprise view only, to filter by scope, select **Scope**, then choose a scope. @@ -117,7 +112,7 @@ To limit spending on premium requests across all features, enable "Bundled premi Under "Alert Recipients", select the people who will receive the alerts. -1. Click **Create budget**. +{% data reusables.billing.budget-create-button %} ### Editing or deleting a budget diff --git a/data/reusables/billing/access-billing-sidebar.md b/data/reusables/billing/access-billing-sidebar.md new file mode 100644 index 0000000000..1295334b8c --- /dev/null +++ b/data/reusables/billing/access-billing-sidebar.md @@ -0,0 +1 @@ +1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing**. diff --git a/data/reusables/billing/access-org-or-ent-page.md b/data/reusables/billing/access-org-or-ent-page.md new file mode 100644 index 0000000000..12321d4c5d --- /dev/null +++ b/data/reusables/billing/access-org-or-ent-page.md @@ -0,0 +1,3 @@ +1. Click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** to display the billing and licensing overview for the account: + * **Organization** accounts: under "Access" in the sidebar for settings. + * **Enterprise** accounts: a separate tab at the top of the page. diff --git a/data/reusables/billing/azure-accept-permissions.md b/data/reusables/billing/azure-accept-permissions.md new file mode 100644 index 0000000000..618a504831 --- /dev/null +++ b/data/reusables/billing/azure-accept-permissions.md @@ -0,0 +1 @@ +1. Review the "Permissions requested" prompt. If you agree with the terms, click **Accept**. diff --git a/data/reusables/billing/azure-select-subscription.md b/data/reusables/billing/azure-select-subscription.md new file mode 100644 index 0000000000..e6f8947c99 --- /dev/null +++ b/data/reusables/billing/azure-select-subscription.md @@ -0,0 +1 @@ +1. Under "Select a subscription", select the Azure Subscription ID that you want to connect to your account. diff --git a/data/reusables/billing/budget-create-button.md b/data/reusables/billing/budget-create-button.md new file mode 100644 index 0000000000..88c4321b94 --- /dev/null +++ b/data/reusables/billing/budget-create-button.md @@ -0,0 +1 @@ +1. Click **Create budget**. diff --git a/data/reusables/billing/click-licensing.md b/data/reusables/billing/click-licensing.md new file mode 100644 index 0000000000..ab35c6a611 --- /dev/null +++ b/data/reusables/billing/click-licensing.md @@ -0,0 +1 @@ +1. From the list of "Billing & licensing" pages, click **Licensing**. diff --git a/data/reusables/billing/click-payment-info.md b/data/reusables/billing/click-payment-info.md new file mode 100644 index 0000000000..32b8257b4f --- /dev/null +++ b/data/reusables/billing/click-payment-info.md @@ -0,0 +1 @@ +1. From the list of "Billing & licensing" pages, click **Payment information**. diff --git a/data/reusables/billing/client-billing-yearly.md b/data/reusables/billing/client-billing-yearly.md new file mode 100644 index 0000000000..432dc32aa3 --- /dev/null +++ b/data/reusables/billing/client-billing-yearly.md @@ -0,0 +1 @@ +1. Under "How often do you want to be billed?", select **Pay yearly**. diff --git a/data/reusables/billing/cost-center-click-new.md b/data/reusables/billing/cost-center-click-new.md new file mode 100644 index 0000000000..76f105c80a --- /dev/null +++ b/data/reusables/billing/cost-center-click-new.md @@ -0,0 +1,2 @@ +1. Click **Cost centers**. +1. Click **New cost center** in the upper-right corner. diff --git a/data/reusables/billing/cost-center-create-button.md b/data/reusables/billing/cost-center-create-button.md new file mode 100644 index 0000000000..ffc82f75dc --- /dev/null +++ b/data/reusables/billing/cost-center-create-button.md @@ -0,0 +1 @@ +1. Click **Create cost center**. diff --git a/data/reusables/billing/enterprise-create-button.md b/data/reusables/billing/enterprise-create-button.md new file mode 100644 index 0000000000..c6b91936ff --- /dev/null +++ b/data/reusables/billing/enterprise-create-button.md @@ -0,0 +1 @@ +1. Click **Create your enterprise**. diff --git a/data/reusables/billing/ghas-site-admin-committers.md b/data/reusables/billing/ghas-site-admin-committers.md new file mode 100644 index 0000000000..f3909e2a0b --- /dev/null +++ b/data/reusables/billing/ghas-site-admin-committers.md @@ -0,0 +1,2 @@ +1. In the upper-right corner of any page, click {% octicon "rocket" aria-label="Site admin" %} to display the "Site admin" pages. +1. In the left sidebar, click **Advanced Security Committers**. If this option is not displayed, at the top of the page, click {% octicon "rocket" aria-hidden="true" aria-label="Site admin" %} **Site admin** to show the top-level "Site admin" page. diff --git a/data/reusables/billing/marketplace-find-app-downgrade.md b/data/reusables/billing/marketplace-find-app-downgrade.md new file mode 100644 index 0000000000..cb7cb8b551 --- /dev/null +++ b/data/reusables/billing/marketplace-find-app-downgrade.md @@ -0,0 +1,3 @@ +1. In the "Marketplace apps" tab, find the app you want to downgrade. +1. Next to the organization where you want to downgrade the app, select **{% octicon "kebab-horizontal" aria-label="More" %}** and then click **Change plan**. +1. Select the **Edit your plan** dropdown and click an account's plan to edit. diff --git a/data/reusables/billing/marketplace-find-app-upgrade.md b/data/reusables/billing/marketplace-find-app-upgrade.md new file mode 100644 index 0000000000..c6235c264e --- /dev/null +++ b/data/reusables/billing/marketplace-find-app-upgrade.md @@ -0,0 +1,3 @@ +1. In the "Marketplace apps" tab, find the app you want to upgrade. +1. Next to the organization where you want to upgrade the app, select **{% octicon "kebab-horizontal" aria-label="More" %}** and then click **Change plan**. +1. Select the **Edit your plan** dropdown and click an account's plan to edit. diff --git a/data/reusables/billing/nav-to-ent.md b/data/reusables/billing/nav-to-ent.md new file mode 100644 index 0000000000..dd66b3dfc0 --- /dev/null +++ b/data/reusables/billing/nav-to-ent.md @@ -0,0 +1 @@ +1. Navigate to your enterprise. For example, from [https://github.com/settings/enterprises](https://github.com/settings/enterprises?ref_product=ghec&ref_type=engagement&ref_style=text). diff --git a/data/reusables/billing/nav-to-org-or-ent.md b/data/reusables/billing/nav-to-org-or-ent.md new file mode 100644 index 0000000000..cd614ff6ca --- /dev/null +++ b/data/reusables/billing/nav-to-org-or-ent.md @@ -0,0 +1 @@ +1. Navigate to your organization or enterprise. For example, from [https://github.com/settings/organizations](https://github.com/settings/organizations?ref_product=github&ref_type=engagement&ref_style=text) or [https://github.com/settings/enterprises](https://github.com/settings/enterprises?ref_product=ghec&ref_type=engagement&ref_style=text). diff --git a/src/data-directory/lib/data-schemas/ctas.ts b/src/data-directory/lib/data-schemas/ctas.ts index 2e807775df..3951ae7884 100644 --- a/src/data-directory/lib/data-schemas/ctas.ts +++ b/src/data-directory/lib/data-schemas/ctas.ts @@ -12,7 +12,7 @@ export default { type: 'string', name: 'Product', description: 'The GitHub product the CTA leads users to', - enum: ['copilot', 'ghec', 'desktop', 'code-quality', 'cli'], + enum: ['copilot', 'ghec', 'desktop', 'code-quality', 'cli', 'github'], }, // Type of CTA: The type of action the CTA encourages users to take