Fixed Response Issue

This commit is contained in:
devansh bawari 2020-10-05 19:33:57 +05:30
parent bee024ad2f
commit 5cfb126db4
3 changed files with 35 additions and 16 deletions

View File

@ -4,9 +4,12 @@ namespace Webkul\API\Http\Controllers\Shop;
use Cart; use Cart;
use Exception; use Exception;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\Validator;
use Webkul\Checkout\Repositories\CartRepository; use Webkul\Checkout\Repositories\CartRepository;
use Webkul\Checkout\Repositories\CartItemRepository; use Webkul\Checkout\Repositories\CartItemRepository;
use Webkul\Customer\Repositories\WishlistRepository; use Webkul\Customer\Repositories\WishlistRepository;
@ -142,22 +145,30 @@ class CartController extends Controller
* *
* @return \Illuminate\Http\JsonResponse * @return \Illuminate\Http\JsonResponse
*/ */
public function update() public function update(Request $request)
{ {
foreach (request()->get('qty') as $qty) { $validator = Validator::make($request->all(), [
'qty' => 'required|array',
]);
if ($validator->fails()) {
return response($validator->errors(), Response::HTTP_BAD_REQUEST);
}
foreach ($request->qty as $qty) {
if ($qty <= 0) { if ($qty <= 0) {
return response()->json([ return response()->json([
'message' => trans('shop::app.checkout.cart.quantity.illegal'), 'message' => trans('shop::app.checkout.cart.quantity.illegal'),
], 401); ], Response::HTTP_UNAUTHORIZED);
} }
} }
foreach (request()->get('qty') as $itemId => $qty) { foreach ($request->qty as $itemId => $qty) {
$item = $this->cartItemRepository->findOneByField('id', $itemId); $item = $this->cartItemRepository->findOneByField('id', $itemId);
Event::dispatch('checkout.cart.item.update.before', $itemId); Event::dispatch('checkout.cart.item.update.before', $itemId);
Cart::updateItems(request()->all()); Cart::updateItems($request->all());
Event::dispatch('checkout.cart.item.update.after', $item); Event::dispatch('checkout.cart.item.update.after', $item);
} }

View File

@ -2,8 +2,11 @@
namespace Webkul\API\Http\Controllers\Shop; namespace Webkul\API\Http\Controllers\Shop;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\Validator;
use Webkul\Customer\Repositories\CustomerRepository; use Webkul\Customer\Repositories\CustomerRepository;
use Webkul\Customer\Repositories\CustomerGroupRepository; use Webkul\Customer\Repositories\CustomerGroupRepository;
@ -69,24 +72,29 @@ class CustomerController extends Controller
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function create() public function create(Request $request)
{ {
request()->validate([ $validator = Validator::make($request->all(), [
'first_name' => 'required', 'first_name' => 'required',
'last_name' => 'required', 'last_name' => 'required',
'email' => 'email|required|unique:customers,email', 'email' => 'email|required|unique:customers,email',
'password' => 'confirmed|min:6|required', 'password' => 'confirmed|min:6|required',
]); ]);
$data = request()->input(); if ($validator->fails()) {
return response($validator->errors(), Response::HTTP_BAD_REQUEST);
}
$data = array_merge($data, [ $data = [
'password' => bcrypt($data['password']), 'first_name' => $request->first_name,
'channel_id' => core()->getCurrentChannel()->id, 'last_name' => $request->last_name,
'is_verified' => 1, 'email' => $request->email,
]); 'password' => $request->password,
'password' => bcrypt($request->password),
$data['customer_group_id'] = $this->customerGroupRepository->findOneWhere(['code' => 'general'])->id; 'channel_id' => core()->getCurrentChannel()->id,
'is_verified' => 1,
'customer_group_id' => $this->customerGroupRepository->findOneWhere(['code' => 'general'])->id
];
Event::dispatch('customer.registration.before'); Event::dispatch('customer.registration.before');

View File

@ -55,7 +55,7 @@ class Handler extends AppExceptionHandler
return response()->json(['error' => $this->jsonErrorMessages[401]], 401); return response()->json(['error' => $this->jsonErrorMessages[401]], 401);
} }
return redirect()->guest(route('auth.login')); return redirect()->guest(route('customer.session.index'));
} }
private function isAdminUri() private function isAdminUri()