From 91d6586ad8421334c18cc213b25a07b5896c24f2 Mon Sep 17 00:00:00 2001 From: Annika Wolff Date: Wed, 15 Jan 2020 11:53:48 +0100 Subject: [PATCH] resolve exception, rename function haveDownloadableItems --- packages/Webkul/Checkout/src/Models/Cart.php | 2 +- packages/Webkul/Shop/src/Http/Controllers/CartController.php | 2 +- packages/Webkul/Shop/src/Http/Controllers/OnepageController.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Checkout/src/Models/Cart.php b/packages/Webkul/Checkout/src/Models/Cart.php index 3dcbe76f0..4f17e688c 100755 --- a/packages/Webkul/Checkout/src/Models/Cart.php +++ b/packages/Webkul/Checkout/src/Models/Cart.php @@ -120,7 +120,7 @@ class Cart extends Model implements CartContract * * @return boolean */ - public function haveDownloadableItems() + public function hasDownloadableItems() { foreach ($this->items as $item) { if (stristr($item->type,'downloadable') !== false) { diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index cea6b7d4f..374695d40 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -96,7 +96,7 @@ class CartController extends Controller $product = $this->productRepository->find($id); - return redirect()->route('shop.products.index', ['slug' => $product->url_key]); + return redirect()->route('shop.productOrCategory.index', ['slug' => $product->url_key]); } return redirect()->back(); diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index 12dad01aa..8b7760698 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -69,7 +69,7 @@ class OnepageController extends Controller $cart = Cart::getCart(); - if (! auth()->guard('customer')->check() && $cart->haveDownloadableItems()) + if (! auth()->guard('customer')->check() && $cart->hasDownloadableItems()) return redirect()->route('customer.session.index'); Cart::collectTotals();