14008 getAllStoreIds if rule has 0 store and Rule Validation Scope is per store view

Author: Bohdan Berezhniy

Model/Config/Source/RuleValidationScope.php

@@ -12,7 +12,7 @@
 class RuleValidationScope implements OptionSourceInterface
 {
     public const SCOPE_GLOBAL = 0;
-    public const SCOPE_DEFAULT_STORE_VIEW_PER_WEBSITE = 1;
+    public const SCOPE_DEFAULT_STORE_VIEWS_PER_WEBSITE = 1;
     public const SCOPE_SELECTED_STORE_VIEWS_PER_RULE = 2;
 
     /**
@@ -22,7 +22,7 @@ public function toOptionArray(): array
     {
         return [
             ['value' => self::SCOPE_GLOBAL, 'label' => __('Global (Default)')],
-            ['value' => self::SCOPE_DEFAULT_STORE_VIEW_PER_WEBSITE, 'label' => __('Default Store View(s) per Website')],
+            ['value' => self::SCOPE_DEFAULT_STORE_VIEWS_PER_WEBSITE, 'label' => __('Default Store View(s) per Website')],
             ['value' => self::SCOPE_SELECTED_STORE_VIEWS_PER_RULE, 'label' => __('Selected Store View(s) per Rule')],
         ];
     }

Model/ProductLabelAction.php

@@ -19,6 +19,7 @@
 use Magento\Framework\Module\Manager as ModuleManager;
 use Magefan\ProductLabel\Model\Config\Source\ApplyByOptions;
 use Magefan\ProductLabel\Model\Config\Source\RuleValidationScope;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class ProductLabelAction
@@ -56,7 +57,7 @@ class ProductLabelAction
     private $connection;
 
     /**
-     * @var \Magefan\ProductLabel\Model\Config
+     * @var Config
      */
     protected $config;
 
@@ -85,13 +86,19 @@ class ProductLabelAction
      */
     private $moduleManager;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @var null
      */
     private $validationFilter = null;
 
+    private $allStoreIds = null;
+
     /**
-     * ProductLabelAction constructor.
      * @param RuleCollectionFactory $ruleCollectionFactory
      * @param ProductCollectionFactory $productCollectionFactory
      * @param CatalogRuleFactory $catalogRuleFactory
@@ -101,7 +108,9 @@ class ProductLabelAction
      * @param GetParentProductIdsInterface $getParentProductIds
      * @param GetWebsitesMapInterface $getWebsitesMap
      * @param ModuleManager $moduleManager
-     * @param null $validationFilter
+     * @param Config $config
+     * @param StoreManagerInterface $storeManager
+     * @param $validationFilter
      */
     public function __construct(
         RuleCollectionFactory $ruleCollectionFactory,
@@ -114,6 +123,7 @@ public function __construct(
         GetWebsitesMapInterface $getWebsitesMap,
         ModuleManager $moduleManager,
         Config $config,
+        StoreManagerInterface $storeManager,
         $validationFilter = null
     ) {
         $this->ruleCollectionFactory = $ruleCollectionFactory;
@@ -126,6 +136,7 @@ public function __construct(
         $this->getParentProductIds = $getParentProductIds;
         $this->getWebsitesMap = $getWebsitesMap;
         $this->config = $config;
+        $this->storeManager = $storeManager;
         $this->moduleManager = $moduleManager;
 
         if ($this->moduleManager->isEnabled('Magefan_DynamicProductAttributes')) {
@@ -328,15 +339,21 @@ protected function isRuleWilBeAppliedForSpecificProduct(array $params): bool
      */
     private function getStoreIdsToValidate($rule): array
     {
-        if ($this->config->getRuleValidationScope() === RuleValidationScope::SCOPE_GLOBAL) {
-            return [0];
+        $storeIds = [0];
+
+        if ($this->config->getRuleValidationScope() === RuleValidationScope::SCOPE_DEFAULT_STORE_VIEWS_PER_WEBSITE) {
+            $storeIds = $this->getDefaultStoreIdsPerWebsite($rule);
         }
 
-        if ($this->config->getRuleValidationScope() === RuleValidationScope::SCOPE_DEFAULT_STORE_VIEW_PER_WEBSITE) {
-            return $this->getDefaultStoreIdsPerWebsite($rule);
+        if ($this->config->getRuleValidationScope() === RuleValidationScope::SCOPE_SELECTED_STORE_VIEWS_PER_RULE) {
+            $storeIds = (array)$rule->getStoreIds();
+
+            if (empty($storeIds) || in_array(0, $storeIds)) {
+                $storeIds = $this->getAllStoreIds();
+            }
         }
 
-        return (array)$rule->getStoreIds() ?: [0];
+        return $storeIds;
     }
 
 
@@ -356,10 +373,8 @@ private function getDefaultStoreIdsPerWebsite($rule): array
         if (in_array(0, $storeIds)) {
             $defaultStoreIds = $websiteToDefaultStoreMap;
         } else {
-            $storeManager = \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Store\Model\StoreManagerInterface::class);
-
             foreach ($storeIds as $id) {
-                $websiteId = $storeManager->getStore($id)->getWebsiteId();
+                $websiteId = $this->storeManager->getStore($id)->getWebsiteId();
                 $websiteIds[$websiteId] = $websiteId;
             }
 
@@ -372,4 +387,19 @@ private function getDefaultStoreIdsPerWebsite($rule): array
 
         return $defaultStoreIds;
     }
+
+    /**
+     * @return array
+     */
+    private function getAllStoreIds()
+    {
+        if (null === $this->allStoreIds) {
+            $this->allStoreIds = [];
+
+            foreach ($this->storeManager->getStores() as $store) {
+                $this->allStoreIds[] = $store->getId();
+            }
+        }
+        return $this->allStoreIds;
+    }
 }