Better fix for product edit pages

yireo · Mar 14, 2023 · f9a1cc4 · f9a1cc4
1 parent d5af3d9
commit f9a1cc4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.0.17] - 14 March 2023
+### Fixed
+- Better fix for product edit pages
+
 ## [3.0.16] - 13 March 2023
 ### Fixed
 - Cast prices to float in orders and order items #133 (@lfolco)

diff --git a/Util/GetCurrentProduct.php b/Util/GetCurrentProduct.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+declare(strict_types=1);
 
 namespace Yireo\GoogleTagManager2\Util;
 
@@ -23,18 +24,18 @@ public function __construct(
         $this->productRepository = $productRepository;
         $this->storeManager = $storeManager;
     }
-
+    
     /**
      * @return ProductInterface
      * @throws NoSuchEntityException
      */
     public function get(): ProductInterface
     {
         $productId = (int)$this->request->getParam('id');
-        if (empty($productId)) {
+        if ($this->request->getActionName() === 'configure' || empty($productId)) {
             $productId = (int)$this->request->getParam('product_id');
         }
-
+        
         return $this->productRepository->getById($productId, false, $this->storeManager->getStore()->getId());
     }
 }
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "yireo/magento2-googletagmanager2",
-  "version": "3.0.16",
+  "version": "3.0.17",
   "license": "OSL-3.0",
   "type": "magento2-module",
   "homepage": "https://www.yireo.com/software/magento-extensions/googletagmanager2",