diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index bfb284c..7dce0d7 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -155,6 +155,7 @@ class CustomerController extends Controller return [ 'master_menu_id' => $menu->master_menu_id, 'nama' => $menu->nama_menu, + 'exist_foto' => file_exists(public_path('gambar/' . $menu->foto)) ? true : false, 'foto' => $menu->foto, 'jenis_menu' => $menu->jenis_menu, 'harga_public' => $menu->harga_public, @@ -187,7 +188,7 @@ class CustomerController extends Controller // Urutkan: someday → tgl_harian terdekat $sorted = $enriched->sortBy(function ($menu) { - $hariIni = now()->day; + $besok = now()->addDay()->day; $isSomeday = $menu['apakah_someday'] ? 0 : 1; if ($menu['apakah_someday']) { @@ -195,8 +196,11 @@ class CustomerController extends Controller } $tglTerdekat = collect($menu['dmph'])->pluck('tgl_harian') - ->map(function ($tgl) use ($hariIni) { - return $tgl >= $hariIni ? $tgl : $tgl + 31; + ->map(function ($tgl) use ($besok) { + if ($tgl == $besok) { + return 0; // Besok paling awal + } + return $tgl > $besok ? $tgl : $tgl + 31; }) ->sort() ->first() ?? 99; @@ -322,7 +326,7 @@ class CustomerController extends Controller } catch (\Throwable $th) { //throw $th; } - + } DB::connection('dbOrderGizi')->commit(); return response()->json([ @@ -445,6 +449,8 @@ class CustomerController extends Controller 'od.status_order as status_order_detail', 'od.catatan', 'od.total_kalori', + 'od.type', + 'od.jam_layanan', DB::raw('COALESCE(mm.nama_menu, mcu.nama_mcu) as nama_item'), 'mm.foto as foto' ) @@ -487,12 +493,15 @@ class CustomerController extends Controller 'order_detail_id' => $item->order_detail_id, 'nama_item' => $item->nama_item, 'tgl_antar' => $item->tgl_antar, + 'exist_foto' => file_exists(public_path('gambar/' . $item->foto)) ? true : false, 'foto' => $item->foto, 'jumlah' => $item->jumlah, 'harga_satuan' => $item->harga_satuan, 'status_order' => $item->status_order_detail, 'catatan' => $item->catatan ?? '-', - 'total_kalori' => $item->total_kalori + 'total_kalori' => $item->total_kalori, + 'type' => $item->type, + 'jam_layanan' => $item->jam_layanan, // tambahkan field tambahan jika diperlukan ]; })->values(), diff --git a/public/gambar/default.png b/public/gambar/default.png new file mode 100644 index 0000000..a4f6704 Binary files /dev/null and b/public/gambar/default.png differ diff --git a/public/js/checkout/index.js b/public/js/checkout/index.js index 0590508..7fce52a 100644 --- a/public/js/checkout/index.js +++ b/public/js/checkout/index.js @@ -329,11 +329,11 @@ function renderCartSummary() { const itemTotal = pesananList.reduce((sum, p) => sum + (p.jumlah * harga), 0); if (checkout_biodata.jenis_customer === "Karyawan RSAB Harapan Kita") { - $('#karyawan').addClass('d-none'); - $('#pasien').removeClass('d-none'); - } else if (checkout_biodata.jenis_customer === "Keluarga Pasien / Penunggu Pasien") { $('#karyawan').removeClass('d-none'); $('#pasien').addClass('d-none'); + } else if (checkout_biodata.jenis_customer === "Keluarga Pasien / Penunggu Pasien") { + $('#karyawan').addClass('d-none'); + $('#pasien').removeClass('d-none'); } else { $('#karyawan').addClass('d-none'); $('#pasien').addClass('d-none'); @@ -452,7 +452,7 @@ function renderCartSummary() { const itemHTML = `
-
@@ -528,8 +528,8 @@ function renderCartSummary() { container.insertAdjacentHTML('beforeend', `
-
-
Total Keseluruhan: Rp ${totalKeseluruhan.toLocaleString('id-ID')}
+
+
Total Keseluruhan: Rp ${totalKeseluruhan.toLocaleString('id-ID')}
`); @@ -858,12 +858,12 @@ function initFlatpickrTersedia(item, i) { const dayStr = String(day).padStart(2, '0'); const fullDateStr = `${year}-${month}-${dayStr}`; const fullDate = new Date(`${fullDateStr}T13:00:00`); - + // Jika bukan menu someday, cek aturan H-1 dan jam batas if (item.apakah_someday) { availableDates.push(fullDateStr); } else { - + const selisihHari = Math.floor((fullDate - now) / (1000 * 60 * 60 * 24)); if (selisihHari >= 1 || (selisihHari === 1 && !lewatBatasNormal)) { availableDates.push(fullDateStr); diff --git a/public/js/order_guest/index.js b/public/js/order_guest/index.js index 8f489dc..d1f8433 100644 --- a/public/js/order_guest/index.js +++ b/public/js/order_guest/index.js @@ -178,7 +178,6 @@ if(filter.jenis_menu === "konsultasi"){ const jk = res.data|| []; - console.log(jk); $("#tanggal-filter").addClass('d-none'); let html = ` @@ -371,6 +370,7 @@
`; list?.forEach(menu => { + html += ` @@ -149,7 +154,7 @@ Total Kalori: {{ $label->total_kalori }} @endif Catatan - : + : {{ $label?->catatan ?? '-' }} @@ -172,16 +177,12 @@
- Halal + SELAMAT MENIKMATI
+ Makanan sebaiknya dikonsumsi dalam waktu maksimal 2 jam setelah diberikan
- - - diff --git a/resources/views/dashboard/master/menu/modal/detail.blade.php b/resources/views/dashboard/master/menu/modal/detail.blade.php index d9713a8..83f9b1d 100644 --- a/resources/views/dashboard/master/menu/modal/detail.blade.php +++ b/resources/views/dashboard/master/menu/modal/detail.blade.php @@ -12,6 +12,7 @@ + Foto Menu
diff --git a/resources/views/guest/check_order/index.blade.php b/resources/views/guest/check_order/index.blade.php index febd635..d0c3e2f 100644 --- a/resources/views/guest/check_order/index.blade.php +++ b/resources/views/guest/check_order/index.blade.php @@ -69,6 +69,7 @@ } const data = order.data; (data.items || []).forEach(item => { + console.log(item); const harga = parseInt(item.harga_satuan); const jumlah = parseInt(item.jumlah); @@ -77,7 +78,7 @@
- ${item.nama_item} + ${item.nama_item}
@@ -89,6 +90,7 @@

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

Jumlah: ${jumlah}

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

+

Waktu : ${item?.type || item?.jam_layanan}

@@ -155,6 +157,20 @@

${data?.no_ekstensien || '-'}
+ ${data?.status_order === "Lunas" ? ` +
+
+
Informasi Penting
+
+ Bagi Karyawan, makanan yang dipesan harus diambil sendiri (tidak diantar). + Pengambilan dapat dilakukan di Instalasi Gizi (Ruang Distribusi Makan) dengan jadwal: +
    +
  • Siang: 12.00 - 13.00 WIB
    • +
  • Sore: 16.00 - 17.00 WIB
    • +
+
+
+
` : ''} ` : data?.jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? `
@@ -181,6 +197,17 @@
${data?.kelas_perawatan || '-'}
+ ${data?.status_order === "Lunas" ? ` +
+
+
Informasi Penting
+
+ Bagi Keluarga atau Penunggu Pasien, makanan yang dipesan akan diantarkan ke ruang perawatan +
+
+
+ ` : ''} + ` : data?.jenis_customer === "Masyarakat Umum" ? `
Alamat
@@ -194,7 +221,6 @@
Item Pesanan
${itemHTML} -
Total Seluruh Pesanan: Rp ${parseInt(data?.total_harga).toLocaleString('id-ID')}
diff --git a/resources/views/guest/checkout/step/step2.blade.php b/resources/views/guest/checkout/step/step2.blade.php index 0a2554d..2eec41c 100644 --- a/resources/views/guest/checkout/step/step2.blade.php +++ b/resources/views/guest/checkout/step/step2.blade.php @@ -15,63 +15,43 @@
-
diff --git a/routes/web.php b/routes/web.php index 208aaec..ee2179a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -107,11 +107,11 @@ Route::get('/unit-instalasi', [CustomerController::class, 'unitInstalasi']); // Mail::to('skyjok14@gmail.com')->queue(new NotifikasiCustomer('Test')); // }); -Route::get('/dumy', function(){ - return view('guest.layout_mail'); -}); -Route::get('/label', function(){ - $pdf = Pdf::loadView('dashboard.label.index'); - return $pdf->stream('label_.pdf'); +// Route::get('/dumy', function(){ +// return view('guest.layout_mail'); +// }); +// Route::get('/label', function(){ +// $pdf = Pdf::loadView('dashboard.label.index'); +// return $pdf->stream('label_.pdf'); -}); +// });