Merge branch 'github/main' into develop

ActiveCampaign · Jan 10, 2022 · aa8fbd8 · aa8fbd8
2 parents 2098dd3 + 5f3135f
commit aa8fbd8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/Core/Controller/Adminhtml/System/Config/Connect.php b/Core/Controller/Adminhtml/System/Config/Connect.php
@@ -91,6 +91,10 @@ public function __construct(
     public function execute()
     {
         $request = $this->getRequest()->getParams();
+
+        // Set store to default if Single store mode
+        $request['store'] = $request['store'] ?? $this->storeManager->getDefaultStoreView()->getId();
+
         $return = [];
 
         if ($request['status'] && !empty($request['api_url']) && !empty($request['api_key'])) {

diff --git a/Core/Controller/Adminhtml/System/Config/Disconnect.php b/Core/Controller/Adminhtml/System/Config/Disconnect.php
@@ -12,6 +12,7 @@
 use Magento\PageCache\Model\Cache\Type;
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class Disconnect extends Action
 {
@@ -56,13 +57,19 @@ class Disconnect extends Action
      */
     private $curl;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * Connection constructor.
      * @param Context $context
      * @param JsonFactory $resultJsonFactory
      * @param TypeListInterface $cacheTypeList
      * @param ConfigInterface $configInterface
      * @param StoreRepositoryInterface $storeRepository
+     * @param StoreManagerInterface $storeManager
      * @param ActiveCampaignHelper $activeCampaignHelper
      * @param Curl $curl
      */
@@ -72,6 +79,7 @@ public function __construct(
         TypeListInterface $cacheTypeList,
         ConfigInterface $configInterface,
         StoreRepositoryInterface $storeRepository,
+        StoreManagerInterface $storeManager,
         ActiveCampaignHelper $activeCampaignHelper,
         Curl $curl
     ) {
@@ -80,6 +88,7 @@ public function __construct(
         $this->cacheTypeList = $cacheTypeList;
         $this->configInterface = $configInterface;
         $this->storeRepository = $storeRepository;
+        $this->storeManager = $storeManager;
         $this->activeCampaignHelper = $activeCampaignHelper;
         $this->curl = $curl;
     }
@@ -92,6 +101,10 @@ public function __construct(
     public function execute()
     {
         $request = $this->getRequest()->getParams();
+
+        // Set store to default if Single store mode
+        $request['store'] = $request['store'] ?? $this->storeManager->getDefaultStoreView()->getId();
+
         $return = [];
         $return['success'] = false;