jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes on addresses

Browse Source
This commit is contained in:
ludo
2024-04-29 22:01:45 +02:00
parent c63bb762ed
commit ee60bac538
14 changed files with 99 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Shop/Auth/LoginController.php
View File

@@ -32,8 +32,13 @@ class LoginController extends Controller
if ($this->guard()->attempt($credentials, $request->get('remember'))) {
$request->session()->regenerate();
return back()->getTargetUrl() === route('Shop.login') ? redirect()->intended(route('home')) : back();
if (back()->getTargetUrl() === route('Shop.Orders.store')) {
$route = 'Shop.Orders.order';
} else {
$route = 'home';
}
return redirect()->intended(route($route));
}
return back()->withErrors([

19
app/Http/Controllers/Shop/Auth/RegisterController.php
View File

@@ -24,28 +24,27 @@ class RegisterController extends Controller
public function register(RegisterCustomer $request)
{
$validatedData = $request->validateWithBag('Errors', [
$request->validateWithBag('Errors', [
'last_name' => 'required|max:255',
'first_name' => 'required|max:255',
'email' => 'required|email|max:255|unique:shop_customers,email,NULL,id,deleted_at,NULL',
'password' => ['required', 'confirmed', new Password()],
]);
if (back()->getTargetUrl() === route('Shop.Orders.store')) {
$route = 'Shop.Orders.order';
} else {
$route = 'home';
}
$user = $this->create($request->all());
$this->guard()->login($user);
/*
$response = $this->registered($request, $user);
if ($response) {
return $response;
}
*/
return $request->wantsJson()
? new JsonResponse([], 201)
: redirect()->route('home');
: redirect()->route($route);
}
public function emailVerify()