MAGETWO-30468: [GitHub] Related products not able to add to cart #1279

magento · Jul 23, 2015 · bce4179 · bce4179
1 parent 5e8b706
commit bce4179
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 3 deletions.
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
@@ -131,4 +131,19 @@ public function getIdentities()
         }
         return $identities;
     }
+
+    /**
+     * Find out if some products can be easy added to cart
+     *
+     * @return bool
+     */
+    public function canItemsAddToCart()
+    {
+        foreach ($this->getItems() as $item) {
+            if (!$item->isComposite() && $item->isSaleable() && !$item->getRequiredOptions()) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/RelatedTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/RelatedTest.php
@@ -41,4 +41,47 @@ public function testGetIdentities()
             $this->block->getIdentities()
         );
     }
+
+    /**
+     * @dataProvider canItemsAddToCartDataProvider
+     * @param bool $isComposite
+     * @param bool $isSaleable
+     * @param bool $hasRequiredOptions
+     * @param bool $canItemsAddToCart
+     */
+    public function testCanItemsAddToCart($isComposite, $isSaleable, $hasRequiredOptions, $canItemsAddToCart)
+    {
+        $product = $this->getMock(
+            'Magento\Catalog\Model\Product',
+            ['isComposite', 'isSaleable', 'getRequiredOptions'],
+            [],
+            '',
+            false
+        );
+        $product->expects($this->any())->method('isComposite')->willReturn($isComposite);
+        $product->expects($this->any())->method('isSaleable')->willReturn($isSaleable);
+        $product->expects($this->any())->method('getRequiredOptions')->willReturn($hasRequiredOptions);
+
+        $itemsCollection = new \ReflectionProperty(
+            'Magento\Catalog\Block\Product\ProductList\Related',
+            '_itemCollection'
+        );
+        $itemsCollection->setAccessible(true);
+        $itemsCollection->setValue($this->block, [$product]);
+
+        $this->assertEquals(
+            $canItemsAddToCart,
+            $this->block->canItemsAddToCart()
+        );
+    }
+
+    public function canItemsAddToCartDataProvider()
+    {
+        return [
+            [false, true, false, true],
+            [false, false, false, false],
+            [true, false, false, false],
+            [true, false, true, false],
+        ];
+    }
 }
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
@@ -23,6 +23,7 @@ switch ($type = $block->getType()) {
             $items = $block->getAllItems();
             $limit = $block->getPositionLimit();
             $shuffle = (int) $block->isShuffled();
+            $canItemsAddToCart = $block->canItemsAddToCart();
 
             $showWishlist = true;
             $showCompare = true;
@@ -44,6 +45,7 @@ switch ($type = $block->getType()) {
             $items = $block->getItems();
             $limit = 0;
             $shuffle = 0;
+            $canItemsAddToCart = $block->canItemsAddToCart();
 
             $showWishlist = true;
             $showCompare = true;
@@ -70,6 +72,7 @@ switch ($type = $block->getType()) {
             $showCart = false;
             $templateType = null;
             $description = false;
+            $canItemsAddToCart = false;
         }
     break;
 
@@ -91,6 +94,7 @@ switch ($type = $block->getType()) {
             $showCart = false;
             $templateType = null;
             $description = false;
+            $canItemsAddToCart = false;
         }
     break;
 
@@ -110,6 +114,7 @@ switch ($type = $block->getType()) {
             $showCart = true;
             $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW;
             $description = false;
+            $canItemsAddToCart = false;
         }
     break;
 
@@ -129,6 +134,7 @@ switch ($type = $block->getType()) {
             $showCart = true;
             $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW;
             $description = false;
+            $canItemsAddToCart = false;
         }
     break;
 
@@ -150,6 +156,7 @@ switch ($type = $block->getType()) {
             $showCart = true;
             $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW;
             $description = ($mode == 'list') ? true : false;
+            $canItemsAddToCart = false;
         }
     break;
 
@@ -173,7 +180,7 @@ switch ($type = $block->getType()) {
         <strong id="block-<?php echo $class?>-heading" role="heading" aria-level="2"><?php echo $title; ?></strong>
     </div>
     <div class="block-content content" aria-labelledby="block-<?php echo $class?>-heading">
-        <?php if ($type == 'related'): ?>
+        <?php if ($type == 'related' && $canItemsAddToCart): ?>
         <div class="block-actions">
             <?php echo __('Check items to add to the cart or') ?>
             <button type="button" class="action select" role="select-all"><span><?php echo __('select all') ?></span></button>

diff --git a/app/design/frontend/Magento/luma/i18n/en_US.csv b/app/design/frontend/Magento/luma/i18n/en_US.csv
@@ -5,8 +5,6 @@
 "Items %1-%2 of %3","%3 items"
 "Regular Price", "was"
 "Shop By","Filter"
-"select all", "Add all"
-"unselect all", "Select none"
 "Remove item", "Remove"
 "Proceed to Checkout", "Go to Checkout"
 "Grand Total", "Estimated Total"