MAGETWO-58057: [Backport] - [GitHub] Unable to add more than 1 produc…

…t to a cart from Wishlist #5282 - for 2.1
magento · Sep 8, 2016 · f553379 · f553379
1 parent fdb3182
commit f553379
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 4 deletions.
diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php
@@ -446,7 +446,13 @@ public function getSharedAddAllToCartUrl()
      */
     protected function _getCartUrlParameters($item)
     {
-        return ['item' => is_string($item) ? $item : $item->getWishlistItemId()];
+        $params = [
+            'item' => is_string($item) ? $item : $item->getWishlistItemId(),
+        ];
+        if ($item instanceof \Magento\Wishlist\Model\Item) {
+            $params['qty'] = $item->getQty();
+        }
+        return $params;
     }
 
     /**

diff --git a/app/code/Magento/Wishlist/Test/Unit/Helper/DataTest.php b/app/code/Magento/Wishlist/Test/Unit/Helper/DataTest.php
@@ -124,6 +124,7 @@ protected function setUp()
             ->setMethods([
                 'getProduct',
                 'getWishlistItemId',
+                'getQty',
             ])
             ->getMock();
 
@@ -217,13 +218,17 @@ public function testGetAddToCartParams()
         $url = 'result url';
         $storeId = 1;
         $wishlistItemId = 1;
+        $wishlistItemQty = 1;
 
         $this->wishlistItem->expects($this->once())
             ->method('getProduct')
             ->willReturn($this->product);
         $this->wishlistItem->expects($this->once())
             ->method('getWishlistItemId')
             ->willReturn($wishlistItemId);
+        $this->wishlistItem->expects($this->once())
+            ->method('getQty')
+            ->willReturn($wishlistItemQty);
 
         $this->product->expects($this->once())
             ->method('isVisibleInSiteVisibility')
@@ -243,9 +248,13 @@ public function testGetAddToCartParams()
             ->with('wishlist/index/cart')
             ->willReturn($url);
 
+        $expected = [
+            'item' => $wishlistItemId,
+            'qty' => $wishlistItemQty,
+        ];
         $this->postDataHelper->expects($this->once())
             ->method('getPostData')
-            ->with($url, ['item' => $wishlistItemId])
+            ->with($url, $expected)
             ->willReturn($url);
 
         $this->assertEquals($url, $this->model->getAddToCartParams($this->wishlistItem));
@@ -256,6 +265,7 @@ public function testGetAddToCartParamsWithReferer()
         $url = 'result url';
         $storeId = 1;
         $wishlistItemId = 1;
+        $wishlistItemQty = 1;
         $referer = 'referer';
         $refererEncoded = 'referer_encoded';
 
@@ -265,6 +275,9 @@ public function testGetAddToCartParamsWithReferer()
         $this->wishlistItem->expects($this->once())
             ->method('getWishlistItemId')
             ->willReturn($wishlistItemId);
+        $this->wishlistItem->expects($this->once())
+            ->method('getQty')
+            ->willReturn($wishlistItemQty);
 
         $this->product->expects($this->once())
             ->method('isVisibleInSiteVisibility')
@@ -288,9 +301,14 @@ public function testGetAddToCartParamsWithReferer()
             ->with('wishlist/index/cart')
             ->willReturn($url);
 
+        $expected = [
+            'item' => $wishlistItemId,
+            ActionInterface::PARAM_NAME_URL_ENCODED => $refererEncoded,
+            'qty' => $wishlistItemQty,
+        ];
         $this->postDataHelper->expects($this->once())
             ->method('getPostData')
-            ->with($url, ['item' => $wishlistItemId, ActionInterface::PARAM_NAME_URL_ENCODED => $refererEncoded])
+            ->with($url, $expected)
             ->willReturn($url);
 
         $this->assertEquals($url, $this->model->getAddToCartParams($this->wishlistItem, true));
@@ -363,13 +381,17 @@ public function testGetSharedAddToCartUrl()
         $url = 'result url';
         $storeId = 1;
         $wishlistItemId = 1;
+        $wishlistItemQty = 1;
 
         $this->wishlistItem->expects($this->once())
             ->method('getProduct')
             ->willReturn($this->product);
         $this->wishlistItem->expects($this->once())
             ->method('getWishlistItemId')
             ->willReturn($wishlistItemId);
+        $this->wishlistItem->expects($this->once())
+            ->method('getQty')
+            ->willReturn($wishlistItemQty);
 
         $this->product->expects($this->once())
             ->method('isVisibleInSiteVisibility')
@@ -383,9 +405,13 @@ public function testGetSharedAddToCartUrl()
             ->with('wishlist/shared/cart')
             ->willReturn($url);
 
+        $exptected = [
+            'item' => $wishlistItemId,
+            'qty' => $wishlistItemQty,
+        ];
         $this->postDataHelper->expects($this->once())
             ->method('getPostData')
-            ->with($url, ['item' => $wishlistItemId])
+            ->with($url, $exptected)
             ->willReturn($url);
 
         $this->assertEquals($url, $this->model->getSharedAddToCartUrl($this->wishlistItem));

diff --git a/app/code/Magento/Wishlist/view/frontend/web/wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/wishlist.js
@@ -47,6 +47,7 @@ define([
                         event.preventDefault();
                         $.mage.dataPost().postData($(event.currentTarget).data('post-remove'));
                     }, this))
+                    .on('click', this.options.addToCartSelector, $.proxy(this._beforeAddToCart, this))
                     .on('click', this.options.addAllToCartSelector, $.proxy(this._addAllWItemsToCart, this))
                     .on('focusin focusout', this.options.commentInputType, $.proxy(this._focusComment, this));
             }
@@ -59,6 +60,27 @@ define([
             });
         },
 
+        /**
+         * Process data before add to cart
+         *
+         * - update item's qty value.
+         *
+         * @param {Event} event
+         * @private
+         */
+        _beforeAddToCart: function(event) {
+            var elem = $(event.currentTarget),
+                itemId = elem.data(this.options.dataAttribute),
+                qtyName = $.validator.format(this.options.nameFormat, itemId),
+                qtyValue = elem.parents().find('[name="' + qtyName + '"]').val(),
+                params = elem.data('post');
+
+            if (params) {
+                params.data = $.extend({}, params.data, {'qty': qtyValue});
+                elem.data('post', params);
+            }
+        },
+
         /**
          * Add wish list items to cart.
          * @private