Merge pull request #2081 from jitendra-webkul/1.0

Issue #2075 fixed

packages/Webkul/Category/src/Http/Controllers/CategoryController.php

@@ -122,7 +122,7 @@ class CategoryController extends Controller
     {
         $category = $this->categoryRepository->findOrFail($id);
 
-        $categories = $this->categoryRepository->getCategoryTree($id);
+        $categories = $this->categoryRepository->getCategoryTreeWithoutDescendant($id);
 
         $attributes = $this->attributeRepository->findWhere(['is_filterable' =>  1]);
 

packages/Webkul/Category/src/Repositories/CategoryRepository.php

@@ -76,6 +76,19 @@ class CategoryRepository extends Repository
             : $this->model::orderBy('position', 'ASC')->get()->toTree();
     }
 
+    /**
+     * Specify category tree
+     *
+     * @param integer $id
+     * @return mixed
+     */
+    public function getCategoryTreeWithoutDescendant($id = null)
+    {
+        return $id
+            ? $this->model::orderBy('position', 'ASC')->where('id', '!=', $id)->whereNotDescendantOf($id)->get()->toTree()
+            : $this->model::orderBy('position', 'ASC')->get()->toTree();
+    }
+
     /**
      * Get root categories
      *