Merge branch 'MAGETWO-58504' into 2.0-develop-pr4

Author: OlgaVasyltsun

app/code/Magento/Catalog/Block/Product/AbstractProduct.php

@@ -124,7 +124,7 @@ public function __construct(\Magento\Catalog\Block\Product\Context $context, arr
      */
     public function getAddToCartUrl($product, $additional = [])
     {
-        if ($product->getTypeInstance()->hasRequiredOptions($product)) {
+        if (!$product->getTypeInstance()->isPossibleBuyFromList($product)) {
             if (!isset($additional['_escape'])) {
                 $additional['_escape'] = true;
             }

app/code/Magento/Catalog/Model/Product/Type/AbstractType.php

@@ -1070,4 +1070,15 @@ public function getAssociatedProducts($product)
     {
         return [];
     }
+
+    /**
+     * Check if product can be potentially buyed from the category page or some other list.
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @return bool
+     */
+    public function isPossibleBuyFromList($product)
+    {
+        return !$this->hasRequiredOptions($product);
+    }
 }

app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php

@@ -148,9 +148,9 @@ public function testGetAddToCartPostParams()
         ];
 
         $this->typeInstanceMock->expects($this->once())
-            ->method('hasRequiredOptions')
+            ->method('isPossibleBuyFromList')
             ->with($this->equalTo($this->productMock))
-            ->will($this->returnValue(false));
+            ->will($this->returnValue(true));
         $this->cartHelperMock->expects($this->any())
             ->method('getAddUrl')
             ->with($this->equalTo($this->productMock), $this->equalTo([]))

app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js

@@ -75,6 +75,18 @@ define([
                     }
 
                     if (res.backUrl) {
+                        var eventData = {
+                            'form': form,
+                            'redirectParameters': []
+                        };
+
+                        // trigger global event, so other modules will be able add parameters to redirect url
+                        $('body').trigger('catalogCategoryAddToCartRedirect', eventData);
+                        if (eventData.redirectParameters.length > 0) {
+                            var parameters = res.backUrl.split('#');
+                            parameters.push(eventData.redirectParameters.join('&'));
+                            res.backUrl = parameters.join('#');
+                        }
                         window.location = res.backUrl;
                         return;
                     }
@@ -120,4 +132,4 @@ define([
     });
 
     return $.mage.catalogAddToCart;
-});
+});

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

@@ -1185,4 +1185,23 @@ public function setImageFromChildProduct(\Magento\Catalog\Model\Product $product
         }
         return parent::setImageFromChildProduct($product);
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function isPossibleBuyFromList($product)
+    {
+        $isAllCustomOptionsDisplayed = true;
+
+        foreach ($this->getConfigurableAttributes($product) as $attribute) {
+            $eavAttribute = $attribute->getProductAttribute();
+
+            $isAllCustomOptionsDisplayed = (
+                $isAllCustomOptionsDisplayed
+                && $eavAttribute->getData('used_in_product_listing')
+            );
+        }
+
+        return $isAllCustomOptionsDisplayed;
+    }
 }

app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml

@@ -7,7 +7,7 @@
 <?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Configurable */ ?>
 <div class="swatch-opt-<?php /* @escapeNotVerified */ echo $block->getProduct()->getId() ?>"></div>
 <script>
-    require(["jquery", "jquery/ui", "Magento_Swatches/js/swatchRenderer"], function ($) {
+    require(["jquery", "jquery/ui", "Magento_Swatches/js/SwatchRenderer", "Magento_Swatches/js/catalog-add-to-cart"], function ($) {
         $('.swatch-opt-<?php /* @escapeNotVerified */ echo $block->getProduct()->getId() ?>').SwatchRenderer({
             selectorProduct: '.product-item-details',
             onlySwatches: true,

app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml

@@ -10,7 +10,7 @@
 <script type="text/x-magento-init">
     {
         "[data-role=swatch-options]": {
-            "Magento_Swatches/js/swatchRenderer": {
+            "Magento_Swatches/js/SwatchRenderer": {
                 "jsonConfig": <?php /* @escapeNotVerified */ echo $block->getJsonConfig(); ?>,
                 "jsonSwatchConfig": <?php /* @escapeNotVerified */ echo $block->getJsonSwatchConfig(); ?>,
                 "mediaCallback": "<?php /* @escapeNotVerified */ echo $block->getMediaCallback() ?>"