Skip to content

Commit 71b0142

Browse files
🔃 [Magento Community Engineering] Community Contributions - 2.3-develop daily delivery
Accepted Community Pull Requests: - #24291: 23279: Implementation of integration tests for ProductAlert Stock notifications (by @yuriichayka) - #24638: Consistent capitalization of the word 'ID' in comments of db_schema.xml files (by @psdevhh) - #24602: Fix whats this scroll top (by @vinidziuba) - #24590: fixed schedule currency_rates_update cron job not working (by @brunoroeder) - #24679: Update Magento_Braintree module ReadMe (by @diazwatson) - #24431: Resolved select from gallery option not working in theme design configuration #24430 (by @rani-webkul) - #24595: Added description discount for each summary(cart, order) (by @MaxSouza) - #24675: Fix the error message of folder not writable. (by @Hailong) Fixed GitHub Issues: - #23279: Integration test for unsubscribing from 'Back in stock notification' (reported by @yuriichayka) has been fixed in #24291 by @yuriichayka in 2.3-develop branch Related commits: 1. b089cc2 2. 36c00d2 3. 665aad5 4. f590127 - #24511: Click "What 's this" link scroll to the top of page (reported by @edenduong) has been fixed in #24602 by @vinidziuba in 2.3-develop branch Related commits: 1. 056b9ea 2. 407649f 3. 60d1ce2 4. 397ce47 - #23846: Schedule currency_rates_update cron job not working (reported by @krzysztofkuzniar) has been fixed in #24590 by @brunoroeder in 2.3-develop branch Related commits: 1. b63fd5e 2. 42b9141 3. 9fb9ce9 4. 7f44d6d 5. 7dbd2cd 6. 126a974 7. 5494064 - #24430: Select from gallery option not working in theme design configuration (reported by @rani-webkul) has been fixed in #24431 by @rani-webkul in 2.3-develop branch Related commits: 1. 6b8c7ee 2. d8e8233 - #3594: Discount Description does not get displayed on cart page (reported by @parekhreena) has been fixed in #24595 by @MaxSouza in 2.3-develop branch Related commits: 1. 23382ed 2. 217ab79 3. 83a84a3 4. 7ec7d65 5. 42edfaf 6. fb5c663 7. 7eed116 8. afd489b 9. c1d4190 10. 57247f8 - #24623: Subfolder string is used as scheme in generating sitemap error message. (reported by @Hailong) has been fixed in #24675 by @Hailong in 2.3-develop branch Related commits: 1. 3adb1eb
2 parents 267db35 + 3480ba6 commit 71b0142

File tree

58 files changed

+993
-601
lines changed

Some content is hidden

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

58 files changed

+993
-601
lines changed

app/code/Magento/AdminNotification/etc/db_schema.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="adminnotification_inbox" resource="default" engine="innodb" comment="Adminnotification Inbox">
1111
<column xsi:type="int" name="notification_id" padding="10" unsigned="true" nullable="false" identity="true"
12-
comment="Notification id"/>
12+
comment="Notification ID"/>
1313
<column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
1414
default="0" comment="Problem type"/>
1515
<column xsi:type="timestamp" name="date_added" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
@@ -35,7 +35,7 @@
3535
</index>
3636
</table>
3737
<table name="admin_system_messages" resource="default" engine="innodb" comment="Admin System Messages">
38-
<column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message id"/>
38+
<column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message ID"/>
3939
<column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
4040
default="0" comment="Problem type"/>
4141
<column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"

app/code/Magento/AdvancedSearch/etc/db_schema.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="catalogsearch_recommendations" resource="default" engine="innodb"
1111
comment="Advanced Search Recommendations">
12-
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
12+
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="ID"/>
1313
<column xsi:type="int" name="query_id" padding="10" unsigned="true" nullable="false" identity="false"
14-
default="0" comment="Query Id"/>
14+
default="0" comment="Query ID"/>
1515
<column xsi:type="int" name="relation_id" padding="10" unsigned="true" nullable="false" identity="false"
16-
default="0" comment="Relation Id"/>
16+
default="0" comment="Relation ID"/>
1717
<constraint xsi:type="primary" referenceId="PRIMARY">
1818
<column name="id"/>
1919
</constraint>

app/code/Magento/Braintree/README.md

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,47 @@
1-
Module Magento\Braintree implements integration with the Braintree payment system.
1+
# Magento_Braintree module
2+
3+
The Magento_Braintree module implements integration with the Braintree payment system.
4+
5+
## Extensibility
6+
7+
Extension developers can interact with the Magento_Braintree module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
8+
9+
[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_Braintree module.
10+
11+
### Events
12+
13+
This module observes the following events:
14+
15+
- `payment_method_assign_data_braintree` event in `Magento\Braintree\Observer\DataAssignObserver` file.
16+
- `payment_method_assign_data_braintree_paypal` event in `Magento\Braintree\Observer\DataAssignObserver` file.
17+
- `shortcut_buttons_container` event in `Magento\Braintree\Observer\AddPaypalShortcuts` file.
18+
19+
For information about an event in Magento 2, see [Events and observers](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html#events).
20+
21+
### Layouts
22+
23+
This module interacts with the following layouts and layout handles in the `view/adminhtml/layout` directory:
24+
25+
- `braintree_paypal_review`
26+
- `checkout_index_index`
27+
- `multishipping_checkout_billing`
28+
- `vault_cards_listaction`
29+
30+
This module interacts with the following layout handles in the `view/frontend/layout` directory:
31+
32+
- `adminhtml_system_config_edit`
33+
- `braintree_report_index`
34+
- `sales_order_create_index`
35+
- `sales_order_create_load_block_billing_method`
36+
37+
For more information about layouts in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).
38+
39+
### UI components
40+
41+
You can extend admin notifications using the `view/adminhtml/ui_component/braintree_report.xml` configuration file.
42+
43+
For information about UI components in Magento 2, see [Overview of UI components](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html).
44+
45+
## Additional information
46+
47+
For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).

app/code/Magento/Bundle/etc/db_schema.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<table name="catalog_product_bundle_option" resource="default" engine="innodb"
1111
comment="Catalog Product Bundle Option">
1212
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="true"
13-
comment="Option Id"/>
13+
comment="Option ID"/>
1414
<column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
15-
comment="Parent Id"/>
15+
comment="Parent ID"/>
1616
<column xsi:type="smallint" name="required" padding="5" unsigned="true" nullable="false" identity="false"
1717
default="0" comment="Required"/>
1818
<column xsi:type="int" name="position" padding="10" unsigned="true" nullable="false" identity="false"
@@ -31,14 +31,14 @@
3131
<table name="catalog_product_bundle_option_value" resource="default" engine="innodb"
3232
comment="Catalog Product Bundle Option Value">
3333
<column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="true"
34-
comment="Value Id"/>
34+
comment="Value ID"/>
3535
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
36-
comment="Option Id"/>
36+
comment="Option ID"/>
3737
<column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
38-
comment="Store Id"/>
38+
comment="Store ID"/>
3939
<column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
4040
<column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
41-
comment="Parent Product Id"/>
41+
comment="Parent Product ID"/>
4242
<constraint xsi:type="primary" referenceId="PRIMARY">
4343
<column name="value_id"/>
4444
</constraint>
@@ -54,13 +54,13 @@
5454
<table name="catalog_product_bundle_selection" resource="default" engine="innodb"
5555
comment="Catalog Product Bundle Selection">
5656
<column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="true"
57-
comment="Selection Id"/>
57+
comment="Selection ID"/>
5858
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
59-
comment="Option Id"/>
59+
comment="Option ID"/>
6060
<column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
61-
comment="Parent Product Id"/>
61+
comment="Parent Product ID"/>
6262
<column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
63-
comment="Product Id"/>
63+
comment="Product ID"/>
6464
<column xsi:type="int" name="position" padding="10" unsigned="true" nullable="false" identity="false"
6565
default="0" comment="Position"/>
6666
<column xsi:type="smallint" name="is_default" padding="5" unsigned="true" nullable="false" identity="false"
@@ -92,15 +92,15 @@
9292
<table name="catalog_product_bundle_selection_price" resource="default" engine="innodb"
9393
comment="Catalog Product Bundle Selection Price">
9494
<column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
95-
comment="Selection Id"/>
95+
comment="Selection ID"/>
9696
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
97-
comment="Website Id"/>
97+
comment="Website ID"/>
9898
<column xsi:type="smallint" name="selection_price_type" padding="5" unsigned="true" nullable="false"
9999
identity="false" default="0" comment="Selection Price Type"/>
100100
<column xsi:type="decimal" name="selection_price_value" scale="6" precision="20" unsigned="false"
101101
nullable="false" default="0" comment="Selection Price Value"/>
102102
<column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
103-
comment="Parent Product Id"/>
103+
comment="Parent Product ID"/>
104104
<constraint xsi:type="primary" referenceId="PK_CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE">
105105
<column name="selection_id"/>
106106
<column name="parent_product_id"/>
@@ -122,7 +122,7 @@
122122
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
123123
comment="Entity ID"/>
124124
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
125-
comment="Website Id"/>
125+
comment="Website ID"/>
126126
<column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
127127
comment="Customer Group ID"/>
128128
<column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="false"
@@ -159,7 +159,7 @@
159159
<column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="false"
160160
comment="Stock ID"/>
161161
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
162-
default="0" comment="Option Id"/>
162+
default="0" comment="Option ID"/>
163163
<column xsi:type="smallint" name="stock_status" padding="6" unsigned="false" nullable="true" identity="false"
164164
default="0" comment="Stock Status"/>
165165
<constraint xsi:type="primary" referenceId="PRIMARY">
@@ -246,9 +246,9 @@
246246
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
247247
comment="Website ID"/>
248248
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
249-
default="0" comment="Option Id"/>
249+
default="0" comment="Option ID"/>
250250
<column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
251-
default="0" comment="Selection Id"/>
251+
default="0" comment="Selection ID"/>
252252
<column xsi:type="smallint" name="group_type" padding="5" unsigned="true" nullable="true" identity="false"
253253
default="0" comment="Group Type"/>
254254
<column xsi:type="smallint" name="is_required" padding="5" unsigned="true" nullable="true" identity="false"
@@ -274,9 +274,9 @@
274274
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
275275
comment="Website ID"/>
276276
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
277-
default="0" comment="Option Id"/>
277+
default="0" comment="Option ID"/>
278278
<column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
279-
default="0" comment="Selection Id"/>
279+
default="0" comment="Selection ID"/>
280280
<column xsi:type="smallint" name="group_type" padding="5" unsigned="true" nullable="true" identity="false"
281281
default="0" comment="Group Type"/>
282282
<column xsi:type="smallint" name="is_required" padding="5" unsigned="true" nullable="true" identity="false"
@@ -302,7 +302,7 @@
302302
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
303303
comment="Website ID"/>
304304
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
305-
default="0" comment="Option Id"/>
305+
default="0" comment="Option ID"/>
306306
<column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
307307
comment="Min Price"/>
308308
<column xsi:type="decimal" name="alt_price" scale="6" precision="20" unsigned="false" nullable="true"
@@ -329,7 +329,7 @@
329329
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
330330
comment="Website ID"/>
331331
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
332-
default="0" comment="Option Id"/>
332+
default="0" comment="Option ID"/>
333333
<column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
334334
comment="Min Price"/>
335335
<column xsi:type="decimal" name="alt_price" scale="6" precision="20" unsigned="false" nullable="true"

0 commit comments

Comments
 (0)