Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6469ea7

Browse files
meker12meker12
committed
Merge branch 'master' into Cloud-2002.1.0
2 parents 4e4f192 + b37272c commit 6469ea7

File tree

1,173 files changed

+107960
-1884
lines changed

Some content is hidden

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

1,173 files changed

+107960
-1884
lines changed

‎.github/CONTRIBUTING.md

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ If you write and contribute a full topic, we will add your name (or your company
1515

1616
## Get started
1717

18+
> We no longer accept contributions to files in the `src/guides/v2.2/` directory.
19+
1820
![Get started workflow](https://devdocs.magento.com/common/images/contribute-prerequisites.png)
1921

2022
1. Make sure you have a [GitHub account](https://github.com/signup/free).
@@ -119,49 +121,6 @@ title: Continue with your installation
119121
| `group` | Defines the topic's guide or section. Use the table of contents `.yml` file name. This loads your left-side navigation. We will help during the PR process to add new files to the `.yml` file. |
120122
| `title` | Sets the title of the page in the HTML metadata and the main title on the page. |
121123

122-
## Symbolic links
123-
124-
We use symbolic links for topics that are the same across versions of Magento. A file is symlinked if the entire content of the file is a path to the original version, such as [ext-best-practices/tutorials/serialized-to-json-data-upgrade.md](https://github.com/magento/devdocs/blob/master/guides/v2.3/ext-best-practices/tutorials/serialized-to-json-data-upgrade.md). Note that some editors will automatically follow symlinks so it might not be clear if a file is symlinked or not. Check the file on Github directly to be sure.
125-
126-
### Create a symbolic link
127-
128-
When you create a new topic (create a new `.md` file) and its content is the same for 2.2 and 2.3 versions, create a symbolic link.
129-
130-
For example, if you created a new file for v.2.2: `guides/v2.2/install-gde/new-doc-topic.md` and its content is the same for v.2.3, use the command below to create the symbolic link.
131-
132-
```bash
133-
cd <DEVDOCS_REPOSITORY_ROOT_DIR>/guides/v2.3/install-gde
134-
```
135-
136-
```bash
137-
ln -s ../../v2.2/install-gde/new-doc-topic.md new-doc-topic.md
138-
```
139-
140-
If you have an image that is identical between versions, it should placed in `/common/images`. Please optimize images before committing them to the repository.
141-
If done correctly, the symbolic link path will start with 2-4 instances of `../`, as the above example shows. If possible, check a symlinked file within the same folder to ensure the proper pathing.
142-
143-
### Remove a symbolic link
144-
145-
If your changes are unique to a specific version, remove the symbolic link and add a new file. Copy and paste a previous version of the topic to get started.
146-
147-
The removal should use the `git rm` command specifically. Deleting the file through the regular file system might cause issues with the repository.
148-
149-
For example:
150-
151-
```bash
152-
cd <DEVDOCS_REPOSITORY_ROOT_DIR>
153-
```
154-
155-
```bash
156-
git rm guides/v2.3/install-gde/new-doc-topic.md
157-
```
158-
159-
```bash
160-
cp guides/v2.2/install-gde/new-doc-topic.md guides/v2.3/install-gde/new-doc-topic.md
161-
```
162-
163-
Once you have the copy in place, you can edit it with the version-specific information.
164-
165124
## Report an issue
166125

167126
If you find a typo or errors in Magento DevDocs, you can either fix it with a pull request (as described above) or you can report it by creating an issue in the DevDocs GitHub repository.

‎src/_data/toc/graphql.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ pages:
1616
- label: GraphQL Caching
1717
url: /graphql/caching.html
1818

19+
- label: Filtering with custom attributes
20+
url: /graphql/custom-filters.html
21+
1922
- label: Development
2023
children:
2124
- label: Define the GraphQL schema for a module
@@ -50,6 +53,9 @@ pages:
5053
- label: category query
5154
url: /graphql/queries/category.html
5255

56+
- label: categoryList query
57+
url: /graphql/queries/category-list.html
58+
5359
- label: checkoutAgreements query
5460
url: /graphql/queries/checkout-agreements.html
5561

@@ -74,6 +80,9 @@ pages:
7480
- label: customer query
7581
url: /graphql/queries/customer.html
7682

83+
- label: customerCart query
84+
url: /graphql/queries/customer-cart.html
85+
7786
- label: customerDownloadableProducts query
7887
url: /graphql/queries/customer-downloadable-products.html
7988

@@ -112,9 +121,15 @@ pages:
112121
- label: Using mutations
113122
url: /graphql/mutations/index.html
114123

124+
- label: addBundleProductsToCart mutation
125+
url: /graphql/mutations/add-bundle-products.html
126+
115127
- label: addConfigurableProductsToCart mutation
116128
url: /graphql/mutations/add-configurable-products.html
117129

130+
- label: addDownloadableProductsToCart mutation
131+
url: /graphql/mutations/add-downloadable-products.html
132+
118133
- label: addSimpleProductsToCart mutation
119134
url: /graphql/mutations/add-simple-products.html
120135

@@ -163,6 +178,9 @@ pages:
163178
- label: handlePayflowProResponse mutation
164179
url: /graphql/mutations/handle-payflow-pro-response.html
165180

181+
- label: mergeCarts mutation
182+
url: /graphql/mutations/merge-carts.html
183+
166184
- label: placeOrder mutation
167185
url: /graphql/mutations/place-order.html
168186

‎src/_data/toc/ui-components-guide.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ pages:
9393
- label: HtmlContent component
9494
url: /ui_comp_guide/components/ui-htmlcontent.html
9595

96+
- label: ImagePreview component
97+
include_versions: ["2.3"]
98+
url: /ui_comp_guide/components/ui-image-preview.html
99+
96100
- label: ImageUploader component
97101
include_versions: ["2.3"]
98102
url: /ui_comp_guide/components/image-uploader/
@@ -113,6 +117,10 @@ pages:
113117
- label: Listing (grid) component
114118
url: /ui_comp_guide/components/ui-listing-grid.html
115119

120+
- label: Masonry (grid) component
121+
include_versions: ["2.3"]
122+
url: /ui_comp_guide/components/ui-masonry.html
123+
116124
- label: MassActions component
117125
url: /ui_comp_guide/components/ui-massactions.html
118126

‎src/_includes/cloud/enable-ssh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ To create an SSH key pair:
5151

5252
GitHub also uses the key length `-b 4096` in the command. Follow the prompts to complete the key.
5353

54-
1. When prompted to "Enter a file in which to save the key," press **Enter**to save the file to the default location. The prompt displays the location.
54+
1. When prompted to "Enter a file in which to save the key," press **Enter** to save the file to the default location. The prompt displays the location.
5555

5656
1. When prompted to enter a secure passphrase, enter a phrase to use like a password. Make note of this passphrase. You may be requested to enter it depending on tasks you complete using a terminal during development.
5757

‎src/_includes/config/consumers.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Name|Value|Required?|
2+
|`--consumers-wait-for-messages`|Should consumers wait for a message from the queue? 1 - Yes, 0 - No|No|
3+
{:style="table-layout:auto;"}
4+
5+
`0`—Consumers process available messages in the queue, close the TCP connection, and terminate. Consumers do not wait for additional messages to enter the queue, even if the number of processed messages is less than the `--max_messages` value specified during starting consumers.
6+
7+
`1`—Consumers continue to process messages from the message queue until reaching the maximum number of messages (the value specified for `--max_messages` on the `queue:consumers:start` command) before closing the TCP connection and terminating the consumer process. If the queue empties before reaching `--max_messages` the consumer waits for more messages to arrive. If you use workers to run consumers instead of using a cron job, set this variable to `1`.

‎src/_includes/graphql/cart-object.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
Attribute | Data Type | Description
22
--- | --- | ---
3-
`applied_coupon` | [`AppliedCoupon`][AppliedCoupon] | The `AppliedCoupon` object contains the `code` text attribute, which specifies the coupon code
3+
`applied_coupon` | [`AppliedCoupon`][AppliedCoupon] | Deprecated. Use `applied_coupons` instead
4+
`applied_coupons` | [[`AppliedCoupon`]][AppliedCoupon] | An array of `AppliedCoupon` objects. Each object contains the `code` text attribute, which specifies the coupon code
45
`applied_gift_cards` | [[`AppliedGiftCard`]][AppliedGiftCard] | An array of `AppliedGiftCard` objects. An `AppliedGiftCard` object contains the `code` text attribute, which specifies the gift card code. `applied_gift_cards` is a Commerce-only attribute, defined in the GiftCardAccountGraphQl module
56
`applied_store_credit` | [`AppliedStoreCredit`][AppliedStoreCredit] | Contains store credit information applied to the cart. `applied_store_credit` is a Commerce-only attribute, defined in the CustomerBalanceGraphQl module
67
`available_payment_methods` | [[AvailablePaymentMethod]][AvailablePaymentMethod] | Available payment methods
7-
`billing_address` | [BillingCartAddress][BillingCartAddress]! | Contains the billing address specified in the customer's cart
8+
`billing_address` | [BillingCartAddress][BillingCartAddress] | Contains the billing address specified in the customer's cart
89
`email` | String | The customer's email address
10+
`id` | ID! | The ID of the cart
11+
`is_virtual` | Boolean | Indicates whether the cart contains only virtual products
912
`items` | [[CartItemInterface]][CartItemInterface] | Contains the items in the customer's cart
1013
`prices` | [CartPrices][CartPrices] | Contains subtotals and totals
1114
`selected_payment_method` | [SelectedPaymentMethod][SelectedPaymentMethod] | Selected payment method

‎src/_includes/graphql/cms-block-object.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
The `CmsBlock` object can contain the following attributes:
2+
3+
Attribute | Data type | Description
4+
--- | --- | ---
5+
`content` | String | The content of the CMS block in raw HTML
6+
`identifier` | String | The CMS block identifier
7+
`title` | String | The title assigned to the CMS block

‎src/_includes/graphql/create-customer.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Attribute | Data Type | Description
22
--- | --- | ---
3-
`dob` | String | The customer’s date of birth
3+
`date_of_birth` | String | The customer’s date of birth
4+
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer’s date of birth
45
`email` | String | The customer’s email address. Required to create a customer
56
`firstname` | String | The customer’s first name. Required to create a customer
67
`gender` | Int | The customer's gender (Male - 1, Female - 2)

‎src/_includes/graphql/customer-address-input.md

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
### CustomerAddress input {#customerAddressInput}
1+
### CustomerAddressInput attributes {#customerAddressInput}
22

3-
The `CustomerAddress` input can contain the following attributes:
3+
The `CustomerAddressInput` object can contain the following attributes:
44

55
Attribute | Data Type | Description
66
--- | --- | ---
77
`city` | String | The city or town
88
`company` | String | The customer's company
9-
`country_id` | String | The customer's country
10-
`custom_attributes` | [CustomerAddressAttribute](#customerAddressAttributeInput) | Address custom attributes
9+
`country_code` | String | The customer's country
10+
`country_id` | String | Deprecated. Use `country_code` instead. The customer's country
11+
`custom_attributes` | [CustomerAddressAttributeInput](#customerAddressAttributeInput) | Deprecated. Not applicable for GraphQL
1112
`customer_id` | Int | The customer ID
1213
`default_billing` | Boolean | Indicates whether the address is the default billing address
1314
`default_shipping` | Boolean | Indicates whether the address is the default shipping address
@@ -19,28 +20,28 @@ Attribute | Data Type | Description
1920
`middlename` | String | The middle name of the person associated with the shipping/billing address
2021
`postcode` | String | The customer's ZIP or postal code
2122
`prefix` | String | An honorific, such as Dr., Mr., or Mrs.
22-
`region` | [CustomerAddressRegion](#customerAddressRegionInput) | An object that defines the customer's state or province
23-
`region_id` | Int | A number that uniquely identifies the state, province, or other area
23+
`region` | [CustomerAddressRegionInput](#customerAddressRegionInput) | An object that defines the customer's state or province
24+
`region_id` | Int | Deprecated. Use `region` instead. A number that uniquely identifies the state, province, or other area
2425
`street` | [String] | An array of strings that define the street number and name
2526
`suffix` | String | A value such as Sr., Jr., or III
2627
`telephone` | String | The telephone number
2728
`vat_id` | String | The customer's Tax/VAT number (for corporate customers)
2829

29-
### CustomerAddressAttribute input {#customerAddressAttributeInput}
30+
### CustomerAddressAttributeInput attributes {#customerAddressAttributeInput}
3031

31-
The `CustomerAddressAttribute` input can contain the following attributes:
32+
The `CustomerAddressAttributeInput` data type has been deprecated because the contents are not applicable for GraphQL. It can contain the following attributes:
3233

3334
Attribute | Data Type | Description
3435
--- | --- | ---
3536
`attribute_code` | String | Attribute code
3637
`value` | String | Attribute value
3738

38-
### CustomerAddressRegion input {#customerAddressRegionInput}
39+
### CustomerAddressRegionInput attributes {#customerAddressRegionInput}
3940

40-
The `customerAddressRegion` input can contain the following attributes:
41+
The `customerAddressRegionInput` object can contain the following attributes:
4142

4243
Attribute | Data Type | Description
4344
--- | --- | ---
44-
`region_code` | String | The address region code
4545
`region` | String | The state or province name
46-
`region_id` | Int | Uniquely identifies the region
46+
`region_code` | String | The address region code
47+
`region_id` | Int | Deprecated. Use `region` instead. Uniquely identifies the region

‎src/_includes/graphql/customer-address-output.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### CustomerAddress output {#customerAddressOutput}
1+
### CustomerAddress attributes {#customerAddressOutput}
22

33
The values assigned to attributes such as `firstname` and `lastname` in this object may be different from those defined in the `Customer` object.
44

@@ -8,8 +8,9 @@ Attribute | Data Type | Description
88
--- | --- | ---
99
`city` | String | The city or town
1010
`company` | String | The customer's company
11-
`country_id` | String | The customer's country
12-
`custom_attributes` | [CustomerAddressAttribute](#customerAddressAttributeOutput) | Address custom attributes
11+
`country_code` | CountryCodeEnum | The customer's country
12+
`country_id` | String | Deprecated. Use `country_code` instead. The customer's country
13+
`custom_attributes` | [CustomerAddressAttribute](#customerAddressAttributeOutput) | Deprecated. Not applicable for GraphQL
1314
`customer_id` | Int | The customer ID
1415
`default_billing` | Boolean | Indicates whether the address is the default billing address
1516
`default_shipping` | Boolean | Indicates whether the address is the default shipping address
@@ -22,27 +23,27 @@ Attribute | Data Type | Description
2223
`postcode` | String | The customer's ZIP or postal code
2324
`prefix` | String | An honorific, such as Dr., Mr., or Mrs.
2425
`region` | [CustomerAddressRegion](#customerAddressRegionOutput) | An object that defines the customer's state or province
25-
`region_id` | Int | A number that uniquely identifies the state, province, or other area
26+
`region_id` | Int | Deprecated. Use `region` instead. A number that uniquely identifies the state, province, or other area
2627
`street` | [String] | An array of strings that define the street number and name
2728
`suffix` | String | A value such as Sr., Jr., or III
2829
`telephone` | String | The telephone number
2930
`vat_id` | String | The customer's Tax/VAT number (for corporate customers)
3031

31-
### CustomerAddressAttribute output {#customerAddressAttributeOutput}
32+
### CustomerAddressAttribute attributes {#customerAddressAttributeOutput}
3233

33-
The `CustomerAddressAttribute` output returns the following attributes:
34+
The `CustomerAddressAttribute` output data type has been deprecated because the contents are not applicable for GraphQL. It can contain the following attributes:
3435

3536
Attribute | Data Type | Description
3637
--- | --- | ---
3738
`attribute_code` | String | Attribute code
3839
`value` | String | Attribute value
3940

40-
### CustomerAddressRegion output {#customerAddressRegionOutput}
41+
### CustomerAddressRegion attributes {#customerAddressRegionOutput}
4142

4243
The `customerAddressRegion` output returns the following attributes:
4344

4445
Attribute | Data Type | Description
4546
--- | --- | ---
46-
`region_code` | String | The address region code
4747
`region` | String | The state or province name
48-
`region_id` | Int | Uniquely identifies the region
48+
`region_code` | String | The address region code
49+
`region_id` | Int | Deprecated. Use `region` instead. Uniquely identifies the region

‎src/_includes/graphql/customer-input.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ Attribute | Data Type | Description
22
--- | --- | ---
33
`addresses` | [CustomerAddress](#customerAddressInput) | An array containing the customer's shipping and billing addresses
44
`created_at` | String | Timestamp indicating when the account was created
5+
`date_of_birth` | String | The customer's date of birth
56
`default_billing` | String | The ID assigned to the billing address
67
`default_shipping` | String | The ID assigned to the shipping address
7-
`dob` | String | The customer's date of birth
8+
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth
89
`email` | String | The customer's email address
910
`firstname` | String | The customer's first name
1011
`gender` | Int | The customer's gender (Male - 1, Female - 2)
11-
`group_id` | Int | The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)
12+
`group_id` | Int | Deprecated. This attribute is not applicable for GraphQL. The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)
1213
`id` | Int | The ID assigned to the customer
1314
`is_subscribed` | Boolean | Indicates whether the customer is subscribed to the company's newsletter
1415
`lastname` | String | The customer's family name

‎src/_includes/graphql/customer-output.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@ Attribute | Data Type | Description
22
--- | --- | ---
33
`addresses` | [CustomerAddress](#customerAddressOutput) | An array containing the customer's shipping and billing addresses
44
`created_at` | String | Timestamp indicating when the account was created
5+
`date_of_birth` | String | The customer's date of birth
56
`default_billing` | String | The ID assigned to the billing address
67
`default_shipping` | String | The ID assigned to the shipping address
7-
`dob` | String | The customer's date of birth
8+
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth
89
`email` | String | The customer's email address
910
`firstname` | String | The customer's first name
1011
`gender` | Int | The customer's gender (Male - 1, Female - 2)
11-
`group_id` | Int | The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)
12+
`group_id` | Int | Deprecated. This attribute is not applicable for GraphQL. The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)
1213
`id` | Int | The ID assigned to the customer
1314
`is_subscribed` | Boolean | Indicates whether the customer is subscribed to the company's newsletter
1415
`lastname` | String | The customer's family name
1516
`middlename` |String | The customer's middle name
1617
`prefix` | String | An honorific, such as Dr., Mr., or Mrs.
1718
`suffix` | String | A value such as Sr., Jr., or III
1819
`taxvat` | String | The customer's Tax/VAT number (for corporate customers)
20+
`wishlist` | Wishlist! | Contains the contents of the customer's wish lists
1921

2022
{% include graphql/customer-address-output.md %}

‎src/_includes/install/file-system-perms-twouser_22.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ find var generated vendor pub/static pub/media app/etc -type d -exec chmod g+ws
136136
```
137137

138138
```bash
139-
sudo chown -R :<web server group> .
139+
chown -R :<web server group> .
140140
```
141141

142142
```bash

‎src/cloud/architecture/cloud-architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Magento Commerce Cloud architecture
44
functional_areas:
55
- Cloud
66
redirect_from:
7-
- /guides/v2.2/cloud/basic-information/cloud-plans.html
7+
- /cloud/basic-information/cloud-plans.html
88
---
99

1010
{{site.data.var.ece}} has a Starter and a Pro plan. Each plan has a unique architecture to drive your {{site.data.var.ee}} development and deployment process. Both the Starter plan and the Pro plan architecture deploy databases, web server, and caching servers across multiple environments for end-to-end testing while supporting continuous integration.

‎src/cloud/architecture/pro-architecture.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
group: cloud-guide
33
title: Pro architecture
44
redirect_from:
5-
- /guides/v2.2/cloud/discover-arch.html
6-
- /guides/v2.2/cloud/reference/discover-arch.html
7-
- /guides/v2.3/cloud/reference/discover-arch.html
8-
- /guides/v2.2/cloud/architecture/pro-architecture-legacy.html
9-
- /guides/v2.3/cloud/architecture/pro-architecture-legacy.html
5+
- /cloud/discover-arch.html
6+
- /cloud/reference/discover-arch.html
7+
- /cloud/architecture/pro-architecture-legacy.html
108
functional_areas:
119
- Cloud
1210
---

0 commit comments

Comments
 (0)