14008-use-default-stores-for-rule-validation

Author: Bohdan Berezhniy

Model/ProductLabelAction.php

@@ -235,18 +235,7 @@ public function getListProductIds($rule, array $params = []): array
         $conditions = $rule->getConditions();
 
         if (!empty($conditions['conditions'])) {
-            if ($rule->getWebsiteIds()) {
-                $storeIds = [];
-                $websites = $this->getWebsitesMap->execute();
-                foreach ($websites as $websiteId => $defaultStoreId) {
-                    if (in_array($websiteId, $rule->getWebsiteIds())) {
-                        $storeIds[] = $defaultStoreId;
-                    }
-                }
-            } else {
-                $storeIds = [0];
-            }
-
+            $storeIds = $this->getDefaultStoreIds($rule);
             $conditions = $rule->getConditions()->asArray();
 
             if ($this->validationFilter !== null) {
@@ -327,4 +316,39 @@ protected function isRuleWilBeAppliedForSpecificProduct(array $params): bool
     {
         return $params && isset($params['rule_apply_type']) && ($params['rule_apply_type'] == ApplyByOptions::ON_PRODUCT_SAVE);
     }
+
+    /**
+     * @param $rule
+     * @return array
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getDefaultStoreIds($rule): array
+    {
+        $defaultStoreIds = [];
+
+        $storeIds = (array)$rule->getStoreIds();
+
+        // [website_id => default_store_id]
+        $websiteIdToDefaultStoreIdMap = $this->getWebsitesMap->execute();
+
+        if (in_array(0, $storeIds)) {
+            $defaultStoreIds = $websiteIdToDefaultStoreIdMap;
+        } else {
+            $storeManager = \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Store\Model\StoreManagerInterface::class);
+
+            foreach ($storeIds as $id) {
+
+                $websiteId = $storeManager->getStore($id)->getWebsiteId();
+                $websiteIds[$websiteId] = $websiteId;
+            }
+
+            foreach ($websiteIds as $websiteId) {
+                if (isset($websiteIdToDefaultStoreIdMap[$websiteId])) {
+                    $defaultStoreIds[] = $websiteIdToDefaultStoreIdMap[$websiteId];
+                }
+            }
+        }
+
+        return $defaultStoreIds;
+    }
 }

view/adminhtml/web/js/grid/provider.js

@@ -25,10 +25,9 @@ define([
                 $.extend(params, temp);
             });
             $.extend(this.params, conditions);
-            
+
             $.extend(this.params, {
-                'website_ids' : $('[name=website_ids]').val(),
-                'catalog_price_rule_ids' : $('[name=catalog_price_rule_ids]').val(),
+                'store_ids' : $('[name=store_ids]').val(),
                 'apply_by' : $('[name=apply_by]').val(),
                 'display_on_parent' : $('[name=display_on_parent]').val()
             });