From 11aed5ecbeb29db4eafc7d941b9b1065ca4d345b Mon Sep 17 00:00:00 2001 From: Rachael Rose Renk <91027132+rachaelrenk@users.noreply.github.com> Date: Thu, 3 Aug 2023 07:52:08 -0600 Subject: [PATCH] Marketplace support for self-serve Enterprise Accounts - [GA] (#37697) Co-authored-by: Matt Pollard Co-authored-by: Melanie Yarbrough <11952755+myarb@users.noreply.github.com> --- ...om-github-marketplace-for-your-organizations.md | 2 ++ .../about-billing-for-github-marketplace.md | 6 ++++++ .../canceling-a-github-marketplace-app.md | 11 +++++++++++ ...he-billing-plan-for-a-github-marketplace-app.md | 13 +++++++++++++ ...he-billing-plan-for-a-github-marketplace-app.md | 14 ++++++++++++++ ...etting-up-a-trial-of-github-enterprise-cloud.md | 2 +- .../marketplace/marketplace-enterprise-account.md | 7 +++++++ 7 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 data/reusables/marketplace/marketplace-enterprise-account.md diff --git a/content/apps/using-github-apps/installing-a-github-app-from-github-marketplace-for-your-organizations.md b/content/apps/using-github-apps/installing-a-github-app-from-github-marketplace-for-your-organizations.md index c76f1be4ea..dce7d2872e 100644 --- a/content/apps/using-github-apps/installing-a-github-app-from-github-marketplace-for-your-organizations.md +++ b/content/apps/using-github-apps/installing-a-github-app-from-github-marketplace-for-your-organizations.md @@ -42,6 +42,8 @@ For more information about authorizing {% data variables.product.prodname_github Organization owners can install {% data variables.product.prodname_github_apps %} on their organization. +For enterprises that pay by credit card, enterprise owners who are also organization owners can install {% data variables.product.prodname_github_apps %} on organizations within their enterprise. + Admins of repositories that are owned by an organization can also install {% data variables.product.prodname_github_apps %} on the organization if they only grant the app access to repositories that they are an admin of and if the app does not request any organization resources. Organization owners can prevent outside collaborators who are repository admins from installing {% data variables.product.prodname_github_apps %}. The "app manager" role in an organization does not give a person the ability to install a {% data variables.product.prodname_github_app %} in the organization. For more information, see "[AUTOTITLE](/apps/maintaining-github-apps/about-github-app-managers)." diff --git a/content/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace.md b/content/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace.md index bc0aceb4ae..711b37feb4 100644 --- a/content/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace.md +++ b/content/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace.md @@ -42,6 +42,12 @@ When you choose a paid plan with a free trial: {% data reusables.user-settings.context_switcher %} +{% note %} + +**Note:** When you transfer an organization with paid {% data variables.product.prodname_marketplace %} apps into an enterprise account, you may receive a second receipt but you will not be charged twice. + +{% endnote %} + ## Unit plan limits If you choose a unit plan (for example, a plan that charges per user), and you exceed the units that you're paying for, the integrator may disable your access until you upgrade the app. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app)." diff --git a/content/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md b/content/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md index 77c84f9a99..91d4d9df4d 100644 --- a/content/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md +++ b/content/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md @@ -58,3 +58,14 @@ When you cancel a free trial on a paid plan, your subscription is immediately ca {% data reusables.organizations.billing_plans %} {% data reusables.marketplace.cancel-free-trial-billing-settings %} {% data reusables.marketplace.cancel-app %} + + +## Canceling an app in your enterprise + +{% data reusables.marketplace.marketplace-enterprise-account %} + +{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.billing-tab %} +1. In the "Marketplace apps" tab, find the app you want to cancel. +1. Next to the organization where you want to cancel the app, select **{% octicon "kebab-horizontal" aria-label="More" %}** and then click **Cancel plan**. +2. Click **Confirm**. \ No newline at end of file diff --git a/content/billing/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md b/content/billing/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md index 0eddb605e4..954182e530 100644 --- a/content/billing/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md +++ b/content/billing/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md @@ -43,6 +43,19 @@ When you downgrade an app, your subscription remains active until the end of you {% data reusables.marketplace.choose-new-quantity %} {% data reusables.marketplace.issue-plan-changes %} +## Downgrading an app in your enterprise + +{% data reusables.marketplace.marketplace-enterprise-account %} + +{% 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.marketplace.choose-new-plan %} +{% data reusables.marketplace.choose-new-quantity %} +{% data reusables.marketplace.issue-plan-changes %} + ## Further reading - "[AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app)" diff --git a/content/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md b/content/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md index 8a08445440..b49e68aba9 100644 --- a/content/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md +++ b/content/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md @@ -40,3 +40,17 @@ When you upgrade an app, your payment method is charged a prorated amount based {% data reusables.marketplace.choose-new-plan %} {% data reusables.marketplace.choose-new-quantity %} {% data reusables.marketplace.issue-plan-changes %} + +## Upgrading an app in your enterprise + +{% data reusables.marketplace.marketplace-enterprise-account %} + +{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.billing-tab %} +1. In the "Marketplace apps" tab, find the app you want to uprade. +1. Next to the organization where you want to upgrade the app, select **{% octicon "kebab-horizontal" aria-label="More" %}** and then click **Change plan**. +2. Select the **Edit your plan** dropdown and click an account's plan to edit. +{% data reusables.marketplace.choose-new-plan %} +{% data reusables.marketplace.choose-new-quantity %} +{% data reusables.marketplace.issue-plan-changes %} + diff --git a/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md b/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md index 50c8c52ed7..f14b03f057 100644 --- a/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md +++ b/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md @@ -50,7 +50,7 @@ The following features are not included in the trial of {% data variables.produc - {% data variables.product.prodname_github_codespaces %} - {% data variables.product.prodname_copilot_for_business %} - {% data variables.product.prodname_sponsors %} -- {% data variables.product.prodname_marketplace %} apps +- Paid {% data variables.product.prodname_marketplace %} apps (free apps are supported as part of the trial) - {% data variables.product.prodname_github_connect %} - For {% data variables.product.prodname_actions %}, increased minutes, job concurrency, and {% data variables.actions.hosted_runner %}s - If you set up your own trial, access to {% data variables.product.prodname_ghe_server %} is not included. If you would like to use {% data variables.product.prodname_ghe_server %}, contact {% data variables.contact.contact_enterprise_sales %}. diff --git a/data/reusables/marketplace/marketplace-enterprise-account.md b/data/reusables/marketplace/marketplace-enterprise-account.md new file mode 100644 index 0000000000..2dd3555a40 --- /dev/null +++ b/data/reusables/marketplace/marketplace-enterprise-account.md @@ -0,0 +1,7 @@ +{% note %} + +**Note:** To use a {% data variables.product.prodname_marketplace %} app, you must install the app on an organization account within your enterprise. For more information, see "[AUTOTITLE](/apps/using-github-apps/installing-a-github-app-from-github-marketplace-for-your-organizations)." + +You cannot purchase or manage paid {% data variables.product.prodname_marketplace %} apps if your enterprise account is invoiced. Organizations belonging to an enterprise can view and use {% data variables.product.prodname_marketplace %} apps from their billing settings, but you can only purchase or manage apps through your enterprise account. Only enterprise owners who are also organization owners can purchase {% data variables.product.prodname_marketplace %} apps. + +{% endnote %} \ No newline at end of file