Merge pull request #47 from landofcoder/develop

updated files

Author: landofcoder

Block/AbstractWidget.php

@@ -23,6 +23,10 @@
 
 namespace Lof\ProductTags\Block\Tag\Product;
 
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Registry;
+use Magento\Framework\Exception\LocalizedException;
+
 class TagProduct extends \Magento\Framework\View\Element\Template
 {
     protected $resultPageFactory;
@@ -33,16 +37,28 @@ class TagProduct extends \Magento\Framework\View\Element\Template
 
     protected $_tagHelper;
 
+    /**
+     * @var Registry
+     */
+    protected $registry;
+
+    /**
+     * @var Product
+     */
+    private $product;
+
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
         \Lof\ProductTags\Model\TagFactory $tagFactory,
         \Lof\ProductTags\Helper\Data $tagdata,
+        Registry $registry,
         array $data = []
     ) {
         $this->resultPageFactory = $resultPageFactory;
         $this->_tagFactory = $tagFactory;
         $this->_tagHelper = $tagdata;
+        $this->registry = $registry;
         parent::__construct($context, $data);
     }
     public function _toHtml(){
@@ -54,21 +70,43 @@ public function _toHtml(){
         }
         return "";
     }
+
+    /**
+     * @return Product
+     */
+    private function getProduct()
+    {
+        if (is_null($this->product)) {
+            $this->product = $this->registry->registry('product');
+
+            if (!$this->product->getId()) {
+                throw new LocalizedException(__('Failed to initialize product'));
+            }
+        }
+
+        return $this->product;
+    }
+
     function getTagHelper(){
         return $this->_tagHelper;
     }
     public function getTagCollection()
     {
         if(!$this->_tagcollection){
-            $limit = $this->_tagHelper->getGeneralConfig('number_tags');
-            $limit = $limit?(int)$limit:10;
-            $tag = $this->_tagFactory->create();
-            $collection = $tag->getCollection();
-            $collection->addFieldToFilter("status", 1);
-            $collection->setOrder("tag_id","DESC");
-            $collection->setPageSize($limit);
-            //$collection->setLimit($limit);
-            $this->_tagcollection = $collection;
+            $product = $this->getProduct();
+            $product_id = $product->getId();
+            if($product_id){
+                $limit = $this->_tagHelper->getGeneralConfig('number_tags');
+                $limit = $limit?(int)$limit:10;
+                $tag = $this->_tagFactory->create();
+                $collection = $tag->getCollection();
+                $collection->addFieldToFilter("status", 1);
+                $collection->addProductToFilter($product_id);
+                $collection->setOrder("tag_id","DESC");
+                $collection->setPageSize($limit);
+                //$collection->setLimit($limit);
+                $this->_tagcollection = $collection;
+            }
         }
         return $this->_tagcollection;
     }

Block/Tag/Product/TagProduct.php

@@ -27,7 +27,6 @@ public function __construct(
    }
    public function match(\Magento\Framework\App\RequestInterface $request)
    {
-       die("Awetae");
         if (!$this->dispatched) {
 
             $identifier = trim($request->getPathInfo(), '/');

Controller/Router.php

@@ -142,6 +142,7 @@ protected function performAddStoreFilter($store, $withAdmin = true)
 
         $this->addFilter('store', ['in' => $store], 'public');
     }
+    
 
     /**
      * Join store relation table if there is store filter
@@ -157,13 +158,30 @@ protected function joinStoreRelationTable($tableName, $linkField)
                 ['store_table' => $this->getTable($tableName)],
                 'main_table.' . $linkField . ' = store_table.' . $linkField,
                 []
-            )->group(
+            )->where('')->group(
                 'main_table.' . $linkField
             );
         }
+        
         parent::_renderFiltersBefore();
     }
 
+
+    public function addProductToFilter($product_id = 0){
+        if($product_id) {
+            $this->getSelect()->join(
+                ['product_table' => $this->getTable('lof_producttags_product')],
+                'main_table.tag_id = product_table.tag_id',
+                []
+            )->where('product_table.product_id = ?', (int)$product_id)->group(
+                'main_table.tag_id'
+            );
+        }
+        return $this;
+    }
+
+    
+
     /**
      * Get SQL for get record count
      *