Skip to content

Commit 70171a3

Browse files
doboothdobooth
authored
Merge branch 'master' into patch-5
2 parents 5c62e4f + 631e7c6 commit 70171a3

File tree

15 files changed

+162
-17
lines changed

15 files changed

+162
-17
lines changed

‎src/_data/toc/rest-api.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pages:
7070
- label: Search for the status of a bulk operation
7171
url: /rest/operation-status-search.html
7272

73-
- label: Parameters in URLs
73+
- label: API usage notes
7474
url: /rest/notes.html
7575

7676
- label: Tutorials

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Attribute | Data Type | Description
88
`billing_address` | [BillingCartAddress][BillingCartAddress] | Contains the billing address specified in the customer's cart
99
`email` | String | The customer's email address
1010
`id` | ID! | The ID of the cart
11-
`is_virtual` | Boolean | Indicates whether the cart contains only virtual products
11+
`is_virtual` | Boolean! | Indicates whether the cart contains only virtual products
1212
`items` | [[CartItemInterface]][CartItemInterface] | Contains the items in the customer's cart
1313
`prices` | [CartPrices][CartPrices] | Contains subtotals and totals
1414
`selected_payment_method` | [SelectedPaymentMethod][SelectedPaymentMethod] | Selected payment method

‎src/cloud/project/project-integrate-blackfire.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
title: Blackfire.io for Magento Cloud
3+
redirect_from:
4+
- guides/v2.2/cloud/project/project-integrate-blackfire.html
5+
redirect_to: https://support.blackfire.io/en/articles/771436-step-3-configure-blackfire-to-run-in-all-magento-cloud-environments
6+
---

‎src/cloud/setup/first-time-setup-import-first-steps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Before you begin, do the following:
2121

2222
### SSH access to cloud environments {#ssh}
2323

24-
To transfer the database dump and files to {{site.data.var.ece}}, you must know the SSH access link. You can locate the SSH access link using the [`magento-cloud`] CLI tool({{ site.baseurl }}/cloud/reference/cli-ref-topic.html):
24+
To transfer the database dump and files to {{site.data.var.ece}}, you must know the SSH access link. You can locate the SSH access link using the [Magento Cloud CLI tool]({{ site.baseurl }}/cloud/reference/cli-ref-topic.html):
2525

2626
```bash
2727
magento-cloud environment:ssh --pipe

‎src/guides/v2.3/extension-dev-guide/declarative-schema/db-schema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ A column can have the following attributes:
124124
</tr>
125125
<tr>
126126
<td><code>length</code></td>
127-
<td>In text and binary types (including varchar and varbinary), specifies the length of a column.</td>
127+
<td>Specifies the length of a column. Can be used for `char`, `varchar`, and `varbinary` types.</td>
128128
</tr>
129129
<tr>
130130
<td><code>nullable</code></td>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ To learn more about theme layouts, refer to the [Layout section]({{page.baseurl}
262262

263263
## Troubleshooting {#trouble}
264264

265-
When your theme changes are not visible even after clearing the cache, try redeploying your static files using the `magento setup:static-content:deploy` command, or add the `-f` argument to force deploy static content in any deployment mode in case you are not in production mode.
265+
When your theme changes are not visible even after clearing the cache, try redeploying your static files using the `bin/magento setup:static-content:deploy` command, or add the `-f` argument to force deploy static content in any deployment mode in case you are not in production mode.
266266

267267
{:.bs-callout-info}
268268
Running this command with the `-f` argument can fix issues regarding deployment of static content, but removes **all** symlinks and deploys the actual static content files.

‎src/guides/v2.3/graphql/queries/cart.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ query {
564564

565565
Attribute | Data Type | Description
566566
--- | --- | ---
567-
`cart_id` | String | A 32-character string that is created when you [create a cart]({{page.baseurl}}/graphql/mutations/create-empty-cart.html)
567+
`cart_id` | String! | A 32-character string that is created when you [create a cart]({{page.baseurl}}/graphql/mutations/create-empty-cart.html)
568568

569569
## Output attributes {#cart-output}
570570

@@ -622,7 +622,7 @@ Attribute | Data Type | Description
622622
--- | --- | ---
623623
`amount` | Money! | The cost of shipping using this shipping method
624624
`available` | Boolean! | Indicates whether this shipping method can be applied to the cart
625-
`base_amount` | Money | The base shipping cost, not including taxes or other cost adjustment. Could be null if method is not available
625+
`base_amount` | Money | Deprecated. This attribute is not applicable for GraphQL
626626
`carrier_code` | String! | A string that identifies a commercial carrier or an offline shipping method
627627
`carrier_title` | String! | The label for the carrier code
628628
`error_message` | String | Describes an error condition

‎src/guides/v2.3/migration/migration-tool-configure.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ There are two possible ways to configure the Data Migration Tool for migration:
136136
<database host="127.0.0.1" name="magento1" user="root"/>
137137
</source>
138138
<destination>
139-
<database host="127.0.0.1" name="magento2" user="root"/>
140-
</destination>
139+
<database host="127.0.0.1" name="magento2" user="root"/>
140+
</destination>
141141
<options>
142142
<crypt_key />
143143
</options>

‎src/guides/v2.3/rest/notes.md

Lines changed: 140 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ functional_areas:
55
- Integration
66
---
77

8-
You might encounter the following issue when using REST endpoints
8+
You might encounter the following issues when using REST endpoints.
99

1010
## Duplicate parameters in an REST call
1111

@@ -18,6 +18,145 @@ The REST URL to update a customer is `PUT /V1/customers/:id`. If you specify an
1818

1919
This applies to all REST APIs where a parameter is passed in the URL. Any value specified in the URL with the same parameter name as in the request body is ignored.
2020

21+
## Create a bundle product
22+
23+
The following sample code creates a bundle product. The `price_type` attribute code defined in the `custom_attributes` object is set to `1` to allow the product to have a fixed price.
24+
25+
```json
26+
{
27+
"product":{
28+
"sku":"box-of-watches",
29+
"name":"Box of Watches",
30+
"attribute_set_id":11,
31+
"price":100,
32+
"status":1,
33+
"visibility":4,
34+
"type_id":"bundle",
35+
"extension_attributes":{
36+
"website_ids":[
37+
1,
38+
2
39+
],
40+
"category_links":[
41+
{
42+
"position":0,
43+
"category_id":"3"
44+
},
45+
{
46+
"position":0,
47+
"category_id":"6"
48+
}
49+
],
50+
"bundle_product_options":[
51+
{
52+
"title":"Men's Watches",
53+
"required":true,
54+
"type":"radio",
55+
"position":1,
56+
"sku":"box-of-watches",
57+
"product_links":[
58+
{
59+
"sku":"24-MG04",
60+
"qty":50,
61+
"position":2,
62+
"is_default":false,
63+
"price":0,
64+
"price_type":0,
65+
"can_change_quantity":0
66+
},
67+
{
68+
"sku":"24-MG05",
69+
"qty":50,
70+
"position":4,
71+
"is_default":false,
72+
"price":0,
73+
"price_type":0,
74+
"can_change_quantity":0
75+
}
76+
]
77+
},
78+
{
79+
"title":"Women's Watches",
80+
"required":true,
81+
"type":"radio",
82+
"position":2,
83+
"sku":"box-of-watches",
84+
"product_links":[
85+
{
86+
"sku":"24-WG01",
87+
"qty":50,
88+
"position":1,
89+
"is_default":false,
90+
"price":0,
91+
"price_type":0,
92+
"can_change_quantity":0
93+
},
94+
{
95+
"sku":"24-WG09",
96+
"qty":50,
97+
"position":2,
98+
"is_default":false,
99+
"price":0,
100+
"price_type":0,
101+
"can_change_quantity":0
102+
}
103+
]
104+
}
105+
]
106+
},
107+
"custom_attributes":[
108+
{
109+
"attribute_code":"price_type",
110+
"value":"1"
111+
},
112+
{
113+
"attribute_code":"price_view",
114+
"value":"0"
115+
},
116+
{
117+
"attribute_code":"required_options",
118+
"value":"1"
119+
},
120+
{
121+
"attribute_code":"has_options",
122+
"value":"1"
123+
},
124+
{
125+
"attribute_code":"meta_title",
126+
"value":"watch-test"
127+
},
128+
{
129+
"attribute_code":"sku_type",
130+
"value":"1"
131+
},
132+
{
133+
"attribute_code":"meta_description",
134+
"value":"watch-test This is a box of watches!"
135+
},
136+
{
137+
"attribute_code":"weight_type",
138+
"value":"0"
139+
},
140+
{
141+
"attribute_code":"category_ids",
142+
"value":[
143+
"3",
144+
"6"
145+
]
146+
},
147+
{
148+
"attribute_code":"description",
149+
"value":"<p>This is a box of watches!</p>"
150+
},
151+
{
152+
"attribute_code":"short_description",
153+
"value":"<p>A box of watches</p>"
154+
}
155+
]
156+
}
157+
}
158+
```
159+
21160
{:.ref-header}
22161
Related topics
23162

‎src/recommendations/events.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Recommendation Events
44
ee_only: True
55
---
66

7-
When you deploy the `product-recommendations` module, the module tracks the following user events. These events enable behavioral data collection.
7+
When you deploy the `magento/product-recommendations` module, the module tracks the following user events. These events enable behavioral data collection.
88

99
{:.bs-callout-info}
1010
If [Cookie Restriction Mode](https://docs.magento.com/m2/ce/user_guide/stores/compliance-cookie-restriction-mode.html) is enabled, Magento does not collect behavioral data until the shopper consents. If Cookie Restriction Mode is disabled, Magento collects behavioral data by default.

‎src/recommendations/images/filter-tp2.png

26.3 KB
Loading

‎src/recommendations/install-configure.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ Install the `magento/product-recommendations` module with Composer:
1818

1919
The `magento/product-recommendations` module requires the following dependencies:
2020

21-
- **module-data-services** — This module enables behavioral data collection by tracking [user events on the page]({{ page.baseurl }}/recommendations/events.html). This type of data is required by Adobe Sensei to compute product affinities based on production shopper behavior like product views, products added to a cart, and checkouts. Adobe Sensei then uses this information to create and train machine learning models for each website and storeview. This unlocks recommendation types like "Customers who viewed this, also viewed...", which automatically adjusts with shopper behavior over time. Magento and Adobe Sensei do not collect personally identifiable information.
21+
- **data-services** — This module enables behavioral data collection by tracking [user events on the page]({{ page.baseurl }}/recommendations/events.html). This type of data is required by Adobe Sensei to compute product affinities based on production shopper behavior like product views, products added to a cart, and checkouts. Adobe Sensei then uses this information to create and train machine learning models for each website and store view. This unlocks recommendation types like "Customers who viewed this, also viewed...", which automatically adjusts with shopper behavior over time. Magento and Adobe Sensei do not collect personally identifiable information.
2222

2323
- **saas-export** — This module syncs catalog data. This type of data provides product information to the Product Recommendations service so it can accurately return product names, pricing, images, URLs, inventory and availability, and other attributes.
2424

2525
{:.bs-callout-info}
26-
If you prefer, you can install the above modules explicitly using Composer: `composer require magento/module-data-services` and `composer require magento/saas-export`
26+
If you prefer, you can install the above modules explicitly using Composer: `composer require magento/data-services` and `composer require magento/saas-export`
2727

2828
### Update your Product Recommendations installation
2929

30-
If for any reason you need to update the `product-recommendations` module, run the following:
30+
If for any reason you need to update the `magento/product-recommendations` module, run the following:
3131

3232
```bash
3333
composer update magento/product-recommendations --with-dependencies

‎src/recommendations/product-recs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Product Recommendations require the following data:
2424

2525
- **Catalog** - Product metadata, such as name, price, availability, and so on.
2626

27-
When you install the `product-recommendations` module, Adobe Sensei aggregates the behavioral and catalog data, creating Product Recommendations for each recommendation type. The Product Recommendations service then deploys those recommendations to your storefront.
27+
When you install the `magento/product-recommendations` module, Adobe Sensei aggregates the behavioral and catalog data, creating Product Recommendations for each recommendation type. The Product Recommendations service then deploys those recommendations to your storefront.
2828

2929
## Next steps
3030

‎src/recommendations/test.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The following recommendation types are listed in the recommended order when test
1717

1818
## Testing recommendations on a non-production environment
1919

20-
1. Deploy the `product-recommendations` module to a non-production environment where the catalog data is similar to your production catalog.
20+
1. Deploy the `magento/product-recommendations` module to a non-production environment where the catalog data is similar to your production catalog.
2121

2222
1. Use one of the non-production SaaS Environment IDs for [configuration](https://docs.magento.com/m2/ce/user_guide/configuration/services/saas.html) in the Magento Admin.
2323

‎src/recommendations/verify.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Verify Event Collection
44
ee_only: True
55
---
66

7-
After you [install]({{ page.baseurl }}/recommendations/product-recs.html) and [configure]({{ page.baseurl }}/recommendations/install-configure.html) the product recommendations module, you can verify that the behavioral data is being sent to Magento. Magento uses the `DataServices.js` file to collect and send behavioral data. You can use developer tools available in Chrome, or you can install the Snowplow Chrome extension.
7+
After you [install]({{ page.baseurl }}/recommendations/product-recs.html) and [configure]({{ page.baseurl }}/recommendations/install-configure.html) the `magento/product-recommendations` module, you can verify that the behavioral data is being sent to Magento. Magento uses the `DataServices.js` file to collect and send behavioral data. You can use developer tools available in Chrome, or you can install the Snowplow Chrome extension.
88

99
## Verify using developer tools in Chrome
1010

0 commit comments

Comments
 (0)