Merge remote-tracking branch 'tango/MAGETWO-94080' into TANGO-PR-22

Author: dhorytskyi

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

@@ -124,9 +124,22 @@ public function addToCollection($collection)
     {
         $attribute = $this->getAttributeObject();
 
-        if ($attribute->getUsedInProductListing() && $collection->isEnabledFlat()) {
-            $alias = array_keys($collection->getSelect()->getPart('from'))[0];
-            $this->joinedAttributes[$attribute->getAttributeCode()] = $alias . '.' . $attribute->getAttributeCode();
+        if ($collection->isEnabledFlat()) {
+            if ($this->isEnabledInFlat($attribute)) {
+                $alias = array_keys($collection->getSelect()->getPart('from'))[0];
+                $this->joinedAttributes[$attribute->getAttributeCode()] = $alias . '.' . $attribute->getAttributeCode();
+            } else {
+                $alias = 'at_' . $attribute->getAttributeCode();
+                if (!in_array($alias, array_keys($collection->getSelect()->getPart('from')))) {
+                    $collection->joinAttribute(
+                        $attribute->getAttributeCode(),
+                        'catalog_product/'.$attribute->getAttributeCode(),
+                        'entity_id'
+                    );
+                }
+
+                $this->joinedAttributes[$attribute->getAttributeCode()] = $alias . '.value';
+            }
             return $this;
         }
 
@@ -245,4 +258,15 @@ public function collectValidatedAttributes($productCollection)
     {
         return $this->addToCollection($productCollection);
     }
+
+    /**
+     * @param \Magento\Framework\DataObject $attribute
+     * @return bool
+     */
+    private function isEnabledInFlat(\Magento\Framework\DataObject $attribute): bool
+    {
+        return $attribute->getData('backend_type') === 'static'
+            || (int) $attribute->getData('used_in_product_listing') === 1
+            || (int) $attribute->getData('used_for_sort_by') === 1;
+    }
 }

dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php

@@ -89,12 +89,12 @@ public function testCreateCollectionWithMultipleSkuCondition()
     }
 
     /**
-     * Test product list widget can process condition with dropdown type of attribute which has Store Scope
+     * Test product list widget can process condition with dropdown type of attribute
      *
      * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/Catalog/_files/products_with_dropdown_attribute.php
      */
-    public function testCreateCollectionWithDropdownAttributeStoreScope()
+    public function testCreateCollectionWithDropdownAttribute()
     {
         /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
         $attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
@@ -118,6 +118,9 @@ public function testCreateCollectionWithDropdownAttributeStoreScope()
         $attribute->setUsedInProductListing(0);
         $attribute->save();
         $this->performAssertions(2);
+        $attribute->setIsGlobal(1);
+        $attribute->save();
+        $this->performAssertions(2);
     }
 
     /**