Merge pull request #36 from lovata/develop

Release version 1.3.1
oc-shopaholic · Jan 15, 2018 · 5eea280 · 5eea280
2 parents 9435df5 + 7e068b0
commit 5eea280
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/classes/helper/CatalogMenuType.php b/classes/helper/CatalogMenuType.php
@@ -34,7 +34,9 @@ public function resolveMenuItem($obMenuItem, $sURL)
         /** @var \Lovata\Shopaholic\Classes\Item\CategoryItem $obCategoryItem */
         foreach ($obCategoryList as $obCategoryItem) {
             $arMenuItem = $this->getCategoryMenuData($obCategoryItem, $obMenuItem->cmsPage, $sURL);
-            $arMenuItem['items'] = $this->getChildrenCategoryList($obCategoryItem, $obMenuItem->cmsPage, $sURL);
+            if ($obMenuItem->nesting) {
+                $arMenuItem['items'] = $this->getChildrenCategoryList($obCategoryItem, $obMenuItem->cmsPage, $sURL);
+            }
 
             $arResult['items'][] = $arMenuItem;
         }

diff --git a/updates/version.yaml b/updates/version.yaml
@@ -15,4 +15,6 @@
 1.2.3:
     - '!!! Adding additional cache cleaning for the sorted list of brands, after the creation of a new brand. Requires Toolbox plugin version 1.3.0 and later.'
 1.3.0:
-    - '!!! Add menu types for integration with the StaticPage plugin. Add getPageUrl() method to the CategoryItem class. Requires Toolbox plugin version 1.4.0 and later. Thanks for contribution Alvaro Cánepa.'
+    - '!!! Add menu types for integration with the StaticPage plugin. Add getPageUrl() method to the CategoryItem class. Requires Toolbox plugin version 1.4.0 and later. Thanks for contribution Alvaro Cánepa.'
+1.3.1:
+    - 'Fix: processing of the "nesting" flag for the menu type "catalog"'