MAGETWO-36224: Success message is absent while adding product with options from wishlist to shopping cart

Author: Sergey Semenov

app/code/Magento/Wishlist/Controller/Index/Cart.php

@@ -36,6 +36,16 @@ class Cart extends Action\Action implements IndexInterface
      */
     protected $cart;
 
+    /**
+     * @var \Magento\Checkout\Helper\Cart
+     */
+    protected $cartHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    protected $jsonHelper;
+
     /**
      * @var \Magento\Wishlist\Model\Item\OptionFactory
      */
@@ -76,7 +86,9 @@ public function __construct(
         \Magento\Wishlist\Model\Item\OptionFactory $optionFactory,
         \Magento\Catalog\Helper\Product $productHelper,
         \Magento\Framework\Escaper $escaper,
-        \Magento\Wishlist\Helper\Data $helper
+        \Magento\Wishlist\Helper\Data $helper,
+        \Magento\Checkout\Helper\Cart $cartHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelper
     ) {
         $this->wishlistProvider = $wishlistProvider;
         $this->quantityProcessor = $quantityProcessor;
@@ -86,6 +98,8 @@ public function __construct(
         $this->productHelper = $productHelper;
         $this->escaper = $escaper;
         $this->helper = $helper;
+        $this->cartHelper = $cartHelper;
+        $this->jsonHelper = $jsonHelper;
         parent::__construct($context);
     }
 
@@ -159,8 +173,8 @@ public function execute()
                 $this->messageManager->addSuccess($message);
             }
 
-            if ($this->cart->getShouldRedirectToCart()) {
-                $redirectUrl = $this->cart->getCartUrl();
+            if ($this->cartHelper->getShouldRedirectToCart()) {
+                $redirectUrl = $this->cartHelper->getCartUrl();
             } else {
                 $refererUrl = $this->_redirect->getRefererUrl();
                 if ($refererUrl && $refererUrl != $configureUrl) {
@@ -178,6 +192,13 @@ public function execute()
 
         $this->helper->calculate();
 
+        if ($this->getRequest()->isAjax()) {
+            $this->getResponse()->representJson(
+                $this->jsonHelper->jsonEncode(['backUrl' => $redirectUrl])
+            );
+            return;
+        }
+
         return $this->getResponse()->setRedirect($redirectUrl);
     }
 }

app/code/Magento/Wishlist/view/frontend/templates/view.phtml

@@ -13,14 +13,6 @@
     <?php echo($block->getChildHtml('wishlist.rss.link'));?>
     <form class="form-wishlist-items" id="wishlist-view-form"
           data-mage-init='{"wishlist":{
-          "dataAttribute":"item-id",
-          "nameFormat":"qty[{0}]",
-          "btnRemoveSelector":".action.delete",
-          "qtySelector":".qty",
-          "addToCartSelector":".action.tocart",
-          "addAllToCartSelector":".primary > .action.tocart",
-          "commentInputType":"textarea",
-          "infoList":false,
           "addToCartUrl":"<?php echo $block->getItemAddToCartUrl("%item%");?>",
           "confirmRemoveMessage":"<?php echo __("Are you sure you want to remove this product from your wishlist?") ?>",
           "addAllToCartUrl":"<?php echo $block->getAddAllToCartUrl(); ?>",

app/code/Magento/Wishlist/view/frontend/web/wishlist.js

@@ -81,12 +81,11 @@ define([
                 var itemId = elem.data(this.options.dataAttribute),
                     url = this.options.addToCartUrl.replace('%item%', itemId),
                     inputName = $.validator.format(this.options.nameFormat, itemId),
-                    inputValue = elem.parent().find('[name="' + inputName + '"]').val(),
+                    inputValue = $('[name="' + inputName + '"]').val(),
                     separator = (url.indexOf('?') >= 0) ? '&' : '?';
                 url += separator + inputName + '=' + encodeURIComponent(inputValue);
                 this._validateAndRedirect(url);
             }
-
         },
 
         /**

dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct/Associated.php

@@ -198,19 +198,19 @@ protected function getPreset($name)
                         'id' => '%id%',
                         'name' => '%item1_simple::getProductName%',
                         'position' => '%position%',
-                        'qty' => 17,
+                        'qty' => 3,
                     ],
                     [
                         'id' => '%id%',
                         'name' => '%item1_simple::getProductName%',
                         'position' => '%position%',
-                        'qty' => 36,
+                        'qty' => 1,
                     ],
                     [
                         'id' => '%id%',
                         'name' => '%item1_simple::getProductName%',
                         'position' => '%position%',
-                        'qty' => 20,
+                        'qty' => 2,
                     ],
                 ],
                 'products' => [

dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php

@@ -33,6 +33,19 @@ class AddProductsToCartFromCustomerWishlistOnFrontendTest extends AbstractWishli
     const DOMAIN = 'CS';
     /* end tags */
 
+    /**
+     * Prepare data for test
+     *
+     * @param Customer $customer
+     * @return array
+     */
+    public function __prepare(Customer $customer)
+    {
+        $customer->persist();
+
+        return ['customer' => $customer];
+    }
+
     /**
      * Run suggest searching result test.
      *
@@ -43,9 +56,6 @@ class AddProductsToCartFromCustomerWishlistOnFrontendTest extends AbstractWishli
      */
     public function test(Customer $customer, $products, $qty)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-34757');
-        // Preconditions
-        $customer->persist();
         $this->loginCustomer($customer);
         $products = $this->createProducts($products);
         $this->addToWishlist($products);