diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 45fa8eb..75edac0 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -17,12 +17,12 @@ public function index(Request $request)
     {
         $query = Booking::query();
 
-        // Filter pencarian berdasarkan status_booking
-        if ($request->has('search') && !empty($request->search)) {
-            $query->where('status_booking', 'like', '%' . $request->search . '%');
-        }
+        // Filter pencarian berdasarkan bulan dari tanggal_booking
+    if ($request->has('search') && !empty($request->search)) {
+        $query->whereMonth('tanggal_checkout', $request->search);
+    }
 
-        $bookings = $query->orderBy('tanggal_booking', 'desc')->paginate(10);
+    $bookings = $query->orderBy('tanggal_checkout', 'desc')->paginate(10);
 
         return view('admin.booking', compact('bookings'));
     }
@@ -220,4 +220,25 @@ public function approvePerpanjangan($id)
 
     return redirect()->route('admin.booking')->with('success', 'Perpanjangan berhasil dikonfirmasi.');
 }
+
+public function markAsCompleted($id_booking)
+{
+    $booking = Booking::findOrFail($id_booking);
+
+    // Pastikan hanya booking yang dikonfirmasi bisa selesai
+    if ($booking->status_booking === 'Dikonfirmasi') {
+        $booking->update(['status_booking' => 'Selesai']);
+
+        // Update status kamar menjadi tersedia
+        $room = $booking->room;
+        if ($room) {
+            $room->update(['status' => 'tersedia']);
+        }
+
+        return redirect()->route('admin.booking')->with('success', 'Booking telah diselesaikan.');
+    }
+
+    return redirect()->route('admin.booking')->with('error', 'Booking belum dikonfirmasi.');
+}
+
 }
diff --git a/app/Http/Controllers/DashboardAdminController.php b/app/Http/Controllers/DashboardAdminController.php
index 975f442..308ab2e 100644
--- a/app/Http/Controllers/DashboardAdminController.php
+++ b/app/Http/Controllers/DashboardAdminController.php
@@ -6,19 +6,43 @@
 use App\Models\User;
 use App\Models\Room;
 use App\Models\Booking;
+use Carbon\Carbon;
 
 class DashboardAdminController extends Controller
 {
     public function index()
-    {
-        // Mengambil data dari database
-        $totalUsers = User::count();
-        $totalRooms = Room::count();
-        $totalBookings = Booking::count();
-        $pendingBookings = Booking::where('status_booking', 'pending')->with('user', 'room')->get();
+{
+    $totalUsers = User::count();
+    $totalRooms = Room::count();
+    $totalBookings = Booking::count();
 
-        // Mengirim data ke view
-        return view('admin.dashboard', compact('totalUsers', 'totalRooms', 'totalBookings', 'pendingBookings'));
+    // Ambil semua booking yang sudah dikonfirmasi
+    $confirmedBookings = Booking::with('user', 'room')
+        ->where('status_booking', 'Dikonfirmasi')
+        ->get();
+
+    // Buat array untuk simpan sisa hari per booking
+    $daysLeftPerBooking = [];
+
+    foreach ($confirmedBookings as $booking) {
+        if ($booking->tanggal_checkout) {
+            $daysLeftPerBooking[$booking->id_booking] = now()->diffInDays(Carbon::parse($booking->tanggal_checkout), false);
+        } else {
+            $daysLeftPerBooking[$booking->id_booking] = null;
+        }
     }
-    
+
+    // Ambil booking pending untuk ditampilkan di tabel
+    $pendingBookings = Booking::where('status_booking', 'pending')->with('user', 'room')->get();
+
+    return view('admin.dashboard', compact(
+        'totalUsers',
+        'totalRooms',
+        'totalBookings',
+        'pendingBookings',
+        'confirmedBookings',
+        'daysLeftPerBooking'
+    ));
+}
+
 }
diff --git a/app/Http/Controllers/DashboardPemilikController.php b/app/Http/Controllers/DashboardPemilikController.php
index b5aa80e..e075fa9 100644
--- a/app/Http/Controllers/DashboardPemilikController.php
+++ b/app/Http/Controllers/DashboardPemilikController.php
@@ -57,7 +57,14 @@ public function index(Request $request)
             return $p - $q;
         }, $pemasukan, $pengeluaran);
 
-        // Kirim data ke view
+        // Ambil data status kamar (tersedia, terisi, maintenance)
+        $data_kamar = [
+            'Terisi' => Room::where('status', 'terisi')->count(),
+            'Kosong' => Room::where('status', 'tersedia')->count(),
+            'Rusak'  => Room::where('status', 'maintenance')->count(),
+        ];
+
+        // Kirim semua data ke view
         return view('pemilik.dashboard', compact(
             'totalUsers',
             'totalRooms',
@@ -70,7 +77,8 @@ public function index(Request $request)
             'pengeluaran',
             'keuntungan',
             'tahunList',
-            'tahunTerpilih'
+            'tahunTerpilih',
+            'data_kamar'
         ));
     }
 }
diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php
index d6c347b..d99e085 100644
--- a/app/Http/Controllers/ExpenseController.php
+++ b/app/Http/Controllers/ExpenseController.php
@@ -41,20 +41,26 @@ public function create()
      * Menyimpan data pengeluaran baru ke database.
      */
     public function store(Request $request)
-    {
-        $request->validate([
-            'keterangan'         => 'required|string|max:255',
-            'jumlah_pengeluaran' => 'required|numeric|min:0',
-            'tanggal_pengeluaran'=> 'required|date',
-        ]);
+{
+    $request->validate([
+        'keterangan'         => 'required|string|max:255',
+        'jumlah_pengeluaran' => 'required',
+        'tanggal_pengeluaran'=> 'required|date',
+    ]);
 
-        Expense::create($request->only(['keterangan', 'jumlah_pengeluaran', 'tanggal_pengeluaran']));
+    // Hilangkan titik/koma agar jumlah valid
+    $jumlah = str_replace(['.', ','], '', $request->jumlah_pengeluaran);
 
-        // Update data keuangan
-        $this->updateFinance();
+    Expense::create([
+        'keterangan'          => $request->keterangan,
+        'jumlah_pengeluaran'  => $jumlah,
+        'tanggal_pengeluaran' => $request->tanggal_pengeluaran,
+    ]);
 
-        return redirect()->route('admin.expense')->with('success', 'Pengeluaran berhasil ditambahkan.');
-    }
+    $this->updateFinance();
+
+    return redirect()->route('admin.expense')->with('success', 'Pengeluaran berhasil ditambahkan.');
+}
 
     /**
      * Menampilkan form untuk mengedit pengeluaran.
@@ -69,21 +75,28 @@ public function edit($id_pengeluaran)
      * Memperbarui data pengeluaran di database.
      */
     public function update(Request $request, $id_pengeluaran)
-    {
-        $request->validate([
-            'keterangan'         => 'required|string|max:255',
-            'jumlah_pengeluaran' => 'required|numeric|min:0',
-            'tanggal_pengeluaran'=> 'required|date',
-        ]);
+{
+    $request->validate([
+        'keterangan'         => 'required|string|max:255',
+        'jumlah_pengeluaran' => 'required',
+        'tanggal_pengeluaran'=> 'required|date',
+    ]);
 
-        $pengeluaran = Expense::findOrFail($id_pengeluaran);
-        $pengeluaran->update($request->only(['keterangan', 'jumlah_pengeluaran', 'tanggal_pengeluaran']));
+    $pengeluaran = Expense::findOrFail($id_pengeluaran);
 
-        // Update data keuangan
-        $this->updateFinance();
+    // Hilangkan titik/koma dari input user
+    $jumlah = str_replace(['.', ','], '', $request->jumlah_pengeluaran);
 
-        return redirect()->route('admin.expense')->with('success', 'Pengeluaran berhasil diperbarui.');
-    }
+    $pengeluaran->update([
+        'keterangan'          => $request->keterangan,
+        'jumlah_pengeluaran'  => $jumlah,
+        'tanggal_pengeluaran' => $request->tanggal_pengeluaran,
+    ]);
+
+    $this->updateFinance();
+
+    return redirect()->route('admin.expense')->with('success', 'Pengeluaran berhasil diperbarui.');
+}
 
     /**
      * Menghapus data pengeluaran dari database.
@@ -104,16 +117,32 @@ public function destroy($id_pengeluaran)
      */
     private function updateFinance()
     {
+        $tanggalHariIni = now()->format('Y-m-d');
+    
         $totalPemasukan   = Transaksi::sum('jumlah_pembayaran');
         $totalPengeluaran = Expense::sum('jumlah_pengeluaran');
         $totalKeuntungan  = $totalPemasukan - $totalPengeluaran;
-
-        Finance::create([
-            'tanggal'     => now()->format('Y-m-d'),
-            'pemasukan'   => $totalPemasukan,
-            'pengeluaran' => $totalPengeluaran,
-            'keuntungan'  => $totalKeuntungan,
-            'keterangan'  => 'Update otomatis dari data pengeluaran'
-        ]);
+    
+        // Cek apakah sudah ada data finance untuk hari ini
+        $finance = Finance::where('tanggal', $tanggalHariIni)->first();
+    
+        if ($finance) {
+            // Update data yang sudah ada
+            $finance->update([
+                'pemasukan'   => $totalPemasukan,
+                'pengeluaran' => $totalPengeluaran,
+                'keuntungan'  => $totalKeuntungan,
+                'keterangan'  => 'Update otomatis dari data pengeluaran'
+            ]);
+        } else {
+            // Buat data baru
+            Finance::create([
+                'tanggal'     => $tanggalHariIni,
+                'pemasukan'   => $totalPemasukan,
+                'pengeluaran' => $totalPengeluaran,
+                'keuntungan'  => $totalKeuntungan,
+                'keterangan'  => 'Update otomatis dari data pengeluaran'
+            ]);
+        }
     }
-}
+}    
diff --git a/app/Http/Controllers/KamarController.php b/app/Http/Controllers/KamarController.php
index 1e8122b..9ec36b6 100644
--- a/app/Http/Controllers/KamarController.php
+++ b/app/Http/Controllers/KamarController.php
@@ -1,18 +1,30 @@
-<?php 
+<?php
 
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use App\Models\Room;
 use App\Models\Booking;
+use Carbon\Carbon;
 
 class KamarController extends Controller
 {
     public function index()
     {
-        $booking = Booking::where('id_user', auth()->id())->orderBy('tanggal_booking', 'desc')->first();
+        $booking = Booking::where('id_user', auth()->id())
+            ->orderBy('tanggal_booking', 'desc')
+            ->first();
+
         $rooms = Room::all();
-        return view('users.peta', compact('booking', 'rooms'));
+
+        $daysLeft = null;
+
+        if ($booking && $booking->status_booking === 'Dikonfirmasi' && $booking->tanggal_checkout) {
+            $today = Carbon::now();
+            $checkoutDate = Carbon::parse($booking->tanggal_checkout);
+            $daysLeft = $today->diffInDays($checkoutDate, false);
+        }
+
+        return view('users.peta', compact('booking', 'rooms', 'daysLeft'));
     }
-    
 }
diff --git a/app/Http/Controllers/KeuanganController.php b/app/Http/Controllers/KeuanganController.php
index 85461b9..4a78ee3 100644
--- a/app/Http/Controllers/KeuanganController.php
+++ b/app/Http/Controllers/KeuanganController.php
@@ -36,7 +36,15 @@ public function index(Request $request)
             $row->bulan = $months[$row->bulan] ?? $row->bulan;
         }
 
-        return view('admin.keuangan', compact('filteredLaporan', 'years', 'months'));
+        // Hitung total pemasukan, pengeluaran, dan keuntungan bersih
+        $totalPemasukan = $filteredLaporan->sum('total_pemasukan');
+        $totalPengeluaran = $filteredLaporan->sum('total_pengeluaran');
+        $totalKeuntungan = $filteredLaporan->sum('keuntungan_bersih');
+
+        // Kirim ke view
+        return view('admin.keuangan', compact(
+            'filteredLaporan', 'years', 'months',
+            'totalPemasukan', 'totalPengeluaran', 'totalKeuntungan'
+        ));
     }
 }
-
diff --git a/public/assets/users/1746684524_kamar.jpg b/public/assets/users/1746684524_kamar.jpg
deleted file mode 100644
index 9b5854b..0000000
Binary files a/public/assets/users/1746684524_kamar.jpg and /dev/null differ
diff --git a/public/assets/users/1746798080_pembayaran.jpg b/public/assets/users/1747925367_pembayaran.jpg
similarity index 100%
rename from public/assets/users/1746798080_pembayaran.jpg
rename to public/assets/users/1747925367_pembayaran.jpg
diff --git a/public/assets/users/1746901541_pembayaran.jpg b/public/assets/users/1747925679_pembayaran.jpg
similarity index 100%
rename from public/assets/users/1746901541_pembayaran.jpg
rename to public/assets/users/1747925679_pembayaran.jpg
diff --git a/resources/views/Admin/booking.blade.php b/resources/views/Admin/booking.blade.php
index 7d69e76..eeffed4 100644
--- a/resources/views/Admin/booking.blade.php
+++ b/resources/views/Admin/booking.blade.php
@@ -49,22 +49,12 @@
                                         onclick="return confirm('Apakah Anda yakin ingin menghapus booking ini?');">
                                         <i class="bi bi-trash-fill"></i>
                                     </a>
-                    
-                                    {{-- <!-- Tombol Konfirmasi Pemesanan hanya muncul jika status booking 'Pending' -->
-                                    @if($booking->status_booking == 'Pending')
-                                        <form action="{{ route('admin.bookingconfirm', $booking->id_booking) }}" method="POST" style="display:inline-block; margin-top: 5px;">
-                                            @csrf
-                                            <button type="submit" class="btn btn-primary btn-sm">Konfirmasi Pemesanan</button>
-                                        </form>
+
+                                    @if ($booking->status_booking === 'Dikonfirmasi')
+                                        <a href="{{ route('admin.bookingselesai', $booking->id_booking) }}" class="btn btn-success btn-sm mt-1">
+                                            Tandai Selesai
+                                        </a>
                                     @endif
-                    
-                                    <!-- Tombol Batalkan Booking hanya muncul jika status booking 'Dikonfirmasi' -->
-                                    @if($booking->status_booking == 'Dikonfirmasi')
-                                        <form action="{{ route('admin.bookingcancel', $booking->id_booking) }}" method="POST" style="display:inline-block; margin-top: 5px;">
-                                            @csrf
-                                            <button type="submit" class="btn btn-danger btn-sm">Batalkan Booking</button>
-                                        </form>
-                                    @endif --}}
                                 </td>
                             </tr>
                         @endforeach
diff --git a/resources/views/Admin/createexpense.blade.php b/resources/views/Admin/createexpense.blade.php
index 86b3204..2bc4142 100644
--- a/resources/views/Admin/createexpense.blade.php
+++ b/resources/views/Admin/createexpense.blade.php
@@ -19,8 +19,8 @@
 
             <div class="mb-3">
                 <label for="jumlah_pengeluaran" class="form-label">Jumlah (Rp)</label>
-                <input type="number" name="jumlah_pengeluaran" id="jumlah_pengeluaran" class="form-control" step="0.01" required>
-            </div>
+                <input type="text" name="jumlah_pengeluaran" id="jumlah_pengeluaran" class="form-control" required placeholder="Contoh: 1.200.000">
+            </div>            
 
             <div class="d-flex justify-content-between">
                 <a href="{{ route('admin.expense') }}" class="btn btn-secondary">Kembali</a>
diff --git a/resources/views/Admin/dashboard.blade.php b/resources/views/Admin/dashboard.blade.php
index 1c31322..e1cda85 100644
--- a/resources/views/Admin/dashboard.blade.php
+++ b/resources/views/Admin/dashboard.blade.php
@@ -2,7 +2,28 @@
 @section('content')
     <div class="container-fluid p-4" style="background-color: #F5F5F5; border-radius: 10px;">
         <h3 class="fw-bold" style="color: #063986;">Selamat Datang Di Kos Calista</h3>
+
+        {{-- Notifikasi sisa masa booking customer (kalau ada booking terakhir) --}}
+        @isset($booking)
+            @if (!is_null($daysLeft))
+                @if ($daysLeft > 0)
+                    <div class="alert alert-warning mt-3 fw-semibold text-dark">
+                        Sisa booking customer: <strong>{{ $daysLeft }} hari</strong>
+                    </div>
+                @elseif ($daysLeft === 0)
+                    <div class="alert alert-danger mt-3 fw-semibold">
+                        Hari ini adalah <strong>hari terakhir</strong> masa booking customer!
+                    </div>
+                @else
+                    <div class="alert alert-secondary mt-3 fw-semibold">
+                        Masa booking customer sudah <strong>berakhir</strong>.
+                    </div>
+                @endif
+            @endif
+        @endisset
+
         <div class="row mt-4">
+            {{-- Statistik --}}
             <div class="col-md-4">
                 <div class="card border shadow-sm">
                     <div class="card-body text-center p-4">
@@ -45,6 +66,8 @@
                     </div>
                 </div>
             </div>
+
+            {{-- Tabel Pending Booking --}}
             <div class="row mt-5">
                 <div class="col-12">
                     <div class="card border shadow-sm">
@@ -64,6 +87,7 @@
                                                 <th>Kamar</th>
                                                 <th>Tanggal Pemesanan</th>
                                                 <th>Status</th>
+                                                <th>Aksi</th>
                                             </tr>
                                         </thead>
                                         <tbody>
@@ -102,7 +126,6 @@
                                                 </tr>
                                             @endforeach
                                         </tbody>
-                                        
                                     </table>
                                 </div>
                             @endif
@@ -110,5 +133,38 @@
                     </div>
                 </div>
             </div>
+
+            {{-- Tampilkan Booking yang sudah dikonfirmasi beserta sisa hari --}}
+            <div class="row mt-5">
+                <div class="col-12">
+                    <h5 class="fw-bold text-primary mb-3">Sisa Hari Booking</h5>
+                    @foreach ($confirmedBookings as $booking)
+                        <div class="mb-3 p-3 border rounded bg-light">
+                            <p><strong>Customer:</strong> {{ $booking->user->name }}</p>
+                            <p><strong>Booking Kamar:</strong> {{ $booking->room->room_type }}</p>
+                            @php
+                                $daysLeft = $daysLeftPerBooking[$booking->id_booking] ?? null;
+                            @endphp
+
+                            @if(!is_null($daysLeft))
+                                @if($daysLeft > 0)
+                                    <div class="alert alert-warning mb-0">
+                                        Sisa booking: <strong>{{ $daysLeft }} hari</strong>
+                                    </div>
+                                @elseif($daysLeft === 0)
+                                    <div class="alert alert-danger mb-0">
+                                        Hari ini <strong>terakhir</strong> masa booking!
+                                    </div>
+                                @else
+                                    <div class="alert alert-secondary mb-0">
+                                        Masa booking sudah <strong>berakhir</strong>
+                                    </div>
+                                @endif
+                            @endif
+                        </div>
+                    @endforeach
+                </div>
+            </div>
         </div>
-@endsection
\ No newline at end of file
+    </div>
+@endsection
diff --git a/resources/views/Admin/rooms.blade.php b/resources/views/Admin/rooms.blade.php
index 28cc992..140fd73 100644
--- a/resources/views/Admin/rooms.blade.php
+++ b/resources/views/Admin/rooms.blade.php
@@ -42,7 +42,7 @@
                                 <td>{{ ($rooms->currentPage() - 1) * $rooms->perPage() + $loop->iteration }}</td>
                                 <td>{{ $room->room_number }}</td>
                                 <td>{{ $room->room_type }}</td>
-                                <td>Rp {{ number_format($room->harga, 0, ',', '.') }}</td>
+                                <td>Rp {{ number_format((int) $room->harga, 0, ',', '.') }}</td>
                                 <td>{{ ucfirst($room->status) }}</td>
                                 <td>{{ $room->lantai }}</td>
                                 <td>{{ $room->fasilitas }}</td>
diff --git a/resources/views/Admin/transaksi.blade.php b/resources/views/Admin/transaksi.blade.php
index 629b737..aa186b2 100644
--- a/resources/views/Admin/transaksi.blade.php
+++ b/resources/views/Admin/transaksi.blade.php
@@ -36,7 +36,7 @@
                             <tr>
                                 <td>{{ $index + 1 }}</td>
                                 <td>{{ $item->booking->user->name }} - Kamar {{ $item->booking->room->room_number }}</td>
-                                <td>Rp {{ number_format($item->jumlah_pembayaran, 2, ',', '.') }}</td>
+                                <td>Rp {{ number_format((int) $item->jumlah_pembayaran, 0, ',', '.') }}</td>
                                 <td>{{ $item->metode_pembayaran ?? 'Belum dipilih' }}</td>
                                 <td>{{ ucfirst($item->status_transaksi) }}</td>
                                 <td>
diff --git a/resources/views/Pemilik/dashboard.blade.php b/resources/views/Pemilik/dashboard.blade.php
index a2dafdb..47b56f3 100644
--- a/resources/views/Pemilik/dashboard.blade.php
+++ b/resources/views/Pemilik/dashboard.blade.php
@@ -1,213 +1,219 @@
 @extends('layouts.app1')
 
 @section('content')
-<div class="container-fluid p-4" style="background-color: #F5F5F5; border-radius: 10px;">
-    <h3 class="fw-bold" style="color: #063986;">Selamat Datang Di Kos Calista</h3>
+    <div class="container-fluid p-4" style="background-color: #F5F5F5; border-radius: 10px;">
+        <h3 class="fw-bold" style="color: #063986;">Selamat Datang Di Kos Calista</h3>
 
-    <div class="row mt-4">
-        <div class="col-md-4">
-            <div class="card border shadow-sm">
-                <div class="card-body text-center p-4">
-                    <div class="d-flex justify-content-center">
-                        <div class="rounded-circle d-flex align-items-center justify-content-center" 
-                            style="width: 60px; height: 60px; background-color: #0080B5;">
-                            <i class="bi bi-person-badge-fill text-white" style="font-size: 30px;"></i>
+        <div class="row mt-4">
+            <div class="col-md-4">
+                <div class="card border shadow-sm">
+                    <div class="card-body text-center p-4">
+                        <div class="d-flex justify-content-center">
+                            <div class="rounded-circle d-flex align-items-center justify-content-center"
+                                style="width: 60px; height: 60px; background-color: #0080B5;">
+                                <i class="bi bi-person-badge-fill text-white" style="font-size: 30px;"></i>
+                            </div>
                         </div>
+                        <h3 class="fw-bold mt-3 mb-0">{{ $totalUsers }}</h3>
+                        <p class="mb-0">Total Customer</p>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-4">
+                <div class="card border shadow-sm">
+                    <div class="card-body text-center p-4">
+                        <div class="d-flex justify-content-center">
+                            <div class="rounded-circle d-flex align-items-center justify-content-center"
+                                style="width: 60px; height: 60px; background-color: #0080B5;">
+                                <i class="bi bi-door-closed-fill text-white" style="font-size: 30px;"></i>
+                            </div>
+                        </div>
+                        <h3 class="fw-bold mt-3 mb-0">{{ $totalRooms }}</h3>
+                        <p class="mb-0">Total Kamar</p>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-4">
+                <div class="card border shadow-sm">
+                    <div class="card-body text-center p-4">
+                        <div class="d-flex justify-content-center">
+                            <div class="rounded-circle d-flex align-items-center justify-content-center"
+                                style="width: 60px; height: 60px; background-color: #0080B5;">
+                                <i class="bi bi-journal-check text-white" style="font-size: 30px;"></i>
+                            </div>
+                        </div>
+                        <h3 class="fw-bold mt-3 mb-0">{{ $totalBookings }}</h3>
+                        <p class="mb-0">Total Booking</p>
                     </div>
-                    <h3 class="fw-bold mt-3 mb-0">{{ $totalUsers }}</h3>
-                    <p class="mb-0">Total Customer</p>
                 </div>
             </div>
         </div>
-        <div class="col-md-4">
-            <div class="card border shadow-sm">
-                <div class="card-body text-center p-4">
-                    <div class="d-flex justify-content-center">
-                        <div class="rounded-circle d-flex align-items-center justify-content-center" 
-                            style="width: 60px; height: 60px; background-color: #0080B5;">
-                            <i class="bi bi-door-closed-fill text-white" style="font-size: 30px;"></i>
-                        </div>
+
+        <div class="row mt-4">
+            <div class="col-12 text-center mb-3">
+                <div class="d-flex justify-content-center gap-3 flex-wrap">
+                    <div>
+                        <label for="bulanSelect" class="form-label fw-semibold mb-1">Pilih Bulan</label>
+                        <select id="bulanSelect" class="form-select">
+                            <option value="0">Semua Bulan</option>
+                            @foreach($labels as $index => $bulan)
+                                <option value="{{ $index + 1 }}">{{ $bulan }}</option>
+                            @endforeach
+                        </select>
+                    </div>
+                    <div>
+                        <label for="tahunSelect" class="form-label fw-semibold mb-1">Pilih Tahun</label>
+                        <select id="tahunSelect" class="form-select" onchange="location.href='?tahun=' + this.value">
+                            @foreach($tahunList as $tahun)
+                                <option value="{{ $tahun }}" {{ $tahun == $tahunTerpilih ? 'selected' : '' }}>{{ $tahun }}
+                                </option>
+                            @endforeach
+                        </select>
                     </div>
-                    <h3 class="fw-bold mt-3 mb-0">{{ $totalRooms }}</h3>
-                    <p class="mb-0">Total Kamar</p>
                 </div>
             </div>
-        </div>
-        <div class="col-md-4">
-            <div class="card border shadow-sm">
-                <div class="card-body text-center p-4">
-                    <div class="d-flex justify-content-center">
-                        <div class="rounded-circle d-flex align-items-center justify-content-center" 
-                            style="width: 60px; height: 60px; background-color: #0080B5;">
-                            <i class="bi bi-journal-check text-white" style="font-size: 30px;"></i>
-                        </div>
+
+            <!-- Grafik Keuangan -->
+            <div class="col-md-6">
+                <div class="card border shadow-sm">
+                    <div class="card-body p-4">
+                        <h5 class="text-center fw-bold">Keuangan</h5>
+                        <canvas id="keuanganBarChart" style="max-height: 300px;"></canvas>
                     </div>
-                    <h3 class="fw-bold mt-3 mb-0">{{ $totalBookings }}</h3>
-                    <p class="mb-0">Total Booking</p>
                 </div>
             </div>
-        </div>
-    </div>
 
-<!-- Grafik Keuangan -->
-<div class="row mt-4">
-    <div class="col-12 text-center mb-3">
-        <div class="d-flex justify-content-center gap-3 flex-wrap">
-            <div>
-                <label for="bulanSelect" class="form-label fw-semibold mb-1">Pilih Bulan</label>
-                <select id="bulanSelect" class="form-select">
-                    <option value="all">Semua Bulan</option>
-                    @foreach($labels as $index => $bulan)
-                        <option value="{{ $index }}">{{ $bulan }}</option>
-                    @endforeach
-                </select>
+            <!-- Grafik Kamar -->
+            <div class="col-md-6">
+                <div class="card border shadow-sm">
+                    <div class="card-body p-4">
+                        <h5 class="text-center fw-bold">Data Kamar</h5>
+                        <canvas id="dataKamarPieChart" style="max-height: 300px;"></canvas>
+                    </div>
+                </div>
             </div>
-            <div>
-                <label for="tahunSelect" class="form-label fw-semibold mb-1">Pilih Tahun</label>
-                <select id="tahunSelect" class="form-select">
-                    @foreach($tahunList as $tahun)
-                        <option value="{{ $tahun }}" {{ $tahun == $tahunTerpilih ? 'selected' : '' }}>{{ $tahun }}</option>
-                    @endforeach
-                </select>
-            </div>
-        </div>
-    </div>
 
-    <div class="col-md-6">
-        <div class="card border shadow-sm">
-            <div class="card-body p-4">
-                <h5 class="text-center fw-bold">Bar Chart Keuangan</h5>
-                <canvas id="keuanganBarChart"></canvas>
-            </div>
-        </div>
-    </div>
-    
-    <div class="col-md-6">
-        <div class="card border shadow-sm">
-            <div class="card-body p-4">
-                <h5 class="text-center fw-bold">Pie Chart Keuangan</h5>
-                <canvas id="keuanganPieChart"></canvas>
-            </div>
-        </div>
-    </div>
-</div>
 
 @endsection
 
-@push('scripts')
-<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-<script>
-document.addEventListener("DOMContentLoaded", function () {
-    const labels = {!! json_encode($labels) !!};
-    const pemasukan = {!! json_encode($pemasukan) !!};
-    const pengeluaran = {!! json_encode($pengeluaran) !!};
-    const keuntungan = {!! json_encode($keuntungan) !!};
+        @push('scripts')
+            <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+            <script src="https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@2"></script>
+            <script>
+                document.addEventListener("DOMContentLoaded", function () {
+                    const labels = {!! json_encode($labels) !!};
+                    const pemasukan = {!! json_encode($pemasukan) !!};
+                    const pengeluaran = {!! json_encode($pengeluaran) !!};
+                    const keuntungan = {!! json_encode($keuntungan) !!};
+                    const dataKamar = {!! json_encode($data_kamar ?? []) !!}; // ✅ benar
 
-    // === BAR CHART ===
-    const ctxBar = document.getElementById('keuanganBarChart').getContext('2d');
-    new Chart(ctxBar, {
-        type: 'bar',
-        data: {
-            labels: labels,
-            datasets: [
-                {
-                    label: 'Pemasukan',
-                    data: pemasukan,
-                    backgroundColor: 'rgba(54, 162, 235, 0.6)',
-                    borderColor: 'rgba(54, 162, 235, 1)',
-                    borderWidth: 1
-                },
-                {
-                    label: 'Pengeluaran',
-                    data: pengeluaran,
-                    backgroundColor: 'rgba(255, 99, 132, 0.6)',
-                    borderColor: 'rgba(255, 99, 132, 1)',
-                    borderWidth: 1
-                },
-                {
-                    label: 'Keuntungan',
-                    data: keuntungan,
-                    type: 'line',
-                    borderColor: 'rgba(75, 192, 192, 1)',
-                    backgroundColor: 'rgba(75, 192, 192, 0.2)',
-                    borderWidth: 2,
-                    tension: 0.3,
-                    fill: false
-                }
-            ]
-        },
-        options: {
-            responsive: true,
-            interaction: {
-                mode: 'index',
-                intersect: false,
-            },
-            stacked: false,
-            scales: {
-                y: {
-                    beginAtZero: true,
-                    ticks: {
-                        callback: function(value) {
-                            return 'Rp ' + value.toLocaleString('id-ID');
+                    // BAR CHART KEUANGAN
+                    new Chart(document.getElementById('keuanganBarChart').getContext('2d'), {
+                        type: 'bar',
+                        data: {
+                            labels: labels,
+                            datasets: [
+                                {
+                                    label: 'Pemasukan',
+                                    data: pemasukan,
+                                    backgroundColor: 'rgba(54, 162, 235, 0.6)',
+                                    borderColor: 'rgba(54, 162, 235, 1)',
+                                    borderWidth: 1
+                                },
+                                {
+                                    label: 'Pengeluaran',
+                                    data: pengeluaran,
+                                    backgroundColor: 'rgba(255, 99, 132, 0.6)',
+                                    borderColor: 'rgba(255, 99, 132, 1)',
+                                    borderWidth: 1
+                                },
+                                {
+                                    label: 'Keuntungan',
+                                    data: keuntungan,
+                                    type: 'line',
+                                    borderColor: 'rgba(75, 192, 192, 1)',
+                                    backgroundColor: 'rgba(75, 192, 192, 0.2)',
+                                    borderWidth: 2,
+                                    tension: 0.3,
+                                    fill: false
+                                }
+                            ]
+                        },
+                        options: {
+                            responsive: true,
+                            interaction: {
+                                mode: 'index',
+                                intersect: false,
+                            },
+                            stacked: false,
+                            scales: {
+                                y: {
+                                    beginAtZero: true,
+                                    ticks: {
+                                        callback: value => 'Rp ' + value.toLocaleString('id-ID')
+                                    }
+                                }
+                            },
+                            plugins: {
+                                tooltip: {
+                                    callbacks: {
+                                        label: context => `${context.dataset.label}: Rp ${context.parsed.y.toLocaleString('id-ID')}`
+                                    }
+                                }
+                            }
                         }
+                    });
+
+                   // PIE CHART DATA KAMAR (Tampilkan jumlah kamar sebagai label)
+const ctxKamar = document.getElementById('dataKamarPieChart').getContext('2d');
+const kamarLabels = Object.keys(dataKamar);
+const kamarData = Object.values(dataKamar);
+
+new Chart(ctxKamar, {
+    type: 'pie',
+    data: {
+        labels: kamarLabels,
+        datasets: [{
+            data: kamarData,
+            backgroundColor: [
+                'rgba(75, 192, 192, 0.7)', // Terisi
+                'rgba(255, 206, 86, 0.7)', // Kosong
+                'rgba(255, 99, 132, 0.7)'  // Rusak
+            ],
+            borderColor: [
+                'rgba(75, 192, 192, 1)',
+                'rgba(255, 206, 86, 1)',
+                'rgba(255, 99, 132, 1)'
+            ],
+            borderWidth: 1
+        }]
+    },
+    options: {
+        responsive: true,
+        plugins: {
+            tooltip: {
+                callbacks: {
+                    label: (context) => {
+                        const value = context.parsed;
+                        return `${context.label}: ${value} kamar`;
                     }
                 }
             },
-            plugins: {
-                tooltip: {
-                    callbacks: {
-                        label: function(context) {
-                            return context.dataset.label + ': Rp ' + context.parsed.y.toLocaleString('id-ID');
-                        }
-                    }
+            legend: {
+                position: 'bottom'
+            },
+            datalabels: {
+                color: '#000',
+                formatter: (value) => `${value} kamar`,
+                font: {
+                    weight: 'bold',
+                    size: 14
                 }
             }
         }
-    });
-
-    // === PIE CHART ===
-    const bulanSelect = document.getElementById('bulanSelect');
-    const ctxPie = document.getElementById('keuanganPieChart').getContext('2d');
-
-    let pieChart = new Chart(ctxPie, {
-        type: 'pie',
-        data: {
-            labels: ['Pemasukan', 'Pengeluaran', 'Keuntungan'],
-            datasets: [{
-                data: [pemasukan[0], pengeluaran[0], keuntungan[0]],
-                backgroundColor: [
-                    'rgba(54, 162, 235, 0.7)',
-                    'rgba(255, 99, 132, 0.7)',
-                    'rgba(75, 192, 192, 0.7)'
-                ],
-                borderColor: [
-                    'rgba(54, 162, 235, 1)',
-                    'rgba(255, 99, 132, 1)',
-                    'rgba(75, 192, 192, 1)'
-                ],
-                borderWidth: 1
-            }]
-        },
-        options: {
-            responsive: true,
-            plugins: {
-                tooltip: {
-                    callbacks: {
-                        label: function(context) {
-                            return context.label + ': Rp ' + context.parsed.toLocaleString('id-ID');
-                        }
-                    }
-                }
-            }
-        }
-    });
-
-    // Event listener untuk ubah bulan
-    bulanSelect.addEventListener('change', function () {
-        const i = parseInt(this.value);
-        pieChart.data.datasets[0].data = [pemasukan[i], pengeluaran[i], keuntungan[i]];
-        pieChart.update();
-    });
+    },
+    plugins: [ChartDataLabels] // ← tambahkan kembali plugin ini
 });
-</script>
-@endpush
+                });
+            </script>
+        @endpush
\ No newline at end of file
diff --git a/resources/views/Users/detail_kamar.blade.php b/resources/views/Users/detail_kamar.blade.php
index 96359b8..7117506 100644
--- a/resources/views/Users/detail_kamar.blade.php
+++ b/resources/views/Users/detail_kamar.blade.php
@@ -51,11 +51,42 @@ class="{{ $room->status == 'tersedia' ? 'text-green-600' : ($room->status == 'te
                         @endif
 
                         @if (!empty($room->deskripsi))
-                            <div class="mb-4">
-                                <h3 class="text-md font-semibold text-gray-800 mb-1">Deskripsi:</h3>
-                                <p class="text-gray-700 leading-relaxed text-sm">{!! nl2br(e($room->deskripsi)) !!}</p>
-                            </div>
-                        @endif
+                        @php
+                            // Pisahkan berdasarkan dua bagian utama: 'Fasilitas umum :' dan 'Aturan di Kos Calista'
+                            $fasilitas = '';
+                            $aturan = '';
+                    
+                            if (preg_match('/Fasilitas umum\s*:\s*(.+?)\s*Aturan di Kos Calista\s*/s', $room->deskripsi, $match)) {
+                                $fasilitas = trim($match[1]);
+                            }
+                    
+                            if (preg_match('/Aturan di Kos Calista\s*(.+)/s', $room->deskripsi, $match)) {
+                                $aturan = trim($match[1]);
+                            }
+                    
+                            // Ambil item berdasarkan pola angka di depan (1. xxx 2. xxx ...)
+                            preg_match_all('/\d+\.\s*([^0-9]+)/', $fasilitas, $fasilitasList);
+                            preg_match_all('/\d+\.\s*([^0-9]+)/', $aturan, $aturanList);
+                        @endphp
+                    
+                        <div class="mb-4">
+                            <h3 class="text-md font-semibold text-gray-800 mb-1">Fasilitas Umum:</h3>
+                            <ul class="list-disc pl-5 text-gray-700 text-sm leading-relaxed">
+                                @foreach ($fasilitasList[1] as $item)
+                                    <li>{{ trim($item) }}</li>
+                                @endforeach
+                            </ul>
+                        </div>
+                    
+                        <div class="mb-4">
+                            <h3 class="text-md font-semibold text-gray-800 mb-1">Aturan di Kos Calista:</h3>
+                            <ul class="list-decimal pl-5 text-gray-700 text-sm leading-relaxed">
+                                @foreach ($aturanList[1] as $item)
+                                    <li>{{ trim($item) }}</li>
+                                @endforeach
+                            </ul>
+                        </div>
+                    @endif                    
 
                         <div class="mt-6">
                             <a href="{{ route('users.peta') }}"
diff --git a/resources/views/Users/peta.blade.php b/resources/views/Users/peta.blade.php
index c980351..942638a 100644
--- a/resources/views/Users/peta.blade.php
+++ b/resources/views/Users/peta.blade.php
@@ -11,46 +11,65 @@
 
 <body class="bg-gradient-to-br from-blue-400 to-white min-h-screen flex items-center justify-center p-6 font-sans">
     <div class="max-w-6xl mx-auto py-6 px-4">
-        <!-- Header -->
-        <header class="bg-black text-white px-6 py-4 rounded-lg flex justify-between items-center shadow-md">
-            <h1 class="text-2xl font-bold">Kos Calista</h1>
-            <div class="flex items-center gap-4">
-                <i class="fa fa-female text-2xl"></i>
-                <!-- Dropdown -->
-                <div class="relative group">
-                    <button class="bg-white text-blue-800 font-semibold px-4 py-2 rounded shadow hover:bg-gray-100 transition">
-                        Menu
+      <!-- Header -->
+<header class="bg-black text-white px-6 py-4 rounded-lg flex justify-between items-center shadow-md">
+    <h1 class="text-2xl font-bold">Kos Calista</h1>
+
+    <div class="flex items-center gap-6">
+
+        {{-- Notifikasi sisa masa booking --}}
+        @isset($daysLeft)
+            @if ($daysLeft > 0)
+                <div class="bg-yellow-400 text-black px-4 py-1 rounded text-sm font-medium">
+                    Sisa booking: <strong>{{ $daysLeft }} hari</strong>
+                </div>
+            @elseif ($daysLeft === 0)
+                <div class="bg-red-500 text-white px-4 py-1 rounded text-sm font-medium">
+                    Hari ini <strong>terakhir</strong> masa booking!
+                </div>
+            @else
+                <div class="bg-gray-600 text-white px-4 py-1 rounded text-sm font-medium">
+                    Masa booking sudah <strong>berakhir</strong>
+                </div>
+            @endif
+        @endisset
+
+        <i class="fa fa-female text-2xl"></i>
+
+        <!-- Dropdown -->
+        <div class="relative group">
+            <button class="bg-white text-blue-800 font-semibold px-4 py-2 rounded shadow hover:bg-gray-100 transition">
+                Menu
+            </button>
+            <div class="absolute right-0 mt-2 w-44 bg-white border border-gray-200 rounded shadow-md opacity-0 invisible group-hover:opacity-100 group-hover:visible transition-all duration-200 z-10">
+                @isset($booking)
+                    <a href="{{ route('users.detail-pesanan', ['id_booking' => $booking->id_booking]) }}"
+                       class="block px-4 py-2 text-black hover:bg-gray-100">
+                        Detail Pesanan
+                    </a>
+                    <a href="{{ route('users.perpanjangan-sewa', ['id_booking' => $booking->id_booking]) }}"
+                       class="block px-4 py-2 text-black hover:bg-gray-100">
+                        Perpanjang Sewa
+                    </a>
+                @else
+                    <span class="block px-4 py-2 text-gray-400 cursor-not-allowed">
+                        Detail Pesanan
+                    </span>
+                @endisset
+
+                <a href="{{ route('users.profile') }}" class="block px-4 py-2 text-black hover:bg-gray-100">
+                    Profile
+                </a>
+                <form action="{{ route('logout') }}" method="POST">
+                    @csrf
+                    <button type="submit" class="w-full text-left px-4 py-2 text-black hover:bg-gray-100">
+                        Logout
                     </button>
-                    <div class="absolute right-0 mt-2 w-44 bg-white border border-gray-200 rounded shadow-md opacity-0 invisible group-hover:opacity-100 group-hover:visible transition-all duration-200 z-10">
-                        @isset($booking)
-                            <a href="{{ route('users.detail-pesanan', ['id_booking' => $booking->id_booking]) }}"
-                                class="block px-4 py-2 text-black hover:bg-gray-100">
-                                Detail Pesanan
-                            </a>
-                            <!-- Menambahkan opsi perpanjangan sewa -->
-                            <a href="{{ route('users.perpanjangan-sewa', ['id_booking' => $booking->id_booking]) }}"
-                                class="block px-4 py-2 text-black hover:bg-gray-100">
-                                Perpanjang Sewa
-                            </a>
-                        @else
-                            <span class="block px-4 py-2 text-gray-400 cursor-not-allowed">
-                                Detail Pesanan
-                            </span>
-                        @endisset
-                         <!-- Menambahkan opsi Profile -->
-                         <a href="{{ route('users.profile') }}" class="block px-4 py-2 text-black hover:bg-gray-100">
-                            Profile
-                        </a>                        
-                        <form action="{{ route('logout') }}" method="POST">
-                            @csrf
-                            <button type="submit" class="w-full text-left px-4 py-2 text-black hover:bg-gray-100">
-                                Logout
-                            </button>
-                        </form>
-                    </div>
-                </div>                
+                </form>
             </div>
-        </header>
+        </div>
+    </div>
+</header>
 
         <!-- Denah Kos -->
         <section class="mt-8 bg-white p-6 rounded-lg shadow-lg">
diff --git a/routes/web.php b/routes/web.php
index 8b5b388..14c8c23 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -98,9 +98,9 @@
         Route::get('/', [CustomerController::class, 'index'])->name('admin.customer');
         Route::get('/create', [CustomerController::class, 'create'])->name('admin.createcustomer');
         Route::post('/store', [CustomerController::class, 'store'])->name('admin.storecustomer');
-        Route::get('/edit/{id}', [CustomerController::class, 'edit'])->name('admin.editcustomer');
-        Route::put('/update/{id}', [CustomerController::class, 'update'])->name('admin.updatecustomer');
-        Route::get('/delete/{id}', [CustomerController::class, 'destroy'])->name('admin.deletecustomer');
+        Route::get('/edit/{id_user}', [CustomerController::class, 'edit'])->name('admin.editcustomer');
+        Route::put('/update/{id_user}', [CustomerController::class, 'update'])->name('admin.updatecustomer');
+        Route::get('/delete/{id_user}', [CustomerController::class, 'destroy'])->name('admin.deletecustomer');
     });
 
     // Rooms
@@ -134,6 +134,7 @@
         Route::put('/confirm/{id_booking}', [BookingController::class, 'confirm'])->name('admin.bookingconfirm');
         Route::put('/cancel/{id_booking}', [BookingController::class, 'cancel'])->name('admin.bookingcancel');
         Route::put('/admin/booking/perpanjangan/{id}/approve', [BookingController::class, 'approvePerpanjangan'])->name('admin.approvePerpanjangan');
+        Route::get('/admin/booking/selesai/{id_booking}', [BookingController::class, 'markAsCompleted'])->name('admin.bookingselesai');
     });
 
     // Expense