v.1.0.4

Tun2U · Oct 29, 2019 · 8a116f8 · 8a116f8
1 parent f67d103
commit 8a116f8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 30 deletions.
diff --git a/Block/Product/ProductList/Related.php b/Block/Product/ProductList/Related.php
@@ -9,6 +9,9 @@
 
 namespace Tun2U\AutoRelated\Block\Product\ProductList;
 
+use Magento\Framework\ObjectManagerInterface;
+use Tun2U\AutoRelated\Model\Collection;
+
 class Related extends \Magento\Catalog\Block\Product\ProductList\Related
 {
 
@@ -42,10 +45,9 @@ public function __construct(
         \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Framework\Module\Manager $moduleManager,
-        \Magento\Framework\ObjectManagerInterface $helperFactory,
-        \Tun2U\AutoRelated\Model\Collection $collection,
-        \Tun2U\AutoRelated\Helper\Data $helper,
-        array $data = []
+        array $data = [],
+        ObjectManagerInterface $helperFactory,
+        Collection $collection
     ) {
         $this->_helper = $helperFactory;
         $this->_registry = $context->getRegistry();
@@ -61,12 +63,8 @@ public function __construct(
             $data
         );
 
-        $this->setBlockType('related');
-
-        $this->helper = $helper;
-
         // Only cache if we have something thats keyable..
-        $_time = $this->helper->get_cache_lifetime();
+        $_time = $this->_helper->get('Tun2U\AutoRelated\Helper\Data')->get_cache_lifetime();
 
         if ($_time > 0 && $cacheKey = $this->_cacheKey()) {
             $this->addData(array(
@@ -77,16 +75,6 @@ public function __construct(
         }
     }
 
-    public function getHelper()
-    {
-        // Amasty Cart
-        if ($this->moduleManager->isOutputEnabled('Amasty_Cart')) {
-            return $this->_helper->get('Amasty\Cart\Helper\Data');
-        }
-
-        return $this->helper;
-    }
-
     protected function _cacheKey()
     {
         $product = $this->_registry->registry('product');
@@ -102,7 +90,7 @@ protected function _prepareData()
     {
         parent::_prepareData();
 
-        $_enabled = $this->helper->get_enabled();
+        $_enabled = $this->_helper->get('Tun2U\AutoRelated\Helper\Data')->get_enabled();
 
         if ($_enabled && count($this->getItems()) == 0) {
             $_products = $this->_collection->getRelatedProducts();
@@ -111,10 +99,6 @@ protected function _prepareData()
             }
         }
 
-        foreach ($this->_itemCollection as $product) {
-            $product->setDoNotUseCategoryId(true);
-        }
-
         return $this;
     }
 

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "keywords": ["magento2","autorelated","related","products"],
     "homepage": "https://github.com/Tun2U/M2-AutoRelated",
     "type": "magento2-module",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "minimum-stability": "stable",
     "license": "GPL-3.0",
     "authors": [

diff --git a/etc/di.xml b/etc/di.xml
@@ -10,5 +10,4 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
     <preference for="Magento\Catalog\Block\Product\ProductList\Related" type="Tun2U\AutoRelated\Block\Product\ProductList\Related" />
-	<preference for="Amasty\Cart\Block\Product\Related" type="Tun2U\AutoRelated\Block\Product\ProductList\Related" />
 </config>
diff --git a/etc/module.xml b/etc/module.xml
@@ -9,8 +9,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Tun2U_AutoRelated" setup_version="1.0.3" />
-    <sequence>
-        <module name="Amasty_Cart" />
-    </sequence>
+    <module name="Tun2U_AutoRelated" setup_version="1.0.4" />
 </config>