Update Sort #8

magepow · May 11, 2021 · df33eb0 · df33eb0
1 parent 4440beb
commit df33eb0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/Block/Categories.php b/Block/Categories.php
@@ -128,22 +128,24 @@ public function getCurrentCategory()
 
     public function getCategories()
     {
-
         $category = $this->getCurrentCategory();
         if(!$category) return;
 
         $categoryId = $category->getId();
 
         if ($this->isExcluded($categoryId)) return;
 
-        $sortAttribute = $this->getSortAttribute();  
-        $model = $this->categoryFactory->create();
-        $categories = $model->getCollection()
-        ->addAttributeToSelect(['name', 'url_key', 'url_path', 'image','description'])
-        // ->addAttributeToFilter('include_in_menu', 1)
-        ->addAttributeToFilter('parent_id', $categoryId)
-        ->addAttributeToSort($sortAttribute)
-        ->addIsActiveFilter();
+        $sortAttribute = $this->getSortAttribute();
+        $categories = $this->categoryFactory->create()->getCollection()
+                            ->addAttributeToSelect(['name', 'url_key', 'url_path', 'image','description'])
+                            ->addAttributeToFilter('parent_id', $categoryId)
+                            ->addIsActiveFilter();
+
+        if($sortAttribute == "position") {
+            $categories->addAttributeToSort('level');
+        }
+
+        $categories->addAttributeToSort($sortAttribute);
 
         return $categories;
     }

diff --git a/Block/Cmspage.php b/Block/Cmspage.php
@@ -13,6 +13,9 @@
 
 class Cmspage extends Categories
 {
+
+    const DEFAULT_CACHE_TAG = 'MAGEPOW_CATEGORIES_CMS';
+
     const XML_PATH = 'home_page';
 
     public function getLayout() 
@@ -54,13 +57,18 @@ public function getCategories()
     {
         $categoryIds = $this->getCategorySelect();
         if(!$categoryIds) return;
-        $sortAttribute = $this->getSortAttribute();
-        $model = $this->categoryFactory->create();      
-        $categories = $model->getCollection()
-        ->addAttributeToSelect(['name', 'url_key', 'url_path', 'image', 'description'])
-        ->addAttributeToSort($sortAttribute)
-        ->addIdFilter($categoryIds)
-        ->addIsActiveFilter();
+
+        $sortAttribute = $this->getSortAttribute();    
+        $categories = $this->categoryFactory->create()->getCollection()
+                            ->addAttributeToSelect(['name', 'url_key', 'url_path', 'image', 'description'])
+                            ->addIdFilter($categoryIds)
+                            ->addIsActiveFilter();
+
+        if($sortAttribute == "position") {
+            $categories->addAttributeToSort('level');
+        }
+
+        $categories->addAttributeToSort($sortAttribute);
 
         return $categories;
     }