m

app/Http/Controllers/Admin/AdminController.php

@@ -42,13 +42,15 @@ class AdminController extends Controller
     public function store(Request $request)
     {
         $request->validate([
-            'msnv'     => 'required|unique:user,msnv',
-            'mail'     => 'required|email|unique:user,mail',
-            'password' => 'required|min:6',
-            'role'     => 'required|in:' . User::ROLE_MEMBER . ',' . User::ROLE_ADMIN,
+            'msnv'        => 'required|integer|unique:user,msnv',
+            'name'        => 'required|string|max:255',
+            'mail'        => 'required|email|unique:user,mail',
+            'departments' => 'required|integer|min:1|max:5',
+            'password'    => 'required|string',
+            'role'        => 'required|in:' . User::ROLE_MEMBER . ',' . User::ROLE_ADMIN,
         ]);
 
-        $this->adminService->createUser($request->only('msnv', 'mail', 'password', 'role'));
+        $this->adminService->createUser($request->only('msnv', 'name', 'mail', 'departments', 'password', 'role'));
 
         return redirect()->route('admin.users.index')->with('success', __('messages.user_create_success'));
     }

app/Http/Controllers/User/UserController.php

@@ -34,7 +34,10 @@ class UserController extends Controller
     public function storeThankcards(Request $request)
     {
         $request->validate([
-            'receiver' => 'required|exists:user,msnv',
+            'receiver' => [
+                'required',
+                \Illuminate\Validation\Rule::exists('user', 'msnv')->where('status', \App\Models\User::STATUS_ACTIVE)
+            ],
             'amount'   => 'required|integer|min:1|max:' . Administration::MAX_SEND_CARD_PER_MONTH,
         ]);