Merge pull request #560 from PrestaShopCorp/SC-39_active-multishop

Activate multishop support

controllers/admin/AdminPsfacebookModuleController.php

@@ -23,7 +23,6 @@
 use PrestaShop\Module\PrestashopFacebook\Config\Env;
 use PrestaShop\Module\PrestashopFacebook\Handler\ErrorHandler\ErrorHandler;
 use PrestaShop\Module\PrestashopFacebook\Presenter\ModuleUpgradePresenter;
-use PrestaShop\Module\PrestashopFacebook\Provider\MultishopDataProvider;
 use PrestaShop\Module\PrestashopFacebook\Repository\ShopRepository;
 use PrestaShop\PrestaShop\Core\Addon\Module\ModuleManagerBuilder;
 use PrestaShop\PsAccountsInstaller\Installer\Facade\PsAccounts;
@@ -50,11 +49,6 @@ class AdminPsfacebookModuleController extends ModuleAdminController
      */
     private $moduleUpgradePresenter;
 
-    /**
-     * @var MultishopDataProvider
-     */
-    private $multishopDataProvider;
-
     /**
      * @var ShopRepository
      */
@@ -69,7 +63,6 @@ public function __construct()
         $this->configurationAdapter = $this->module->getService(ConfigurationAdapter::class);
         $this->env = $this->module->getService(Env::class);
         $this->moduleUpgradePresenter = $this->module->getService(ModuleUpgradePresenter::class);
-        $this->multishopDataProvider = $this->module->getService(MultishopDataProvider::class);
         $this->shopRepository = $this->module->getService(ShopRepository::class);
         $this->module->getService(ErrorHandler::class);
         $this->bootstrap = false;
@@ -158,7 +151,7 @@ public function initContent()
                 ->present($this->module->name),
             'psAccountsToken' => $psAccountsData['psAccountsToken'],
             'defaultCategory' => $this->shopRepository->getDefaultCategoryShop(),
-            'psAccountShopInConflict' => $this->multishopDataProvider->isCurrentShopInConflict($this->context->shop),
+            'psAccountShopInConflict' => false,
             'psFacebookAppId' => $this->env->get('PSX_FACEBOOK_APP_ID'),
             'psFacebookFbeUiUrl' => $this->env->get('PSX_FACEBOOK_UI_URL'),
             'psFacebookSegmentId' => $this->env->get('PSX_FACEBOOK_SEGMENT_API_KEY'),