From 626d363606ab172b761cc67f612cda9c46af37e9 Mon Sep 17 00:00:00 2001 From: JokoPrasetio Date: Thu, 21 Aug 2025 16:02:49 +0700 Subject: [PATCH 1/3] done --- public/js/order_guest/index.js | 12 +++++- .../views/guest/checkout_order.blade.php | 39 +++++++++++++++---- resources/views/guest/layout/main.blade.php | 1 + 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/public/js/order_guest/index.js b/public/js/order_guest/index.js index 97b5cde..4e08957 100644 --- a/public/js/order_guest/index.js +++ b/public/js/order_guest/index.js @@ -146,7 +146,7 @@ zoomable: true, autoplayVideos: true }); - return + return } @@ -598,7 +598,15 @@ `); $('#cathering_order_menu_id').val(el.data('id')); $('#cathering_order_jenis_menu').val(el.data('jenis_menu')); - $('#cathering_order_deskripsi').text(el.data('deskripsi') || ''); + let deskripsi = el.data('deskripsi'); + if (deskripsi) { + $('#cathering_order_deskripsi').html( + `Deskripsi: ${deskripsi}` + ); + } else { + $('#cathering_order_deskripsi').html(''); + } + $('#cathering_order_price_karyawan').text("Rp " + parseInt(el.data('harga_karyawan') || 0).toLocaleString('id-ID')); $('#cathering_order_price_public').text("Rp " + parseInt(el.data('harga_public') || 0).toLocaleString('id-ID')); $('#tag_klasifikasi_menu').html(klasifikasiMenu); diff --git a/resources/views/guest/checkout_order.blade.php b/resources/views/guest/checkout_order.blade.php index 4105833..419ac64 100644 --- a/resources/views/guest/checkout_order.blade.php +++ b/resources/views/guest/checkout_order.blade.php @@ -20,17 +20,40 @@
-
-
Harga Karyawan:
-
-
Harga Public:
-
-
+
+
+ + Harga Karyawan: + + +
+ +
+ + Harga: + + +
+
+ + + + +

+

+ -

- + diff --git a/resources/views/guest/layout/main.blade.php b/resources/views/guest/layout/main.blade.php index c61bfc2..cac1b53 100644 --- a/resources/views/guest/layout/main.blade.php +++ b/resources/views/guest/layout/main.blade.php @@ -8,6 +8,7 @@ {{ $title }} | Order Gizi RSAB HK + {{-- --}} -- 2.47.2 From 23925ed842b97a04edfead76f5ee7bb830dcc52a Mon Sep 17 00:00:00 2001 From: JokoPrasetio Date: Thu, 21 Aug 2025 16:12:36 +0700 Subject: [PATCH 2/3] done --- public/js/order_guest/index.js | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/public/js/order_guest/index.js b/public/js/order_guest/index.js index 4e08957..9c18213 100644 --- a/public/js/order_guest/index.js +++ b/public/js/order_guest/index.js @@ -546,14 +546,8 @@ $("#scroll-top").addClass('d-none'); const tags = (el.data('klasifikasi_menu') || '').split(',').filter(Boolean).map(tag => tag.trim()); const kaloriRaw = el.data('kalori'); - let kalori = []; - if(Array.isArray(kaloriRaw)){ - kalori = kaloriRaw.map(k => String(k)) - }else if(typeof kaloriRaw === 'string'){ - kalori = kaloriRaw.split(',').map(k => k.trim()) - }else if(kaloriRaw !== undefined && kaloriRaw !== null){ - kalori = [String(kaloriRaw)] - } + let kalori = String(kaloriRaw); + const someday = el.data('apakah_someday'); const siang = el.data('apakah_menu_siang'); const sore = el.data('apakah_menu_sore'); @@ -562,9 +556,7 @@ ${tag} `).join(''); - const resultKkal = kalori.length > 0 - ? kalori.map(kkal => `${kkal ? kkal + ' kal' : ''}`).join('') - : ''; + const resultKkal = kalori ? `${kalori + ' kal'}` : ''; const tglMenuTersedia = `
-- 2.47.2 From 79e1f846fff5466ffe4b52e31e56f83c31d4146c Mon Sep 17 00:00:00 2001 From: JokoPrasetio Date: Fri, 22 Aug 2025 08:29:07 +0700 Subject: [PATCH 3/3] done fixing layout detail + update tampilan topnav --- app/Http/Controllers/CustomerController.php | 16 +++++---- public/js/order_guest/functions.js | 36 ++++++++++++------- public/js/order_guest/index.js | 10 +++--- .../views/guest/checkout_order.blade.php | 1 + resources/views/guest/index.blade.php | 29 +++++++++++++-- 5 files changed, 65 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index ecd7014..4516c2c 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -279,21 +279,23 @@ class CustomerController extends Controller 'no_wa' => $biodataResult['no_whatsapp'], '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'], - 'kelas_perawatan' => $biodataResult['kelas_perawatan'], - 'bagian_instalasi' => $biodataResult['bagian_instalasi'], - 'no_ekstensien' => $biodataResult['no_ekstensien'], 'total_harga' => $totalHarga, 'status_order' => "Belum Bayar", 'email' => $biodataResult['email'], - 'alamat' => $biodataResult['alamat'], 'entry_at' => Carbon::now()->format('Y-m-d H:i:s.u'), ]; if($jenisCustomer === "Karyawan RSAB Harapan Kita"){ $nip_pns = Karyawan::where('namalengkap',$biodataResult['nama_pemesan'])->first()->nip_pns; $payloadOrder['nip'] = $nip_pns ?? null; + $payloadOrder['bagian_instalasi'] = $biodataResult['ruang_perawatan'] ?? null; + $payloadOrder['no_ekstensien'] = $biodataResult['ruang_perawatan'] ?? null; + }else if($jenisCustomer === "Keluarga Pasien / Penunggu Pasien"){ + $payloadOrder['nama_pasien'] = $biodataResult['nama_pasien'] ?? null; + $payloadOrder['ruang_perawatan'] = $biodataResult['ruang_perawatan'] ?? null; + $payloadOrder['no_kamar_perawatan'] = $biodataResult['no_kamar'] ?? null; + $payloadOrder['kelas_perawatan'] = $biodataResult['kelas_perawatan'] ?? null; + }else{ + $payloadOrder['alamat'] = $biodataResult['alamat'] ?? null; } $order = Order::create($payloadOrder); foreach ($dataCart as $cart) { diff --git a/public/js/order_guest/functions.js b/public/js/order_guest/functions.js index 02c62e7..403271a 100644 --- a/public/js/order_guest/functions.js +++ b/public/js/order_guest/functions.js @@ -9,24 +9,34 @@ $(document).ready(function(){ fetchMenu(filterState) - $('#tabJenisMenu .nav-link').on('click', function(e){ + $('#tabJenisMenu .btn').on('click', function(e) { e.preventDefault(); - const jenis = $(this).data('filter') - $('#tabJenisMenu .nav-link').removeClass('active text-success').addClass('text-black'); + const jenis = $(this).data('filter'); - $(this).closest('.nav-link').removeClass('text-black').addClass('active text-success'); + // reset semua button jadi outline-success + $('#tabJenisMenu .btn') + .removeClass('btn-success active') + .addClass('btn-outline-success'); + // set button yang dipilih jadi active + $(this) + .removeClass('btn-outline-success') + .addClass('btn-success active'); + + // reset datepicker & label datePicker.clear(); - document.getElementById('tanggalTerpilihLabel').classList.add('d-none'); // Sembunyikan label - document.getElementById('tanggalTerpilihLabel').textContent = ''; - document.getElementById('resetTanggal').classList.add('d-none'); - filterState.jenis_menu = jenis - fetchMenu(filterState) - }) + $('#tanggalTerpilihLabel').addClass('d-none').text(''); + $('#resetTanggal').addClass('d-none'); + + // set filter state + filterState.jenis_menu = jenis; + fetchMenu(filterState); + }); + $(".alert-link").on('click', function(e){ e.preventDefault(); - $('#tabJenisMenu .nav-link').removeClass('active text-success').addClass('text-black'); - $('#tabJenisMenu .nav-link[data-filter="konsultasi" ]').removeClass('text-black').addClass('active text-success'); + $('#tabJenisMenu .btn').removeClass('btn-success active').addClass('btn-outline-success'); + $('#tabJenisMenu .btn[data-filter="konsultasi" ]').removeClass('btn-outline-success').addClass('btn-success active'); if (typeof datePicker !== 'undefined') { datePicker.clear(); @@ -52,7 +62,7 @@ $(document).ready(function(){ }, 300) }) - + }) function changePerPage(select) { diff --git a/public/js/order_guest/index.js b/public/js/order_guest/index.js index 9c18213..8f489dc 100644 --- a/public/js/order_guest/index.js +++ b/public/js/order_guest/index.js @@ -585,9 +585,9 @@ $('#cathering_order_photo').attr('src', `/gambar/${el.data('foto') || 'default.jpg'}`); $('#cathering_order_name').html(` -
${el.data('nama_menu')} - ${resultKkal} -
`); +
${el.data('nama_menu')}
`); + $("#kalori_detail").html(resultKkal) + $('#kalori_checkout').val(el.data('id')); $('#cathering_order_menu_id').val(el.data('id')); $('#cathering_order_jenis_menu').val(el.data('jenis_menu')); let deskripsi = el.data('deskripsi'); @@ -675,6 +675,8 @@ let existingItem = cart.find(item => item.id_menu === idMenu); if(!existingItem){ + let kaloriText = $('#kalori_detail').text().trim(); // misal "250 kal" + let kaloriOnly = kaloriText ? kaloriText.replace(' kal', '').trim() : ''; const orderItem ={ id:Date.now(), id_menu :idMenu, @@ -688,7 +690,7 @@ apakah_menu_sore: $('#apakah_menu_sore').val() === "1" ? true: false, apakah_someday: $('#apakah_someday').val() === "1" ? true: false, tgl_tersedia: $('#tgl_tersedia').val(), - kalori: $('#kalori').text(), + kalori: kaloriOnly, pesanan : orders } cart.push(orderItem) diff --git a/resources/views/guest/checkout_order.blade.php b/resources/views/guest/checkout_order.blade.php index 419ac64..8ff6a45 100644 --- a/resources/views/guest/checkout_order.blade.php +++ b/resources/views/guest/checkout_order.blade.php @@ -18,6 +18,7 @@
+
diff --git a/resources/views/guest/index.blade.php b/resources/views/guest/index.blade.php index e3b82cc..cefabde 100644 --- a/resources/views/guest/index.blade.php +++ b/resources/views/guest/index.blade.php @@ -4,7 +4,30 @@
-
+
+ +
+ + {{--
-
+
--}}
@@ -144,7 +167,7 @@ } else { label.textContent = `Menampilkan menu tersedia dari ${formatTanggal(start)} hingga ${formatTanggal(end)}`; } - const activeFilter = document.querySelector('#tabJenisMenu .nav-link.active')?.dataset?.filter || null; + const activeFilter = document.querySelector('#tabJenisMenu .btn.btn-success.active')?.dataset?.filter || null; // Baru kirim ke fetchMenu jika dua tanggal sudah dipilih fetchMenu({ jenis_menu: activeFilter, tanggal_awal: startDay, tanggal_akhir: endDay }); -- 2.47.2