Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 9df9a5d

Browse files
doboothdobooth
committed
Merge master
2 parents 19591ee + 16a741e commit 9df9a5d

File tree

88 files changed

+78290
-645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+78290
-645
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
######################
33
/*.db
44
.DS_Store
5+
.vscode
56

67
# Config and output files #
78
###########################
@@ -31,4 +32,4 @@ _algolia_api_key
3132
# Docs from different branches #
3233
###################################
3334

34-
/guides/v2.0/
35+
/guides/v2.0/

‎_data/compatibility.yml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ versions:
22
- 2.2.4+
33
- 2.3.0
44
- 2.3.1
5+
- 2.3.2
56
extension:
67
-
78
name: Amazon Sales Channel
@@ -12,6 +13,7 @@ extension:
1213
2.2.4+: general availability
1314
2.3.0: general availability
1415
2.3.1: general availability
16+
2.3.2: general availability
1517
-
1618
name: Google Shopping ads Channel
1719
versions:
@@ -21,48 +23,62 @@ extension:
2123
2.2.4+: general availability
2224
2.3.0: general availability
2325
2.3.1: general availability
26+
2.3.2: general availability
2427
-
2528
name: 1.1.1
2629
support:
2730
2.2.4+: general availability
2831
2.3.0: general availability
2932
2.3.1: general availability
33+
2.3.2: general availability
3034
-
3135
name: Magento Shipping
3236
versions:
3337
-
34-
name: 1.4.6
38+
name: 1.5.3
3539
support:
3640
2.2.4+: not supported
37-
2.3.0: general availability
41+
2.3.0: not supported
3842
2.3.1: not supported
43+
2.3.2: general availability
3944
-
4045
name: 1.5.1
4146
support:
4247
2.2.4+: not supported
4348
2.3.0: not supported
4449
2.3.1: general availability
50+
2.3.2: not supported
51+
-
52+
name: 1.4.6
53+
support:
54+
2.2.4+: not supported
55+
2.3.0: general availability
56+
2.3.1: not supported
57+
2.3.2: not supported
4558
-
46-
name: Multi Source Inventory
59+
name: Magento Inventory
4760
versions:
4861
-
4962
name: 1.1.2
5063
support:
5164
2.2.4+: not supported
5265
2.3.0: general availability
5366
2.3.1: general availability
67+
2.3.2: general availability
5468
-
5569
name: 1.1.0
5670
support:
5771
2.2.4+: not supported
5872
2.3.0: general availability
5973
2.3.1: general availability
74+
2.3.2: general availability
6075
-
6176
name: 1.0.3
6277
support:
6378
2.2.4+: not supported
6479
2.3.0: general availability
6580
2.3.1: general availability
81+
2.3.2: general availability
6682
-
6783
name: Page Builder
6884
versions:
@@ -72,3 +88,4 @@ extension:
7288
2.2.4+: not supported
7389
2.3.0: open beta
7490
2.3.1: general availability
91+
2.3.2: general availability

‎_data/toc/graphql.yml

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ pages:
1919
- label: Mutations
2020
url: /graphql/mutations.html
2121

22+
- label: GraphQL Caching
23+
url: /graphql/caching.html
24+
2225
- label: Development
2326
children:
2427
- label: Define the GraphQL schema for a module
@@ -27,6 +30,9 @@ pages:
2730
- label: Resolvers
2831
url: /graphql/develop/resolvers.html
2932

33+
- label: Identity class
34+
url: /graphql/develop/identity-class.html
35+
3036
- label: Create a custom urlResolver service
3137
url: /graphql/develop/create-custom-url-resolver.html
3238

@@ -80,8 +86,48 @@ pages:
8086
- label: GroupedProduct endpoint
8187
url: /graphql/reference/grouped-product.html
8288

83-
- label: Quote endpoint
89+
- label: Quote endpoint (cart query)
8490
url: /graphql/reference/quote.html
91+
children:
92+
93+
- label: addSimpleProductsToCart mutation
94+
url: /graphql/reference/quote-add-simple-products.html
95+
96+
- label: addVirtualProductsToCart mutation
97+
url: /graphql/reference/quote-add-virtual-products.html
98+
99+
- label: applyCouponToCart mutation
100+
url: /graphql/reference/quote-apply-coupon.html
101+
102+
- label: createEmptyCart mutation
103+
url: /graphql/reference/quote-create-cart.html
104+
105+
- label: placeOrder mutation
106+
url: /graphql/reference/quote-place-order.html
107+
108+
- label: removeCouponFromCart mutation
109+
url: /graphql/reference/quote-remove-coupon.html
110+
111+
- label: removeItemFromCart mutation
112+
url: /graphql/reference/quote-remove-item.html
113+
114+
- label: setBillingAddressesOnCart mutation
115+
url: /graphql/reference/quote-set-billing-address.html
116+
117+
- label: setGuestEmailOnCart mutation
118+
url: /graphql/reference/quote-set-guest-email.html
119+
120+
- label: setPaymentMethodOnCart mutation
121+
url: /graphql/reference/quote-payment-method.html
122+
123+
- label: setShippingAddressesOnCart mutation
124+
url: /graphql/reference/quote-set-shipping-address.html
125+
126+
- label: setShippingMethodsOnCart mutation
127+
url: /graphql/reference/quote-shipping-method.html
128+
129+
- label: updateCartItems mutation
130+
url: /graphql/reference/quote-update-cart-items.html
85131

86132
- label: Sales endpoint
87133
url: /graphql/reference/sales.html
@@ -92,6 +138,9 @@ pages:
92138
- label: UrlRewrite endpoint
93139
url: /graphql/reference/url-resolver.html
94140

141+
- label: Vault endpoint
142+
url: /graphql/reference/vault.html
143+
95144
- label: Wishlist endpoint
96145
url: /graphql/reference/wishlist.html
97146

‎_data/toc/installation-guide.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,10 @@ pages:
258258
- label: Update the Magento database schema and data
259259
url: /install-gde/install/cli/install-cli-subcommands-db-upgr.html
260260

261+
- label: Configure the lock provider
262+
url: /install-gde/install/cli/install-cli-subcommands-lock.html
263+
include_versions: ["2.2","2.3"]
264+
261265
- label: Configure the store
262266
url: /install-gde/install/cli/install-cli-subcommands-store.html
263267

‎_data/toc/php-developer-guide.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,14 @@ pages:
210210
- label: Configure message Queues
211211
url: /extension-dev-guide/message-queues/config-mq.html
212212

213+
- label: Handling outdated in-memory object states
214+
include_versions: ["2.3"]
215+
url: /extension-dev-guide/message-queues/refresh-config.html
216+
213217
- label: Migrate message queue configuration
214218
include_versions: ["2.1", "2.2", "2.3"]
215219
url: /extension-dev-guide/message-queues/queue-migration.html
216-
220+
217221
- label: Bulk operations
218222
include_versions: ["2.2", "2.3"]
219223
url: /extension-dev-guide/message-queues/bulk-operations.html

‎_data/toc/release-notes.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ pages:
1010
- label: Component Status
1111
url: /release-notes/component-status.html
1212

13+
- label: Magento Open Source 2.3.2 Release Notes
14+
url: /release-notes/ReleaseNotes2.3.2OpenSource.html
15+
16+
- label: Magento Commerce 2.3.2 Release Notes
17+
url: /release-notes/ReleaseNotes2.3.2Commerce.html
1318

1419
- label: Magento Open Source 2.3.1 Release Notes
1520
url: /release-notes/ReleaseNotes2.3.1OpenSource.html
@@ -94,6 +99,9 @@ pages:
9499
- label: Magento Open Source 2.1.x Release Notes
95100
children:
96101

102+
- label: Magento Open Source 2.1.18 Release Notes
103+
url: /release-notes/ReleaseNotes2.1.18CE.html
104+
97105
- label: Magento Open Source 2.1.17 Release Notes
98106
url: /release-notes/ReleaseNotes2.1.17CE.html
99107

@@ -151,6 +159,9 @@ pages:
151159
- label: Magento Commerce 2.1.x Release Notes
152160
children:
153161

162+
- label: Magento Commerce 2.1.18 Release Notes
163+
url: /release-notes/ReleaseNotes2.1.18EE.html
164+
154165
- label: Magento Commerce 2.1.17 Release Notes
155166
url: /release-notes/ReleaseNotes2.1.17EE.html
156167

@@ -273,7 +284,7 @@ pages:
273284
url: /graphql/release-notes.html
274285
exclude_versions: ["2.0", "2.1", "2.2"]
275286

276-
- label: Inventory management
287+
- label: Inventory Management
277288
url: /inventory/release-notes.html
278289
exclude_versions: ["2.0", "2.1", "2.2"]
279290

‎_data/whats-new.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,20 @@ description: |
44
We exclude from this list proofreading, spelling checks, and all minor updates.
55
link: /whats-new.html
66
thread: /whatsnew-feed.xml
7-
updated: Mon Jun 17 11:55:49 2019
7+
updated: Mon Jun 24 10:57:15 2019
88
entries:
9+
- description: Completed the reference list and added a 'Code sample' section to the
10+
[Prompt Widget](https://devdocs.magento.com/guides/v2.3/javascript-dev-guide/widgets/widget_prompt.html)
11+
topic.
12+
versions: 2.2.x, 2.3.x
13+
type: Major update
14+
date: June 19, 2019
15+
link: https://github.com/magento/devdocs/pull/4782
16+
- description: Added a new topic for the [Redirect Widget](https://devdocs.magento.com/guides/v2.3/javascript-dev-guide/widgets/widget_redirectUrl.html).
17+
versions: 2.1.x, 2.3.x, 2.x
18+
type: New topic
19+
date: June 18, 2019
20+
link: https://github.com/magento/devdocs/pull/4771
921
- description: Added the [Data Provider Annotation](https://devdocs.magento.com/guides/v2.3/test/unit/annotations/data-provider.html)
1022
topic to the PHP Unit Testing guide.
1123
versions: 2.1.x, 2.2.x, 2.3.x

‎_includes/graphql/cart-address-input.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Attribute | Data Type | Description
2+
--- | --- | ---
3+
`city` | String! | The city specified for the billing or shipping address
4+
`company` | String | The company specified for the billing or shipping address
5+
`country_code` | String! | The country code and label for the billing or shipping address
6+
`firstname` | String! | The customer's first name
7+
`lastname` | String! | The customer's last name
8+
`postcode` | String | The postal code for the billing or shipping address
9+
`region` | String | The region code and label for the billing or shipping address
10+
`save_in_address_book` | Boolean! | Specifies whether to save the address (`True`/`False`)
11+
`street` | [String]! | An array containing the street for the billing or shipping address
12+
`telephone` | String | The telephone number for the billing or shipping address

‎_includes/graphql/cart-item-input.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Attribute | Data Type | Description
2+
--- | --- | ---
3+
`quantity` | Float! | The quantity of the item to add to the cart
4+
`sku` | String! | The sku of the product to be added to the cart

‎_includes/graphql/cart-object.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Attribute | Data Type | Description
2+
--- | --- | ---
3+
`applied_coupon` | [`AppliedCoupon`][AppliedCoupon] | The `AppliedCoupon` object contains the `code` text attribute, which specifies the coupon code
4+
`available_payment_methods` | [AvailablePaymentMethod][AvailablePaymentMethod] | Available payment methods
5+
`billing_address` | [BillingCartAddress][BillingCartAddress] | Contains the billing address specified in the customer's cart
6+
`email` | String | The customer's email address
7+
`items` | [CartItemInterface][CartItemInterface] | Contains the items in the customer's cart
8+
`prices` | [CartPrices][CartPrices] | Contains subtotals and totals
9+
`selected_payment_method` | [SelectedPaymentMethod][SelectedPaymentMethod] | Selected payment method
10+
`shipping_addresses` | [ShippingCartAddress][ShippingCartAddress] | Contains one or more shipping addresses
11+
12+
[AppliedCoupon]: {{page.baseurl}}/graphql/reference/quote.html#AppliedCoupon
13+
[AvailablePaymentMethod]: {{page.baseurl}}/graphql/reference/quote.html#AvailablePaymentMethod
14+
[BillingCartAddress]: {{page.baseurl}}/graphql/reference/quote.html#BillingCartAddress
15+
[CartItemInterface]: {{page.baseurl}}/graphql/reference/quote.html#CartItemInterface
16+
[CartPrices]: {{page.baseurl}}/graphql/reference/quote.html#CartPrices
17+
[SelectedPaymentMethod]: {{page.baseurl}}/graphql/reference/quote.html#SelectedPaymentMethod
18+
[ShippingCartAddress]: {{page.baseurl}}/graphql/reference/quote.html#ShippingCartAddress

‎_includes/graphql/customer-payment-tokens.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
The `CustomerPaymentTokens` output object contains an array of `items`.
2+
3+
Attribute | Data Type | Description
4+
--- | --- | ---
5+
`items` | [PaymentToken] | Contains an array of customer payment tokens
6+
7+
#### PaymentToken attributes
8+
9+
The `PaymentToken` object defines characteristics of a token stored in the payment vault.
10+
11+
Attribute | Data Type | Description
12+
--- | --- | ---
13+
`details` | String | Stored account details
14+
`payment_method_code` | String | The payment method code associated with the token
15+
`public_hash` | String | The public hash of the token generated by the vault provider
16+
`type` | `PaymentTokenTypeEnum` | `card` or `account`

‎_includes/graphql/customizable-option-input.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Attribute | Data Type | Description
2+
--- | --- | ---
3+
`id` | Int! | A unique ID assigned to the customizable option
4+
`value_string` | String! | A value assigned to the the customizable option

‎_includes/layout/after-site-header.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
{% if page.guide_version == "2.1" %}
2+
<div class="message-banner">
3+
<a href="http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.18CE.html" target="_blank">Magento 2.1.18</a> is the final 2.1.x release. After June 2019, Magento 2.1.x will no longer receive security patches, quality fixes, or documentation updates.</br>To maintain your site's performance, security, and PCI compliance, upgrade to the latest version of Magento.</a>
4+
</div>
5+
{% endif %}
6+
17
{% if page.group == "inventory" %}
28
<div class="message-banner">
39
This page may include updates for <a href="https://devdocs.magento.com/guides/v2.3/inventory/release-notes.html" target="_blank">Inventory Management (MSI) 1.1.2 Beta</a>. Content is subject to change.

0 commit comments

Comments
 (0)