DONE: whatsapp api integration, fix linter using laravel pint, fix issue on invoice not found
This commit is contained in:
@@ -13,6 +13,7 @@ class UserController extends Controller
|
||||
{
|
||||
/**
|
||||
* Register user
|
||||
*
|
||||
* @param request
|
||||
* @return response
|
||||
*/
|
||||
@@ -22,18 +23,19 @@ class UserController extends Controller
|
||||
$this->validate($request, [
|
||||
'name' => 'required',
|
||||
'email' => 'required|email',
|
||||
'password' => 'required|min:6'
|
||||
'password' => 'required|min:6',
|
||||
]);
|
||||
|
||||
User::create([
|
||||
'name' => $request->name,
|
||||
'email' => $request->email,
|
||||
'password' => Hash::make($request->password)
|
||||
'password' => Hash::make($request->password),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Login page
|
||||
*
|
||||
* @param NA
|
||||
* @return view
|
||||
*/
|
||||
@@ -44,6 +46,7 @@ class UserController extends Controller
|
||||
|
||||
/**
|
||||
* User Login
|
||||
*
|
||||
* @param request
|
||||
* @return response
|
||||
*/
|
||||
@@ -51,7 +54,7 @@ class UserController extends Controller
|
||||
{
|
||||
$this->validate($request, [
|
||||
'email' => 'required|email',
|
||||
'password' => 'required|min:6'
|
||||
'password' => 'required|min:6',
|
||||
]);
|
||||
|
||||
$user = User::where('email', $request->email)->first();
|
||||
@@ -59,13 +62,16 @@ class UserController extends Controller
|
||||
if (Hash::check($request->password, $user->password)) {
|
||||
return back()->with('success', 'Success! You are logged in');
|
||||
}
|
||||
|
||||
return back()->with('failed', 'Failed! Invalid password');
|
||||
}
|
||||
|
||||
return back()->with('failed', 'Failed! Invalid email');
|
||||
}
|
||||
|
||||
/**
|
||||
* Forgot password
|
||||
*
|
||||
* @param NA
|
||||
* @return view
|
||||
*/
|
||||
@@ -76,6 +82,7 @@ class UserController extends Controller
|
||||
|
||||
/**
|
||||
* Validate token for forgot password
|
||||
*
|
||||
* @param token
|
||||
* @return view
|
||||
*/
|
||||
@@ -85,13 +92,16 @@ class UserController extends Controller
|
||||
// dd($user);
|
||||
if ($user) {
|
||||
$email = $user->email;
|
||||
|
||||
return view('auth.change-password', compact('email'));
|
||||
}
|
||||
|
||||
return redirect()->route('forgot-password')->with('failed', 'Password reset link is expired');
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset password
|
||||
*
|
||||
* @param request
|
||||
* @return response
|
||||
*/
|
||||
@@ -103,7 +113,7 @@ class UserController extends Controller
|
||||
|
||||
$user = User::where('email', $request->email)->first();
|
||||
// dd($user);
|
||||
if (!$user) {
|
||||
if (! $user) {
|
||||
return back()->with('failed', 'Gagal! Alamat Ini Belum Didaftarkan.');
|
||||
}
|
||||
|
||||
@@ -113,26 +123,29 @@ class UserController extends Controller
|
||||
$user['is_verified'] = 0;
|
||||
$user->save();
|
||||
|
||||
$resetUrl = url('/forgot-password/' . $token);
|
||||
$resetUrl = url('/forgot-password/'.$token);
|
||||
|
||||
Mail::to($request->email)->send(new ResetPassword($user->name, $resetUrl));
|
||||
|
||||
if(Mail::failures() != 0) {
|
||||
if (Mail::failures() != 0) {
|
||||
return back()->with('success', 'Berjaya DiHantar! Pautan Lupa Katalaluan Telah Dihantarkan Kepada Alamat Emel Anda.');
|
||||
}
|
||||
|
||||
return back()->with('failed', 'Failed! there is some issue with email provider');
|
||||
}
|
||||
|
||||
/**
|
||||
* Change password
|
||||
*
|
||||
* @param request
|
||||
* @return response
|
||||
*/
|
||||
public function updatePassword(Request $request) {
|
||||
public function updatePassword(Request $request)
|
||||
{
|
||||
$this->validate($request, [
|
||||
'email' => 'required',
|
||||
'password' => 'required|min:6',
|
||||
'confirm_password' => 'required|same:password'
|
||||
'confirm_password' => 'required|same:password',
|
||||
]);
|
||||
|
||||
$user = User::where('email', $request->email)->first();
|
||||
@@ -142,12 +155,13 @@ class UserController extends Controller
|
||||
$user['password'] = Hash::make($request->password);
|
||||
$user->save();
|
||||
// dd($user->user_type);
|
||||
if($user->user_type == 2){
|
||||
if ($user->user_type == 2) {
|
||||
return redirect()->to(config('app.app_pembida'));
|
||||
}
|
||||
|
||||
|
||||
return redirect()->route('login')->with('success', 'Berjaya! Katalaluan Anda Telah Didaftarkan.');
|
||||
}
|
||||
|
||||
return redirect()->route('forgot-password')->with('failed', 'Gadal! Sila Cuba Lagi...');
|
||||
}
|
||||
|
||||
@@ -155,4 +169,4 @@ class UserController extends Controller
|
||||
{
|
||||
return view('auth.termasyarat');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user