Fix issue with category api recursively including subcategories, add sort order to facet attributes

Author: RBech

code/Block/Adminhtml/System/Config/Form/AttributeLabels.php

@@ -7,8 +7,9 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
         $html = '<div class="hor-scroll"><table class="dynamic-grid" id="attribute-labels-table" cellspacing="0"><tbody>';
 
         $html .= '<tr>';
-        $html .= '<th>Default</th>';
+        $html .= '<th>' . $this->__('Default') .'</th>';
         $html .= '<th>' . $this->getStore()->getName() . '</th>';
+        $html .= '<th>' . $this->__('Sort Order') . '</th>';
         $html .= '</tr>';
 
         //Loop over specified facet attributes
@@ -21,7 +22,8 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
 
             $html .= '<tr>';
             $html .= '<td><input id="' . $element->getHtmlId() . '_orig" class="input-text disabled" value="' . $attribute . '" type="text" readonly></td>';
-            $html .= '<td><input id="' . $element->getHtmlId() . '" class="input-text" name="' . $element->getName() . '[' . $attribute . ']" value="' . $value . '' . '" type="text"></td>';
+            $html .= '<td><input id="' . $element->getHtmlId() . '" class="input-text" name="' . $element->getName() . '[' . $attribute . '][label]" value="' . $value['label'] . '' . '" type="text"></td>';
+            $html .= '<td><input id="' . $element->getHtmlId() . '" class="input-text" name="' . $element->getName() . '[' . $attribute . '][sort_order]" value="' . $value['sort_order'] . '' . '" type="text"></td>';
             $html .= '</tr>';
         }
 

code/Block/Search.php

@@ -39,18 +39,35 @@ public function getSpanAttributes()
         ];
 
         if (Mage::getStoreConfigFlag(Clerk_Clerk_Model_Config::XML_PATH_FACETED_SEARCH_ENABLED)) {
-            if ($attributes = Mage::getStoreConfig(Clerk_Clerk_Model_Config::XML_PATH_FACETED_SEARCH_ATTRIBUTES)) {
-                $spanAttributes['data-facets-target'] = "#clerk-search-filters";
-                $spanAttributes['data-facets-attributes'] = '["' . str_replace(',', '","', $attributes) . '"]';
+            $spanAttributes['data-facets-target'] = "#clerk-search-filters";
+
+            if ($titles = Mage::getStoreConfig(Clerk_Clerk_Model_Config::XML_PATH_FACETED_SEARCH_TITLES)) {
+                $titles = json_decode($titles, true);
+
+                // sort by sort_order
+                uasort($titles, function($a, $b) {
+                    return $a['sort_order'] > $b['sort_order'];
+                });
+
+                $spanAttributes['data-facets-titles'] = json_encode(array_filter(array_combine(array_keys($titles), array_column($titles, 'label'))));
+                $spanAttributes['data-facets-attributes'] = json_encode(array_keys($titles));
 
                 if ($multiselectAttributes = Mage::getStoreConfig(Clerk_Clerk_Model_Config::XML_PATH_FACETED_SEARCH_MULTISELECT_ATTRIBUTES)) {
                     $spanAttributes['data-facets-multiselect-attributes'] = '["' . str_replace(',', '","', $multiselectAttributes) . '"]';
                 }
-
-                if ($titles = Mage::getStoreConfig(Clerk_Clerk_Model_Config::XML_PATH_FACETED_SEARCH_TITLES)) {
-                    $spanAttributes['data-facets-titles'] = $titles;
-                }
             }
+
+//            if ($attributes = Mage::getStoreConfig(Clerk_Clerk_Model_Config::XML_PATH_FACETED_SEARCH_ATTRIBUTES)) {
+//                $spanAttributes['data-facets-attributes'] = '["' . str_replace(',', '","', $attributes) . '"]';
+//
+//                if ($multiselectAttributes = Mage::getStoreConfig(Clerk_Clerk_Model_Config::XML_PATH_FACETED_SEARCH_MULTISELECT_ATTRIBUTES)) {
+//                    $spanAttributes['data-facets-multiselect-attributes'] = '["' . str_replace(',', '","', $multiselectAttributes) . '"]';
+//                }
+//
+//                if ($titles = Mage::getStoreConfig(Clerk_Clerk_Model_Config::XML_PATH_FACETED_SEARCH_TITLES)) {
+//                    $spanAttributes['data-facets-titles'] = $titles;
+//                }
+//            }
         }
 
 

code/controllers/ApiController.php

@@ -132,7 +132,7 @@ public function categoryAction()
 
         foreach ($categories as $category) {
             //Get children categories
-            $children = $category->getResource()->getChildren($category);
+            $children = $category->getResource()->getChildren($category, false);
 
             $data = [
                 'id' => (int) $category->getId(),