9528-default-store-id-for-website-id

Author: DenysTsymbal

Controller/Adminhtml/Container/Generate.php

@@ -21,6 +21,7 @@
 use Psr\Log\LoggerInterface;
 use Magefan\GoogleTagManager\Model\Config;
 use Magefan\GoogleTagManager\Model\Container;
+use Magento\Store\Model\StoreManagerInterface;
 
 class Generate extends Action implements HttpGetActionInterface
 {
@@ -66,6 +67,11 @@ class Generate extends Action implements HttpGetActionInterface
      */
     private $container;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * Generate constructor.
      *
@@ -77,6 +83,7 @@ class Generate extends Action implements HttpGetActionInterface
      * @param RedirectInterface $redirect
      * @param Config $config
      * @param Container $container
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         Context $context,
@@ -86,7 +93,8 @@ public function __construct(
         LoggerInterface $logger,
         RedirectInterface $redirect,
         Config $config,
-        Container $container
+        Container $container,
+        StoreManagerInterface $storeManager
     ) {
         $this->resultRawFactory = $resultRawFactory;
         $this->fileFactory = $fileFactory;
@@ -95,6 +103,7 @@ public function __construct(
         $this->redirect = $redirect;
         $this->config = $config;
         $this->container = $container;
+        $this->storeManager = $storeManager;
         parent::__construct($context);
     }
 
@@ -121,8 +130,8 @@ public function execute()
 
         try {
             $storeId = (string)$this->getRequest()->getParam('store_id') ?: null;
-            if (!$storeId) {
-                $storeId = (string)$this->getRequest()->getParam('mf_generate_website_id') ?: null;
+            if (!$storeId && ($websiteId = ((string)$this->getRequest()->getParam('website_id') ?: null))) {
+                $storeId = $this->storeManager->getWebsite($websiteId)->getDefaultStore()->getId();
             }
 
             $container = $this->container->generate($storeId);

Model/Config.php

@@ -11,7 +11,6 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Config\Model\Config\Backend\Admin\Custom;
-use Magento\Framework\App\RequestInterface;
 
 class Config
 {
@@ -59,23 +58,15 @@ class Config
      */
     private $scopeConfig;
 
-    /**
-     * @var RequestInterface
-     */
-    private $request;
-
     /**
      * Config constructor.
      *
      * @param ScopeConfigInterface $scopeConfig
-     * @param RequestInterface $request
      */
     public function __construct(
-        ScopeConfigInterface $scopeConfig,
-        RequestInterface $request
+        ScopeConfigInterface $scopeConfig
     ) {
         $this->scopeConfig = $scopeConfig;
-        $this->request = $request;
     }
 
     /**
@@ -259,8 +250,7 @@ public function getInstallGtm(string $storeId = null): string
      */
     public function getConfig(string $path, string $storeId = null)
     {
-        $scope = $this->request->getParam('mf_generate_website_id') ? ScopeInterface::SCOPE_WEBSITE : ScopeInterface::SCOPE_STORE;
-        return $this->scopeConfig->getValue($path, $scope, $storeId);
+        return $this->scopeConfig->getValue($path,  ScopeInterface::SCOPE_STORE, $storeId);
     }
 
     /**

view/adminhtml/templates/system/config/button/button.phtml

@@ -33,7 +33,7 @@ if (!isset($escaper)) {
                         'mfgoogletagmanager/container/generate',
                         [
                             'store_id' => (int)$block->getRequest()->getParam('store') ?: null,
-                            'mf_generate_website_id' => (int)$block->getRequest()->getParam('website') ?: null
+                            'website_id' => (int)$block->getRequest()->getParam('website') ?: null
                         ]
                     )
                 )?>';