remove Mail use from Notifications classes
This commit is contained in:
@@ -2,6 +2,8 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Mail\RegisterMail;
|
||||
use App\Mail\UpdateRoleMail;
|
||||
use App\Notifications\VolunteerRoleUpdated;
|
||||
use App\Mail\CreateUserByAdminMail;
|
||||
use App\Mail\DeactivateAccountMail;
|
||||
@@ -56,6 +58,17 @@ class UserController extends Controller
|
||||
$admins = User::whereIn('role', [1, 2])->get();
|
||||
Notification::sendNow($admins, new UserRegistered($user));
|
||||
|
||||
foreach ($admins as $admin) {
|
||||
if ($admin->email_notifications) {
|
||||
Mail::to($admin->email)->send(new RegisterMail([
|
||||
'adminName' => $admin->name,
|
||||
'adminLastname' => $admin->lastname,
|
||||
'userName' => $user->name,
|
||||
'userLastname' => $user->lastname,
|
||||
]));
|
||||
}
|
||||
}
|
||||
|
||||
return response()->json(['message' => 'User created successfully']);
|
||||
}
|
||||
|
||||
@@ -244,6 +257,14 @@ class UserController extends Controller
|
||||
|
||||
$user->notify(new VolunteerRoleUpdated($role));
|
||||
|
||||
if ($user->email_notifications) {
|
||||
Mail::to($user->email)->send(new UpdateRoleMail([
|
||||
'name' => $user->name,
|
||||
'lastname' => $user->lastname,
|
||||
'role' => $role,
|
||||
]));
|
||||
}
|
||||
|
||||
return response()->json(['message' => 'User role added successfully']);
|
||||
} catch(\Exception $e) {
|
||||
Log::info($e->getMessage());
|
||||
|
||||
Reference in New Issue
Block a user