diff --git a/app/Http/Controllers/Admin/PesananFotoController.php b/app/Http/Controllers/Admin/PesananFotoController.php
index 2c4be67..1fe3426 100644
--- a/app/Http/Controllers/Admin/PesananFotoController.php
+++ b/app/Http/Controllers/Admin/PesananFotoController.php
@@ -34,7 +34,7 @@ public function updateStatus(Request $request, $id)
                 session()->flash('success', "Booking {$pesanan->no_invoice} telah diterima!");
             } elseif ($request->jenis === 'selesai') {
                 $status = 'selesai';
-                session()->flash('success', "Pesanan {$pesanan->no_invoice} berhasil diselesaikan!");
+                session()->flash('success', "Booking {$pesanan->no_invoice} berhasil diselesaikan!");
             } else {
                 $status = 'ditolak';
                 session()->flash('error', "Booking {$pesanan->no_invoice} telah ditolak!");
@@ -67,6 +67,7 @@ public function updateStatus(Request $request, $id)
             }
 
             // 6. Susun Pesan WA
+            $msg = null;
             if ($status === 'diterima') {
                 $msg = "Halo Kak *{$nama}* ,\n\n" .
                     "Booking foto Anda dengan Invoice: *{$invoice}* telah kami *TERIMA*. \n\n" .
@@ -78,7 +79,7 @@ public function updateStatus(Request $request, $id)
                     " Tanggal: {$tanggal}\n" .
                     " Jam: {$jam_mulai} - {$jam_selesai} WIB\n\n" .
                     "Mohon datang 15 menit sebelum jadwal dimulai ya Kak. Sampai jumpa di studio! ";
-            } else {
+            } elseif ($status === 'ditolak') {
                 $msg = "Halo Kak *{$nama}*,\n\n" .
                     "Mohon maaf, booking foto Anda dengan Invoice *{$invoice}* terpaksa kami *TOLAK* dikarenakan:\n\n" .
                     "*[TULIS ALASAN DI SINI]*\n\n" .
@@ -93,17 +94,24 @@ public function updateStatus(Request $request, $id)
             }
 
             // 7. Format Nomor WhatsApp (Sesuaikan kolom: no_hp / no_wa)
-            $no_wa = preg_replace('/[^0-9]/', '', $pesanan->pelanggan->no_wa);
+            $wa_url = null;
 
-            if (str_starts_with($no_wa, '0')) {
-                $no_wa = '62' . substr($no_wa, 1);
-            } elseif (str_starts_with($no_wa, '8')) {
-                $no_wa = '62' . $no_wa;
+            if ($msg) {
+                $no_wa = preg_replace('/[^0-9]/', '', $pesanan->pelanggan->no_wa);
+
+                if (str_starts_with($no_wa, '0')) {
+                    $no_wa = '62' . substr($no_wa, 1);
+                } elseif (str_starts_with($no_wa, '8')) {
+                    $no_wa = '62' . $no_wa;
+                }
+
+                $wa_url = "https://wa.me/{$no_wa}?text=" . urlencode($msg);
             }
 
+
             return response()->json([
                 'success' => true,
-                'wa_url' => "https://wa.me/{$no_wa}?text=" . urlencode($msg)
+                'wa_url' => $wa_url
             ]);
         } catch (\Exception $e) {
             return response()->json(['success' => false, 'message' => $e->getMessage()], 500);
diff --git a/resources/views/admin/pesanan/partials/modal-foto.blade.php b/resources/views/admin/pesanan/partials/modal-foto.blade.php
index 6176321..36765e1 100755
--- a/resources/views/admin/pesanan/partials/modal-foto.blade.php
+++ b/resources/views/admin/pesanan/partials/modal-foto.blade.php
@@ -1,10 +1,10 @@
-<div class="modal fade text-left" id="foto{{ $p->id_booking }}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel1"
-    aria-hidden="true">
+<div class="modal fade text-left" id="foto{{ $p->id_booking }}" tabindex="-1" role="dialog"
+    aria-labelledby="labelFoto{{ $p->id_booking }}" aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
         <div class="modal-content">
 
             <div class="modal-header">
-                <h5 class="modal-title" id="myModalLabel1">Detail Pesanan Foto</h5>
+                <h5 class="modal-title" id="labelFoto{{ $p->id_booking }}">Detail Pesanan Foto</h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
 
@@ -90,8 +90,7 @@ class="badge {{ $p->status_label->class }}">
                                 <div class="proof-img-wrapper">
                                     @if ($p->bukti_bayar)
                                         {{-- Klik hanya pada gambar --}}
-                                        <img src="{{ asset('storage/' . $p->bukti_bayar) }}" class="proof-img" <img
-                                            src="{{ asset('storage/' . $p->bukti_bayar) }}" class="proof-img"
+                                        <img src="{{ asset('storage/' . $p->bukti_bayar) }}" class="proof-img"
                                             style="cursor: pointer;"
                                             onclick="showImageFoto('{{ asset('storage/' . $p->bukti_bayar) }}')">
                                     @else
@@ -109,15 +108,22 @@ class="badge {{ $p->status_label->class }}">
                 </div>
                 <div class="modal-footer border-top-0 pt-2 px-2">
                     <div class="d-flex w-100 gap-2">
-                        <button type="button" class="btn btn-danger flex-fill tolak"
-                            onclick="prosesTanpaDialog(this, 'tolak', '{{ $p->id_booking }}')">
-                            Tolak Pesanan
-                        </button>
+                        @if ($p->status_booking == 'menunggu_verifikasi')
+                            <button type="button" class="btn btn-danger flex-fill tolak"
+                                onclick="prosesFoto(this, 'tolak', '{{ $p->id_booking }}', 'foto')">
+                                Tolak Pesanan
+                            </button>
 
-                        <button type="button" class="btn btn-success flex-fill terima"
-                            onclick="prosesTanpaDialog(this, 'terima', '{{ $p->id_booking }}')">
-                            Terima Pesanan
-                        </button>
+                            <button type="button" class="btn btn-success flex-fill terima"
+                                onclick="prosesFoto(this, 'terima', '{{ $p->id_booking }}', 'foto')">
+                                Terima Pesanan
+                            </button>
+                        @elseif ($p->status_booking == 'diterima')
+                            <button type="button" class="btn btn-primary flex-fill terima"
+                                onclick="prosesFoto(this, 'selesai', '{{ $p->id_booking }}', 'foto')">
+                                Selesaikan Pesanan
+                            </button>
+                        @endif
                     </div>
                 </div>
             </div>
@@ -126,7 +132,7 @@ class="badge {{ $p->status_label->class }}">
 </div>
 
 {{-- MODAL GAMBAR --}}
-<div class="modal fade" id="modalImagePreviewFoto" tabindex="-1" aria-hidden="true">
+<div class="modal fade" id="modalImagePreviewFoto" tabindex="-1" aria-hidden="true" style="z-index: 1060 !important;">
     <div class="modal-dialog modal-dialog-centered modal-lg">
         <div class="modal-content bg-transparent border-0 shadow-none">
             {{-- Tombol close putih agar terlihat di background gelap --}}
@@ -158,7 +164,7 @@ function showImageFoto(src) {
 
 
 <script>
-    function prosesTanpaDialog(btn, jenis, id) {
+    function prosesFoto(btn, jenis, id) {
         // 1. Efek Loading pada tombol yang diklik
         const originalText = btn.innerHTML;
         btn.innerHTML = '<span class="spinner-border spinner-border-sm"></span>';
@@ -183,8 +189,9 @@ function prosesTanpaDialog(btn, jenis, id) {
             .then(data => {
                 if (data.success) {
                     // 3. Langsung buka WhatsApp di tab baru
-                    window.open(data.wa_url, '_blank');
-                    // 4. Reload halaman utama untuk update status di tabel
+                    if (data.wa_url) {
+                        window.open(data.wa_url, '_blank');
+                    }
                     location.reload();
                 } else {
                     alert("Error: " + data.message);