Compare commits

..

No commits in common. "23925ed842b97a04edfead76f5ee7bb830dcc52a" and "5f64dbb40963543bd87d2d50de33c3f3727c65b1" have entirely different histories.

3 changed files with 21 additions and 45 deletions

View File

@ -146,7 +146,7 @@
zoomable: true,
autoplayVideos: true
});
return
return
}
@ -546,8 +546,14 @@
$("#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 = String(kaloriRaw);
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)]
}
const someday = el.data('apakah_someday');
const siang = el.data('apakah_menu_siang');
const sore = el.data('apakah_menu_sore');
@ -556,7 +562,9 @@
<span class="badge bg-secondary me-1 mb-1">${tag}</span>
`).join('');
const resultKkal = kalori ? `<small class="badge bg-success me-1 mb-1 fs-6">${kalori + ' kal'}</small>` : '';
const resultKkal = kalori.length > 0
? kalori.map(kkal => `<small class="badge bg-success me-1 mb-1 fs-6">${kkal ? kkal + ' kal' : ''}</small>`).join('')
: '';
const tglMenuTersedia = `
<div class="mb-1 small text-muted">
@ -590,15 +598,7 @@
</div>`);
$('#cathering_order_menu_id').val(el.data('id'));
$('#cathering_order_jenis_menu').val(el.data('jenis_menu'));
let deskripsi = el.data('deskripsi');
if (deskripsi) {
$('#cathering_order_deskripsi').html(
`<span class="fw-semibold text-dark">Deskripsi:</span> ${deskripsi}`
);
} else {
$('#cathering_order_deskripsi').html('');
}
$('#cathering_order_deskripsi').text(el.data('deskripsi') || '');
$('#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);

View File

@ -20,40 +20,17 @@
<h5 id="cathering_order_name" class="mb-2 fw-bold"></h5>
<div id="tgl_menu_tersedia" class="mb-2"></div>
<div class="card shadow-sm border-0 rounded-3 p-3 bg-light">
<div class="d-flex justify-content-between align-items-center small mb-2 d-none">
<span class="text-muted">
<i class="bi bi-person-badge"></i> Harga Karyawan:
</span>
<span class="fw-bold text-success" id="cathering_order_price_karyawan"></span>
</div>
<div class="d-flex justify-content-between align-items-center">
<span class="">
<i class="bi bi-cash-coin"></i> Harga:
</span>
<span class="fw-bold fs-5 text-primary" id="cathering_order_price_public"></span>
</div>
</div>
<p id="cathering_order_deskripsi"
class="text-muted small mb-2 mt-2"
style="
max-width: 100%;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
overflow: hidden;
">
</p>
<div class="row text-muted small mb-2">
<div class="col-6">Harga Karyawan:</div>
<div class="col-6 text-end"><span class="fw-semibold" id="cathering_order_price_karyawan"></span></div>
<div class="col-6">Harga Public:</div>
<div class="col-6 text-end"><span class="fw-semibold" id="cathering_order_price_public"></span></div>
</div>
<p id="cathering_order_deskripsi" class="text-muted small mb-2"></p>
<div id="tag_klasifikasi_menu" class="mb-2"></div>
<div id="kalori_menu" class="mb-2"></div>
<input type="hidden" id="cathering_order_menu_id">
<input type="hidden" id="cathering_order_jenis_menu">
</div>

View File

@ -8,7 +8,6 @@
<title>{{ $title }} | Order Gizi RSAB HK</title>
<meta name="description" content="">
<meta name="keywords" content="">
{{-- <link rel="icon" type="image/png" href="{{ asset('logo/logo_rsabhk.png') }}" sizes="16x16"> --}}
<!-- Fonts -->
<link href="https://fonts.googleapis.com" rel="preconnect">