Remove catalog config from onsite flag (#559)

* Catalog onsite flag dependency removed

* Manual Data Sync: QOL

Improve the manual data sync experience:

1. Always show the Manual Data Sync section
2. Show instructions to select a storeview if on default config
3. Show instructions to connect to Meta if not connected

* Remove unused variable

* Promotions config path fixed

* Promotions config path fixed

---------

Co-authored-by: Steve Gordon <[email protected]>

Author: singhramanpreett

app/code/Meta/BusinessExtension/etc/adminhtml/system.xml

@@ -89,7 +89,6 @@
                 </comment>
                 <depends>
                     <field id="facebook_business_extension/business_extension/active">1</field>
-                    <field id="facebook_business_extension/business_extension/onsite">1</field>
                 </depends>
             </group>
             <group id="manual_data_sync" translate="label" type="text" sortOrder="15" showInDefault="1"
@@ -101,7 +100,6 @@
                 </comment>
                 <depends>
                     <field id="facebook_business_extension/business_extension/active">1</field>
-                    <field id="facebook_business_extension/business_extension/onsite">1</field>
                 </depends>
                 <field id="manual_data_sync_empty" translate="label" type="note" sortOrder="16" showInDefault="1"
                     showInWebsite="0" showInStore="1">

app/code/Meta/Catalog/etc/adminhtml/system.xml

@@ -10,7 +10,8 @@
                     <label>Push Products</label>
                     <depends>
                         <field id="facebook_business_extension/business_extension/installed">1</field>
-                        <field id="facebook_business_extension/catalog_management/enable_catalog_sync">1</field>
+                        <field id="facebook_business_extension/business_extension/enable_catalog_sync">1</field>
+                        <field id="facebook_business_extension/business_extension/active">1</field>
                     </depends>
                     <frontend_model>Meta\Catalog\Block\Adminhtml\System\Config\ProductFeed</frontend_model>
                 </field>
@@ -19,7 +20,8 @@
                     <label>Push Categories</label>
                     <depends>
                         <field id="facebook_business_extension/business_extension/installed">1</field>
-                        <field id="facebook_business_extension/catalog_management/enable_catalog_sync">1</field>
+                        <field id="facebook_business_extension/business_extension/enable_catalog_sync">1</field>
+                        <field id="facebook_business_extension/business_extension/active">1</field>
                     </depends>
                     <comment>Upload Product Categories to Meta</comment>
                     <frontend_model>Meta\Catalog\Block\Adminhtml\System\Config\CategoryFeed</frontend_model>
@@ -45,31 +47,19 @@
                        showInDefault="1" showInWebsite="0" showInStore="1">
                     <label>Out-of-Stock Threshold</label>
                     <depends>
-                        <field id="facebook_business_extension/business_extension/onsite">1</field>
+                        <field id="facebook_business_extension/business_extension/enable_catalog_sync">1</field>
+                        <field id="facebook_business_extension/business_extension/active">1</field>
                     </depends>
                     <config_path>facebook/catalog_management/out_of_stock_threshold</config_path>
                     <comment>Product's availability will be out of stock if inventory count is lower than the specified
                         threshold value
                     </comment>
                 </field>
-                <field id="price_incl_tax" translate="label comment" type="select" sortOrder="50" showInDefault="0"
-                       showInWebsite="0" showInStore="0">
-                    <label>Price Including Tax</label>
-                    <depends>
-                        <field id="facebook_business_extension/business_extension/onsite">1</field>
-                    </depends>
-                    <config_path>facebook/catalog_management/price_incl_tax</config_path>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment>
-                        Use price including tax in feed. Should be "No" for the US and "Yes" for the UK. Note: only
-                        works if Sales -> Tax -> Price Display Settings -> Display Product Prices In Catalog is set to
-                        "Including Tax"
-                    </comment>
-                </field>
             </group>
             <group id="attribute_mapping" translate="label" type="text" sortOrder="30" showInDefault="1"
                    showInWebsite="0" showInStore="1">
                 <depends>
+                    <field id="facebook_business_extension/business_extension/enable_catalog_sync">1</field>
                     <field id="facebook_business_extension/business_extension/active">1</field>
                 </depends>
                 <label>Catalog Configuration</label>

app/code/Meta/Promotions/etc/adminhtml/system.xml

@@ -26,8 +26,9 @@
                     <label>Push Promotions</label>
                     <frontend_model>Meta\Promotions\Block\Adminhtml\System\Config\PushPromotions</frontend_model>
                     <depends>
+                        <field id="facebook_business_extension/business_extension/onsite">1</field>
                         <field id="facebook_business_extension/business_extension/installed">1</field>
-                        <field id="facebook/promotions/enable_promotions_sync">1</field>
+                        <field id="facebook_business_extension/business_extension/enable_promotion_sync">1</field>
                     </depends>
                 </field>
             </group>

app/code/Meta/Sales/etc/adminhtml/system.xml

@@ -11,7 +11,8 @@
                     <frontend_model>Meta\Sales\Block\Adminhtml\System\Config\PullOrders</frontend_model>
                     <depends>
                         <field id="facebook_business_extension/business_extension/installed">1</field>
-                        <field id="facebook_business_extension/orders_sync/active">1</field>
+                        <field id="facebook_business_extension/business_extension/orders_sync_active">1</field>
+                        <field id="facebook_business_extension/business_extension/onsite">1</field>
                     </depends>
                     <comment>Pull orders awaiting acknowledgement from your Meta Commerce Account</comment>
                 </field>
@@ -39,7 +40,7 @@
                     <config_path>facebook/orders_sync/default_fulfillment_location</config_path>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
-                        <field id="facebook_business_extension/orders_sync/active">1</field>
+                        <field id="facebook_business_extension/business_extension/orders_sync_active">1</field>
                         <field id="facebook_business_extension/business_extension/active">1</field>
                     </depends>
                     <comment>Store address is the default fulfillment location</comment>
@@ -48,7 +49,9 @@
                        showInWebsite="0" showInStore="0">
                     <label>Fulfillment Address</label>
                     <depends>
-                        <field id="facebook_business_extension/orders_sync/default_fulfillment_location">0</field>
+                        <field id="facebook_business_extension/business_extension/default_fulfillment_location">
+                            0
+                        </field>
                         <field id="facebook_business_extension/business_extension/active">1</field>
                     </depends>
                     <field id="street_line1" translate="label" type="text" sortOrder="55" showInDefault="0"
@@ -94,7 +97,8 @@
                     <config_path>facebook/orders_sync/auto_subscribe_to_newsletter</config_path>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
-                        <field id="facebook_business_extension/orders_sync/active">1</field>
+                        <field id="facebook_business_extension/business_extension/orders_sync_active">1</field>
+                        <field id="facebook_business_extension/business_extension/onsite">1</field>
                     </depends>
                     <comment>Automatically subscribe buyers to the Adobe Commerce newsletter. Note: only works if the
                         buyer agreed to use their email for marketing purposes on Meta