merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1695 from jitendra-webkul/jitendra 

Move wishlist to cart issue fixed
This commit is contained in:
Jitendra Singh 2019-10-24 17:09:50 +05:30 committed by GitHub
parent 5a93e2f1bb dfb9c75e77
commit fb4e977dbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/Webkul/Checkout/src/Cart.php
View File

@ -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) {

10
packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
View File

@ -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]);
// }
}
/**