Updated logic of Url Rewrite regeneration via category entity. Fixed compilation issue in helper.

Author: olegkoval

.github/FUNDING.yml

@@ -1 +1,2 @@
 patreon: olegkoval
+custom: ["https://api.fondy.eu/s/aeOD4YCieqKE7U", Fondy]

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.5.5] - 2020-04-02
+### Changed
+- updated logic of Url Rewrite regeneration via category entity
+- fixed compilation issue in helper
+
 ## [1.5.4] - 2020-03-21
 ### Changed
 - fixed issue of non-empty/non-false "request_path" of product entity.

Helper/Regenerate.php

@@ -33,13 +33,12 @@ class Regenerate extends \Magento\Framework\App\Helper\AbstractHelper
      */
     public function __construct(
         Context $context,
-        StoreManagerInterface $storeManager,
-        ScopeConfigInterface $scopeConfig
+        StoreManagerInterface $storeManager
     )
     {
         parent::__construct($context);
         $this->storeManager = $storeManager;
-        $this->scopeConfig = $scopeConfig;
+        $this->scopeConfig = $context->getScopeConfig();
     }
 
     /**
@@ -51,8 +50,7 @@ public function getSupportMeText()
         return [
             'Please, support me on:',
             'https://www.patreon.com/olegkoval',
-            'You can hire me via Upwork:',
-            'https://www.upwork.com/o/profiles/users/~01a40656da65c38d3a/'
+            'https://api.fondy.eu/s/aeOD4YCieqKE7U'
         ];
     }
 

Model/RegenerateCategoryRewrites.php

@@ -223,11 +223,14 @@ protected function categoryProcess($category, $storeId = 0)
             $this->saveUrlRewrites($categoryUrlRewriteResult);
         }
 
-        $productsIds = $this->_getCategoriesProductsIds($category->getAllChildren());
-        if (!empty($productsIds)) {
-            $this->regenerateProductRewrites->regenerateOptions = $this->regenerateOptions;
-            $this->regenerateProductRewrites->regenerateOptions['showProgress'] = false;
-            $this->regenerateProductRewrites->regenerateProductsRangeUrlRewrites($productsIds, $storeId);
+        // if config option "Use Categories Path for Product URLs" is "Yes" then regenerate product urls
+        if ($this->helper->useCategoriesPathForProductUrls($storeId)) {
+            $productsIds = $this->_getCategoriesProductsIds($category->getAllChildren());
+            if (!empty($productsIds)) {
+                $this->regenerateProductRewrites->regenerateOptions = $this->regenerateOptions;
+                $this->regenerateProductRewrites->regenerateOptions['showProgress'] = false;
+                $this->regenerateProductRewrites->regenerateProductsRangeUrlRewrites($productsIds, $storeId);
+            }
         }
 
         //frees memory for maps that are self-initialized in multiple classes that were called by the generators
@@ -247,11 +250,12 @@ protected function categoryProcess($category, $storeId = 0)
     protected function _getCategoriesCollection($categoriesFilter = [], $storeId = 0)
     {
         $categoriesCollection = $this->categoryCollectionFactory->create();
-
         $categoriesCollection->addAttributeToSelect('name')
             ->addAttributeToSelect('url_key')
             ->addAttributeToSelect('url_path')
-            ->addFieldToFilter('level', array('gt' => '1'))
+            // if we need to regenerate Url Rewrites for all categories then we select only top level
+            // and all sub-categories (and products) will be regenerated as child's
+            ->addFieldToFilter('level', (count($categoriesFilter) > 0 ? ['gt' => '1'] : 2))
             ->setOrder('level', 'ASC')
             // use limit to avoid a "eating" of a memory
             ->setPageSize($this->categoriesCollectionPageSize);

README.md

@@ -9,7 +9,7 @@ Extension homepage: https://github.com/olegkoval/magento2-regenerate_url_rewrite
 
 ## DONATIONS / SUPPORT ME ON
 * [Patreon](https://www.patreon.com/olegkoval)
-* You can hire me via [Upwork](https://www.upwork.com/o/profiles/users/~01a40656da65c38d3a/)
+* [Fondy](https://api.fondy.eu/s/aeOD4YCieqKE7U)
 
 ## INSTALLATION
 

composer.json

@@ -3,7 +3,7 @@
     "description": "Add into Magento 2 a CLI feature which allow to regenerate a Url Rewrites of products and categories",
     "keywords": ["magento", "magento2 extension", "magento 2 extension", "extension", "module", "magento2 module", "magento 2 module"],
     "type": "magento2-module",
-    "version": "1.5.4",
+    "version": "1.5.5",
     "homepage": "https://github.com/olegkoval/magento2-regenerate_url_rewrites",
     "authors": [
         {

etc/module.xml

@@ -10,7 +10,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="OlegKoval_RegenerateUrlRewrites" setup_version="1.5.4">
+    <module name="OlegKoval_RegenerateUrlRewrites" setup_version="1.5.5">
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Catalog"/>