|
@@ -16,6 +16,7 @@ use Illuminate\Http\Request;
|
|
use Illuminate\Support\Facades\Auth;
|
|
use Illuminate\Support\Facades\Auth;
|
|
use Illuminate\Support\Facades\DB;
|
|
use Illuminate\Support\Facades\DB;
|
|
use Illuminate\Support\Facades\Hash;
|
|
use Illuminate\Support\Facades\Hash;
|
|
|
|
+use function Laravel\Prompts\password;
|
|
|
|
|
|
class UserController extends Controller
|
|
class UserController extends Controller
|
|
{
|
|
{
|
|
@@ -132,15 +133,19 @@ class UserController extends Controller
|
|
public function update(UpdateRequest $request,string $id)
|
|
public function update(UpdateRequest $request,string $id)
|
|
{
|
|
{
|
|
$user = User::findOrFail($id);
|
|
$user = User::findOrFail($id);
|
|
|
|
+ $newPassword=null;
|
|
|
|
+
|
|
if(Auth::user()->super_admin){
|
|
if(Auth::user()->super_admin){
|
|
$user->fill([
|
|
$user->fill([
|
|
- ...$request->except(['username'])
|
|
|
|
|
|
+ ...$request->except(['username']),
|
|
|
|
+ 'password'=> $request->password ? Hash::make($request->password):Auth::user()->password,
|
|
]);
|
|
]);
|
|
$user->save();
|
|
$user->save();
|
|
return $this->noContent();
|
|
return $this->noContent();
|
|
}
|
|
}
|
|
$user->fill([
|
|
$user->fill([
|
|
- ...$request->except(['role_id','department_id','company_id'])
|
|
|
|
|
|
+ ...$request->except(['role_id','department_id','company_id']),
|
|
|
|
+ 'password'=> $request->password ? Hash::make($request->password):Auth::user()->password,
|
|
]);
|
|
]);
|
|
$user->save();
|
|
$user->save();
|
|
return $this->noContent();
|
|
return $this->noContent();
|