Skip to content

Commit e519015

Browse files
sarahsanders-dockersarahsanders-docker
committed
UI flows
1 parent 01612dc commit e519015

File tree

10 files changed

+158
-75
lines changed

10 files changed

+158
-75
lines changed

‎content/manuals/billing/cycle.md‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ You can pay for a Pro or Team subscription on a monthly or yearly billing cycle.
1212
If you have a monthly billing cycle, you can choose to switch to an annual billing cycle. Note that it's not possible to switch from an annual billing cycle to monthly.
1313

1414
When you change the billing cycle's duration:
15+
1516
- The next billing date reflects the new cycle. To find your next billing date, see [View renewal date](history.md#view-renewal-date).
1617
- The subscription's start date resets. For example, if the start date of the monthly subscription is March 1st and the end date is April 1st, then after switching the billing duration to March 15th, 2023 the new start date is March 15th, 2023, and the new end date is March 15th, 2024.
1718
- Any unused monthly subscription is prorated and applied as credit towards the new annual period. For example, if you switch from a $10 monthly subscription to a $100 annual plan, deducting the unused monthly value (in this case $5), the migration cost becomes $95 ($100 - $5). The renewal cost after March 15, 2024 is $100.
@@ -31,15 +32,16 @@ When you change the billing cycle's duration:
3132
6. Confirm or **Change** your payment method.
3233
7. Review your new plan details on the right-hand side of the page, and select **Update subscription**.
3334

34-
The Billing Console's Plans and usage page will now reflect your new annual plan details.
35+
The Billing Console's plans and usage page will now reflect your new annual plan details.
3536

3637
{{< /tab >}}
3738
{{< tab name="Legacy Docker subscription" >}}
3839

39-
1. Select your avatar in the top-right corner of Docker Hub.
40-
2. From the drop-down menu select **Billing**.
41-
3. In the bottom-right of the **Plan** tab, select **Switch to annual billing**.
42-
4. Review the information displayed on the **Change to an Annual subscription** page and select **Accept Terms and Purchase** to confirm.
40+
1. Sign in to [Docker Hub](https://hub.docker.com).
41+
2. Select your avatar in the top-right corner.
42+
3. From the drop-down menu select **Billing**.
43+
4. In the bottom-right of the **Plan** tab, select **Switch to annual billing**.
44+
5. Review the information displayed on the **Change to an Annual subscription** page and select **Accept Terms and Purchase** to confirm.
4345

4446
{{< /tab >}}
4547
{{< /tabs >}}
@@ -64,7 +66,8 @@ The Billing Console's Plans and usage page will now reflect your new annual plan
6466
{{< /tab >}}
6567
{{< tab name="Legacy Docker subscription" >}}
6668

67-
1. In Docker Hub, select **Organizations**.
69+
1. Sign in to [Docker Hub](https://hub.docker.com).
70+
2. Select **Organizations** from the top-level navigation.
6871
2. Select the organization that you want to change the payment method for.
6972
3. In the bottom-right of the **Plan** tab, select **Switch to annual billing**.
7073
4. Review the information displayed on the **Change to an Annual subscription** page and select **Accept Terms and Purchase** to confirm.

‎content/manuals/billing/history.md‎

Lines changed: 68 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,54 +36,108 @@ You can’t make changes to a paid or unpaid billing invoice. When you update yo
3636

3737
### View renewal date
3838

39-
You receive your invoice when the subscription renews. To verify your renewal date, sign in to Hub, then:
39+
{{< tabs >}}
40+
{{< tab name="Docker subscription" >}}
4041

41-
1. Select your user avatar to open the drop-down menu.
42+
You receive your invoice when the subscription renews. To verify your renewal date, sign in to the [Docker Billing Console](https://app.docker.com/billing). Your renewal date and amount are displayed on your subscription plan card.
43+
44+
45+
{{< /tab >}}
46+
{{< tab name="Legacy Docker subscription" >}}
47+
48+
You receive your invoice when the subscription renews. To verify your renewal date:
49+
50+
1. Sign in to [Docker Hub](https://hub.docker.com).
51+
3. Select your user avatar to open the drop-down menu.
4252
2. Select **Billing**.
4353
3. Select the user or organization account to view the billing details. Here you can find your renewal date and the renewal amount.
4454

55+
{{< /tab >}}
56+
{{< /tabs >}}
57+
4558
### Include your VAT number on your invoice
4659

47-
TBD
60+
{{< tabs >}}
61+
{{< tab name="Docker subscription" >}}
62+
63+
1. Sign in to the [Docker Billing Console](https://app.docker.com/billing).
64+
2. Select **Billing information** from the left-hand menu.
65+
3. Select **Change** on your billing information card.
66+
4. Ensure the **I'm purchasing as a business** checkbox is checked.
67+
5. In the Tax ID section, select the **ID type** and enter your VAT number.
68+
6. Select **Update**.
69+
70+
{{< /tab >}}
71+
{{< tab name="Legacy Docker subscription" >}}
4872

4973
Update your billing information to include your VAT number:
5074

51-
1. Sign in to Docker Hub.
75+
1. Sign in to [Docker Hub](https://hub.docker.com).
5276
2. For user accounts, Select your avatar in the top-right corner, then **Billing**. For organizations, select the name of the organization.
5377
3. Select the **Payment methods and billing history** link.
5478
4. In the **Billing Information** section, select **Update information**.
55-
5. In the **Tax ID** section, select the ID type and enter your VAT number.
79+
5. In the Tax ID section, select the **ID type** and enter your VAT number.
5680
6. Select **Save**.
5781

5882
Your VAT number will be included on your next invoice.
5983

84+
{{< /tab >}}
85+
{{< /tabs >}}
86+
6087
## View billing history
6188

6289
You can view the billing history and download past invoices for a personal account or organization.
6390

6491
### Personal account
6592

66-
TBD
93+
{{< tabs >}}
94+
{{< tab name="Docker subscription" >}}
6795

68-
1. Select your avatar in the top-right corner of Docker Hub.
69-
2. From the drop-down menu select **Billing**.
70-
3. Select the **Payment methods and billing history** link.
96+
1. Sign in to the [Docker Billing Console](https://app.docker.com/billing).
97+
2. Select **Invoices** from the left-hand menu.
98+
3. Optional. Select the **date link** to open invoice details.
99+
4. Optional. Select the **download** button to download an invoice.
100+
101+
102+
{{< /tab >}}
103+
{{< tab name="Legacy Docker subscription" >}}
104+
105+
1. Sign in to [Docker Hub](https://hub.docker.com).
106+
2. Select your avatar in the top-right corner.
107+
3. From the drop-down menu select **Billing**.
108+
4. Select the **Payment methods and billing history** link.
71109
You can find your past invoices in the **Invoice History** section.
72110

73111
From here you can download an invoice.
74112

75-
### Organization
113+
{{< /tab >}}
114+
{{< /tabs >}}
76115

77-
TBD
116+
### Organization
78117

79118
> [!NOTE]
80119
>
81120
> You must be an owner of the organization to view the billing history.
82121
83-
1. Select your avatar in the top-right corner of Docker Hub.
84-
2. From the drop-down menu select **Billing**.
85-
3. Select the organization that you want to change the payment method for.
122+
{{< tabs >}}
123+
{{< tab name="Docker subscription" >}}
124+
125+
1. Sign in to the [Docker Billing Console](https://app.docker.com/billing).
126+
2. Select **Invoices** from the left-hand menu.
127+
3. Optional. Select the **date link** to open invoice details.
128+
4. Optional. Select the **download** button to download an invoice.
129+
130+
131+
{{< /tab >}}
132+
{{< tab name="Legacy Docker subscription" >}}
133+
134+
1. Sign in to [Docker Hub](https://hub.docker.com).
135+
2. Select your avatar in the top-right corner.
136+
3. From the drop-down menu select **Billing**.
86137
4. Select the **Payment methods and billing history** link.
87138
You can find your past invoices in the **Invoice History** section.
88139

89140
From here you can download an invoice.
141+
142+
{{< /tab >}}
143+
{{< /tabs >}}

‎content/manuals/billing/payment-method.md‎

Lines changed: 52 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,32 +33,65 @@ All currency, for example the amount listed on your billing invoice, is in Unite
3333

3434
### Personal account
3535

36-
TBD
36+
{{< tabs >}}
37+
{{< tab name="Docker subscription" >}}
38+
39+
1. Sign in to the [Docker Billing Console](https://app.docker.com/billing).
40+
2. Select **Payment methods** from the left-hand menu.
41+
3. Select **Add payment method**.
42+
4. Enter your new payment information.
43+
5. Optional. Select the **Use as default payment method** checkbox.
44+
6. Select **Add**.
45+
7. Optional. You can remove non-default payment methods by selecting the **Delete** action.
46+
47+
{{< /tab >}}
48+
{{< tab name="Legacy Docker subscription" >}}
49+
50+
1. Sign in to [Docker Hub](https://hub.docker.com).
51+
2. Select your avatar in the top-right corner.
52+
3. From the drop-down menu select **Billing**.
53+
4. Select the **Payment methods and billing history** link.
54+
5. In the **Payment method** section, select **Add payment method**.
55+
6. Enter your new payment information, then select **Add**.
56+
7. Select the **Actions** icon, then select **Make default** to ensure that your new payment method applies to all purchases and subscriptions.
57+
8. Optional. You can remove non-default payment methods by selecting the **Actions** icon. Then, select **Delete**.
3758

38-
1. Select your avatar in the top-right corner of Docker Hub.
39-
2. From the drop-down menu select **Billing**.
40-
3. Select the **Payment methods and billing history** link.
41-
4. In the **Payment method** section, select **Add payment method**.
42-
5. Enter your new payment information, then select **Add**.
43-
6. Select the **Actions** icon, then select **Make default** to ensure that your new payment method applies to all purchases and subscriptions.
44-
7. Optional. You can remove non-default payment methods by selecting the **Actions** icon. Then, select **Delete**.
59+
{{< /tab >}}
60+
{{< /tabs >}}
4561

4662
### Organization
4763

48-
TBD
49-
5064
> [!NOTE]
5165
>
5266
> You must be an organization owner to make changes to the payment information.
5367
54-
1. Select your avatar in the top-right corner of Docker Hub.
55-
2. From the drop-down menu select **Billing**.
56-
3. Select the organization account you want to update.
57-
4. Select the **Payment methods and billing history** link.
58-
5. In the **Payment Method** section, select **Add payment method**.
59-
6. Enter your new payment information, then select **Add**.
60-
7. Select the **Actions** icon, then select **Make default** to ensure that your new payment method applies to all purchases and subscriptions.
61-
8. Optional. You can remove non-default payment methods by selecting the **Actions** icon. Then, select **Delete**.
68+
{{< tabs >}}
69+
{{< tab name="Docker subscription" >}}
70+
71+
1. Sign in to the [Docker Billing Console](https://app.docker.com/billing).
72+
2. Choose your organization from the top-left drop-down.
73+
3. Select **Payment methods** from the left-hand menu.
74+
4. Select **Add payment method**.
75+
5. Enter your new payment information.
76+
6. Optional. Select the **Use as default payment method** checkbox.
77+
7. Select **Add**.
78+
8. Optional. You can remove non-default payment methods by selecting the **Delete** action.
79+
80+
{{< /tab >}}
81+
{{< tab name="Legacy Docker subscription" >}}
82+
83+
1. Sign in to [Docker Hub](https://hub.docker.com).
84+
2. Select your avatar in the top-right corner.
85+
3. From the drop-down menu select **Billing**.
86+
4. Select the organization account you want to update.
87+
5. Select the **Payment methods and billing history** link.
88+
6. In the **Payment Method** section, select **Add payment method**.
89+
7. Enter your new payment information, then select **Add**.
90+
8. Select the **Actions** icon, then select **Make default** to ensure that your new payment method applies to all purchases and subscriptions.
91+
9. Optional. You can remove non-default payment methods by selecting the **Actions** icon. Then, select **Delete**.
92+
93+
{{< /tab >}}
94+
{{< /tabs >}}
6295

6396
## Failed payments
6497

@@ -68,7 +101,7 @@ If your subscription payment fails, there is a grace period of 15 days, includin
68101
- 5 days after the previous attempt
69102
- 7 days after the previous attempt
70103

71-
Docker also sends an email notification `Action Required - Credit Card Payment Failed` with an attached unpaid invoice after each failed payment attempt.
104+
Docker also sends an email notification `Action Required - Credit Card Payment Failed` with an attached unpaid invoice after each failed payment attempt.
72105

73106
Once the grace period is over and the invoice is still not paid, the subscription downgrades to a free plan and all paid features are disabled.
74107

‎content/manuals/billing/tax-certificate.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Palo Alto, CA 94306
3131

3232
1. [Submit a Docker Support ticket](https://hub.docker.com/support/contact?topic=Billing&subtopic=Tax%20information) to initiate the process to register a tax certificate.
3333
2. Enter the required information.
34-
3. In the **Additional Information** field, list the Docker ID/namespace(s) of the accounts that you want to apply the tax exemption certificate to.
34+
3. In the **Additional Information** field, list the Docker ID/namespace(s) of the accounts that you want to apply the tax exemption certificate to.
3535

3636
> [!TIP]
3737
>

‎content/manuals/subscription/change.md‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,17 @@ When you upgrade to a paid subscription, you immediately have access to all the
3636
{{< tabs >}}
3737
{{< tab name="Docker subscription" >}}
3838

39-
TBD
39+
To upgrade your Docker subscription:
4040

41-
To upgrade your subscription:
42-
43-
1. Sign in to [Docker Billing](https://app.docker.com/billing).
44-
2. Optional. If you're upgrading from a free user account to a Team subscription and want to keep your account name, [convert your user account into an organization](../admin/convert-account.md).
41+
1. Sign in to the [Docker Billing Console](https://app.docker.com/billing).
42+
2. Optional. If you're upgrading from a free user account to a Team subscription and want to keep your username, [convert your user account into an organization](../admin/convert-account.md).
4543
3. Select the account you want to upgrade in the drop-down at the top-left of the page.
46-
4. Select the upgrade button.
44+
4. Select **Upgrade**.
4745
5. Follow the on-screen instructions to complete your upgrade.
4846

4947
{{< /tab >}}
5048
{{< tab name="Legacy Docker subscription" >}}
5149

52-
TBD
53-
5450
You can upgrade a legacy Docker Core, Docker Build Cloud, or Docker Scout subscription plan to a Docker subscription plan that includes access to all tools.
5551

5652
Contact [Docker sales](https://www.docker.com/pricing/contact-sales/) to upgrade your legacy Docker plan.
@@ -79,21 +75,17 @@ Before you downgrade, consider the following aspects before you downgrade your s
7975
{{< tabs >}}
8076
{{< tab name="Docker subscription" >}}
8177
82-
TBD
78+
To downgrade your Docker subscription:
8379

84-
To downgrade your subscription:
85-
86-
1. Sign in to [Docker Billing](https://app.docker.com/billing).
80+
1. Sign in to the [Docker Billing Console](https://app.docker.com/billing).
8781
2. Select the account you want to downgrade in the drop-down at the top-left of the page.
88-
3. Select the action icon and then TBD.
82+
3. Select the action icon and then **Cancel subscription**.
8983
4. Follow the on-screen instructions to complete your downgrade.
9084

9185
{{< /tab >}}
9286
{{< tab name="Legacy Docker subscription" >}}
9387

94-
TBD
95-
96-
To downgrade your legacy Docker Core subscription:
88+
To downgrade your legacy Docker subscription:
9789

9890
1. Sign in to [Docker Hub Billing](https://hub.docker.com/billing).
9991
2. Select the account you want to downgrade in the drop-down at the top-left of the page.

‎content/manuals/subscription/desktop-license.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ GNU General Public License. Select [here](https://download.docker.com/opensource
2727

2828
> [!TIP]
2929
>
30-
> Explore [Docker subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you.
30+
> Explore [Docker subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you.

‎content/manuals/subscription/details.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ tools as well as trials for powerful tools that'll level up your development loo
5050

5151
Docker Personal includes:
5252

53-
- 1 included repository with continuous vulnerability analysis in Docker Scout.
54-
- Unlimited public Docker Hub repositories.
55-
- 1 private Docker Hub repository with 2GB storage.
56-
- 40 pulls per hour Docker Hub image pull rate limit.
57-
- 7-day Docker Build Cloud trial.
58-
- 30-day Testcontainers Cloud trial.
53+
- 1 included repository with continuous vulnerability analysis in Docker Scout
54+
- Unlimited public Docker Hub repositories
55+
- 1 private Docker Hub repository with 2GB storage
56+
- 40 pulls per hour Docker Hub image pull rate limit
57+
- 7-day Docker Build Cloud trial
58+
- 7-day Testcontainers Cloud trial
5959

6060
Docker Personal users who want to continue using Docker Build Cloud or Docker
6161
Testcontainers Cloud after their trial can upgrade to a Docker Pro plan at any
@@ -197,7 +197,7 @@ Legacy Docker Pro includes:
197197
- [Auto Builds](/docker-hub/builds/) with 5 concurrent builds
198198
- 300 [Vulnerability Scans](/docker-hub/vulnerability-scanning/)
199199

200-
For a list of features available in each legacy tier, see [TBD](https://www.docker.com/pricing/).
200+
For a list of features available in each legacy tier, see [Docker Pricing](https://www.docker.com/pricing/).
201201

202202
#### New Docker Pro plan
203203

@@ -229,7 +229,7 @@ Legacy Docker Team includes:
229229

230230
There are also advanced collaboration and management tools, including organization and team management with [Role Based Access Control (RBAC)](/security/for-admins/roles-and-permissions/), [activity logs](/admin/organization/activity-logs/), and more.
231231

232-
For a list of features available in each legacy tier, see [TBD](https://www.docker.com/pricing/).
232+
For a list of features available in each legacy tier, see [Docker Pricing]](https://www.docker.com/pricing/).
233233

234234
#### New Docker Team plan
235235

@@ -262,7 +262,7 @@ Legacy Docker Business includes:
262262
- [Single Sign-On](/security/for-admins/single-sign-on/)
263263
- [System for Cross-domain Identity Management](/security/for-admins/provisioning/scim/) and more.
264264

265-
For a list of features available in each tier, see [TBD](https://www.docker.com/pricing/).
265+
For a list of features available in each tier, see [Docker Pricing]](https://www.docker.com/pricing/).
266266

267267
#### New Docker Business plan
268268

0 commit comments

Comments
 (0)