diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 09b3422..f120d49 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -56,7 +56,10 @@ class CustomerController extends Controller 'mn.harga_karyawan', 'mn.harga_keluarga_pasien', 'mn.status', - 'mn.deskripsi' + 'mn.deskripsi', + 'mn.apakah_someday', + 'mn.apakah_menu_siang', + 'mn.apakah_menu_sore', ) ->paginate($perPage); $menuIds = collect($paginated->items())->pluck('master_menu_id')->toArray(); @@ -70,8 +73,15 @@ class CustomerController extends Controller ->get() ->groupBy('master_menu_id'); + $dmph = DB::connection('dbOrderGizi') + ->table('public.detail_menu_paket_harian as dmph') + ->whereIn('dmph.master_menu_id', $menuIds) + ->select('dmph.master_menu_id', 'dmph.tgl_harian') + ->get() + ->groupBy('master_menu_id'); + // Step 3: Gabungkan data menu + klasifikasi - $result = collect($paginated->items())->map(function ($menu) use ($klasifikasi) { + $result = collect($paginated->items())->map(function ($menu) use ($klasifikasi, $dmph) { return [ 'master_menu_id' => $menu->master_menu_id, 'nama' => $menu->nama_menu, @@ -82,12 +92,20 @@ class CustomerController extends Controller 'harga_keluarga_pasien' => $menu->harga_keluarga_pasien, 'status' => $menu->status, 'deskripsi' => $menu->deskripsi, + 'apakah_someday' => $menu->apakah_someday, + 'apakah_menu_sore' => $menu->apakah_menu_sore, + 'apakah_menu_siang' => $menu->apakah_menu_siang, 'klasifikasiMenu' => isset($klasifikasi[$menu->master_menu_id]) ? $klasifikasi[$menu->master_menu_id]->map(function ($item) { return [ 'kategori_diet_id' => $item->kategori_diet_id, 'nama_kategori_diet' => $item->nama_kategori_diet, ]; })->values() : [], + 'dmph' => isset($dmph[$menu->master_menu_id]) ? $dmph[$menu->master_menu_id]->map(function ($item) { + return [ + 'tgl_harian' => $item->tgl_harian, + ]; + })->values() : [], ]; }); diff --git a/public/gambar/35cMZAabIvafkAA.jpeg b/public/gambar/35cMZAabIvafkAA.jpeg new file mode 100644 index 0000000..5d7ca39 Binary files /dev/null and b/public/gambar/35cMZAabIvafkAA.jpeg differ diff --git a/public/gambar/EPeNUXr9YlhdL9J.jpeg b/public/gambar/EPeNUXr9YlhdL9J.jpeg new file mode 100644 index 0000000..5d7ca39 Binary files /dev/null and b/public/gambar/EPeNUXr9YlhdL9J.jpeg differ diff --git a/public/js/order_guest/index.js b/public/js/order_guest/index.js index 97ed5a7..0d4d867 100644 --- a/public/js/order_guest/index.js +++ b/public/js/order_guest/index.js @@ -82,6 +82,8 @@ if (menus.length === 0){ return containerGuest.html('

.

'); } + + let html = '
'; menus.forEach(menu => { html += ` @@ -91,7 +93,41 @@ ${menu.nama_menu} + +
+ ${ + menu.apakah_someday + ? ` Tersedia setiap hari (Senin - Minggu)` + : (menu.dmph && menu.dmph.length > 0 + ? ` Tersedia pada tanggal: + ${menu.dmph.slice(0, 5).map(i => i.tgl_harian).join(', ')} + ${menu.dmph.length > 5 ? ` dan ${menu.dmph.length - 5} lainnya...` : ''}` + : ` Tidak tersedia saat ini`) + } +
+ +
+ ${ + menu.apakah_menu_siang && menu.apakah_menu_sore + ? ` Tersedia untuk makan siang dan sore` + : menu.apakah_menu_siang + ? ` Tersedia untuk makan siang` + : menu.apakah_menu_sore + ? ` Tersedia untuk makan sore` + : ` Tidak tersedia untuk waktu makan apapun` + } +
+ +
+ ${ + menu.apakah_someday + ? `Menu Someday +` + : `Menu Normal +` + } +
${menu.nama}
@@ -116,7 +152,7 @@ ? `+${(menu.klasifikasiMenu.length - 2)} lainnya` : ''}
- +