diff --git a/packages/Webkul/API/Http/Controllers/Shop/CartController.php b/packages/Webkul/API/Http/Controllers/Shop/CartController.php index d54bddb9f..49c5a55c1 100644 --- a/packages/Webkul/API/Http/Controllers/Shop/CartController.php +++ b/packages/Webkul/API/Http/Controllers/Shop/CartController.php @@ -4,6 +4,8 @@ namespace Webkul\API\Http\Controllers\Shop; use Cart; use Exception; +use Illuminate\Http\Request; +use Illuminate\Http\Response; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Event; @@ -142,22 +144,28 @@ class CartController extends Controller * * @return \Illuminate\Http\JsonResponse */ - public function update() + public function update(Request $request) { - foreach (request()->get('qty') as $qty) { + $this->validate($request, [ + 'qty' => 'required|array', + ]); + + $requestedQuantity = $request->get('qty'); + + foreach ($requestedQuantity as $qty) { if ($qty <= 0) { return response()->json([ 'message' => trans('shop::app.checkout.cart.quantity.illegal'), - ], 401); + ], Response::HTTP_UNAUTHORIZED); } } - foreach (request()->get('qty') as $itemId => $qty) { + foreach ($requestedQuantity as $itemId => $qty) { $item = $this->cartItemRepository->findOneByField('id', $itemId); Event::dispatch('checkout.cart.item.update.before', $itemId); - Cart::updateItems(request()->all()); + Cart::updateItems(['qty' => $requestedQuantity]); Event::dispatch('checkout.cart.item.update.after', $item); } diff --git a/packages/Webkul/API/Http/Controllers/Shop/CustomerController.php b/packages/Webkul/API/Http/Controllers/Shop/CustomerController.php index 04eca77a1..7fb6b796b 100644 --- a/packages/Webkul/API/Http/Controllers/Shop/CustomerController.php +++ b/packages/Webkul/API/Http/Controllers/Shop/CustomerController.php @@ -2,6 +2,7 @@ namespace Webkul\API\Http\Controllers\Shop; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Event; use Webkul\Customer\Repositories\CustomerRepository; @@ -69,24 +70,25 @@ class CustomerController extends Controller * * @return \Illuminate\Http\Response */ - public function create() + public function create(Request $request) { - request()->validate([ + $this->validate($request, [ 'first_name' => 'required', 'last_name' => 'required', 'email' => 'email|required|unique:customers,email', 'password' => 'confirmed|min:6|required', ]); - $data = request()->input(); - - $data = array_merge($data, [ - 'password' => bcrypt($data['password']), - 'channel_id' => core()->getCurrentChannel()->id, - 'is_verified' => 1, - ]); - - $data['customer_group_id'] = $this->customerGroupRepository->findOneWhere(['code' => 'general'])->id; + $data = [ + 'first_name' => $request->get('first_name'), + 'last_name' => $request->get('last_name'), + 'email' => $request->get('email'), + 'password' => $request->get('password'), + 'password' => bcrypt($request->get('password')), + 'channel_id' => core()->getCurrentChannel()->id, + 'is_verified' => 1, + 'customer_group_id' => $this->customerGroupRepository->findOneWhere(['code' => 'general'])->id + ]; Event::dispatch('customer.registration.before'); diff --git a/packages/Webkul/Core/src/Exceptions/Handler.php b/packages/Webkul/Core/src/Exceptions/Handler.php index 8e84fcf64..199a013a0 100755 --- a/packages/Webkul/Core/src/Exceptions/Handler.php +++ b/packages/Webkul/Core/src/Exceptions/Handler.php @@ -55,7 +55,7 @@ class Handler extends AppExceptionHandler return response()->json(['error' => $this->jsonErrorMessages[401]], 401); } - return redirect()->guest(route('auth.login')); + return redirect()->guest(route('customer.session.index')); } private function isAdminUri()