- Update HTML Sitemap

Author: giaphn

Block/Sitemap.php

@@ -21,6 +21,7 @@
 
 namespace Mageplaza\Sitemap\Block;
 
+use Exception;
 use Magento\Catalog\Helper\Category;
 use Magento\Catalog\Model\CategoryRepository;
 use Magento\Catalog\Model\Product\Visibility as ProductVisibility;
@@ -143,18 +144,17 @@ public function getProductCollection()
             ->addMinimalPrice()
             ->addFinalPrice()
             ->addTaxPercents()
-            ->setPageSize($limit)
             ->addAttributeToSelect('*');
 
-        $sortProductBy = $this->_helper->getHtmlSitemapConfig('product_sorting');
+        $sortProductBy  = $this->_helper->getHtmlSitemapConfig('product_sorting');
         $sortProductDir = $this->_helper->getHtmlSitemapConfig('product_sorting_dir');
 
         switch ($sortProductBy) {
             case SortProduct::PRODUCT_NAME:
                 $collection->setOrder('name', $sortProductDir);
                 break;
             case SortProduct::PRICE:
-                $collection->setOrder('price', $sortProductDir);
+                $collection->setOrder('minimal_price', $sortProductDir);
                 break;
             default:
                 $collection->setOrder('entity_id', $sortProductDir);
@@ -165,6 +165,8 @@ public function getProductCollection()
             $this->_stockFilter->addInStockFilterToCollection($collection);
         }
 
+        $collection->setPageSize($limit);
+
         return $collection;
     }
 
@@ -180,21 +182,71 @@ public function getCategoryCollection()
             ->addFieldToFilter('is_active', 1)
             ->addFieldToFilter('include_in_menu', 1)
             ->addFieldToFilter('entity_id', ['nin' => [1, 2]])->setOrder('path');
-        $excludeCategories  = $this->_helper->getHtmlSitemapConfig('category_page');
+
+        $excludeCategories = $this->_helper->getHtmlSitemapConfig('category_page');
         if (!empty($excludeCategories)) {
             $excludeCategories = array_map('trim', explode(
                 "\n",
                 $excludeCategories
             ));
 
             foreach ($excludeCategories as $excludeCategory) {
-                $categoryCollection->addFieldToFilter('url_path', ['nlike' => $excludeCategory . '%']);
+                try {
+                    $testRegex = preg_match($excludeCategory, '');
+                    if ($testRegex) {
+                        $excludeCategoriesIds = $this->filterCategoryWithRegex($excludeCategory);
+                        if (count($excludeCategoriesIds)) {
+                            $categoryCollection->addFieldToFilter('entiry_id', ['nin' => $excludeCategoriesIds]);
+                        }
+                    }
+                } catch (Exception $e) {
+                    $excludePath = $this->getExcludePath($excludeCategory);
+                    $categoryCollection->addFieldToFilter('url_path', ['nlike' => '%' . $excludePath . '%']);
+                }
             }
         }
 
         return $categoryCollection;
     }
 
+    /**
+     * @param $regex
+     *
+     * @return array
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    protected function filterCategoryWithRegex($regex)
+    {
+        $excludeCategoriesIds = [];
+        $categoryCollection = $this->_categoryCollection->create()->addAttributeToSelect('*')
+            ->setStoreId($this->_storeManager->getStore()->getId());
+        foreach ($categoryCollection as $category) {
+            if (!preg_match($regex, $category->getUrlPath())) {
+                $excludeCategoriesIds[] = $category->getId();
+            }
+        }
+
+        return $excludeCategoriesIds;
+    }
+
+    /**
+     * @param $excludeCategory
+     *
+     * @return string
+     */
+    protected function getExcludePath($excludeCategory)
+    {
+        if ($excludeCategory[0] == '/') {
+            $excludeCategory = substr($excludeCategory, 1);
+        }
+        if ($excludeCategory[-1] == '/') {
+            $excludeCategory = substr($excludeCategory, 0, -1);
+        }
+
+        return $excludeCategory;
+    }
+
     /**
      * @param int $categoryId
      *

etc/adminhtml/system.xml

@@ -41,7 +41,7 @@
                     <label>Exclude Category Page</label>
                     <comment>
                         <![CDATA[
-                          Display Category Page pages in HTML SiteMap except those with the above string selected. Separated by a line break.
+                          Display Category Pages in HTML Sitemap except those with the above selected string. Separated by a line break.
                         E.g: Do not display with the category pages including /men/ such as:
                         /men/top
                         /men/top/t-shirt
@@ -57,6 +57,7 @@
                 <field id="display_type" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Display Style</label>
                     <source_model>Mageplaza\Sitemap\Model\Source\DisplayType</source_model>
+                    <comment>Choose style to display categories in HTML Sitemap.</comment>
                     <depends>
                         <field id="enable">1</field>
                         <field id="category">1</field>
@@ -73,23 +74,23 @@
                     <label>Sort Products in HTML Sitemap by</label>
                     <source_model>Mageplaza\Sitemap\Model\Source\SortProduct</source_model>
                     <depends>
-                        <field id="enable">1</field>
+                        <field id="product">1</field>
                     </depends>
                     <comment>Choose how to arrange and display products in HTML Site Map.</comment>
                 </field>
                 <field id="product_sorting_dir" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Default Sort Direction</label>
                     <source_model>Mageplaza\Sitemap\Model\Source\SortDirection</source_model>
                     <depends>
-                        <field id="enable">1</field>
+                        <field id="product">1</field>
                     </depends>
                 </field>
                 <field id="out_of_stock_products" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Hide Out Of Stock Products</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>If yes, will hide out of stock products in HTML Site Map.</comment>
                     <depends>
-                        <field id="enable">1</field>
+                        <field id="product">1</field>
                     </depends>
                 </field>
                 <field id="product_limit" translate="label comment" type="text" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">

view/frontend/templates/sitemap.phtml

@@ -38,7 +38,7 @@ use Mageplaza\Sitemap\Block\Sitemap;
                 var elementClass = $(this).attr('class'),
                     level, margin;
                 if (elementClass.trim()) {
-                    level  = (elementClass.slice(-1) - 1) * 5;
+                    level  = (elementClass.slice(-1) - 2) * 5;
                     margin = level + '%';
                     $(this).css('margin-left', margin);
                 }