Merge pull request #17 from magefan/9528-прибрати-заборону-на-генерацію-json-на-рівні-сайту

9528-прибрати-заборону-на-генерацію-json-на-рівні-сайту

Author: magefan

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,6 +130,10 @@ public function execute()
 
         try {
             $storeId = (string)$this->getRequest()->getParam('store_id') ?: null;
+            if (!$storeId && ($websiteId = ((string)$this->getRequest()->getParam('website_id') ?: null))) {
+                $storeId = $this->storeManager->getWebsite($websiteId)->getDefaultStore()->getId();
+            }
+
             $container = $this->container->generate($storeId);
 
             $fileContent = [

Model/Config.php

@@ -263,4 +263,4 @@ public function isSpeedOptimizationEnabled(string $storeId = null): bool
     {
         return (bool)$this->getConfig(self::XML_PATH_SPEED_OPTIMIZATION_ENABLED, $storeId);
     }
-}
+}

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

@@ -14,34 +14,31 @@ if (!isset($escaper)) {
 }
 ?>
 <div class="pp-buttons-container">
-    <?php if ($block->getRequest()->getParam('website')) { ?>
-        <strong>
-            <?= $escaper->escapeHtml(__('Container generation is not available for website scope.')) ?>
-        </strong>
-    <?php } else { ?>
-        <button type="button" id="mf_download">
-            <?= $escaper->escapeHtml(__('Generate JSON Container & Download File')); ?>
-        </button>
-        <p>
-            <br/>
-            <?= __('Once the JSON file is downloaded, upload it to %1 > Choose Container > Admin > Import Container.', '<a href="https://tagmanager.google.com/" title="Google Tag Manager" target="_blank">Google Tag Manager</a>') ?>
-        </p>
-        <script>
-            require([
-                'jquery',
-                'domReady!'
-            ], function ($) {
-                $('#mf_download').on('click', function(event) {
-                    event.preventDefault;
-                    window.location='<?= $escaper->escapeUrl(
-                        $block->getUrl(
-                            'mfgoogletagmanager/container/generate',
-                            ['store_id' => (int)$block->getRequest()->getParam('store') ?: null]
-                        )
-                    )?>';
-                });
+    <button type="button" id="mf_download">
+        <?= $escaper->escapeHtml(__('Generate JSON Container & Download File')); ?>
+    </button>
+    <p>
+        <br/>
+        <?= __('Once the JSON file is downloaded, upload it to %1 > Choose Container > Admin > Import Container.', '<a href="https://tagmanager.google.com/" title="Google Tag Manager" target="_blank">Google Tag Manager</a>') ?>
+    </p>
+    <script>
+        require([
+            'jquery',
+            'domReady!'
+        ], function ($) {
+            $('#mf_download').on('click', function(event) {
+                event.preventDefault;
+                window.location='<?= $escaper->escapeUrl(
+                    $block->getUrl(
+                        'mfgoogletagmanager/container/generate',
+                        [
+                            'store_id' => (int)$block->getRequest()->getParam('store') ?: null,
+                            'website_id' => (int)$block->getRequest()->getParam('website') ?: null
+                        ]
+                    )
+                )?>';
             });
-        </script>
-    <?php } ?>
+        });
+    </script>
 </div>