From 163ce17e3482f515e059c42ea8faf8189feb08f3 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Thu, 31 Oct 2019 13:50:17 +0530
Subject: [PATCH] Issue #1662 fixed

---
 .../Http/Controllers/Shop/CartController.php    |  4 +++-
 .../Controllers/Shop/WishlistController.php     | 17 +++++------------
 .../src/Http/Controllers/CartController.php     |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/packages/Webkul/API/Http/Controllers/Shop/CartController.php b/packages/Webkul/API/Http/Controllers/Shop/CartController.php
index 3329e06c3..b85af9eb9 100644
--- a/packages/Webkul/API/Http/Controllers/Shop/CartController.php
+++ b/packages/Webkul/API/Http/Controllers/Shop/CartController.php
@@ -104,12 +104,14 @@ class CartController extends Controller
 
         if (! $result) {
             $message = session()->get('warning') ?? session()->get('error');
+            
             return response()->json([
                     'error' => session()->get('warning')
                 ], 400);
         }
 
-        $this->wishlistRepository->deleteWhere(['product_id' => $id]);
+        if ($customer = auth($this->guard)->user())
+            $this->wishlistRepository->deleteWhere(['product_id' => $id, 'customer_id' => $customer->id]);
         
         Event::fire('checkout.cart.item.add.after', $result);
 
diff --git a/packages/Webkul/API/Http/Controllers/Shop/WishlistController.php b/packages/Webkul/API/Http/Controllers/Shop/WishlistController.php
index db9273986..700bdfb34 100644
--- a/packages/Webkul/API/Http/Controllers/Shop/WishlistController.php
+++ b/packages/Webkul/API/Http/Controllers/Shop/WishlistController.php
@@ -107,19 +107,12 @@ class WishlistController extends Controller
         $result = Cart::moveToCart($wishlistItem);
 
         if ($result) {
-            if ($wishlistItem->delete()) {
-                Cart::collectTotals();
+            Cart::collectTotals();
 
-                return response()->json([
-                        'data' => 1,
-                        'message' => trans('shop::app.wishlist.moved')
-                    ]);
-            } else {
-                return response()->json([
-                        'data' => 1,
-                        'error' => trans('shop::app.wishlist.move-error')
-                    ], 400);
-            }
+            return response()->json([
+                    'data' => 1,
+                    'message' => trans('shop::app.wishlist.moved')
+                ]);
         } else {
             return response()->json([
                     'data' => -1,
diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php
index fe58bc3bc..6cc2958c2 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php
@@ -82,7 +82,7 @@ class CartController extends Controller
                 session()->flash('success', trans('shop::app.checkout.cart.item.success'));
 
                 if ($customer = auth()->guard('customer')->user())
-                    $this->wishlistRepository->deleteWhere(['product_id' => $id]);
+                    $this->wishlistRepository->deleteWhere(['product_id' => $id, 'customer_id' => $customer->id]);
 
                 if (request()->get('is_buy_now'))
                     return redirect()->route('shop.checkout.onepage.index');