Add context that calls out disabling pay by invoice (#24615)

* Explicit call out for disabling pay by invoice, nested within the
enable procedures, per support request
* Because I'm in the area:
    * Verified existing steps
* Removed redundant procedures for personal versus paid accounts. I
tested myself; they're the same procedures. Added context so users are
aware they're the same.
* Added explicit procedures to remove and set default payments, with
context about when users cannot remove a payment method
* Added pre-req section that consolidated the "If you want X, you need
Y"; e.g., verified bank accounts for ACH payments, dodcker business/team
for pay by invoice, and Link

Running this by support / billing before merging since i made an
assumption about Link payment from my testing. still not clear what the
exact prereq is to use this method....the doc says you have to have a
card already filled out and that tracks with my testing, but i saw one
instance where different UI copy appears in the payment portal...

Author: akristen

content/manuals/billing/payment-method.md

@@ -7,71 +7,53 @@ aliases:
   - /billing/core-billing/payment-method/
 ---
 
-This page describes how to add or update a payment method for your personal
-account or for an organization.
+Docker supports different payment methods for your paid personal
+account or organization. This page describes supported payment types, how to make payments from [Docker Home](https://app.docker.com/), and how to set up pay by invoice. 
+
+## Supported payment types
 
 You can add a payment method or update your account's existing payment method
-at any time. If you want to remove all payment methods, you must first downgrade your
-subscription to a free subscription. See [Downgrade](../subscription/change.md).
-
-The following payment methods are supported:
-
-- Cards
-  - Visa
-  - MasterCard
-  - American Express
-  - Discover
-  - JCB
-  - Diners
-  - UnionPay
-- Wallets
-  - Stripe Link
-- Bank accounts
-  - Automated Clearing House (ACH) transfer with a
-    [verified](/manuals/billing/payment-method.md#verify-a-bank-account) US
-    bank account
-- [Pay by invoice](/manuals/billing/history.md)
-
-All charges are in United States dollars (USD).
+at any time. All charges are in United States dollars (USD). The following payment methods are supported:
+
+| Category      | Payment type                                                                 |
+| ------------- | ------------------------------------------------------------------------------ |
+| Cards         | Visa, MasterCard, American Express, Discover, JCB, Diners, UnionPay            |
+| Wallets       | Stripe Link                                                                    |
+| Bank accounts | Automated Clearing House (ACH) transfer with a verified US bank account |
+  
+## Prerequisites 
+
+Certain payment methods require additional steps before selecting them as a payment method: 
+
+* You must [verify a bank account](/manuals/billing/payment-method.md#verify-a-bank-account) before choosing a bank account.
+* You must have a Docker Business or Docker Team plan to [pay by invoice](/billing/payment-method/#enable-and-disable-pay-by-invoice).
+* You must be an existing Stripe Link customer, or fill out the card information form to use Link payments.
 
 {{% include "tax-compliance.md" %}}
 
 ## Manage payment method
 
-### Personal account
+Paid personal accounts and organizations follow the same procedures to add, update, or remove payment methods. 
+
+### Add payment method 
 
 {{< tabs >}}
 {{< tab name="Docker subscription" >}}
 
-To add a payment method:
-
-1. Sign in to [Docker Home](https://app.docker.com/) and select your
-   organization.
-1. Select **Billing**.
-1. Select **Payment methods** from the left-hand menu.
-1. Select **Add payment method**.
-1. Enter your new payment information:
-   - Add a card:
-     - Select **Card** and fill out the card information form.
-   - Add a Link payment:
-     - Select **Secure, 1-click checkout with Link** and enter your
-       Link **email address** and **phone number**.
-     - If you don't already use Link, you must fill out the card information
-       form to store a card for Link payments.
-   - Add a bank account:
-     - Select **US bank account**.
+1. Sign in to [Docker Home](https://app.docker.com/). 
+1. Select your account name for personal accounts, or select your organization name for organization accounts.
+1. Select **Billing**, then **Payment methods**.
+1. Select **Add payment method** and enter your new payment information:
+   - For first time setup, fill in your billing information. 
+   - To purchase as a business, provide your tax ID. 
+1. Choose to add a card, a US bank account, or a Link payment. 
+   - To pay with card, fill out the card information form.
+   - To pay with a US bank account:
      - Verify your **Email** and **Full name**.
      - If your bank is listed, select your bank's name.
      - If your bank is not listed, select **Search for your bank**.
-     - To verify your bank account, see
-       [Verify a bank account](/manuals/billing/payment-method.md#verify-a-bank-account).
-1. Select **Add payment method**.
-1. Optional. You can set a new default payment method by selecting
-   the **Set as default** action.
-1. Optional. You can remove non-default payment methods by selecting
-   the **Delete** action.
-
-If you want to set a US bank account as your default payment method, you must [verify the account](#verify-a-bank-account) first.
+   - To pay through Link, select an existing payment and choose **Use this card**. 
+1. Finish adding the payment method by selecting **Add payment method**.
 
 {{< /tab >}}
 {{< tab name="Legacy Docker subscription" >}}
@@ -99,91 +81,43 @@ To add a payment method:
 {{< /tab >}}
 {{< /tabs >}}
 
-### Organization
+### Set default payment method 
 
-You must be an organization owner to make changes to the payment information.
+After adding one or more payment methods, you can set one as a default method. 
 
-{{< tabs >}}
-{{< tab name="Docker subscription" >}}
+1. From **Billing**, go to **Payment methods**. 
+1. Find the payment method you want to set as default from the **Payment method** table.
+1. Select the three dots, then choose **Set as default**.   
 
-To add a payment method:
+### Remove payment method 
 
-1. Sign in to [Docker Home](https://app.docker.com/) and select your
-   organization.
-1. Select **Billing**.
-1. Select **Payment methods** from the left-hand menu.
-1. Select **Add payment method**.
-1. Enter your new payment information:
-   - Add a card:
-     - Select **Card** and fill out the card information form.
-   - Add a Link payment:
-     - Select **Secure, 1-click checkout with Link** and enter your
-       Link **email address** and **phone number**.
-     - If you are not an existing Link customer, you must fill out the
-       card information form to store a card for Link payments.
-   - Add a bank account:
-     - Select **US bank account**.
-     - Verify your **Email** and **Full name**.
-     - If your bank is listed, select your bank's name.
-     - If your bank is not listed, select **Search for your bank**.
-     - To verify your bank account, see [Verify a bank account](/manuals/billing/payment-method.md#verify-a-bank-account).
-1. Select **Add payment method**.
-1. Optional. You can set a new default payment method by selecting
-   the **Set as default** action.
-1. Optional. You can remove non-default payment methods by selecting
-   the **Delete** action.
+To remove a single payment method:
 
-If you want to set a US bank account as your default payment method, you must verify the account first.
+1. From **Billing**, go to **Payment methods**. 
+1. Find the payment method you want to remove from the **Payment method** table.
+1. Select the three dots, then choose **Remove**.  
 
-{{< /tab >}}
-{{< tab name="Legacy Docker subscription" >}}
+To remove your default payment method, first set a different payment method as default, or [downgrade to a free subscription](/subscription/change).
 
-To add a payment method:
+## Enable and disable pay by invoice
 
-1. Sign in to [Docker Hub](https://hub.docker.com).
-1. Select your organization, then select **Billing**.
-1. Select the **Payment methods** link.
-1. Select **Add payment method**.
-1. Enter your new payment information:
-   - Add a card:
-     - Select **Card** and fill out the card information form.
-   - Add a Link payment:
-     - Select **Secure, 1-click checkout with Link** and enter your
-       Link **email address** and **phone number**.
-     - If you are not an existing Link customer, you must fill out the
-       card information form to store a card for Link payments.
-1. Select **Add payment method**.
-1. Select the **Actions** icon, then select **Make default** to ensure that
-   your new payment method applies to all purchases and subscriptions.
-1. Optional. You can remove non-default payment methods by selecting
-   the **Actions** icon. Then, select **Delete**.
-
-{{< /tab >}}
-{{< /tabs >}}
-
-## Enable pay by invoice
-
-{{< summary-bar feature_name="Pay by invoice" >}}
+> [!TIP]
+> Do you need to pay by invoice? [Upgrade to a Docker Business or Docker Team plan](https://www.docker.com/pricing?ref=Docs&refAction=DocsBillingPaymentMethod) and choose the annual subscription.
 
-Pay by invoice is available for Teams and Business customers with annual
-subscriptions, starting with your first renewal. When you select this
-payment method, you'll pay upfront for your first subscription period using a
-payment card or ACH bank transfer.
+Pay by invoice requires you to pay upfront for your first subscription period using a payment card or ACH bank transfer. At renewal time, instead of automatic payment, you'll receive an invoice via
+email that you must pay manually. 
 
-At renewal time, instead of automatic payment, you'll receive an invoice via
-email that you must pay manually. Pay by invoice is not available for
-subscription upgrades or changes.
+Follow these steps to enable or disable pay by invoice:
 
 1. Sign in to [Docker Home](https://app.docker.com/) and select your
    organization.
-1. Select **Billing**.
-1. Select **Payment methods**, then **Pay by invoice**.
-1. To enable pay by invoice, select the toggle.
-1. Confirm your billing contact details. If you need to change them, select
+2. Select **Billing**, then **Payment methods**. 
+3. Select **Pay by invoice**, then select the pay by invoice toggle to enable or disable.
+4. Confirm your billing contact details. If you need to change them, select
    **Change** and enter your new details.
 
-> [!TIP]
-> Do you need to pay by invoice? [Upgrade to a Docker Business or Docker Team plan](https://www.docker.com/pricing?ref=Docs&refAction=DocsBillingPaymentMethod) and choose the annual subscription.
+Pay by invoice is not available for
+subscription upgrades or changes.
 
 ## Verify a bank account