diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 2d11a99..e9cae43 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -193,8 +193,8 @@ class CustomerController extends Controller 'jenis_kelamin' => $biodataResult['jenis_kelamin'], // 'tanggal_lahir' => $biodataResult['tanggal_lahir'], 'no_wa' => $biodataResult['no_whatsapp'], - // 'tinggi_badan' => $biodataResult['tinggi_badan'], - // 'berat_badan' => $biodataResult['berat_badan'], + 'tinggi_badan' => $biodataResult['tinggi_badan'], + 'berat_badan' => $biodataResult['berat_badan'], 'nama_pasien' => $biodataResult['nama_pasien'], 'ruang_perawatan' => $biodataResult['ruang_perawatan'], 'no_kamar_perawatan' => $biodataResult['no_kamar'], @@ -202,7 +202,7 @@ class CustomerController extends Controller 'bagian_instalasi' => $biodataResult['bagian_instalasi'], 'no_ekstensien' => $biodataResult['no_ekstensien'], 'total_harga' => $totalHarga, - 'status_order' => "Pending" + 'status_order' => "Belum Bayar" ]; $order = Order::create($payloadOrder); foreach ($dataCart as $cart) { @@ -253,7 +253,8 @@ class CustomerController extends Controller $order->update([ 'bukti_pembayaran' => $path, 'cara_pembayaran' => 'Transfer', - 'tgl_pembayaran' => Carbon::now() + 'tgl_pembayaran' => Carbon::now(), + 'status_order' => "Menunggu Konfirmasi Pembayaran" ]); DB::commit(); @@ -305,6 +306,7 @@ class CustomerController extends Controller 'od.jumlah', 'od.tgl_antar', 'od.harga_satuan', + 'od.status_order as status_order_detail', DB::raw("COALESCE(mm.nama_menu, mpm.nama_paket) as nama_item"), DB::raw("COALESCE(mm.foto, mpm.foto) as foto"), ) @@ -348,6 +350,7 @@ class CustomerController extends Controller 'foto' => $item->foto, 'jumlah' => $item->jumlah, 'harga_satuan' => $item->harga_satuan, + 'status_order' => $item->status_order_detail, // tambahkan field tambahan jika diperlukan ]; })->values(), diff --git a/app/Http/Controllers/PesananController.php b/app/Http/Controllers/PesananController.php index 613b0a5..963a9be 100644 --- a/app/Http/Controllers/PesananController.php +++ b/app/Http/Controllers/PesananController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Models\Order; use Illuminate\Http\Request; class PesananController extends Controller @@ -17,6 +18,12 @@ class PesananController extends Controller return view('dashboard.pesanan.pending.index', $payload); } + + public function getDataPending(){ + $data = Order::where('statusenabled', true)->get(); + return $data; + } + /** * Show the form for creating a new resource. */ diff --git a/public/gambar/PAKET 2 (KENTANG REBUS RENDANG DAGING, TUMIS BUNCIS DAGING GILING, SAMBAL).jpg b/public/gambar/PAKET 2 (KENTANG REBUS RENDANG DAGING, TUMIS BUNCIS DAGING GILING, SAMBAL).jpg new file mode 100644 index 0000000..f24b6b1 Binary files /dev/null and b/public/gambar/PAKET 2 (KENTANG REBUS RENDANG DAGING, TUMIS BUNCIS DAGING GILING, SAMBAL).jpg differ diff --git a/public/gambar/bihun.jpg b/public/gambar/bihun.jpg new file mode 100644 index 0000000..21adbba Binary files /dev/null and b/public/gambar/bihun.jpg differ diff --git a/public/gambar/jus_wortel.jpg b/public/gambar/jus_wortel.jpg new file mode 100644 index 0000000..595ba18 Binary files /dev/null and b/public/gambar/jus_wortel.jpg differ diff --git a/public/gambar/nasi_merah.jpg b/public/gambar/nasi_merah.jpg new file mode 100644 index 0000000..def7bb7 Binary files /dev/null and b/public/gambar/nasi_merah.jpg differ diff --git a/public/gambar/nasi_pepes_ayam.jpg b/public/gambar/nasi_pepes_ayam.jpg new file mode 100644 index 0000000..bb0f3de Binary files /dev/null and b/public/gambar/nasi_pepes_ayam.jpg differ diff --git a/public/gambar/paket1.jpg b/public/gambar/paket1.jpg new file mode 100644 index 0000000..c874729 Binary files /dev/null and b/public/gambar/paket1.jpg differ diff --git a/public/gambar/paket2.jpg b/public/gambar/paket2.jpg new file mode 100644 index 0000000..7502f24 Binary files /dev/null and b/public/gambar/paket2.jpg differ diff --git a/public/js/checkout/index.js b/public/js/checkout/index.js index 49d6ac0..46bb7e5 100644 --- a/public/js/checkout/index.js +++ b/public/js/checkout/index.js @@ -57,6 +57,7 @@ document.addEventListener('DOMContentLoaded', () => { renderCartSummary(); showStep(currentStep); isiKonfirmasi(); + toggleCustomerFields() document.getElementById('no_order_display').textContent = order_id }); @@ -111,8 +112,8 @@ if (typeof checkout_biodata === 'object') { } $('#nama_pemesan').val(checkout_biodata.nama_pemesan); // $('#tanggal_lahir').val(checkout_biodata.tanggal_lahir); - // $('#tinggi_badan').val(checkout_biodata.tinggi_badan); - // $('#berat_badan').val(checkout_biodata.berat_badan); + $('#tinggi_badan').val(checkout_biodata.tinggi_badan); + $('#berat_badan').val(checkout_biodata.berat_badan); $('#no_whatsapp').val(checkout_biodata.no_whatsapp); $('#nama_pasien').val(checkout_biodata.nama_pasien); $('#ruang_perawatan').val(checkout_biodata.ruang_perawatan); @@ -128,8 +129,8 @@ function isiKonfirmasi() { nama_pemesan: $('#nama_pemesan').val(), jenis_kelamin: $('input[name="jenis_kelamin"]:checked').val(), // tanggal_lahir: $('#tanggal_lahir').val(), - // tinggi_badan: $('#tinggi_badan').val(), - // berat_badan: $('#berat_badan').val(), + tinggi_badan: $('#tinggi_badan').val(), + berat_badan: $('#berat_badan').val(), no_whatsapp: $('#no_whatsapp').val(), nama_pasien: $('#nama_pasien').val(), ruang_perawatan: $('#ruang_perawatan').val(), diff --git a/public/js/order_guest/index.js b/public/js/order_guest/index.js index 99bc3c3..97ed5a7 100644 --- a/public/js/order_guest/index.js +++ b/public/js/order_guest/index.js @@ -9,6 +9,49 @@ function fetchMenu(filter = {}) { const containerGuest = $("#order_guest_id"); + if(filter.jenis_menu === "konsultasi"){ + const jadwalList = [ + { + nama_dokter: "dr. Andi exp, Sp.A", + spesialis: "Spesialis Anak", + hari: "Senin - Rabu", + jam: "08.00 - 11.00" + }, + { + nama_dokter: "dr. Siti exp, Sp.GK", + spesialis: "Spesialis Gizi Klinik", + hari: "Kamis - Jumat", + jam: "09.00 - 12.00" + }, + { + nama_dokter: "dr. Dimas exp, Sp.PD", + spesialis: "Spesialis Penyakit Dalam", + hari: "Sabtu", + jam: "10.00 - 13.00" + } + ]; + + let html = ` +
+

Jadwal Konsultasi

+
+ `; + + jadwalList.forEach(jadwal => { + html += ` +
+
${jadwal.nama_dokter}
+

${jadwal.spesialis}

+

Hari: ${jadwal.hari}

+

Jam: ${jadwal.jam}

+
+ `; + }); + + html += `
`; + return containerGuest.html(html); + + } let params = new URLSearchParams({ page: filter.page || 1, per_page: filter.per_page || 12, @@ -17,10 +60,12 @@ }).toString(); containerGuest.html('

Memuat data....

'); + fetch(`/datamenu?${params}`) .then(res => res.json()) .then(res => { + if (!res.status){ return containerGuest.html('

Gagal Memuat Data...

'); } @@ -35,7 +80,7 @@ const menus = res.data.data || []; if (menus.length === 0){ - return containerGuest.html('

Pencarian tidak ditemukan.

'); + return containerGuest.html('

.

'); } let html = '
'; menus.forEach(menu => { @@ -199,7 +244,9 @@ }]; let idText = $("#cathering_order_menu_id").text().trim(); let idMenu = parseInt(idText.replace(/[^\d]/g, ''), 10); - + let foto = $('#cathering_order_photo').attr('src') + let resultFoto = foto.replace('/gambar', ''); + let namaMenu = $("#cathering_order_name").text(); let existingItem = cart.find(item => item.id_menu === idMenu && item.nama_menu === namaMenu); @@ -220,7 +267,7 @@ nama_menu : $("#cathering_order_name").text(), harga_karyawan : parseRupiahToNumber($("#cathering_order_price_karyawan").text()), harga_kp : parseRupiahToNumber($("#cathering_order_price_keluarga_pasien").text()), - foto: $('#cathering_order_photo').attr('src'), + foto: resultFoto, jenis_menu: $('#cathering_order_jenis_menu').text(), deskripsi:$("#cathering_order_deskripsi").text(), pesanan : orders diff --git a/public/js/pesanan_pending/dt.js b/public/js/pesanan_pending/dt.js index fb990a9..3cf11a3 100644 --- a/public/js/pesanan_pending/dt.js +++ b/public/js/pesanan_pending/dt.js @@ -1,6 +1,6 @@ datatablePending.bootstrapTable({ - url: "/", + url: "/dashboard/datatable/pending", showColumns: true, showColumnsToggleAll: true, showRefresh: true, @@ -22,19 +22,68 @@ columns: [ { title: "Action", + field:'order_id', + formatter: function(value, row) { + const rowData = row; // jika butuh ID atau status dari baris + return ` +
+ + + ${row?.status_order === "Lunas" ? '' : ` + + + `} + +
+ `; + }, + hozAlign: "center", + headerSort: false + }, + + { + title: "No.Order", + field:'no_order' }, { - title: "Nama Menu", + title: "Pemesan", + field:'nama_pemesan', }, { - title: "Jenis Menu", + title: "Kategori Customer", + field: 'jenis_customer' }, { - title: "Harga", + title: "Total Harga Pesanan", + field:'total_harga', + formatter: function(value, row){ + return 'Rp ' + parseInt(row.total_harga).toLocaleString('id-ID') + } }, { - title: "Deskripsi", - }, + title: "Status Pembayaran", + field: 'status_order', + formatter: function(value, row) { + const status = value; + let badgeClass = 'bg-secondary'; + if (status === "Belum Bayar") { + badgeClass = 'bg-warning text-dark'; + } else if (status === "Menunggu Konfirmasi Pembayaran") { + badgeClass = 'bg-primary'; + } else if (status === "Lunas" || status === "Sudah Bayar") { + badgeClass = 'bg-success'; + } + + return `${status}`; + } + } + ], }); diff --git a/resources/views/guest/check_order/index.blade.php b/resources/views/guest/check_order/index.blade.php index 4796824..65a5608 100644 --- a/resources/views/guest/check_order/index.blade.php +++ b/resources/views/guest/check_order/index.blade.php @@ -73,7 +73,7 @@ const harga = parseInt(item.harga_satuan); const jumlah = parseInt(item.jumlah); const total = harga * jumlah; - + console.log(item); itemHTML += `
@@ -87,6 +87,11 @@

Harga: ${harga.toLocaleString('id-ID')}

Jumlah: ${jumlah}

Total: Rp ${total.toLocaleString('id-ID')}

+

+ ${item?.status_order} +

@@ -95,7 +100,7 @@ html += `
-
+

Pesanan Anda Ditemukan

Berikut adalah detail pesanan dengan No Order: ${data?.no_order}

@@ -124,14 +129,12 @@
Status
- ${!data?.bukti_bayar - ? 'Belum Bayar' - : data?.status_order || '-'} + ${data?.status_order === "Menunggu Konfirmasi Pembayaran" + ? 'bg-primary' + : data?.status_order === "Belum Bayar" + ? "bg-warning" + : "bg-success"}"> + ${data?.status_order}
@@ -187,17 +190,15 @@
Total Seluruh Pesanan: Rp ${parseInt(data?.total_harga).toLocaleString('id-ID')}
- ${data?.bukti_bayar ? ` -
+ ${data?.status_order === "Belum Bayar" + ? `
+ +
` : + `
Bukti Pembayaran
Bukti Pembayaran -
- ` : - `
-
`} -
Kembali ke Beranda diff --git a/resources/views/guest/checkout/step/step1.blade.php b/resources/views/guest/checkout/step/step1.blade.php index aefdbde..9da699b 100644 --- a/resources/views/guest/checkout/step/step1.blade.php +++ b/resources/views/guest/checkout/step/step1.blade.php @@ -41,22 +41,23 @@
+
+ + +
{{--
--}} - {{--
+
-
--}} -
- -
+ {{-- Pasien --}}
diff --git a/resources/views/guest/checkout/step/step3.blade.php b/resources/views/guest/checkout/step/step3.blade.php index 9d0794f..1718938 100644 --- a/resources/views/guest/checkout/step/step3.blade.php +++ b/resources/views/guest/checkout/step/step3.blade.php @@ -12,49 +12,68 @@
-
-
Detail Pembayaran
-
diff --git a/routes/web.php b/routes/web.php index a8013b9..ff2cd52 100644 --- a/routes/web.php +++ b/routes/web.php @@ -23,6 +23,7 @@ Route::group(['middleware' => ['auth']], function(){ Route::get('/', [DashboardController::class, 'index']); Route::resource('/klasifikasi-menu', KlasifikasiMenuController::class); Route::get('/pending', [PesananController::class, 'index']); + Route::get('datatable/pending', [PesananController::class, 'getDataPending']); }); Route::post('/logout', [AuthController::class, 'logout']); });