Commit 8ade4683 authored by Michael Ngei's avatar Michael Ngei

Merge branch 'iprsv2_mike' into 'master'

Add changes to onboarding

See merge request !3
parents 95a3c467 1527d7bc
......@@ -17,6 +17,7 @@ use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Str;
use Spatie\Permission\Models\Permission;
use Spatie\Permission\Models\Role;
use Illuminate\Contracts\Auth\PasswordBroker;
......@@ -219,6 +220,7 @@ class OnboardingController extends Controller
return redirect()->route('onboarding.edit', $ob->id)->with("success", "Contract saved successfully!");
case "user" :
// store the user data
$plainPassword = $validated['password'] ?? Str::random(8);
if ($request->filled('record')) {
$userRequest = new UpdateUserRequest();
$validated = $request->validate($userRequest->rules());
......@@ -227,17 +229,18 @@ class OnboardingController extends Controller
'contract_rid' => $validated['contract_id'],
'name' => $validated['name'],
'email' => $validated['email'],
'password' => bcrypt($validated['password']??'Enc@2024'),
'password' => bcrypt($plainPassword),
'status_l' => $validated['status']
]);
}else{
$userRequest = new StoreUserRequest();
$validated = $request->validate($userRequest->rules());
$plainPassword = $validated['password'] ?? Str::random(8);
$user = User::create([
'contract_rid' => $validated['contract_id'],
'name' => $validated['name'],
'email' => $validated['email'],
'password' => bcrypt($validated['password']??'Enc@2024'),
'password' => bcrypt($plainPassword),
'status_l' => $validated['status']
]);
}
......@@ -263,10 +266,10 @@ class OnboardingController extends Controller
//get a token
$resetToken= $this->passwordBroker->createToken($user);
//generate link
$resetUrl = url('/password/reset/'.$resetToken.'?email='.$user['email']);
//$resetUrl = url('/password/reset/'.$resetToken.'?email='.$user['email']);
$resetUrl='';
//mail with custom template
Mail::to($user['email'])->send(new IPRSRegisterUser($user, $resetUrl));
Mail::to($user['email'])->send(new IPRSRegisterUser($user,$plainPassword,$resetUrl));
// save and retain the same page
return redirect()->route('onboarding.edit',$ob->id)->with("success", "User saved successfully!");
case "review":
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment