resolved conflicts

Author: priyambad

app/code/Meta/BusinessExtension/Block/Adminhtml/Setup.php

@@ -141,6 +141,14 @@ public function fetchConfigurationAjaxRoute()
      *
      * @return mixed
      */
+    public function getCleanCacheAjaxRoute()
+    {
+        return $this->fbeHelper->getUrl('fbeadmin/ajax/cleanCache');
+    }
+
+    /**
+     * @return mixed
+     */
     public function getDeleteAssetIdsAjaxRoute()
     {
         return $this->fbeHelper->getUrl('fbeadmin/ajax/fbdeleteasset');

app/code/Meta/BusinessExtension/Block/Adminhtml/System/Config/Field/Hidden.php

@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Field renderer for hidden fields
+ */
+
+declare(strict_types=1);
+
+namespace Meta\BusinessExtension\Block\Adminhtml\System\Config\Field;
+
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+use Magento\Config\Block\System\Config\Form\Field;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+class Hidden extends Field
+{
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @param Context $context
+     * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     */
+    public function __construct(Context $context, array $data = [], ?SecureHtmlRenderer $secureRenderer = null)
+    {
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        parent::__construct($context, $data, $secureRenderer);
+        $this->secureRenderer = $secureRenderer;
+    }
+
+    /**
+     * Decorate field row html to be invisible
+     *
+     * @param AbstractElement $element
+     * @param string $html
+     * @return string
+     */
+    protected function _decorateRowHtml(AbstractElement $element, $html)
+    {
+        return '<tr id="row_' . $element->getHtmlId() . '" >' . $html . '</tr>' .
+            /* @noEscape */ $this->secureRenderer->renderStyleAsTag(
+                "display: none;",
+                'tr#row_' . $element->getHtmlId()
+            );
+    }
+}

app/code/Meta/BusinessExtension/Controller/Adminhtml/Ajax/ResetSettings.php renamed to app/code/Meta/BusinessExtension/Controller/Adminhtml/Ajax/CleanCache.php

@@ -17,12 +17,12 @@
 
 namespace Meta\BusinessExtension\Controller\Adminhtml\Ajax;
 
-use Meta\BusinessExtension\Helper\FBEHelper;
-use Meta\BusinessExtension\Model\System\Config as SystemConfig;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Controller\Result\JsonFactory;
+use Meta\BusinessExtension\Helper\FBEHelper;
+use Meta\BusinessExtension\Model\System\Config as SystemConfig;
 
-class ResetSettings extends AbstractAjax
+class CleanCache extends AbstractAjax
 {
     /**
      * @var FBEHelper
@@ -35,6 +35,8 @@ class ResetSettings extends AbstractAjax
     private $systemConfig;
 
     /**
+     * Construct
+     *
      * @param Context $context
      * @param JsonFactory $resultJsonFactory
      * @param FBEHelper $fbeHelper
@@ -51,28 +53,24 @@ public function __construct(
         $this->systemConfig = $systemConfig;
     }
 
-    /**
-     * @return array
-     */
     public function executeForJson()
     {
-        $storeId = $this->getRequest()->getParam('store');
-        $defaultStoreId = $this->fbeHelper->getStore()->getId();
-        $this->systemConfig->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_COMMERCE_ACCOUNT_ID, $storeId)
-            ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_ACCESS_TOKEN, $storeId)
-            ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PAGE_ID, $storeId)
-            ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_CATALOG_ID, $storeId)
-            ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_FEED_ID, $storeId)
-            ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_FEED_ID, $defaultStoreId)
-            ->saveConfig(SystemConfig::XML_PATH_FACEBOOK_ORDERS_SYNC_ACTIVE, 0, $storeId)
-            ->cleanCache();
+        try {
+            // clean Magento config cache
+            $this->systemConfig->cleanCache();
 
-        $successMessage = __('Successfully removed core configuration data.');
-        $this->messageManager->addSuccessMessage($successMessage);
+            $response['success'] = true;
+            $response['message'] = __('Config cache successfully cleaned');
 
-        return [
-            'success' => true,
-            'message' => $successMessage,
-        ];
+            if ($this->systemConfig->isDebugMode()) {
+                $this->fbeHelper->log($response['message']);
+            }
+            return $response;
+        } catch (\Exception $e) {
+            $response['success'] = false;
+            $response['message'] = $e->getMessage();
+            $this->fbeHelper->logException($e);
+            return $response;
+        }
     }
 }

app/code/Meta/BusinessExtension/Controller/Adminhtml/Ajax/Fbdeleteasset.php

@@ -23,12 +23,20 @@
 
 class Fbdeleteasset extends AbstractAjax
 {
+    const DELETE_SUCCESS_MESSAGE = "You have successfully deleted Meta Business Extension.
+    The pixel installed on your website is now deleted.";
+
+    const DELETE_FAILURE_MESSAGE = "There was a problem deleting the connection.
+      Please try again.";
+
     /**
      * @var FBEHelper
      */
     private $fbeHelper;
 
     /**
+     * Construct
+     *
      * @param Context $context
      * @param JsonFactory $resultJsonFactory
      * @param FBEHelper $fbeHelper
@@ -47,6 +55,19 @@ public function __construct(
      */
     public function executeForJson()
     {
-        return $this->fbeHelper->deleteConfigKeys();
+        try {
+            $this->fbeHelper->deleteConfigKeys();
+            $response = [
+                'success' => true,
+                'message' => __(self::DELETE_SUCCESS_MESSAGE),
+            ];
+        } catch (\Exception $e) {
+            $this->fbeHelper->log($e->getMessage());
+            $response = [
+                'success' => false,
+                'error_message' => __(self::DELETE_FAILURE_MESSAGE),
+            ];
+        }
+        return $response;
     }
 }

app/code/Meta/BusinessExtension/Controller/Adminhtml/Ajax/Fbprofiles.php

@@ -28,6 +28,11 @@
  */
 class Fbprofiles extends AbstractAjax
 {
+    /**
+     * @var FBEHelper
+     */
+    private $fbeHelper;
+
     /**
      * @var SystemConfig
      */
@@ -48,6 +53,7 @@ public function __construct(
         SystemConfig $systemConfig
     ) {
         parent::__construct($context, $resultJsonFactory, $fbeHelper);
+        $this->fbeHelper = $fbeHelper;
         $this->systemConfig = $systemConfig;
     }
 

app/code/Meta/BusinessExtension/Controller/Adminhtml/Ajax/PersistAccessToken.php

@@ -183,6 +183,7 @@ public function completeOnsiteOnboarding($accessToken, $pageId, $storeId)
         $commerceAccountId = $this->graphApiAdapter->getPageMerchantSettingsId($pageAccessToken, $pageId);
         if (!$commerceAccountId) {
             // commerce account may not be created at this point
+            $this->fbeHelper->log('No commerce account available, skipping onboarding to onsite checkout');
             return $this;
         }