Update default config values (#482)

- Enabled catalog, order sync by default
- Made order sync logic consistent
- Fixed labels for syncing
- Renamed method for consistency

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

Author: sol-loup

app/code/Meta/BusinessExtension/Model/System/Config.php

@@ -393,15 +393,16 @@ public function getOutOfStockThreshold($scopeId = null, $scope = null)
     }
 
     /**
-     * Is active order sync
+     * Is order sync enabled
      *
      * @param int $scopeId
      * @param int $scope
      * @return bool
      */
-    public function isActiveOrderSync($scopeId = null, $scope = null): bool
+    public function isOrderSyncEnabled($scopeId = null, $scope = null): bool
     {
-        return (bool)$this->getConfig(self::XML_PATH_FACEBOOK_ORDERS_SYNC_ACTIVE, $scopeId, $scope);
+        return $this->getConfig(self::XML_PATH_FACEBOOK_ORDERS_SYNC_ACTIVE, $scopeId, $scope) &&
+            $this->getConfig(self::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_ACTIVE, $scopeId, $scope);
     }
 
     /**
@@ -819,7 +820,8 @@ public function isCatalogSyncEnabled($scopeId = null, $scope = ScopeInterface::S
      */
     public function isPromotionsSyncEnabled($scopeId = null, $scope = ScopeInterface::SCOPE_STORES): bool
     {
-        return !!$this->getConfig(self::XML_PATH_FACEBOOK_ENABLE_PROMOTIONS_SYNC, $scopeId, $scope);
+        return $this->getConfig(self::XML_PATH_FACEBOOK_ENABLE_PROMOTIONS_SYNC, $scopeId, $scope) &&
+            $this->getConfig(self::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_ACTIVE, $scopeId, $scope);
     }
 
     /**

app/code/Meta/Catalog/Setup/MetaCatalogAttributes.php

@@ -38,7 +38,7 @@ public function getProductAttributes(): array
             'send_to_facebook' => [
                 'group' => 'General',
                 'type' => 'int',
-                'label' => 'Send to Facebook',
+                'label' => 'Sync to Meta',
                 'default' => 1,
                 'source' => Boolean::class,
                 'input' => 'select',
@@ -65,7 +65,7 @@ public function getCategoryAttributes(): array
         return [
             SystemConfig::CATEGORY_SYNC_TO_FACEBOOK => [
                 'type' => 'int',
-                'label' => 'Sync to Facebook Catalog',
+                'label' => 'Sync to Meta',
                 'input' => 'boolean',
                 'source' => \Magento\Eav\Model\Entity\Attribute\Source\Boolean::class,
                 'visible' => true,

app/code/Meta/Catalog/etc/config.xml

@@ -3,9 +3,8 @@
     <default>
         <facebook>
             <catalog_management>
-                <enable_catalog_sync>0</enable_catalog_sync>
+                <enable_catalog_sync>1</enable_catalog_sync>
                 <price_incl_tax>0</price_incl_tax>
-                <collections_sync>0</collections_sync>
                 <out_of_stock_threshold>0</out_of_stock_threshold>
             </catalog_management>
         </facebook>

app/code/Meta/Sales/Controller/Adminhtml/Ajax/PullOrders.php

@@ -83,7 +83,7 @@ public function executeForJson(): array
             $storeId = $storeParam;
         }
 
-        if (!$this->systemConfig->isActiveOrderSync($storeId)) {
+        if (!$this->systemConfig->isOrdersSyncEnabled($storeId)) {
             $response['success'] = false;
             $response['error_message'] = __('Enable order sync before pulling orders.');
             return $response;

app/code/Meta/Sales/Cron/SyncOrders.php

@@ -79,8 +79,7 @@ public function __construct(
      */
     private function pullOrdersForStore(int $storeId)
     {
-        if (!($this->systemConfig->isActiveExtension($storeId)
-            && $this->systemConfig->isActiveOrderSync($storeId)
+        if (!($this->systemConfig->isOrdersSyncEnabled($storeId)
             && $this->systemConfig->isOnsiteCheckoutEnabled($storeId))) {
             return;
         }

app/code/Meta/Sales/Cron/SyncRefundsAndCancellations.php

@@ -79,8 +79,8 @@ public function __construct(
      */
     private function pullRefundsAndCancellationsForStore(int $storeId)
     {
-        if (!($this->systemConfig->isActiveExtension($storeId)
-            && $this->systemConfig->isActiveOrderSync($storeId))) {
+        if (!($this->systemConfig->isOrdersSyncEnabled($storeId)
+            && $this->systemConfig->isOnsiteCheckoutEnabled($storeId))) {
             return;
         }
 

app/code/Meta/Sales/Observer/Facebook/OrderCreateAfter.php

@@ -94,8 +94,7 @@ public function execute(Observer $observer)
         $facebookOrder = $observer->getEvent()->getFacebookOrder();
         $storeId = $order->getStoreId();
 
-        if (!($this->systemConfig->isActiveExtension($storeId)
-            && $this->systemConfig->isActiveOrderSync($storeId)
+        if (!($this->systemConfig->isOrdersSyncEnabled($storeId)
             && $this->systemConfig->isOnsiteCheckoutEnabled($storeId))) {
             return;
         }

app/code/Meta/Sales/Observer/Order/Cancel.php

@@ -69,8 +69,7 @@ public function execute(Observer $observer)
         $order = $observer->getEvent()->getOrder();
         $storeId = $order->getStoreId();
 
-        if (!($this->systemConfig->isActiveExtension($storeId)
-            && $this->systemConfig->isActiveOrderSync($storeId)
+        if (!($this->systemConfig->isOrdersSyncEnabled($storeId)
             && $this->systemConfig->isOnsiteCheckoutEnabled($storeId))) {
             return;
         }

app/code/Meta/Sales/Observer/Order/MarkAsShipped.php

@@ -88,8 +88,7 @@ public function execute(Observer $observer)
             return;
         }
 
-        if (!($this->systemConfig->isActiveExtension($storeId)
-            && $this->systemConfig->isActiveOrderSync($storeId)
+        if (!($this->systemConfig->isOrdersSyncEnabled($storeId)
             && $this->systemConfig->isOnsiteCheckoutEnabled($storeId))) {
             return;
         }

app/code/Meta/Sales/Observer/Order/Refund.php

@@ -109,8 +109,7 @@ public function execute(Observer $observer)
 
         $storeId = $payment->getOrder()->getStoreId();
 
-        if (!($this->systemConfig->isActiveExtension($storeId)
-            && $this->systemConfig->isActiveOrderSync($storeId)
+        if (!($this->systemConfig->isOrdersSyncEnabled($storeId)
             && $this->systemConfig->isOnsiteCheckoutEnabled($storeId))) {
             return;
         }