From dfb9c75e77d2991401f53668aa57dd7756e12d62 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Thu, 24 Oct 2019 17:08:41 +0530
Subject: [PATCH] Move wishlist to cart issue fixed

---
 packages/Webkul/Checkout/src/Cart.php                  |  5 +++--
 .../src/Http/Controllers/WishlistController.php        | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index b188b5a9a..c0c5f68ed 100755
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -710,7 +710,6 @@ class Cart {
                 $address = $cart->billing_address;
             }
 
-
             $taxRates = $taxCategory->tax_rates()->where([
                     'state' => $address->state,
                     'country' => $address->country,
@@ -913,7 +912,9 @@ class Cart {
     
         if (! $wishlistItem->additional)
             $wishlistItem->additional = ['product_id' => $wishlistItem->product_id];
-        
+
+        request()->merge($wishlistItem->additional);
+
         $result = $this->addProduct($wishlistItem->product_id, $wishlistItem->additional);
 
         if ($result) {
diff --git a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
index 24790355f..2e5c82ecb 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
@@ -158,7 +158,7 @@ class WishlistController extends Controller
         if (! $wishlistItem)
             abort(404);
 
-        try {
+        // try {
             $result = Cart::moveToCart($wishlistItem);
 
             if ($result) {
@@ -170,11 +170,11 @@ class WishlistController extends Controller
             }
 
             return redirect()->back();
-        } catch (\Exception $e) {
-            session()->flash('warning', $e->getMessage());
+        // } catch (\Exception $e) {
+        //     session()->flash('warning', $e->getMessage());
 
-            return redirect()->route('shop.products.index', ['slug' => $wishlistItem->product->url_key]);
-        }
+        //     return redirect()->route('shop.products.index', ['slug' => $wishlistItem->product->url_key]);
+        // }
     }
 
     /**