From 2d8f5f412e3f75a62ff0d5f0a3d5a0918925d19c Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Thu, 23 Jan 2020 10:42:09 +0530 Subject: [PATCH 1/2] Issue #2087 --- .../Webkul/Customer/src/Http/Controllers/WishlistController.php | 2 +- packages/Webkul/Shop/src/Http/Controllers/CartController.php | 2 +- packages/Webkul/Shop/src/Http/routes.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php index f9362e68d..334fd7a98 100755 --- a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php @@ -170,7 +170,7 @@ class WishlistController extends Controller } catch (\Exception $e) { session()->flash('warning', $e->getMessage()); - return redirect()->route('shop.productOrCategory.index', ['slugOrPath' => $wishlistItem->product->url_key]); + return redirect()->route('shop.productOrCategory.index', $wishlistItem->product->url_key); } } diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index 81ea25873..1ca8d90f1 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.productOrCategory.index', ['slugOrPath' => $product->url_key]); + return redirect()->route('shop.productOrCategory.index', $product->url_key); } return redirect()->back(); diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index db644a6d0..e43ced9dc 100755 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -37,7 +37,7 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function Route::post('checkout/cart/coupon', 'Webkul\Shop\Http\Controllers\CartController@applyCoupon')->name('shop.checkout.cart.coupon.apply'); Route::delete('checkout/cart/coupon', 'Webkul\Shop\Http\Controllers\CartController@removeCoupon')->name('shop.checkout.coupon.remove.coupon'); - + //Cart Items Add Route::post('checkout/cart/add/{id}', 'Webkul\Shop\Http\Controllers\CartController@add')->defaults('_config', [ 'redirect' => 'shop.checkout.cart.index' From 6147c3e5db4868b3e9ddff436899ee8b85b3fd08 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Thu, 23 Jan 2020 11:01:04 +0530 Subject: [PATCH 2/2] Issue #2114 --- .../Controllers/ResetPasswordController.php | 46 +++++++++++-------- .../Controllers/ForgetPasswordController.php | 42 +++++++++-------- 2 files changed, 50 insertions(+), 38 deletions(-) diff --git a/packages/Webkul/Customer/src/Http/Controllers/ResetPasswordController.php b/packages/Webkul/Customer/src/Http/Controllers/ResetPasswordController.php index 73e47ef7f..304d915eb 100755 --- a/packages/Webkul/Customer/src/Http/Controllers/ResetPasswordController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/ResetPasswordController.php @@ -57,27 +57,33 @@ class ResetPasswordController extends Controller */ public function store() { - $this->validate(request(), [ - 'token' => 'required', - 'email' => 'required|email', - 'password' => 'required|confirmed|min:6', - ]); - - $response = $this->broker()->reset( - request(['email', 'password', 'password_confirmation', 'token']), function ($customer, $password) { - $this->resetPassword($customer, $password); - } - ); - - if ($response == Password::PASSWORD_RESET) { - return redirect()->route($this->_config['redirect']); - } - - return back() - ->withInput(request(['email'])) - ->withErrors([ - 'email' => trans($response) + try { + $this->validate(request(), [ + 'token' => 'required', + 'email' => 'required|email', + 'password' => 'required|confirmed|min:6', ]); + + $response = $this->broker()->reset( + request(['email', 'password', 'password_confirmation', 'token']), function ($customer, $password) { + $this->resetPassword($customer, $password); + } + ); + + if ($response == Password::PASSWORD_RESET) { + return redirect()->route($this->_config['redirect']); + } + + return back() + ->withInput(request(['email'])) + ->withErrors([ + 'email' => trans($response) + ]); + } catch(\Exception $e) { + session()->flash('success', trans($e->getMessage())); + + return redirect()->back(); + } } /** diff --git a/packages/Webkul/User/src/Http/Controllers/ForgetPasswordController.php b/packages/Webkul/User/src/Http/Controllers/ForgetPasswordController.php index 3ad6f1bc0..4be924629 100755 --- a/packages/Webkul/User/src/Http/Controllers/ForgetPasswordController.php +++ b/packages/Webkul/User/src/Http/Controllers/ForgetPasswordController.php @@ -35,7 +35,7 @@ class ForgetPasswordController extends Controller /** * Show the form for creating a new resource. * - * @return \Illuminate\View\View + * @return \Illuminate\View\View */ public function create() { @@ -49,25 +49,31 @@ class ForgetPasswordController extends Controller */ public function store() { - $this->validate(request(), [ - 'email' => 'required|email' - ]); + try { + $this->validate(request(), [ + 'email' => 'required|email' + ]); - $response = $this->broker()->sendResetLink( - request(['email']) - ); - - if ($response == Password::RESET_LINK_SENT) { - session()->flash('success', trans($response)); - - return back(); - } - - return back() - ->withInput(request(['email'])) - ->withErrors( - ['email' => trans($response)] + $response = $this->broker()->sendResetLink( + request(['email']) ); + + if ($response == Password::RESET_LINK_SENT) { + session()->flash('success', trans($response)); + + return back(); + } + + return back() + ->withInput(request(['email'])) + ->withErrors( + ['email' => trans($response)] + ); + } catch(\Exception $e) { + session()->flash('success', trans($e->getMessage())); + + return redirect()->back(); + } } /**