Skip to content

Commit 9d8ce1c

Browse files
slavvkaslavvka
authored
Merge branch '2.4-develop' into project_pepe
2 parents 5111c05 + 77040e5 commit 9d8ce1c

File tree

382 files changed

+14898
-2109
lines changed

Some content is hidden

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

382 files changed

+14898
-2109
lines changed

‎app/code/Magento/AdminAnalytics/etc/adminhtml/system.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
99
<system>
1010
<section id="admin">
11-
<group id="usage" translate="label" type="text" sortOrder="2000" showInDefault="1" showInWebsite="0" showInStore="0">
11+
<group id="usage" translate="label" type="text" sortOrder="2000" showInDefault="1">
1212
<label>Admin Usage</label>
13-
<field id="enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
13+
<field id="enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1">
1414
<label>Enable Admin Usage Tracking</label>
1515
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
1616
<comment>Allow Magento to track admin usage in order to improve the quality and user experience.</comment>

‎app/code/Magento/AdminNotification/etc/adminhtml/system.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
99
<system>
1010
<section id="system">
11-
<group id="adminnotification" translate="label" type="text" sortOrder="250" showInDefault="1" showInWebsite="0" showInStore="0">
11+
<group id="adminnotification" translate="label" type="text" sortOrder="250" showInDefault="1">
1212
<label>Notifications</label>
13-
<field id="use_https" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
13+
<field id="use_https" translate="label" type="select" sortOrder="1" showInDefault="1" canRestore="1">
1414
<label>Use HTTPS to Get Feed</label>
1515
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
1616
</field>
17-
<field id="frequency" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
17+
<field id="frequency" translate="label" type="select" sortOrder="2" showInDefault="1" canRestore="1">
1818
<label>Update Frequency</label>
1919
<source_model>Magento\AdminNotification\Model\Config\Source\Frequency</source_model>
2020
</field>
21-
<field id="last_update" translate="label" type="label" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0">
21+
<field id="last_update" translate="label" type="label" sortOrder="3" showInDefault="1">
2222
<label>Last Update</label>
2323
<frontend_model>Magento\Config\Block\System\Config\Form\Field\Notification</frontend_model>
2424
</field>

‎app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,57 +10,39 @@
1010
<system>
1111
<section id="catalog">
1212
<group id="search">
13-
<field id="search_recommendations_enabled"
14-
translate="label comment"
15-
type="select"
16-
sortOrder="80"
17-
showInDefault="1"
18-
showInWebsite="1"
19-
showInStore="1">
13+
<field id="search_recommendations_enabled" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
2014
<label>Enable Search Recommendations</label>
2115
<comment>When you enable this option your site may slow down.</comment>
2216
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
2317
</field>
24-
<field id="search_recommendations_count"
25-
translate="label"
26-
type="text"
27-
sortOrder="81"
28-
showInDefault="1"
29-
showInWebsite="1"
30-
showInStore="1">
18+
<field id="search_recommendations_count" translate="label" type="text" sortOrder="81" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
3119
<label>Search Recommendations Count</label>
3220
<validate>validate-digits</validate>
3321
<depends>
3422
<field id="search_recommendations_enabled">1</field>
3523
</depends>
3624
</field>
37-
<field id="search_recommendations_count_results_enabled"
38-
translate="label"
39-
type="select"
40-
sortOrder="82"
41-
showInDefault="1"
42-
showInWebsite="1"
43-
showInStore="1">
25+
<field id="search_recommendations_count_results_enabled" translate="label" type="select" sortOrder="82" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
4426
<label>Show Results Count for Each Recommendation</label>
4527
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
4628
<depends>
4729
<field id="search_recommendations_enabled">1</field>
4830
</depends>
4931
</field>
5032
<!--<group id="suggestions">-->
51-
<field id="search_suggestion_enabled" translate="label comment" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
33+
<field id="search_suggestion_enabled" translate="label comment" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
5234
<label>Enable Search Suggestions</label>
5335
<comment>When you enable this option your site may slow down.</comment>
5436
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
5537
</field>
56-
<field id="search_suggestion_count" translate="label" type="text" sortOrder="91" showInDefault="1" showInWebsite="1" showInStore="1">
38+
<field id="search_suggestion_count" translate="label" type="text" sortOrder="91" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
5739
<label>Search Suggestions Count</label>
5840
<validate>validate-digits validate-zero-or-greater</validate>
5941
<depends>
6042
<field id="search_suggestion_enabled">1</field>
6143
</depends>
6244
</field>
63-
<field id="search_suggestion_count_results_enabled" translate="label comment" type="select" sortOrder="92" showInDefault="1" showInWebsite="1" showInStore="1">
45+
<field id="search_suggestion_count_results_enabled" translate="label comment" type="select" sortOrder="92" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
6446
<label>Show Results Count for Each Suggestion</label>
6547
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
6648
<comment>When you enable this option your site may slow down.</comment>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<argument name="submenuUiId" value="{{AdminMenuReportsBusinessIntelligenceAdvancedReporting.dataUiId}}"/>
3131
</actionGroup>
3232
<switchToNextTab stepKey="switchToNewTab"/>
33+
<waitForPageLoad stepKey="waitForAdvancedReportingPageLoad"/>
3334
<seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
3435
</test>
3536
</tests>

‎app/code/Magento/Analytics/etc/adminhtml/system.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
99
<system>
10-
<section id="analytics" translate="label" type="text" sortOrder="1150" showInDefault="1" showInWebsite="1" showInStore="0">
10+
<section id="analytics" translate="label" type="text" sortOrder="1150" showInDefault="1" showInWebsite="1">
1111
<label>Advanced Reporting</label>
1212
<tab>general</tab>
1313
<resource>Magento_Analytics::analytics_settings</resource>
14-
<group id="general" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
14+
<group id="general" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1">
1515
<label>Advanced Reporting</label>
1616
<comment><![CDATA[This service provides a dynamic suite of reports with rich insights about your business.
1717
Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
1818
"Go to Advanced Reporting" link. </br> For more information, see our <a target="_blank" href="https://magento.com/legal/terms/cloud-terms">
1919
terms and conditions</a>.]]></comment>
20-
<field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
20+
<field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1">
2121
<label>Advanced Reporting Service</label>
2222
<source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
2323
<backend_model>Magento\Analytics\Model\Config\Backend\Enabled</backend_model>
2424
<frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\SubscriptionStatusLabel</frontend_model>
2525
<config_path>analytics/subscription/enabled</config_path>
2626
</field>
27-
<field id="collection_time" translate="label" type="time" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
27+
<field id="collection_time" translate="label" type="time" sortOrder="20" showInDefault="1">
2828
<label>Time of day to send data</label>
2929
<frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel</frontend_model>
3030
<backend_model>Magento\Analytics\Model\Config\Backend\CollectionTime</backend_model>
3131
</field>
32-
<field id="vertical" translate="hint label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
32+
<field id="vertical" translate="hint label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
3333
<hint>Industry Data</hint>
3434
<label>Industry</label>
3535
<comment>In order to personalize your Advanced Reporting experience, please select your industry.</comment>
@@ -40,7 +40,7 @@
4040
<field id="analytics/general/enabled">1</field>
4141
</depends>
4242
</field>
43-
<field id="additional_comment" translate="label comment" type="label" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
43+
<field id="additional_comment" translate="label comment" type="label" sortOrder="40" showInDefault="1">
4444
<label><![CDATA[<strong>Get more insights from Magento Business Intelligence</strong>]]></label>
4545
<comment><![CDATA[Magento Business Intelligence provides you with a simple and clear path to
4646
becoming more data driven.</br> Learn more about <a target="_blank"

‎app/code/Magento/AsynchronousOperations/etc/adminhtml/system.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<system>
1010
<section id="system">
1111
<tab>advanced</tab>
12-
<group id="bulk" translate="label" showInDefault="1" showInWebsite="0" showInStore="0" sortOrder="600">
12+
<group id="bulk" translate="label" showInDefault="1" sortOrder="600">
1313
<label>Bulk Actions</label>
14-
<field id="lifetime" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
14+
<field id="lifetime" translate="label" type="text" sortOrder="10" showInDefault="1">
1515
<label>Days Saved in Log</label>
1616
<validate>validate-zero-or-greater validate-digits</validate>
1717
</field>

0 commit comments

Comments
 (0)