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

Commit 1aaa92f

Browse files
authored
Merge branch '2.4.2-develop' into kh_bundle-example
2 parents 4db8cfc + c8bfa76 commit 1aaa92f

29 files changed

+202
-166
lines changed

src/_includes/graphql/company-team.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ The `CompanyTeam` object contains details about a company team. It contains the
33
Attribute | Data Type | Description
44
--- | --- | ---
55
`description` | String | An optional description of the team
6-
`id` | ID! | A string that contains the encoded team ID
6+
`id` | ID! | The unique ID for a `CompanyTeam` object
77
`name` | String | The display name of the team

src/_includes/graphql/company.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ Attribute | Data type | Description
77
`credit` | CompanyCredit! | The company credit balance
88
`credit_history(filter: CompanyCreditHistoryFilterInput, pageSize: Int = 20, currentPage: Int = 1)` | CompanyCreditHistory! | A history of company credit operations
99
`email` | String | The email address of the company contact
10-
`id` | ID! | The ID assigned to the company
10+
`id` | ID! | The unique ID of a `Company` object
1111
`legal_address` | [CompanyLegalAddress](#CompanyLegalAddress) | The address where the company is registered to conduct business
1212
`legal_name` | String | The full legal name of the company
1313
`name` | String | The name of the company
1414
`payment_methods` | [String] | The list of payment methods available to a company
1515
`reseller_id` | String | The resale number that is assigned to the company for tax reporting purposes
16-
`role(id: ID!)` | [CompanyRole](#CompanyRole) | Returns information about the specified company role
16+
`role(id: ID!)` | [CompanyRole](#CompanyRole) | Returns a company role filtered by the unique ID for a `CompanyRole` object
1717
`roles(pageSize: Int = 20, currentPage: Int = 1 )` | [CompanyRoles!](#CompanyRoles) | Returns the list of company roles
1818
`sales_representative` | [CompanySalesRepresentative](#CompanySalesRepresentative) | The company sales representative
1919
`structure(rootId: ID = 0 depth: Int = 10 )` | [CompanyStructure](#CompanyStructure) | Returns the company structure of teams and customers in depth-first order
20-
`team(id: ID!)` | [CompanyTeam](#CompanyTeam) | Returns the specified company team
21-
`user(id: ID!)` | [Customer]({{page.baseurl}}/graphql/queries/customer.html) | Returns the specified company user
22-
`users(filter: CompanyUsersFilterInput, pageSize: Int = 20, currentPage: Int = 1)`| [CompanyUsers](#CompanyUsers) | Returns the company users that match the specified filter
23-
`vat_id` | String | The value-added tax number that is assigned to the company by some jurisdictions for tax reporting purposes
20+
`team(id: ID!)` | [CompanyTeam](#CompanyTeam) | Returns company team data filtered by the unique ID for a `CompanyTeam` object
21+
`user(id: ID!)` | [Customer]({{page.baseurl}}/graphql/queries/customer.html) | Returns a company user filtered by the unique ID for a `Customer` object
22+
`users(filter: CompanyUsersFilterInput, pageSize: Int = 20, currentPage: Int = 1)`| [CompanyUsers](#CompanyUsers) | Returns a list of company users based on activity status
23+
`vat_tax_id` | String | The value-added tax number that is assigned to the company by some jurisdictions for tax reporting purposes
2424

2525
### CompanyAclResource attributes {#CompanyAclResource}
2626

@@ -29,8 +29,8 @@ The `CompanyAclResource` object can contain the following attributes.
2929
Attribute | Data Type | Description
3030
--- | --- | ---
3131
`children` | [CompanyAclResource!] | An array of sub-resources
32-
`id` | ID! | The ID assigned to the ACL resource
33-
`sort_order` | Int | ACL resource sort order
32+
`id` | ID! | The unique ID for a `CompanyAclResource` object
33+
`sort_order` | Int | The sort order of an ACL resource
3434
`text` | String | The label assigned to the ACL resource
3535

3636
### CompanyAdmin attributes {#CompanyAdmin}
@@ -42,7 +42,7 @@ Attribute | Data Type | Description
4242
`email` | String! | The email address of the company administrator
4343
`firstname` | String! | The company administrator's first name
4444
`gender` | Int | The company administrator's gender (Male - 1, Female - 2, Not Specified - 3)
45-
`id` | ID! | The ID assigned to the company administrator
45+
`id` | ID! | The unique ID for a `CompanyAdmin` object
4646
`job_title` | String | The job title of the company administrator
4747
`lastname` | String! | The company administrator's last name
4848

@@ -105,8 +105,8 @@ The `CompanyLegalAddress` object can contain the following attributes.
105105
Attribute | Data Type | Description
106106
--- | --- | ---
107107
`city` | String! | The city where the company is registered to conduct business
108-
`country_id` | CountryCodeEnum! | Company's country ID. See the [`countries` query]({{page.baseurl}}/graphql/queries/directory-countries.html)
109-
`postcode` | String! | The ZIP/postal code of the company
108+
`country_code` | CountryCodeEnum! | Company's country ID. See the [`countries` query]({{page.baseurl}}/graphql/queries/directory-countries.html)
109+
`postcode` | String! | The company's postal code
110110
`region` | CustomerAddressRegionInput! | An object containing the region name and/or region ID where the company is registered to conduct business
111111
`street` | [String!]! | An array of strings that define the street address where the company is registered to conduct business
112112
`telephone` | String! | The primary phone number of the company.
@@ -117,7 +117,7 @@ The `CompanyRole` object can contain the following attributes.
117117

118118
Attribute | Data Type | Description
119119
--- | --- | ---
120-
`id`| ID! | The ID assigned to the role
120+
`id`| ID! | The unique ID for a `CompanyRole` object
121121
`name` | String | The name assigned to the role
122122
`permissions` | [CompanyAclResource] | A list of permission resources defined for a role
123123
`users_count` | Int | The total number of users assigned the specified role
@@ -129,7 +129,7 @@ The `CompanyRoles` object can contain the following attributes.
129129
Attribute | Data Type | Description
130130
--- | --- | ---
131131
`items` | [CompanyRole]! | A list of company roles that match the specified filter criteria
132-
`page_info` | SearchResultPageInfo | Pagination meta data
132+
`page_info` | SearchResultPageInfo | Pagination metadata
133133
`total_count` | Int! | The total number of roles matching the specified filter
134134

135135
### CompanySalesRepresentative attributes {#CompanySalesRepresentative}
@@ -157,8 +157,8 @@ The `CompanyStructureItem` object can contain the following attributes.
157157
Attribute | Data Type | Description
158158
--- | --- | ---
159159
`entity` | CompanyStructureEntity | A union of [CompanyTeam](#CompanyTeam) and [Customer]({{page.baseurl}}/graphql/queries/customer.html) objects
160-
`id` | ID! | The ID of the item in the hierarchy
161-
`parent_id` | ID | The ID of the parent item in the hierarchy
160+
`id` | ID! | The unique ID for a `CompanyStructureItem` object
161+
`parent_id` | ID | The ID of the parent item in the company hierarchy
162162

163163
### CompanyTeam attributes {#CompanyTeam}
164164

@@ -169,6 +169,6 @@ The `CompanyUsers` object can contain the following attributes.
169169

170170
Attribute | Data Type | Description
171171
--- | --- | ---
172-
`items` | [[Customer]!]({{page.baseurl}}/graphql/queries/customer.html) | An array of `CompanyUser` objects that match the specified search criteria
173-
`page_info` | SearchResultPageInfo | Pagination meta data
172+
`items` | [[Customer]!]({{page.baseurl}}/graphql/queries/customer.html) | An array of `CompanyUser` objects that match the specified filter criteria
173+
`page_info` | SearchResultPageInfo | Pagination metadata
174174
`total_count` | Int! | The number of objects returned

src/_includes/graphql/create-customer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Attribute | Data Type | Description
22
--- | --- | ---
3-
`date_of_birth` | String | The customer’s date of birth
3+
`date_of_birth` | String | The customer’s date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
44
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer’s date of birth
55
`email` | String | The customer’s email address. Required to create a customer
66
`firstname` | String | The customer’s first name. Required to create a customer

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ 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
5+
`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
66
`default_billing` | String | The ID assigned to the billing address
77
`default_shipping` | String | The ID assigned to the shipping address
88
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth

src/_includes/graphql/customer-input.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ 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
5+
`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
66
`default_billing` | String | The ID assigned to the billing address
77
`default_shipping` | String | The ID assigned to the shipping address
88
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Attribute | Data Type | Description
1919
`addresses` | {{ customeraddress_text }} | An array containing the customer's shipping and billing addresses
2020
`allow_remote_shopping_assistance` | Boolean! | Indicates whether the customer has enabled remote shopping assistance
2121
`created_at` | String | Timestamp indicating when the account was created
22-
`date_of_birth` | String | The customer's date of birth
22+
`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
2323
`default_billing` | String | The ID assigned to the billing address
2424
`default_shipping` | String | The ID assigned to the shipping address
2525
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth

src/_includes/graphql/customer-output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ 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
5+
`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
66
`default_billing` | String | The ID assigned to the billing address
77
`default_shipping` | String | The ID assigned to the shipping address
88
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth

src/cloud/howtos/debug.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ To configure PhpStorm to work with Xdebug:
9191

9292
1. In your PhpStorm project, open the settings panel.
9393

94-
- _Mac OS X_—Select **File** > **Preferences**.
94+
- _Mac OS X_—Select **PhpStorm** > **Preferences**.
9595
- _Windows/Linux_—Select **File** > **Settings**.
9696

9797
1. In the _Settings_ panel, expand and locate the **Languages & Frameworks** > **PHP** > **Servers** section.

src/compliance/privacy/pi-data-reference-m2.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Magento 2 primarily stores customer-specific information in customer, address, o
4545

4646
### Customer data {#customer-data}
4747

48-
Magento 2 stores the following customer attributes:
48+
Magento 2 can be figured to store the following customer attributes:
4949

5050
- Date of Birth
5151
- Email
@@ -56,6 +56,9 @@ Magento 2 stores the following customer attributes:
5656
- Name Prefix
5757
- Name Suffix
5858

59+
{:.bs-callout-info}
60+
In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
61+
5962
#### `customer_entity` and 'customer_entity' references
6063

6164
The following columns in the `customer_entity` table contain customer information:

src/guides/v2.3/config-guide/prod/config-reference-most.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ Prefix Dropdown Options | `customer/address/prefix_options` | <!-- ![Not EE-only
405405
Show Middle Name (initial) | `customer/address/middlename_show` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
406406
Show Suffix | `customer/address/suffix_show` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
407407
Suffix Dropdown Options | `customer/address/suffix_options` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
408-
Show Date of Birth | `customer/address/dob_show` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
408+
Show Date of Birth | `customer/address/dob_show`<br>In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.| <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
409409
Show Tax/VAT Number | `customer/address/taxvat_show` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
410410
Show Gender | `customer/address/gender_show` | <!-- ![Not EE-only]({{ site.baseurl }}/common/images/red-x.png) --> |
411411
Enable Store Credit Functionality | `customer/magento_customerbalance/is_enabled` | ![EE-only]({{ site.baseurl }}/common/images/cloud_ee.png) |

src/guides/v2.3/extension-dev-guide/configuration/sensitive-and-environment-settings.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ Examples of sensitive information include:
2828
* E-mail addresses
2929
* Any personally identifiable information (e.g., address, phone number, date of birth, government identification number, etc.)
3030

31+
{:.bs-callout-info}
32+
In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
33+
3134
### Environment or system-specific values
3235

3336
_Environment_ or _system-specific_ values are unique to the system where Magento is deployed.

src/guides/v2.3/frontend-dev-guide/themes/theme-structure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ The key difference between static files and other theme files is that static fil
282282
Static view files that can be accessed by a direct link from the storefront, are distinguished as public theme files.
283283

284284
{:.bs-callout-info}
285-
To be actually accessible for browsers public static files are [published]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-static-view.html#config-cli-static-overview) to the `/pub/static/frontend/<Vendor>/<theme>/<language>/css/` directory.
285+
To be actually accessible for browsers public static files are [published]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-static-view.html#config-cli-static-overview) to the `/pub/static/frontend/<Vendor>/<theme>/<locale>/css/` directory.
286286

287287
### Dynamic view files
288288

src/guides/v2.3/graphql/develop/resolvers.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,14 +284,17 @@ input CustomerInput {
284284
lastname: String @doc(description: "The customer's family name")
285285
suffix: String @doc(description: "A value such as Sr., Jr., or III")
286286
email: String @doc(description: "The customer's email address. Required")
287-
date_of_birth: String @doc(description: "The customer's date of birth")
287+
date_of_birth: String @doc(description: "The customer's date of birth.")
288288
taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
289289
gender: Int @doc(description: "The customer's gender(Male - 1, Female - 2)")
290290
password: String @doc(description: "The customer's password")
291291
is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter")
292292
}
293293
```
294294

295+
{:.bs-callout-info}
296+
In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
297+
295298
The `createCustomer` mutation returns `CustomerOutput` object
296299

297300
```text
@@ -319,7 +322,9 @@ type Customer @doc(description: "Customer defines the customer name and address
319322
addresses: [CustomerAddress] @doc(description: "An array containing the customer's shipping and billing addresses")
320323
gender: Int @doc(description: "The customer's gender (Male - 1, Female - 2)")
321324
}
322-
```
325+
326+
{:.bs-callout-info}
327+
In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
323328
324329
The following example shows the `createCustomer` mutation in action:
325330

src/guides/v2.3/graphql/queries/category.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,3 +212,10 @@ The query returns a `CategoryTree` object, which implements [`CategoryInterface`
212212
Attribute | Data type | Description
213213
--- | --- | ---
214214
`children` | `CategoryTree` | An array containing the next level of subcategories. By default, you can specify up to 10 levels of child categories
215+
216+
## Errors
217+
218+
Error | Description
219+
--- | ---
220+
`Category doesn't exist` | The specified category ID value does not exist.
221+
`Field "category" argument "id" requires type Int, found "XXX"` | The specified `id` argument value has the wrong type.

src/guides/v2.3/graphql/queries/directory-country.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,10 @@ The query returns a single `Country` object.
112112

113113
* [countries query]({{page.baseurl}}/graphql/queries/directory-countries.html)
114114
* [currency query]({{page.baseurl}}/graphql/queries/directory-currency.html)
115+
116+
## Errors
117+
118+
Error | Description
119+
--- | ---
120+
`Country \"id\" value should be specified"` | The Country ID value must be specified to find the mapped country.
121+
`The country isn't available` | There is no country mapped to the given country ID.

0 commit comments

Comments
 (0)