Merge pull request #40 from landofcoder/develop

landofcoder · web-flow · commit 1510f00f0814 · 2019-11-08T16:59:30.000+07:00
Develop
diff --git a/Block/Tag/Product/Sidebar.php b/Block/Tag/Product/Sidebar.php
@@ -48,7 +48,11 @@ public function __construct(
     public function _toHtml(){
         if(!$this->_tagHelper->getGeneralConfig('enabled')) return;
         if(!$this->_tagHelper->getGeneralConfig('enable_tag_sidebar')) return;
-        return parent::_toHtml();
+        $_tag_collection = $this->getTagCollection();
+        if($_tag_collection && $_tag_collection->getSize()){
+            return parent::_toHtml();
+        }
+        return "";
     }
     function getTagHelper(){
         return $this->_tagHelper;
diff --git a/Block/Tag/Product/TagProduct.php b/Block/Tag/Product/TagProduct.php
@@ -48,7 +48,11 @@ public function __construct(
     public function _toHtml(){
         if(!$this->_tagHelper->getGeneralConfig('enabled')) return;
         if(!$this->_tagHelper->getGeneralConfig('enable_tag_on_product')) return;
-        return parent::_toHtml();
+        $_tag_collection = $this->getTagCollection();
+        if($_tag_collection && $_tag_collection->getSize()){
+            return parent::_toHtml();
+        }
+        return "";
     }
     function getTagHelper(){
         return $this->_tagHelper;
diff --git a/composer.json b/composer.json
@@ -3,6 +3,7 @@
     "description": "Assign one or multiple tags to your products and improve the navigation for your customers, who can narrow the search results by tags in the Product Filters or, vice versa, see all products with the tags",
     "type": "magento2-module",
     "license": "MIT",
+    "version": "1.0.1",
     "authors": [
         {
             "name": "Landofcoder",
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -2,7 +2,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
 	<system>
 		<tab id="landofcoder" sortOrder="999" translate="label">
-			<label>landofcoder</label>
+			<label>Landofcoder.com</label>
 		</tab>
 		<section id="lofproductags" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label">
 			<label>lofproductags</label>
diff --git a/etc/module.xml b/etc/module.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" ?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-	<module name="Lof_ProductTags" setup_version="1.0.0"/>
+	<module name="Lof_ProductTags" setup_version="1.0.1"/>
 </config>
diff --git a/view/frontend/layout/catalog_category_view.xml b/view/frontend/layout/catalog_category_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<page layout="2column-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
 	<body>
 		<!-- <move element="catalog.product.related" destination="sidebar.additional" after="tag.view"/> -->
 		<!-- <referenceBlock name="catalog.compare.sidebar" remove="true" />
diff --git a/view/frontend/layout/catalog_product_view.xml b/view/frontend/layout/catalog_product_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<page layout="2column-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
 	<body>
 		<referenceContainer name="product.info.main">
 			<block class="Lof\ProductTags\Block\Tag\Product\TagProduct" name="tag.product.tagproduct" template="Lof_ProductTags::tag/product/tags.phtml"/>

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`"description": "Assign one or multiple tags to your products and improve the navigation for your customers, who can narrow the search results by tags in the Product Filters or, vice versa, see all products with the tags",`
`4`	`4`	`"type": "magento2-module",`
`5`	`5`	`"license": "MIT",`
	`6`	`+ "version": "1.0.1",`
`6`	`7`	`"authors": [`
`7`	`8`	`{`
`8`	`9`	`"name": "Landofcoder",`