latest working update

This commit is contained in:
ghassan committed 2026-04-16 19:42:37 +03:00
1 parent ba453d7b82
commit eb0d79d503
8 files changed
+592 -20

No files matched your search

@@ -0,0 +1,92 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Models\ParkingLot;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use Illuminate\Validation\Rules\Password;
class AdminOperatorController extends Controller
{
public function index()
{
$operators = User::where('role', 'operator')
->with('assignedLot')
->orderBy('name')
->get();
$lots = ParkingLot::orderBy('name')->get();
return view('admin.operators.index', compact('operators', 'lots'));
}
public function store(Request $request)
{
$data = $request->validate([
'name' => 'required|string|max:255',
'email' => 'required|email|unique:users,email',
'phone' => 'nullable|string|max:20',
'password' => ['required', Password::min(8)],
'parking_lot_id' => 'nullable|exists:parking_lots,id',
], [
'email.unique' => 'هذا البريد الإلكتروني مستخدم بالفعل.',
]);
User::create([
'name' => $data['name'],
'email' => $data['email'],
'phone' => $data['phone'] ?? null,
'password' => Hash::make($data['password']),
'role' => 'operator',
'parking_lot_id' => $data['parking_lot_id'] ?? null,
]);
return response()->json(['success' => true, 'message' => 'تم إنشاء حساب المشغّل بنجاح.']);
}
public function update(Request $request, User $operator)
{
if ($operator->role !== 'operator') {
return response()->json(['success' => false, 'message' => 'المستخدم ليس مشغّلاً.'], 403);
}
$data = $request->validate([
'name' => 'required|string|max:255',
'email' => 'required|email|unique:users,email,' . $operator->id,
'phone' => 'nullable|string|max:20',
'password' => ['nullable', Password::min(8)],
'parking_lot_id' => 'nullable|exists:parking_lots,id',
], [
'email.unique' => 'هذا البريد الإلكتروني مستخدم بالفعل.',
]);
$updates = [
'name' => $data['name'],
'email' => $data['email'],
'phone' => $data['phone'] ?? null,
'parking_lot_id' => $data['parking_lot_id'] ?? null,
];
if (!empty($data['password'])) {
$updates['password'] = Hash::make($data['password']);
}
$operator->update($updates);
return response()->json(['success' => true, 'message' => 'تم تحديث بيانات المشغّل.']);
}
public function destroy(User $operator)
{
if ($operator->role !== 'operator') {
return response()->json(['success' => false, 'message' => 'المستخدم ليس مشغّلاً.'], 403);
}
$operator->delete();
return response()->json(['success' => true, 'message' => 'تم حذف المشغّل.']);
}
}
@@ -7,6 +7,7 @@ use App\Models\Booking;
use App\Models\ParkingLot;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Storage;
use Carbon\Carbon;
@@ -16,23 +17,39 @@ class OperatorController extends Controller
public function dashboard(Request $request): \Illuminate\View\View
{
$user = Auth::user();
$assignedLotId = $user->parking_lot_id; // null = no restriction (e.g. admin)
$rawLots = ParkingLot::active()->withStatus()->get();
$parkingLots = $rawLots->map(fn($lot) => [
'id' => $lot->id,
'name' => $lot->name,
'address' => $lot->address,
'total' => $lot->total_capacity,
'avail' => max(0, $lot->total_capacity - ($lot->active_bookings_count + $lot->active_registries_count)),
'occupied'=> $lot->active_bookings_count + $lot->active_registries_count,
'price' => (float) $lot->price_per_hour,
'hours' => $lot->working_hours,
'lat' => (float) $lot->latitude,
'lng' => (float) $lot->longitude,
'image' => $lot->image ? Storage::url($lot->image) : null,
'id' => $lot->id,
'name' => $lot->name,
'address' => $lot->address,
'total' => $lot->total_capacity,
'avail' => max(0, $lot->total_capacity - ($lot->active_bookings_count + $lot->active_registries_count)),
'occupied' => $lot->active_bookings_count + $lot->active_registries_count,
'price' => (float) $lot->price_per_hour,
'hours' => $lot->working_hours,
'lat' => (float) $lot->latitude,
'lng' => (float) $lot->longitude,
'image' => $lot->image ? Storage::url($lot->image) : null,
'locked' => $assignedLotId !== null && $lot->id !== $assignedLotId,
])->values();
$selectedLotId = $request->get('lot_id');
// If operator has an assigned lot, force that lot
$selectedLotId = $request->get('lot_id');
if ($assignedLotId !== null) {
// Reject any attempt to view a different lot
if ($selectedLotId && (int) $selectedLotId !== $assignedLotId) {
return redirect()->route('operator.dashboard', ['lot_id' => $assignedLotId]);
}
// Auto-select assigned lot if nothing selected
if (!$selectedLotId) {
$selectedLotId = $assignedLotId;
}
}
$selectedLot = null;
$activeCars = collect();
$reservations = collect();
@@ -56,7 +73,7 @@ class OperatorController extends Controller
}
return view('operator.dashboard', compact(
'parkingLots', 'selectedLot', 'activeCars', 'reservations', 'selectedLotId'
'parkingLots', 'selectedLot', 'activeCars', 'reservations', 'selectedLotId', 'assignedLotId'
));
}