From 3aef31be2e6dcec3db51b01a4bd5fe87f3fa2edf Mon Sep 17 00:00:00 2001
From: vvasiloud <vvasiloudis@gmail.com>
Date: Wed, 7 Sep 2016 22:00:32 +0300
Subject: [PATCH 1/9] Readme update

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 42cc8ba..ca83870 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Magento 2.0 Category Sidebar extension
 ![Alt text](header.jpg?raw=true "Magento2 Category sidebar")
 
-This extension will add the ability to show one of your root categories in a sidebar. The root category can be selected from the Magento2 admin config page.
+This extension will add the ability to show category tree from a parent or current category in a sidebar. The category can be selected from the Magento2 admin config page.
 
 ## Installation with composer
 * Include the repository: `composer require sebwite/magento2-category-sidebar`
@@ -17,9 +17,9 @@ This extension will add the ability to show one of your root categories in a sid
 * Clear cache
 
 ## Configuration
-* Select the root category you want to use from the config page from the admin panel
-* You should implement the block `Sebwite\Sidebar\Block\Sidebar` in your theme to make this extension work. Example
-`<block class="Sebwite\Sidebar\Block\Sidebar" name="category-sidebar" template="Sebwite_Sidebar::sidebar.phtml" />`
+* Select the root category or current category option you want to use from the config page from the admin panel
+* Select children depth level
+* Categories will appear in col.left sidebar of the theme
 
 ---
 [![Alt text](https://www.sebwite.nl/wp-content/themes/sebwite/assets/images/logo-sebwite.png "Sebwite.nl")](https://sebwite.nl)
\ No newline at end of file

From f4ccb9647a6ee2f56ce322cbd8574f59be293f5b Mon Sep 17 00:00:00 2001
From: vvasiloud <vvasiloudis@gmail.com>
Date: Wed, 7 Sep 2016 22:00:47 +0300
Subject: [PATCH 2/9] Version update

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8a5f8c3..a42e551 100755
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "sebwite/magento2-category-sidebar",
     "description": "Magento 2.0 sidebar",
     "type": "magento2-module",
-    "version": "1.0.1",
+    "version": "2.0.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

From 64a3bdbb49b5b60c118236881f60a1ad95d52ea4 Mon Sep 17 00:00:00 2001
From: vvasiloud <vvasiloudis@gmail.com>
Date: Wed, 7 Sep 2016 22:01:04 +0300
Subject: [PATCH 3/9] Version Update

---
 etc/module.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/module.xml b/etc/module.xml
index 3381246..bd6dc49 100644
--- 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="Sebwite_Sidebar" setup_version="2.0.2"/>
+    <module name="Sebwite_Sidebar" setup_version="2.0.3"/>
 </config>
\ No newline at end of file

From a3bc4b8bb765427925e2da3f69484d8399351121 Mon Sep 17 00:00:00 2001
From: vvasiloud <vvasiloudis@gmail.com>
Date: Wed, 7 Sep 2016 22:02:27 +0300
Subject: [PATCH 4/9] Feature: Depth level select & Current category tree
 option

---
 Block/Sidebar.php                  | 28 ++++++++--
 Helper/Data.php                    | 88 ++++++++++++++++++++++++++++++
 Model/Config/Source/Categories.php |  2 +
 Model/Config/Source/Depth.php      | 43 +++++++++++++++
 etc/adminhtml/system.xml           | 12 +++-
 etc/config.xml                     | 11 ++++
 6 files changed, 177 insertions(+), 7 deletions(-)
 create mode 100644 Helper/Data.php
 create mode 100644 Model/Config/Source/Depth.php
 create mode 100644 etc/config.xml

diff --git a/Block/Sidebar.php b/Block/Sidebar.php
index a30668b..c4c2b54 100644
--- a/Block/Sidebar.php
+++ b/Block/Sidebar.php
@@ -38,9 +38,12 @@ class Sidebar extends Template
     /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection */
     protected $_productCollectionFactory;
 
+	/** @var \Magento\Framework\Registry */
+    protected $registry;
+	
     /** @var \Magento\Catalog\Helper\Output */
     private $helper;
-
+	
     /**
      * @param Template\Context                                        $context
      * @param \Magento\Catalog\Helper\Category                        $categoryHelper
@@ -59,8 +62,11 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         \Magento\Catalog\Model\Indexer\Category\Flat\State $categoryFlatState,
         \Magento\Catalog\Model\CategoryFactory $categoryFactory,
+		\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollectionFactory,
         \Magento\Catalog\Helper\Output $helper,
+		\Sebwite\Sidebar\Helper\Data $dataHelper,
+		\Magento\Framework\Registry $registry,
         $data = [ ]
     )
     {
@@ -70,15 +76,17 @@ public function __construct(
         $this->_categoryFactory          = $categoryFactory;
         $this->_productCollectionFactory = $productCollectionFactory;
         $this->helper                    = $helper;
+		$this->_dataHelper = $dataHelper;
+		$this->registry = $registry;
 
         parent::__construct($context, $data);
     }
-
+	
     /*
     * Get owner name
     * @return string
     */
-
+	
     /**
      * Get all categories
      *
@@ -100,8 +108,10 @@ public function getCategories($sorted = false, $asCollection = false, $toLoad =
          * Check if parent node of the store still exists
          */
         $category = $this->_categoryFactory->create();
+		
+		$categoryDepthLevel = $this->_dataHelper->getCategoryDepthLevel();
 
-        $storeCategories = $category->getCategories($this->getSelectedRootCategory(), $recursionLevel = 1, $sorted, $asCollection, $toLoad);
+        $storeCategories = $category->getCategories($this->getSelectedRootCategory(), $recursionLevel = $categoryDepthLevel, $sorted, $asCollection, $toLoad);
 
         $this->_storeCategories[ $cacheKey ] = $storeCategories;
 
@@ -119,6 +129,10 @@ public function getSelectedRootCategory()
             'sebwite_sidebar/general/category'
         );
 
+		if ( $category == 'current_category_children'){
+			return $this->registry->registry('current_category')->getId();
+		}
+		
         if ( $category === null )
         {
             return 1;
@@ -135,7 +149,7 @@ public function getSelectedRootCategory()
      * @return string
      */
     public function getChildCategoryView($category, $html = '', $level = 1)
-    {
+    {	
         // Check if category has children
         if ( $category->hasChildren() )
         {
@@ -182,11 +196,12 @@ public function getChildCategoryView($category, $html = '', $level = 1)
 
     /**
      * Retrieve subcategories
-     *
+	 *
      * @param $category
      *
      * @return array
      */
+	 
     public function getSubcategories($category)
     {
         if ( $this->categoryFlatConfig->isFlatEnabled() && $category->getUseFlatResource() )
@@ -196,6 +211,7 @@ public function getSubcategories($category)
 
         return $category->getChildren();
     }
+	
 
     /**
      * Get current category
diff --git a/Helper/Data.php b/Helper/Data.php
new file mode 100644
index 0000000..299ba5d
--- /dev/null
+++ b/Helper/Data.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Class:Categories
+ * Sebwite\Sidebar\Model\Config\Source
+ *
+ * @author      Vasilis Vasiloudis
+ * @package     Sebwite\Sidebar
+ * @copyright   Copyright (c) 2016, vvasiloud. All rights reserved
+ */
+namespace Sebwite\Sidebar\Helper;
+
+use Magento\Framework\Module\ModuleListInterface;
+
+class Data extends \Magento\Framework\App\Helper\AbstractHelper
+{
+	const XML_PATH_ENABLED    		 			= 'general/enabled';
+	const XML_PATH_CATEGORY    		 			= 'general/category';
+	const XML_PATH_CATEGORY_DEPTH_LEVEL    		= 'general/categorydepth';
+	
+	
+	/**
+     * @var ModuleListInterface
+     */
+    protected $_moduleList;
+	
+	/**
+     * @param \Magento\Framework\App\Helper\Context $context
+	 * @param ModuleListInterface $moduleList
+     */
+	public function __construct(\Magento\Framework\App\Helper\Context $context, ModuleListInterface $moduleList
+	) {
+		$this->_moduleList              = $moduleList;
+		parent::__construct($context);
+	}
+
+    /**
+     * @param $xmlPath
+     * @param string $section
+     *
+     * @return string
+     */
+    public function getConfigPath(
+        $xmlPath,
+        $section = 'sebwitete_sidebar'
+    ) {
+        return $section . '/' . $xmlPath;
+    }
+	
+	 /**
+     * Check if enabled
+     *
+     * @return string|null
+     */
+    public function isEnabled()
+    {
+        return $this->scopeConfig->getValue(
+            $this->getConfigPath(self::XML_PATH_ENABLED),
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
+	 /**
+     * Get sidebar category
+     *
+     * @return string|null
+     */
+    public function getSidebarCategory()
+    {
+        return $this->scopeConfig->getValue(
+            $this->getConfigPath(self::XML_PATH_CATEGORY),
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+	
+	 /**
+     * Get category depth level
+     *
+     * @return string|null
+     */
+    public function getCategoryDepthLevel()
+    {
+        return $this->scopeConfig->getValue(
+            $this->getConfigPath(self::XML_PATH_CATEGORY_DEPTH_LEVEL),
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }	
+	
+}
\ No newline at end of file
diff --git a/Model/Config/Source/Categories.php b/Model/Config/Source/Categories.php
index 7a26f0b..b0b5c2b 100644
--- a/Model/Config/Source/Categories.php
+++ b/Model/Config/Source/Categories.php
@@ -55,6 +55,8 @@ public function toOptionArray()
         foreach($storeCategories as $category) {
             $resultArray[$category->getId()] = $category->getName();
         }
+		
+		$resultArray['current_category_children'] = __('Current Category Children');
 
         return $resultArray;
     }
diff --git a/Model/Config/Source/Depth.php b/Model/Config/Source/Depth.php
new file mode 100644
index 0000000..14ce0a1
--- /dev/null
+++ b/Model/Config/Source/Depth.php
@@ -0,0 +1,43 @@
+<?php namespace Sebwite\Sidebar\Model\Config\Source;
+
+/**
+ * Class:Categories
+ * Sebwite\Sidebar\Model\Config\Source
+ *
+ * @author      Vasilis Vasiloudis
+ * @package     Sebwite\Sidebar
+ * @copyright   Copyright (c) 2016, vvasiloud. All rights reserved
+ */
+class Depth implements \Magento\Framework\Option\ArrayInterface {
+
+    /**
+     * Return array of options as value-label pairs
+     *
+     * @return array Format: array(array('value' => '<value>', 'label' => '<label>'), ...)
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => 1,
+                'label' => __('1'),
+            ],
+            [
+                'value' => 2,
+                'label' => __('2'),
+            ],
+            [
+                'value' => 3,
+                'label' => __('3'),
+            ],
+            [
+                'value' => 4,
+                'label' => __('4'),
+            ],
+            [
+                'value' => 5,
+                'label' => __('5'),
+            ],			
+        ];
+    }
+}
\ No newline at end of file
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 01a8905..54ef59c 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -12,11 +12,21 @@
             <group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0"
                    showInStore="0">
                 <label>Sidebar settings</label>
-                <field id="category" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0"
+                <field id="enabled" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0"
+                       showInStore="0">
+                    <label>Is Enabled</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>				
+                <field id="category" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0"
                        showInStore="0">
                     <label>Select Sidebar Category</label>
                     <source_model>Sebwite\Sidebar\Model\Config\Source\Categories</source_model>
                 </field>
+                <field id="categorydepth" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="0"
+                       showInStore="0">
+                    <label>Select Category Depth</label>
+                    <source_model>Sebwite\Sidebar\Model\Config\Source\Depth</source_model>
+                </field>				
             </group>
         </section>
     </system>
diff --git a/etc/config.xml b/etc/config.xml
new file mode 100644
index 0000000..6e289c7
--- /dev/null
+++ b/etc/config.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../Store/etc/config.xsd">
+	<default>
+		<sidebar>
+			<general>
+				<enabled>1</enabled>
+				<categorydepth>1</categorydepth>
+			</general>
+		</sidebar>
+	</default>
+</config>

From 5572d0daa09a8b7790d2478c4fc65001d446cf23 Mon Sep 17 00:00:00 2001
From: vvasiloud <vvasiloudis@gmail.com>
Date: Wed, 7 Sep 2016 22:04:55 +0300
Subject: [PATCH 5/9] Added RequireJs dependancy and removed script from head

---
 view/frontend/layout/default.xml      | 2 +-
 view/frontend/requirejs-config.js     | 7 +++++++
 view/frontend/templates/sidebar.phtml | 6 +++++-
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 view/frontend/requirejs-config.js

diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
index f3d55d8..371e42d 100644
--- a/view/frontend/layout/default.xml
+++ b/view/frontend/layout/default.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
-        <script type="text/javascript" src="Sebwite_Sidebar::js/module.js"/>
+        <!--<script type="text/javascript" src="Sebwite_Sidebar::js/module.js"/>-->
         <css src="Sebwite_Sidebar::css/module.css" />
         <css src="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" src_type="url" />
     </head>
diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
new file mode 100644
index 0000000..cc2c4e3
--- /dev/null
+++ b/view/frontend/requirejs-config.js
@@ -0,0 +1,7 @@
+var config = {
+    map: {
+        '*': {
+            sidebarmodule: 'Sebwite_Sidebar/js/module'
+        }
+    }
+};
diff --git a/view/frontend/templates/sidebar.phtml b/view/frontend/templates/sidebar.phtml
index c548c4b..03baf32 100644
--- a/view/frontend/templates/sidebar.phtml
+++ b/view/frontend/templates/sidebar.phtml
@@ -26,4 +26,8 @@ $brands     = $block->getBrands();
             <?php echo $block->getChildCategoryView($category); ?>
         </li>
     <?php endforeach; ?>
-</ul>
\ No newline at end of file
+</ul>
+<script type="text/javascript">
+	/* Simply invoke iffe of sidebarmodule */
+	require(['jquery','sidebarmodule'], function ($) {});
+</script>
\ No newline at end of file

From 49991ecc76d0b7c7e52a7d2d945fd6c5a039de44 Mon Sep 17 00:00:00 2001
From: vvasiloud <vvasiloudis@gmail.com>
Date: Wed, 7 Sep 2016 22:05:37 +0300
Subject: [PATCH 6/9] Changed block to be compatible with my theme setup

---
 view/frontend/page_layout/2columns-left.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/frontend/page_layout/2columns-left.xml b/view/frontend/page_layout/2columns-left.xml
index 973f427..4605a65 100644
--- a/view/frontend/page_layout/2columns-left.xml
+++ b/view/frontend/page_layout/2columns-left.xml
@@ -9,7 +9,7 @@
     <update handle="2columns-left"/>
 
     <referenceContainer name="columns">
-        <container name="div.sidebar.main" htmlTag="div" htmlClass="c-sidebar c-sidebar--categories">
+        <container name="sidebar.main" htmlTag="div" htmlClass="c-sidebar c-sidebar--categories">
             <block class="Sebwite\Sidebar\Block\Sidebar" name="category-sidebar" template="Sebwite_Sidebar::sidebar.phtml"/>
         </container>
     </referenceContainer>

From ca37b2f5304b637ff7a1ad2070c35688116b9256 Mon Sep 17 00:00:00 2001
From: vvasiloud <vvasiloudis@gmail.com>
Date: Wed, 7 Sep 2016 22:06:07 +0300
Subject: [PATCH 7/9] Class changes for own theme setup

---
 view/frontend/web/css/module.less | 14 ++++----------
 view/frontend/web/js/module.js    |  9 +++------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/view/frontend/web/css/module.less b/view/frontend/web/css/module.less
index d87128b..62e661b 100644
--- a/view/frontend/web/css/module.less
+++ b/view/frontend/web/css/module.less
@@ -1,7 +1,6 @@
-.c-sidebar {
-    width: 18.4%;
-
-    .expand, .expanded {
+.sidebar {
+    .expand,
+    .expanded {
         cursor: pointer;
         float: right;
     }
@@ -9,16 +8,13 @@
         display: none;
         margin-bottom: 0px;
         padding-left: 0px;
-
         li {
             list-style: none;
             border-bottom: 1px solid #ededed;
             padding-bottom: 10px;
-
             &.active {
                 > ul {
                     display: block;
-
                     li:last-of-type {
                         border-bottom: 0px;
                         padding-bottom: 0px;
@@ -26,14 +22,12 @@
                     }
                 }
             }
-
             a {
                 &.active {
                     font-weight: bold;
                 }
                 display: inline-block;
             }
-
             > ul {
                 padding-top: 7px;
                 margin-top: 0px;
@@ -58,4 +52,4 @@
         padding-right: 45px;
         margin-bottom: 30px;
     }
-}
\ No newline at end of file
+}
diff --git a/view/frontend/web/js/module.js b/view/frontend/web/js/module.js
index 0e3dc6d..0614dc6 100644
--- a/view/frontend/web/js/module.js
+++ b/view/frontend/web/js/module.js
@@ -3,8 +3,7 @@
  ========================================================================== */
 require(['jquery'], function ($) {
     $(function () {
-
-        $('.c-sidebar').on('click','.o-list .expand, .o-list .expanded', function () {
+        $('.sidebar').on('click', '.o-list .expand, .o-list .expanded', function () {
             var element = $(this).parent('li');
 
             if (element.hasClass('active')) {
@@ -14,9 +13,7 @@ require(['jquery'], function ($) {
                 element.find('li').removeClass('active');
 
                 element.find('i').removeClass('fa-minus').addClass('fa-plus');
-            }
-
-            else {
+            } else {
                 element.children('ul').slideDown();
                 element.siblings('li').children('ul').slideUp();
                 element.parent('ul').find('i').removeClass('fa-minus').addClass('fa-plus');
@@ -29,4 +26,4 @@ require(['jquery'], function ($) {
             }
         });
     });
-});
\ No newline at end of file
+});

From 56d77e3c5d334c00fe529e81af1d5e6eb05b4ee4 Mon Sep 17 00:00:00 2001
From: vvasiloud <vvasiloudis@gmail.com>
Date: Thu, 15 Sep 2016 21:09:57 +0300
Subject: [PATCH 8/9] Removed uneeded dependancies and fixes bug when
 current_category was null

---
 Block/Sidebar.php | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/Block/Sidebar.php b/Block/Sidebar.php
index c4c2b54..1c6b149 100644
--- a/Block/Sidebar.php
+++ b/Block/Sidebar.php
@@ -37,9 +37,6 @@ class Sidebar extends Template
 
     /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection */
     protected $_productCollectionFactory;
-
-	/** @var \Magento\Framework\Registry */
-    protected $registry;
 	
     /** @var \Magento\Catalog\Helper\Output */
     private $helper;
@@ -66,7 +63,6 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollectionFactory,
         \Magento\Catalog\Helper\Output $helper,
 		\Sebwite\Sidebar\Helper\Data $dataHelper,
-		\Magento\Framework\Registry $registry,
         $data = [ ]
     )
     {
@@ -77,7 +73,6 @@ public function __construct(
         $this->_productCollectionFactory = $productCollectionFactory;
         $this->helper                    = $helper;
 		$this->_dataHelper = $dataHelper;
-		$this->registry = $registry;
 
         parent::__construct($context, $data);
     }
@@ -130,9 +125,25 @@ public function getSelectedRootCategory()
         );
 
 		if ( $category == 'current_category_children'){
-			return $this->registry->registry('current_category')->getId();
+			$currentCategory = $this->_coreRegistry->registry('current_category');
+			if($currentCategory){
+				return $currentCategory->getId();
+			}
+			return 1;
 		}
 		
+		if ( $category == 'current_category_parent_children'){
+			$currentCategory = $this->_coreRegistry->registry('current_category');
+			if($currentCategory){
+				$topLevelParent = $currentCategory->getPath();
+				$topLevelParentArray = explode("/", $topLevelParent);
+				if(isset($topLevelParent)){
+					return $topLevelParentArray[2];
+				}
+			}
+			return 1;
+		}		
+		
         if ( $category === null )
         {
             return 1;
@@ -196,6 +207,7 @@ public function getChildCategoryView($category, $html = '', $level = 1)
 
     /**
      * Retrieve subcategories
+     * DEPRECATED
 	 *
      * @param $category
      *
@@ -267,4 +279,4 @@ public function getCategoryUrl($category)
     {
         return $this->_categoryHelper->getCategoryUrl($category);
     }
-}
\ No newline at end of file
+}

From 8e8580acba77305e49e0a1cab9e831088cd6a9c0 Mon Sep 17 00:00:00 2001
From: vvasiloud <vvasiloudis@gmail.com>
Date: Thu, 15 Sep 2016 21:10:45 +0300
Subject: [PATCH 9/9] Added Current Category Parent Children option (level 2
 parent of any subcategory)

---
 Model/Config/Source/Categories.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Model/Config/Source/Categories.php b/Model/Config/Source/Categories.php
index b0b5c2b..40a43d1 100644
--- a/Model/Config/Source/Categories.php
+++ b/Model/Config/Source/Categories.php
@@ -57,6 +57,7 @@ public function toOptionArray()
         }
 		
 		$resultArray['current_category_children'] = __('Current Category Children');
+		$resultArray['current_category_parent_children'] = __('Current Category Parent Children');
 
         return $resultArray;
     }