From 921a14a57fddc371082eef22474826506f6f7a1e Mon Sep 17 00:00:00 2001
From: JokoPrasetio <joko12prasetio@gmail.com>
Date: Mon, 25 Aug 2025 14:47:17 +0700
Subject: [PATCH] add info menu yang dipesan

---
 public/js/laporan_pesanan/action.js           |   8 +-
 public/js/pekerjaan/dt.js                     |   2 +
 .../pesanan_pending/action_progres_order.js   | 177 ++++++++----------
 public/js/pesanan_pending/dt.js               |   4 +-
 public/js/pesanan_pending/of_dt.js            |   4 +-
 public/js/pesanan_selesai/detail_order.js     |  15 +-
 public/js/semua_pesanan/action.js             |  25 +--
 .../dashboard/pesanan/pending/index.blade.php |   3 +-
 .../dashboard/pesanan/semua/index.blade.php   |   4 +-
 9 files changed, 114 insertions(+), 128 deletions(-)

diff --git a/public/js/laporan_pesanan/action.js b/public/js/laporan_pesanan/action.js
index 317b01b..d9bc4cb 100644
--- a/public/js/laporan_pesanan/action.js
+++ b/public/js/laporan_pesanan/action.js
@@ -17,8 +17,8 @@ function fetchDetailOrder(order_id){
                             <p class="mb-1">Nama Menu: <strong>${detail?.menu?.nama_menu || detail?.master_mcu?.nama_mcu}</strong></p>
                             <p class="mb-1">Jumlah: <span>${detail?.jumlah || 0}</span></p>
                             ${detail?.total_kalori ? `<p class="mb-1">Total Kalori: <span>${detail?.total_kalori } kal</span></p>` : ''}
-                            
-                            <p class="mb-1">Tanggal Pesan: <span>${detail?.tgl_antar || 0}</span></p>
+
+                            <p class="mb-1">Tanggal Antar: <span>${detail?.tgl_antar || 0}</span></p>
                             <p class="mb-1">Harga: <strong>Rp ${parseInt(detail?.harga_satuan || 0).toLocaleString('id-ID')}</strong></p>
                             <p class="mb-1">Status Pesanan:
                             <span class="badge text-dark ${detail?.status_order === 'Selesai' ? 'bg-success' : 'bg-warning'}"
@@ -75,7 +75,7 @@ function fetchDetailOrder(order_id){
                                         <div class="mb-2">
                                         <p class="mb-1">Bagian / Instalasi: <strong>${data.bagian_instalasi}</strong></p>
                                         <p class="mb-1">Ekstensien: <strong>${data.no_ekstensien || '-'}</strong></p>
-                                    </div> 
+                                    </div>
                                     ` : ''
                                     }
                                 <hr>
@@ -94,7 +94,7 @@ function fetchDetailOrder(order_id){
                                     <label class="form-label fw-semibold">Status Saat Ini:</label><br>
                                     <span class="badge ${data?.status_order === 'Lunas' ? 'bg-success' : 'bg-warning'} text-dark">
                                         ${data.status_order}
-                                    </span>
+                                    </span> 
                                 </div>
                             </div>
                         </div>
diff --git a/public/js/pekerjaan/dt.js b/public/js/pekerjaan/dt.js
index 14d08dc..44c42b6 100644
--- a/public/js/pekerjaan/dt.js
+++ b/public/js/pekerjaan/dt.js
@@ -118,6 +118,8 @@
                 title: "Pemesan",
                 field:'order.nama_pemesan',
                 formatter: function(value, row){
+                    console.log(row);
+
                       return `
                 <ul class="list-unstyled mb-0 text-nowrap">
                     <li><i class="fa fa-user me-1 text-muted"></i><strong>${row?.order?.nama_pemesan ?? '-'}</strong></li>
diff --git a/public/js/pesanan_pending/action_progres_order.js b/public/js/pesanan_pending/action_progres_order.js
index 7e72d22..0d20a16 100644
--- a/public/js/pesanan_pending/action_progres_order.js
+++ b/public/js/pesanan_pending/action_progres_order.js
@@ -6,34 +6,30 @@ function fetchDetailOrder(order_id){
             document.getElementById('pesanan_container').innerHTML =''
             // Generate HTML untuk order_detail
             const detailHTML = (data?.order_detail || []).map(detail => {
+                const kalori = detail?.total_kalori ? `
+                                 <p class="mb-1">Total Kalori: <span>${detail?.total_kalori || 0} kal</span></p>`
+                                 : '';
                 return `
                 <div class="col-md-12 mb-3">
                     <div class="card shadow-sm border-0">
                         <div class="row g-0">
-                            <div class="col-md-5 d-flex align-items-center p-2">
-                            <img src="/gambar/${detail?.menu?.foto || 'default.jpg'}" alt="Foto Menu" class="img-fluid rounded shadow" style="max-height: 250px; width: auto;">
+                            <div class="${data?.jenis_customer === "MCU" ? 'd-none' : 'col-md-5 d-flex align-items-center p-2'}">
+                            <img src="/gambar/${detail?.menu?.foto || 'default.jpg'}" alt="Foto Menu" class="img-fluid rounded shadow" style="max-height: 250px; width: 240px;">
                             </div>
-                            <div class="col-md-5 p-2">
-                            <p class="mb-1">Nama Menu: <strong>${detail?.menu?.nama_menu || '-'}</strong></p>
+                            <div class="${data?.jenis_customer === "MCU" ? 'col-md-12' : 'col-md-5 p-2'} ">
+                            <p class="mb-1">Nama Menu: <strong>${detail?.menu?.nama_menu || detail?.master_mcu?.nama_mcu}</strong></p>
                             <p class="mb-1">Jumlah: <span>${detail?.jumlah || 0}</span></p>
-                            <p class="mb-1">Tanggal Pesan: <span>${detail?.tgl_antar || 0}</span></p>
+                            <p class="mb-1">Tanggal Antar: <span>${detail?.tgl_antar || 0}</span></p>
+                            ${kalori}
                             <p class="mb-1">Harga: <strong>Rp ${parseInt(detail?.harga_satuan || 0).toLocaleString('id-ID')}</strong></p>
                             <p class="mb-1">Status Pesanan:
                             <span class="badge text-dark ${detail?.status_order === 'Selesai' ? 'bg-success' : 'bg-warning'}"
-                                    id="status_badge_${detail.order_detail_id}">
+                                    id="status_badge_${detail?.order_detail_id}">
                                 ${detail?.status_order}
                             </span>
                             </p>
-                            <p class="mb-1">Catatan : <span>${detail?.catatan || '-'}</span></p>
-                            </div>
-                             <div class="form-check form-switch mt-2">
-                                    <input class="form-check-input status-switch" type="checkbox"
-                                        id="switch_status_${detail.order_detail_id}"
-                                        data-id="${detail.order_detail_id}"
-                                        ${detail.status_order === 'Selesai' ? 'checked' : ''} ${detail.status_order === 'Selesai' ? 'disabled' : ''}>
-                                    <label class="form-check-label " for="switch_status_${detail.order_detail_id}">
-                                        ${detail.status_order === 'Selesai' ? `Selesai` : 'Tandai sebagai Selesai'}
-                                    </label>
+                            ${detail?.catatan ? `<p class="mb-1">Catatan : <span>${detail?.catatan || '-'}</span></p>` : ''}
+
                             </div>
                         </div>
                     </div>
@@ -42,99 +38,84 @@ function fetchDetailOrder(order_id){
             }).join('');
 
             const html = `
-                <div class="row mt-3">
-                    <!-- Bagian Kiri: Gambar Bukti Pembayaran -->
-                     ${data.bukti_pembayaran ? `
-                    <div class="col-md-4 text-center mb-3 mb-md-0">
-                        <a href="/storage/${data.bukti_pembayaran}" target="_blank">
-                        <img src="/storage/${data.bukti_pembayaran || 'gambar/default.jpg'}" alt="Bukti Pembayaran" class="img-fluid rounded shadow" style="max-height: 370px; width: auto;"></a>
-                    </div>` : ''}
-
-                    <!-- Bagian Kanan: Informasi Pemesan -->
-                    <div class="${data?.bukti_pembayaran ? `col-md-8` : `col-md-12`}">
-                        <div class="card shadow-sm border-0">
-                            <div class="card-body">
-                                <h5 class="mb-0">Nama Pemesan: <span class="text-primary" id="nama_pemesan">${data.nama_pemesan}</span></h5>
-                                    <small class="text-muted">Jenis Customer: <span id="jenis_customer">${data.jenis_customer}</span></small>
-
-
-
-                                    ${data?.jenis_customer === 'Keluarga Pasien / Penunggu Pasien' ?
-                                            `<div class="mb-2">
-                                                <p class="mb-1">Nama Pasien: <strong id="no_order">${data.nama_pasien || '-'}</strong></p>
-                                                <p class="mb-1">Nomor Kamar Perawatan: <strong id="no_order">${data.no_kamar_perawatan || '-'}</strong></p>
-                                                <p class="mb-1">Ruang Perawatan: <strong id="no_order">${data.kelas_perawatan || '-'}</strong></p>
-                                                <p class="mb-1">Kelas Perawatan: <strong id="no_order">${data.ruang_perawatan || '-'}</strong></p>
-                                            </div>`: `
-                                            <div class="mb-2">
-                                                <p class="mb-1">Bagian /Instalasi: <strong id="no_order">${data.bagian_instalasi || '-'}</strong></p>
-                                            <p class="mb-1">Ekstensien yang bisa di Hubungi: <strong id="no_order">${data.no_ekstensien || '-'}</strong></p>
-                                            </div>
-
-                                            `}
-
-
-                                    <div class="mb-2">
-                                        <p class="mb-1">No Order: <strong id="no_order">${data.no_order}</strong></p>
-                                        <p class="mb-1">Type Pembayaran: <strong id="no_order">${data.cara_pembayaran}</strong></p>
-                                        <p class="mb-1">Tanggal Pembayaran: <span id="tgl_pembayaran">${data.tgl_pembayaran || '-'}</span></p>
-                                        <p class="mb-1">Total Harga: <strong id="total_harga">Rp ${parseInt(data.total_harga).toLocaleString('id-ID')}</strong></p>
+                        <div class="row mt-4">
 
+                            <!-- Gambar Bukti Pembayaran -->
+                            ${data.bukti_pembayaran ? `
+                                <div class="col-md-4 text-center mb-3 mb-md-0">
+                                    <div class="border rounded shadow-sm p-2 bg-light">
+                                        <a href="/storage/${data?.bukti_pembayaran}" target="_blank">
+                                <img src="/storage/${data.bukti_pembayaran || 'gambar/default.jpg'}"
+                                    alt="Bukti Pembayaran"
+                                    class="img-fluid rounded"
+                                    style="max-height: 170px; width: auto;">
+                            </a>
+                                        <div class="text-muted small mt-2">Bukti Pembayaran</div>
                                     </div>
+                                </div>
+                            ` : ''}
 
-                                    <div class="mt-3">
-                                        <label class="form-label">Status Saat Ini:</label>
-                                        <span class="badge text-dark ${data?.status_order === 'Lunas' ? 'bg-success' : 'bg-warning'}" id="status_order">${data.status_order}</span>
+                            <!-- Informasi Pemesan -->
+                            <div class="${data.bukti_pembayaran ? 'col-md-8' : 'col-md-12'}">
+                                <div class="card shadow-sm border-0">
+                                    <div class="card-body">
+                                        <h5 class="card-title text-primary mb-1">${data?.nama_pemesan}</h5>
+                                        <p class="mb-2">Jenis Kelamin: <strong>${data?.jenis_kelamin}</strong></p>
+                                        <p class="mb-2">Jenis Customer: <strong>${data?.jenis_customer}</strong></p>
+                                        <p class="mb-2">Email: <strong>${data?.email || '-'}</strong></p>
+                                        <p class="mb-2">No.Hp / WA: <strong>${data?.no_wa || '-'}</strong></p>
+                                        <p class="mb-2">Tinggi Badan / Berat Badan: <strong>${data?.tinggi_badan || '-'} / ${data?.berat_badan || '-'}</strong></p>
+
+                                        ${
+                                            data?.jenis_customer === "Masyarakat Umum"
+                                            ? `
+                                                <p class="mb-1">Alamat: <strong>${data?.alamat || '-'}</strong></p>
+                                            `
+                                            : data?.jenis_customer === "Karyawan RSAB Harapan Kita"
+                                            ? `
+                                                <p class="mb-1">Bagian / Instalasi: <strong>${data?.bagian_instalasi || '-'}</strong></p>
+                                                <p class="mb-1">No Ekstensien: <strong>${data?.no_ekstensien || '-'}</strong></p>
+                                            `
+                                            : data?.jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? `
+                                                <p class="mb-1">Nama Pasien: <strong>${data?.nama_pasien || '-'}</strong></p>
+                                                <p class="mb-1">Ruang Perawatan: <strong>${data?.ruang_perawatan || '-'}</strong></p>
+                                                <p class="mb-1">Nomor Kamar Perawatan: <strong>${data?.no_kamar_perawatan || '-'}</strong></p>
+                                                <p class="mb-1">Kelas Perawatan: <strong>${data?.kelas_perawatan || '-'}</strong></p>
+                                            ` : ''
+                                        }
+
+                                        <hr>
+
+                                        <div class="mb-2">
+                                            <p class="mb-1">No Order: <strong>${data.no_order}</strong></p>
+                                            <p class="mb-1">Metode Pembayaran: <strong>${data.cara_pembayaran}</strong></p>
+                                            ${data?.cara_pembayaran === 'Billing' ? `
+                                                <p class="mb-1">No. Medical Record: <strong>${data.medical_record}</strong></p>
+                                            ` : ''}
+                                            <p class="mb-1">Tanggal Pembayaran: <strong>${data.tgl_pembayaran || '-'}</strong></p>
+                                            <p class="mb-1">Total Harga: <strong>Rp ${parseInt(data.total_harga).toLocaleString('id-ID')}</strong></p>
+                                        </div>
+
+                                        <div class="mt-3">
+                                            <label class="form-label fw-semibold">Status Saat Ini:</label><br>
+                                            <span class="badge ${data?.status_order === 'Lunas' ? 'bg-success' : 'bg-warning'} text-dark">
+                                                ${data.status_order}
+                                            </span>
+                                        </div>
                                     </div>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                </div>
 
-                <hr class="my-4">
+                        <hr class="my-4">
 
-                <div class="row">
-                ${detailHTML}
-                </div>
-            `;
+                        <div class="row">
+                            ${detailHTML}
+                        </div>
+                    `;
 
             document.getElementById('pesanan_container').innerHTML = html;
 
-
-            document.querySelectorAll('.status-switch').forEach(el => {
-                el.addEventListener('change', function () {
-                    const id = this.dataset.id;
-                    const isChecked = this.checked;
-                    const newStatus = isChecked ? 'Selesai' : 'Pending';
-
-                    // Update badge UI
-                    const badge = document.getElementById(`status_badge_${id}`);
-                    if (badge) {
-                        badge.innerText = newStatus;
-                        badge.className = `badge text-dark ${isChecked ? 'bg-success' : 'bg-warning'}`;
-                    }
-
-                    // Kirim ke backend
-                    fetch(`/dashboard/pending/update-detail-status/${id}`, {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/json',
-                            'X-CSRF-TOKEN': document.querySelector('input[name="_token"]').value
-                        },
-                        body: JSON.stringify({ status_order: newStatus })
-                    })
-                    .then(res => res.json())
-                    .then(res => {
-                        el.disabled = true;
-                        datatablePending.bootstrapTable('refresh')
-                        showToast('Status berhasil diperbarui!');
-                        getReminderVerifikasiMakanan()
-                    })
-                    .catch(err => {
-                        console.error('Gagal update status:', err);
-                    });
-                });
-            });
         })
         .catch(err => {
         document.getElementById('pesanan_container').innerHTML = '<p class="text-danger">Terjadi kesalahan saat memuat data.</p>';
diff --git a/public/js/pesanan_pending/dt.js b/public/js/pesanan_pending/dt.js
index f9fda32..a945acc 100644
--- a/public/js/pesanan_pending/dt.js
+++ b/public/js/pesanan_pending/dt.js
@@ -65,13 +65,13 @@
                          </button>
                         `
                     }
-                    if(row?.status_order === "Lunas"){
+                    // if(row?.status_order === "Lunas"){
                         buttons += `
                             <button class="btn btn-sm btn-warning text-dark" onclick="approveProgress('${row.order_id}')">
                                         <i class="fa fa-utensils me-1"></i>
                                     </button>
                         `
-                    }
+                    // }
 
                     return `
                         <div class="d-flex space-x">
diff --git a/public/js/pesanan_pending/of_dt.js b/public/js/pesanan_pending/of_dt.js
index a0d410e..92a219e 100644
--- a/public/js/pesanan_pending/of_dt.js
+++ b/public/js/pesanan_pending/of_dt.js
@@ -213,7 +213,7 @@ function getTableColumns() {
 function detailOrder(id){
     const offcanvas = bootstrap.Offcanvas.getInstance(document.getElementById('offcanvasKonfirmasiPesanan')) || new bootstrap.Offcanvas(document.getElementById('offcanvasKonfirmasiPesanan'));
     offcanvas.hide();
-     new bootstrap.Modal(modalDetailOrder).show();
+     new bootstrap.Modal(modalActionProgressOrder).show();
      fetch(`/dashboard/pekerjaan/detail/${id}`)
      .then(res => res.json())
      .then(res => {
@@ -267,7 +267,7 @@ function detailOrder(id){
         `
 
         document.getElementById('pesanan_container').innerHTML = html;
-        document.getElementById('modalDetailOrderOf').addEventListener('hidden.bs.modal', () => {
+        document.getElementById('modalActionProgressOrder').addEventListener('hidden.bs.modal', () => {
                 new bootstrap.Offcanvas(document.getElementById('offcanvasKonfirmasiPesanan')).show()
             }, { once:true});
         })
diff --git a/public/js/pesanan_selesai/detail_order.js b/public/js/pesanan_selesai/detail_order.js
index b8ea8ce..0c4ad5e 100644
--- a/public/js/pesanan_selesai/detail_order.js
+++ b/public/js/pesanan_selesai/detail_order.js
@@ -16,7 +16,7 @@ function fetchDetailOrder(order_id){
                             <div class="${data?.jenis_customer === "MCU" ? 'col-md-12' : 'col-md-5 p-2'}">
                             <p class="mb-1">Nama Menu: <strong>${detail?.menu?.nama_menu || detail?.master_mcu?.nama_mcu}</strong></p>
                             <p class="mb-1">Jumlah: <span>${detail?.jumlah || 0}</span></p>
-                            <p class="mb-1">Tanggal Pesan: <span>${detail?.tgl_antar || 0}</span></p>
+                            <p class="mb-1">Tanggal Antar: <span>${detail?.tgl_antar || 0}</span></p>
                             <p class="mb-1">Harga: <strong>Rp ${parseInt(detail?.harga_satuan || 0).toLocaleString('id-ID')}</strong></p>
                             <p class="mb-1">Status Pesanan:
                             <span class="badge text-dark ${detail?.status_order === 'Selesai' ? 'bg-success' : 'bg-warning'}"
@@ -25,7 +25,7 @@ function fetchDetailOrder(order_id){
                             </span>
                             </p>
                             ${detail?.catatan ? ` <p class="mb-1">Catatan : <span>${detail?.catatan || '-'}</span></p>` : ''}
-                               
+
                             </div>
                         </div>
                     </div>
@@ -40,11 +40,12 @@ function fetchDetailOrder(order_id){
                             ${data.bukti_pembayaran ? `
                                 <div class="col-md-4 text-center mb-3 mb-md-0">
                                     <div class="border rounded shadow-sm p-2 bg-light">
-                                        <img
-                                            src="/storage/${data.bukti_pembayaran || 'gambar/default.jpg'}"
-                                            alt="Bukti Pembayaran"
-                                            class="img-fluid rounded"
-                                            style="max-height: 170px; width: auto;">
+                                        <a href="/storage/${data?.bukti_pembayaran}" target="_blank">
+                                <img src="/storage/${data.bukti_pembayaran || 'gambar/default.jpg'}"
+                                    alt="Bukti Pembayaran"
+                                    class="img-fluid rounded"
+                                    style="max-height: 170px; width: auto;">
+                            </a>
                                         <div class="text-muted small mt-2">Bukti Pembayaran</div>
                                     </div>
                                 </div>
diff --git a/public/js/semua_pesanan/action.js b/public/js/semua_pesanan/action.js
index 5b63f6a..fcee33b 100644
--- a/public/js/semua_pesanan/action.js
+++ b/public/js/semua_pesanan/action.js
@@ -7,7 +7,7 @@ function fetchDetailOrder(order_id){
             // Generate HTML untuk order_detail
             const detailHTML = (data?.order_detail || []).map(detail => {
                 const kalori = detail?.total_kalori ? `
-                                 <p class="mb-1">Total Kalori: <span>${detail?.total_kalori || 0} kal</span></p>` 
+                                 <p class="mb-1">Total Kalori: <span>${detail?.total_kalori || 0} kal</span></p>`
                                  : '';
                 return `
                 <div class="col-md-12 mb-3">
@@ -19,8 +19,8 @@ function fetchDetailOrder(order_id){
                             <div class="${data?.jenis_customer === "MCU" ? 'col-md-12' : 'col-md-5 p-2'} ">
                             <p class="mb-1">Nama Menu: <strong>${detail?.menu?.nama_menu || detail?.master_mcu?.nama_mcu}</strong></p>
                             <p class="mb-1">Jumlah: <span>${detail?.jumlah || 0}</span></p>
-                            <p class="mb-1">Tanggal Pesan: <span>${detail?.tgl_antar || 0}</span></p>
-                            ${kalori}                            
+                            <p class="mb-1">Tanggal Antar: <span>${detail?.tgl_antar || 0}</span></p>
+                            ${kalori}
                             <p class="mb-1">Harga: <strong>Rp ${parseInt(detail?.harga_satuan || 0).toLocaleString('id-ID')}</strong></p>
                             <p class="mb-1">Status Pesanan:
                             <span class="badge text-dark ${detail?.status_order === 'Selesai' ? 'bg-success' : 'bg-warning'}"
@@ -29,14 +29,14 @@ function fetchDetailOrder(order_id){
                             </span>
                             </p>
                             ${detail?.catatan ? `<p class="mb-1">Catatan : <span>${detail?.catatan || '-'}</span></p>` : ''}
-                                
+
                             </div>
                         </div>
                     </div>
                 </div>
                 `;
             }).join('');
-            
+
             const html = `
                         <div class="row mt-4">
 
@@ -44,11 +44,12 @@ function fetchDetailOrder(order_id){
                             ${data.bukti_pembayaran ? `
                                 <div class="col-md-4 text-center mb-3 mb-md-0">
                                     <div class="border rounded shadow-sm p-2 bg-light">
-                                        <img
-                                            src="/storage/${data.bukti_pembayaran || 'gambar/default.jpg'}"
-                                            alt="Bukti Pembayaran"
-                                            class="img-fluid rounded"
-                                            style="max-height: 170px; width: auto;">
+                                      <a href="/storage/${data?.bukti_pembayaran}" target="_blank">
+                                <img src="/storage/${data.bukti_pembayaran || 'gambar/default.jpg'}"
+                                    alt="Bukti Pembayaran"
+                                    class="img-fluid rounded"
+                                    style="max-height: 170px; width: auto;">
+                            </a>
                                         <div class="text-muted small mt-2">Bukti Pembayaran</div>
                                     </div>
                                 </div>
@@ -75,7 +76,7 @@ function fetchDetailOrder(order_id){
                                                 <p class="mb-1">Bagian / Instalasi: <strong>${data?.bagian_instalasi || '-'}</strong></p>
                                                 <p class="mb-1">No Ekstensien: <strong>${data?.no_ekstensien || '-'}</strong></p>
                                             `
-                                            : data?.jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? ` 
+                                            : data?.jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? `
                                                 <p class="mb-1">Nama Pasien: <strong>${data?.nama_pasien || '-'}</strong></p>
                                                 <p class="mb-1">Ruang Perawatan: <strong>${data?.ruang_perawatan || '-'}</strong></p>
                                                 <p class="mb-1">Nomor Kamar Perawatan: <strong>${data?.no_kamar_perawatan || '-'}</strong></p>
@@ -84,7 +85,7 @@ function fetchDetailOrder(order_id){
                                         }
 
                                         <hr>
-                                        
+
                                         <div class="mb-2">
                                             <p class="mb-1">No Order: <strong>${data.no_order}</strong></p>
                                             <p class="mb-1">Metode Pembayaran: <strong>${data.cara_pembayaran}</strong></p>
diff --git a/resources/views/dashboard/pesanan/pending/index.blade.php b/resources/views/dashboard/pesanan/pending/index.blade.php
index 899eba4..2db7094 100644
--- a/resources/views/dashboard/pesanan/pending/index.blade.php
+++ b/resources/views/dashboard/pesanan/pending/index.blade.php
@@ -44,11 +44,12 @@
 
 <x-modalExport modalId="modalExportPending" form="/dashboard/pending/export" confirm="Konfirmasi Pesanan"/>
 <x-modalExport modalId="modalExportPekerjaan" form="/dashboard/pekerjaan/export" confirm="Verifikasi Makanan"/>
+<x-infoPesanan modalId="modalActionProgressOrder" judulModal="Info Pesanan Pending" />
 
 @include('dashboard.pesanan.pending.modal.detail')
 @include('dashboard.pesanan.pending.modal.action')
 @include('dashboard.pesanan.pending.modal.confirmBilling')
-@include('dashboard.pesanan.pending.modal.actionProgressPesanan')
+{{-- @include('dashboard.pesanan.pending.modal.actionProgressPesanan') --}}
 {{-- @include('dashboard.pesanan.pending.modal.export') --}}
 @include('dashboard.pesanan.pending.offcanvas.konfirmasiPesanan')
 @include('dashboard.pesanan.pending.modal.actionPekerjaan')
diff --git a/resources/views/dashboard/pesanan/semua/index.blade.php b/resources/views/dashboard/pesanan/semua/index.blade.php
index ce682d2..bc8c7d8 100644
--- a/resources/views/dashboard/pesanan/semua/index.blade.php
+++ b/resources/views/dashboard/pesanan/semua/index.blade.php
@@ -54,7 +54,7 @@
                             const day = String(d.getDate()).padStart(2, '0');
                             return `${year}-${month}-${day}`;
                     })
-                    // initDt(selectedFormattedDates)
+                    initDt(selectedFormattedDates)
                     if(selectedFormattedDates.length > 0){
                         const tanggalList = selectedFormattedDates;
 
@@ -74,7 +74,7 @@
                 }
             });
             $("#confirm_semua_pesanan_time").text('Hari ini');
-            // initDt()
+            initDt()
     });
 </script>
 @endsection
-- 
2.47.2