Merge remote-tracking branch 'origin/2.4-develop' into unittest-Appen…

…dUpsellProductsObserverTest
magento · Jan 17, 2020 · ccc1823 · ccc1823
2 parents c103950 + 77040e5
commit ccc1823
Show file tree

Hide file tree

Showing 215 changed files with 8,640 additions and 1,526 deletions.
diff --git a/app/code/Magento/AdminAnalytics/etc/adminhtml/system.xml b/app/code/Magento/AdminAnalytics/etc/adminhtml/system.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <section id="admin">
-            <group id="usage" translate="label" type="text" sortOrder="2000" showInDefault="1" showInWebsite="0" showInStore="0">
+            <group id="usage" translate="label" type="text" sortOrder="2000" showInDefault="1">
                 <label>Admin Usage</label>
-                <field id="enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1">
                     <label>Enable Admin Usage Tracking</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Allow Magento to track admin usage in order to improve the quality and user experience.</comment>

diff --git a/app/code/Magento/AdminNotification/etc/adminhtml/system.xml b/app/code/Magento/AdminNotification/etc/adminhtml/system.xml
@@ -8,17 +8,17 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <section id="system">
-            <group id="adminnotification" translate="label" type="text" sortOrder="250" showInDefault="1" showInWebsite="0" showInStore="0">
+            <group id="adminnotification" translate="label" type="text" sortOrder="250" showInDefault="1">
                 <label>Notifications</label>
-                <field id="use_https" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="use_https" translate="label" type="select" sortOrder="1" showInDefault="1" canRestore="1">
                     <label>Use HTTPS to Get Feed</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="frequency" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="frequency" translate="label" type="select" sortOrder="2" showInDefault="1" canRestore="1">
                     <label>Update Frequency</label>
                     <source_model>Magento\AdminNotification\Model\Config\Source\Frequency</source_model>
                 </field>
-                <field id="last_update" translate="label" type="label" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="last_update" translate="label" type="label" sortOrder="3" showInDefault="1">
                     <label>Last Update</label>
                     <frontend_model>Magento\Config\Block\System\Config\Form\Field\Notification</frontend_model>
                 </field>

diff --git a/app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml b/app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml
@@ -10,57 +10,39 @@
     <system>
         <section id="catalog">
             <group id="search">
-                <field id="search_recommendations_enabled"
-                       translate="label comment"
-                       type="select"
-                       sortOrder="80"
-                       showInDefault="1"
-                       showInWebsite="1"
-                       showInStore="1">
+                <field id="search_recommendations_enabled" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Enable Search Recommendations</label>
                     <comment>When you enable this option your site may slow down.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="search_recommendations_count"
-                       translate="label"
-                       type="text"
-                       sortOrder="81"
-                       showInDefault="1"
-                       showInWebsite="1"
-                       showInStore="1">
+                <field id="search_recommendations_count" translate="label" type="text" sortOrder="81" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Search Recommendations Count</label>
                     <validate>validate-digits</validate>
                     <depends>
                         <field id="search_recommendations_enabled">1</field>
                     </depends>
                 </field>
-                <field id="search_recommendations_count_results_enabled"
-                       translate="label"
-                       type="select"
-                       sortOrder="82"
-                       showInDefault="1"
-                       showInWebsite="1"
-                       showInStore="1">
+                <field id="search_recommendations_count_results_enabled" translate="label" type="select" sortOrder="82" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Show Results Count for Each Recommendation</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
                         <field id="search_recommendations_enabled">1</field>
                     </depends>
                 </field>
                 <!--<group id="suggestions">-->
-                    <field id="search_suggestion_enabled" translate="label comment" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="search_suggestion_enabled" translate="label comment" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                         <label>Enable Search Suggestions</label>
                         <comment>When you enable this option your site may slow down.</comment>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     </field>
-                    <field id="search_suggestion_count" translate="label" type="text" sortOrder="91" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="search_suggestion_count" translate="label" type="text" sortOrder="91" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                         <label>Search Suggestions Count</label>
                         <validate>validate-digits validate-zero-or-greater</validate>
                         <depends>
                             <field id="search_suggestion_enabled">1</field>
                         </depends>
                     </field>
-                    <field id="search_suggestion_count_results_enabled" translate="label comment" type="select" sortOrder="92" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="search_suggestion_count_results_enabled" translate="label comment" type="select" sortOrder="92" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                         <label>Show Results Count for Each Suggestion</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <comment>When you enable this option your site may slow down.</comment>

diff --git a/app/code/Magento/Analytics/etc/adminhtml/system.xml b/app/code/Magento/Analytics/etc/adminhtml/system.xml
@@ -7,29 +7,29 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        <section id="analytics" translate="label" type="text" sortOrder="1150" showInDefault="1" showInWebsite="1" showInStore="0">
+        <section id="analytics" translate="label" type="text" sortOrder="1150" showInDefault="1" showInWebsite="1">
             <label>Advanced Reporting</label>
             <tab>general</tab>
             <resource>Magento_Analytics::analytics_settings</resource>
-            <group id="general" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <group id="general" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1">
                 <label>Advanced Reporting</label>
                 <comment><![CDATA[This service provides a dynamic suite of reports with rich insights about your business.
                 Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
                 "Go to Advanced Reporting" link. </br> For more information, see our <a target="_blank" href="https://magento.com/legal/terms/cloud-terms">
                 terms and conditions</a>.]]></comment>
-                <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1">
                     <label>Advanced Reporting Service</label>
                     <source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
                     <backend_model>Magento\Analytics\Model\Config\Backend\Enabled</backend_model>
                     <frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\SubscriptionStatusLabel</frontend_model>
                     <config_path>analytics/subscription/enabled</config_path>
                 </field>
-                <field id="collection_time" translate="label" type="time" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="collection_time" translate="label" type="time" sortOrder="20" showInDefault="1">
                     <label>Time of day to send data</label>
                     <frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel</frontend_model>
                     <backend_model>Magento\Analytics\Model\Config\Backend\CollectionTime</backend_model>
                 </field>
-                <field id="vertical" translate="hint label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="vertical" translate="hint label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
                     <hint>Industry Data</hint>
                     <label>Industry</label>
                     <comment>In order to personalize your Advanced Reporting experience, please select your industry.</comment>
@@ -40,7 +40,7 @@
 						<field id="analytics/general/enabled">1</field>
 					</depends>
                 </field>
-                <field id="additional_comment" translate="label comment" type="label" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="additional_comment" translate="label comment" type="label" sortOrder="40" showInDefault="1">
                     <label><![CDATA[<strong>Get more insights from Magento Business Intelligence</strong>]]></label>
                     <comment><![CDATA[Magento Business Intelligence provides you with a simple and clear path to
                     becoming more data driven.</br> Learn more about <a target="_blank"

diff --git a/app/code/Magento/AsynchronousOperations/etc/adminhtml/system.xml b/app/code/Magento/AsynchronousOperations/etc/adminhtml/system.xml
@@ -9,9 +9,9 @@
     <system>
         <section id="system">
             <tab>advanced</tab>
-            <group id="bulk" translate="label" showInDefault="1" showInWebsite="0" showInStore="0" sortOrder="600">
+            <group id="bulk" translate="label" showInDefault="1" sortOrder="600">
                 <label>Bulk Actions</label>
-                <field id="lifetime" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="lifetime" translate="label" type="text" sortOrder="10" showInDefault="1">
                     <label>Days Saved in Log</label>
                      <validate>validate-zero-or-greater validate-digits</validate>
                 </field>