MAGETWO-62405: Ignoring product visibility for SalesRules

Author: pdohogne-magento

app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php

@@ -518,7 +518,7 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
         $attrCode = $this->getAttribute();
 
         if ('category_ids' == $attrCode) {
-            return $this->validateAttribute($this->getAvailableInCategories($model));
+            return $this->validateAttribute($model->getAvailableInCategories($model));
         } elseif (!isset($this->_entityAttributeValues[$model->getId()])) {
             if (!$model->getResource()) {
                 return false;
@@ -621,7 +621,7 @@ public function getMappedSqlField()
     public function validateByEntityId($productId)
     {
         if ('category_ids' == $this->getAttribute()) {
-            $result = $this->validateAttribute($this->_getAvailableInCategoriesById($productId));
+            $result = $this->validateAttribute($this->_getAvailableInCategories($productId));
         } elseif ('attribute_set_id' == $this->getAttribute()) {
             $result = $this->validateAttribute($this->_getAttributeSetId($productId));
         } else {
@@ -632,24 +632,13 @@ public function validateByEntityId($productId)
         return $result;
     }
 
-    /**
-     * Retrieve category ids where product is available
-     *
-     * @param \Magento\Framework\Model\AbstractModel $model
-     * @return array
-     */
-    protected function getAvailableInCategories($model)
-    {
-        return $model->getAvailableInCategories();
-    }
-
     /**
      * Retrieve category ids where productId is available
      *
      * @param int $productId
      * @return array
      */
-    protected function _getAvailableInCategoriesById($productId)
+    protected function _getAvailableInCategories($productId)
     {
         return $this->_productResource->getConnection()
             ->fetchCol(

app/code/Magento/SalesRule/Model/Rule/Condition/Product.php

@@ -49,18 +49,13 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
             $model->getBaseRowTotal()
         );
 
-        return parent::validate($product);
-    }
+        $attrCode = $this->getAttribute();
 
-    /**
-     * Retrieve category ids where product is available
-     *
-     * @param \Magento\Framework\Model\AbstractModel $model
-     * @return array
-     */
-    protected function getAvailableInCategories($model)
-    {
-        return $this->_getAvailableInCategoriesById($model->getId());
+        if ('category_ids' == $attrCode) {
+            return $this->validateAttribute($this->_getAvailableInCategories($product));
+        }
+
+        return parent::validate($product);
     }
 
     /**