Joko/order_gizi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add keterangan di step pembayaran & di label ditambahin keterangan

Browse Source
This commit is contained in:
JokoPrasetio 2025-09-02 09:44:56 +07:00
parent 42581b13ce
commit 1da09e4f72
11 changed files with 112 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Controllers/CustomerController.php
View File

@ -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(),

BIN
public/gambar/default.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 466 KiB

16
public/js/checkout/index.js
View File

@ -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 = `
<div class="card mb-3 shadow-sm position-relative">
<button type="button" class="btn btn-sm btn-danger position-absolute top-0 end-0 m-2" onClick="removeCartItem(${item.id})" style="z-index:1;">
<button type="button" class="btn btn-sm btn-danger position-absolute top-0 end-0 m-2" onClick="removeCartItem(${item.id})" style="z-index:1;">
Hapus
</button>
<div class="d-flex flex-column flex-md-row">
@ -528,8 +528,8 @@ function renderCartSummary() {
container.insertAdjacentHTML('beforeend', `
<div class="text-end mt-4">
<hr>
<h5><strong>Total Keseluruhan:</strong> <span class="text-success">Rp ${totalKeseluruhan.toLocaleString('id-ID')}</span></h5>
<hr>
<h5><strong>Total Keseluruhan:</strong> <span class="text-success">Rp ${totalKeseluruhan.toLocaleString('id-ID')}</span></h5>
</div>
`);
@ -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);

27
public/js/order_guest/index.js
View File

@ -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 @@
</div>
`;
list?.forEach(menu => {
html += `
<style>
.menu-card {
@ -390,7 +390,8 @@
<!-- GAMBAR + NAMA DI DALAM GAMBAR -->
<div class="position-relative">
<img src="gambar/${menu.foto || '3.jpeg'}"
<img src="${menu.exist_foto ? `/gambar/${menu?.foto}` : '/gambar/default.png'}"
class="rounded shadow-sm object-fit-cover w-100" height="150"
alt="${menu.nama_menu}">
@ -401,7 +402,7 @@
<!-- di dalam .position-relative (gambar) -->
<!-- Nama + kalori di dalam gambar (bawah) -->
<div class="position-absolute bottom-0 start-0 p-2 w-100">
<h6 class="fw-bold text-white mb-0" style="font-size:.75rem; max-width: 85%;">${menu.nama.length > 15 ? menu.nama.substring(0, 17) + '...' : menu.nama}</h6>
<h5 class="fw-bold text-white mb-0" style="font-size:.80rem; max-width: 100%;">${menu.nama.length > 25 ? menu.nama.substring(0, 30) + '...' : menu.nama}</h5>
${menu?.kalori.length > 0 ? `
<small class="text-white badge bg-success">${(menu.kalori || []).slice(0,1).map(k=>k.nilai_kalori||0).join('')} kkal</small>`: ''}
${(menu.klasifikasiMenu || [])
@ -430,13 +431,6 @@
</div>
<!-- Harga 1 baris -->
<!-- <div class="d-flex justify-content-between align-items-center text-muted small mt-1 px-1"> -->
<!--<small>Karyawan</small> -->
<!-- <strong class="text-success">Rp ${parseInt(menu.harga_karyawan).toLocaleString('id-ID')}</strong> -->
<!-- </div> -->
<div class="d-flex justify-content-between align-items-center text-muted small mb-1">
<strong>Harga</strong>
<strong class="text-success">Rp ${parseInt(menu.harga_public).toLocaleString('id-ID')}</strong>
@ -470,6 +464,7 @@
data-tgl_tersedia="${(menu.dmph || []).map(tgl => tgl.tgl_harian).join(', ')}"
data-kalori="${(menu.kalori || []).map(kkal => kkal.nilai_kalori).join(', ')}"
data-foto="${menu.foto}"
data-exist_foto="${menu.exist_foto}"
data-apakah_menu_sore="${menu.apakah_menu_sore}"
data-apakah_menu_siang="${menu.apakah_menu_siang}"
data-apakah_someday="${menu.apakah_someday}">
@ -486,7 +481,8 @@
data-klasifikasi_menu="${(menu.klasifikasiMenu || []).map(tag => tag.nama_kategori_diet).join(', ')}"
data-tgl_tersedia="${(menu.dmph || []).map(tgl => tgl.tgl_harian).join(', ')}"
data-kalori="${(menu.kalori || []).map(kkal => kkal.nilai_kalori).join(', ')}"
data-foto="${menu.foto}"
${menu.exist_foto ? `data-foto=${menu.foto}` : `data-foto="default.png"`}
data-apakah_menu_sore="${menu.apakah_menu_sore}"
data-apakah_menu_siang="${menu.apakah_menu_siang}"
data-apakah_someday="${menu.apakah_someday}">
@ -551,6 +547,7 @@
const someday = el.data('apakah_someday');
const siang = el.data('apakah_menu_siang');
const sore = el.data('apakah_menu_sore');
const exist_foto = el.data('exist_foto');
const klasifikasiMenu = tags.map(tag => `
<span class="badge bg-secondary me-1 mb-1">${tag}</span>
@ -582,7 +579,11 @@
`;
$('#checkoutModal').modal('show');
$('#cathering_order_photo').attr('src', `/gambar/${el.data('foto') || 'default.jpg'}`);
if(exist_foto){
$('#cathering_order_photo').attr('src', `/gambar/${el.data('foto') || 'default.png'}`);
}else{
$('#cathering_order_photo').attr('src', `/gambar/default.png`);
}
$('#cathering_order_name').html(`
<div>${el.data('nama_menu')}</div>`);
@ -603,6 +604,7 @@
$('#cathering_order_price_public').text("Rp " + parseInt(el.data('harga_public') || 0).toLocaleString('id-ID'));
$('#tag_klasifikasi_menu').html(klasifikasiMenu);
$('#tgl_menu_tersedia').html(tglMenuTersedia);
$('#exist_foto').val(exist_foto ? 1 : 0);
$('#apakah_someday').val(someday ? 1 : 0);
$('#apakah_menu_siang').val(siang ? 1 : 0);
$('#apakah_menu_sore').val(sore ? 1 : 0);
@ -731,6 +733,7 @@
foto: $(e).data('foto'),
jenis_menu: $(e).data('jenis_menu'),
deskripsi: $(e).data('deskripsi'),
exist_foto: $(e).data('exist_foto'),
apakah_menu_siang: $(e).data('apakah_menu_siang'),
apakah_menu_sore: $(e).data('apakah_menu_sore'),
apakah_someday: $(e).data('apakah_someday'),

BIN
public/logo/halal_gizi.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 42 KiB

17
resources/views/dashboard/label/index.blade.php
View File

@ -71,12 +71,17 @@
gap: 8px; /* jarak antar elemen */
}
.footer-logo {
height: 45px; /* samakan tinggi logo */
margin-top:5px;
height: 40px; /* samakan tinggi logo */
}
.footer-text {
font-size: 12px;
margin-left:-12px;
font-weight: bold;
}
.footer-text-muted {
font-size: 10.5px;
}
</style>
</head>
<body>
@ -149,7 +154,7 @@
<tr><td>Total Kalori</td><td>: {{ $label->total_kalori }}</td></tr>
@endif
<tr><td>Catatan</td>
<td><span style="vertical-align: top;">:</span>
<td><span style="vertical-align: top;">:</span>
<span style="max-width: 54mm; word-wrap: break-word; white-space: normal; display: inline-block; vertical-align: top;">
{{ $label?->catatan ?? '-' }}
</span></td>
@ -172,16 +177,12 @@
<div class="footer">
<div class="footer-content">
<img src="{{ public_path('logo/halal_gizi.png') }}" alt="Halal" style="height: 52px; margin-top:12px;">
<img src="{{ public_path('logo/halal_gizi.png') }}" alt="Halal" class="footer-logo">
<span class="footer-text">SELAMAT MENIKMATI</span>
<img src="{{ public_path('logo/iso_gizi.png') }}" alt="ISO 22000" class="footer-logo">
</div>
<span class="footer-text-muted">Makanan sebaiknya dikonsumsi dalam waktu maksimal 2 jam setelah diberikan</span>
</div>
<style>
</style>
</body>
</html>

1
resources/views/dashboard/master/menu/modal/detail.blade.php
View File

@ -12,6 +12,7 @@
<input type="hidden" id="apakah_menu_siang">
<input type="hidden" id="apakah_menu_sore">
<input type="hidden" id="tgl_tersedia">
<input type="hidden" id="exist_foto">
<img id="cathering_order_photo" class="img-fluid rounded shadow" style="max-height: 370px; width:270px;" alt="Foto Menu">
</div>
<div class="col-md-8">

30
resources/views/guest/check_order/index.blade.php
View File

@ -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 @@
<div class="card mb-2 shadow-sm">
<div class="row g-0">
<div class="${data?.cara_pembayaran === "MCU" ? 'd-none' : 'col-md-4 p-2'}">
<img src="/gambar/${item.foto || 'default.jpg'}" class="img-fluid rounded-start" alt="${item.nama_item}" style="max-height: 150px; width:100%; object-fit: cover;">
<img src="${item.exist_foto ? `/gambar/${item.foto }` : '/gambar/default.png'}" class="img-fluid rounded-start" alt="${item.nama_item}" style="max-height: 150px; width:100%; object-fit: cover;">
</div>
<div class="${data?.cara_pembayaran === "MCU" ? 'col-md-12' : 'col-md-8'}">
<div class="card-body py-2 px-3 mt-2">
@ -89,6 +90,7 @@
<p class="mb-1 small">Harga: <strong>${harga.toLocaleString('id-ID')}</strong></p>
<p class="mb-1 small">Jumlah: <strong>${jumlah}</strong></p>
<p class="mb-0 small">Total: <strong class="text-success">Rp ${total.toLocaleString('id-ID')}</strong></p>
<p class="mb-0 small">Waktu : ${item?.type || item?.jam_layanan}</p>
<p class="badge text-white
${item?.status_order === 'Pending'? 'bg-primary'
: data.status_order === 'Belum Bayar' ? '' : 'bg-success'}">
@ -155,6 +157,20 @@
<div class="text-dark">${data?.no_ekstensien || '-'}</div>
</div>
</div>
${data?.status_order === "Lunas" ? `
<div class="col-md-12">
<div class="bg-light p-3 rounded shadow-sm small">
<div class="fw-semibold text-secondary mb-1">Informasi Penting</div>
<div class="text-dark">
Bagi <strong>Karyawan</strong>, makanan yang dipesan <strong>harus diambil sendiri</strong> (tidak diantar).
Pengambilan dapat dilakukan di <strong>Instalasi Gizi (Ruang Distribusi Makan)</strong> dengan jadwal:
<ul class="mt-2 mb-0 ps-3 list-unstyled">
<li>Siang: <strong>12.00 - 13.00 WIB</strong></li>
<li>Sore: <strong>16.00 - 17.00 WIB</strong></li>
</ul>
</div>
</div>
</div>` : ''}
` : data?.jenis_customer === "Keluarga Pasien / Penunggu Pasien" ?
`
<div class="col-md-6">
@ -181,6 +197,17 @@
<div class="text-dark">${data?.kelas_perawatan || '-'}</div>
</div>
</div>
${data?.status_order === "Lunas" ? `
<div class="col-md-12">
<div class="bg-light p-3 rounded shadow-sm small">
<div class="fw-semibold text-secondary mb-1">Informasi Penting</div>
<div class="text-dark">
Bagi Keluarga atau Penunggu Pasien, makanan yang dipesan <strong>akan diantarkan</strong> ke ruang perawatan
</div>
</div>
</div>
` : ''}
` : data?.jenis_customer === "Masyarakat Umum" ? ` <div class="col-md-12">
<div class="bg-light p-3 rounded shadow-sm small">
<div class="fw-semibold text-secondary mb-1">Alamat</div>
@ -194,7 +221,6 @@
<div class="bg-white rounded-4 border p-3 shadow-sm mb-4">
<h6 class="fw-semibold mb-3">Item Pesanan</h6>
${itemHTML}
<div class="text-end mt-3">
<h6>Total Seluruh Pesanan: <strong class="text-success">Rp ${parseInt(data?.total_harga).toLocaleString('id-ID')}</strong></h6>
</div>

74
resources/views/guest/checkout/step/step2.blade.php
View File

@ -15,63 +15,43 @@
<button type="button" class="btn btn-success next-step" id="btnSimpanPemesanan">Lanjutkan</button>
</div>
<div class="alert alert-info py-3 px-4 small border-start border-4 border-primary mt-3 d-none" id="karyawan" role="alert">
<div class="fw-bold mb-2">
<i class="fa fa-info-circle me-1"></i>Informasi Penting
</div>
<ul class="mb-0 ps-3">
<li>
<strong>Menu Normal:</strong> Dipesan maksimal H-1 sebelum pukul <strong>13.00 WIB</strong>.
</li>
<li>
<strong>Menu Sameday:</strong>.
<ul class="ps-3 mt-1">
<li><strong>Makan Siang:</strong> Dipesan maksimal pukul <strong>10.00 WIB</strong></li>
<li><strong>Makan Sore:</strong> Dipesan maksimal pukul <strong>13.00 WIB</strong></li>
</ul>
</li>
<li>
Pemesanan tidak dapat dibatalkan dan tidak ada pengembalian uang.
</li>
<li>
Pengambilan makanan dilakukan sendiri di <strong>Instalasi Gizi (Ruang Distribusi Makan)</strong>:
<ul class="ps-3 mt-1">
<li>Siang: <strong>12.00 – 13.00 WIB</strong></li>
<li>Sore: <strong>16.00 – 17.00 WIB</strong></li>
</ul>
</li>
<li>
Jenis karbohidrat dapat dipilih sesuai pilihan yang tersedia.
</li>
<li>
Butuh bantuan? Hubungi WhatsApp <strong>Instalasi Gizi</strong>:
<a href="https://wa.me/08815611382 " target="_blank">08815611382 </a> <br>
<small class="text-muted">Jam kerja: 08.00 – 15.00 WIB</small>
</li>
</ul>
<div class="alert alert-info py-3 px-4 small border-start border-4 border-primary mt-3 d-none" id="karyawan" role="alert">
<div class="fw-bold mb-2">
<i class="fa fa-info-circle me-1"></i>Informasi Penting
</div>
<p class="mb-2">
Bagi Karyawan, makanan yang dipesan <strong>harus diambil sendiri</strong> (tidak diantar).
Pengambilan dilakukan di <strong>Instalasi Gizi (Ruang Distribusi Makan)</strong> dengan jadwal berikut:
</p>
<ul class="mb-0 ps-3">
<li>Pemesanan tidak dapat dibatalkan dan tidak ada pengembalian uang.</li>
<li>
Waktu pengambilan makanan:
<ul class="ps-3 mt-1">
<li>Siang: <strong>12.00 – 13.00 WIB</strong></li>
<li>Sore: <strong>16.00 – 17.00 WIB</strong></li>
</ul>
</li>
<li>
Butuh bantuan? Hubungi WhatsApp <strong>Instalasi Gizi</strong>:
<a href="https://wa.me/08815611382" target="_blank">08815611382</a><br>
<small class="text-muted">Jam kerja: 08.00 – 15.00 WIB</small>
</li>
</ul>
</div>
<div class="alert alert-info py-3 px-4 small border-start border-4 border-primary mt-3 d-none" id="pasien" role="alert">
<div class="fw-bold mb-2">
<i class="fa fa-info-circle me-1"></i>Informasi Penting
</div>
<p class="mb-2">
Bagi Keluarga atau Penunggu Pasien, makanan yang dipesan <strong>akan diantarkan</strong> ke ruang perawatan.
</p>
<ul class="mb-0 ps-3">
<li>
<strong>Menu Normal:</strong> Dipesan maksimal H-1 sebelum pukul <strong>13.00 WIB</strong>.
</li>
<li>
<strong>Menu Sameday:</strong>.
<ul class="ps-3 mt-1">
<li><strong>Makan Siang:</strong> Dipesan maksimal pukul <strong>10.00 WIB</strong></li>
<li><strong>Makan Sore:</strong> Dipesan maksimal pukul <strong>13.00 WIB</strong></li>
</ul>
</li>
<li>
Pemesanan tidak dapat dibatalkan dan tidak ada pengembalian uang.
</li>
<li>
Jenis karbohidrat dapat dipilih sesuai pilihan yang tersedia.
</li>
<li>
Butuh bantuan? Hubungi WhatsApp <strong>Instalasi Gizi</strong>:
<a href="https://wa.me/08815611382 " target="_blank">08815611382 </a> <br>

3
resources/views/guest/checkout/step/step3.blade.php
View File

@ -105,6 +105,9 @@
<label for="exampleInputEmail1" class="form-label">No. Medical Record</label>
<input type="text" class="form-control" name="medical_record" id="medical_record" placeholder="Masukkan No. Medical Record">
</div>
<p class="text-muted small text-center px-2 py-2">
<strong>Makanan yg sudah dipesan tidak dapat dibatalkan, dan tidak ada pengembalian uang</strong>
</p>
</div>
</div>

14
routes/web.php
View File

@ -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');
});
// });