feat: final updates

This commit is contained in:
2026-08-22 11:11:28 -07:00
parent 618a3d4cd9
commit d4bb1b9414
43 changed files with 1136 additions and 375 deletions
+26 -10
View File
@@ -7,6 +7,7 @@ use App\Http\Requests\Admin\Users\UserEditRequest;
use App\Http\Requests\EditProfilePostRequest;
use App\Models\Booking;
use App\Models\Order;
use App\Models\Province;
use App\Models\User;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;
@@ -20,15 +21,16 @@ class UserController extends Controller
{
$users = User::query()
->with(['province', 'city', 'file'])
->when($request->filled('search'), function (Builder $query) use ($request){
$search = $request->input('search');
$search = $request->input('search');
$query->whereAny([
'first_name',
'last_name',
'mobile',
'email'
],'LIKE',"%$search%");
$query->whereAny([
'first_name',
'last_name',
'mobile',
'email'
],'LIKE',"%$search%");
})
->when($request->filled('sort'), function (Builder $query) use ($request) {
$sort = $request->input('sort');
@@ -61,7 +63,11 @@ class UserController extends Controller
public function edit(User $user)
{
return view('admin.users.edit', compact('user'));
$user->load(['province', 'city', 'file']);
$provinces = Province::all();
return view('admin.users.edit', compact('user', 'provinces'));
}
public function update(User $user, UserEditRequest $request)
@@ -71,7 +77,9 @@ class UserController extends Controller
'first_name',
'last_name',
'mobile',
'email'
'email',
'province_id',
'city_id',
]);
if ($request->filled('password')){
@@ -86,9 +94,17 @@ class UserController extends Controller
public function destroy(User $user)
{
if ($user->bookings()->exists()) {
return back()->withErrors([
'error' => 'این کاربر دارای رزرو است و قابل حذف نیست.'
]);
}
$user->delete();
return redirect()->route('admin.users.index');
return redirect()->route('admin.users.index')->withErrors([
'success'=> 'کاربر با موفقیت حذف شد'
]);
}
}