Merge branch 'develop'

Model/Product/ProductCategoryModel.php

@@ -61,6 +61,7 @@ abstract class ProductCategoryModel extends AbstractFullEntity implements TreeIn
         $parent = $this->getParent();
         $title = $parent ? $parent->getTitle() . ' - ' : '';
         $title .= $this->getTitle();
+
         return $title;
     }
 

Repository/Product/ProductCategoryRepositoryQuery.php

@@ -30,8 +30,6 @@ class ProductCategoryRepositoryQuery extends AbstractRepositoryQuery
         return $this;
     }
 
-
-
     public function hasProductFamilyOnline(): self
     {
         $this->joinProductFamilies();

Repository/Product/ProductCategoryStore.php

@@ -22,7 +22,7 @@ class ProductCategoryStore extends AbstractStore
 
     public function orderByDefault(RepositoryQueryInterface $query): RepositoryQueryInterface
     {
-        $query->orderBy('position');
+        $query->addOrderBy('.parent')->addOrderBy('.position');
         return $query;
     }