diff --git a/app/Services/LaporanService.php b/app/Services/LaporanService.php index 1e280db..660de9f 100644 --- a/app/Services/LaporanService.php +++ b/app/Services/LaporanService.php @@ -381,11 +381,14 @@ class LaporanService } if (isset($params['nampan_id'])) { - // UBAH: Filter berdasarkan 'item_transaksis.id_nampan' - if ($params['nampan_id'] == 0) { - $query->whereNull('item_transaksis.id_nampan'); + $nampanId = (int) $params['nampan_id']; + if ($nampanId === -1) { + $query->where('item_transaksis.posisi_asal', 'Brankas'); } else { - $query->where('item_transaksis.id_nampan', $params['nampan_id']); + $query->join('nampans', function ($join) use ($nampanId) { + $join->on('item_transaksis.posisi_asal', '=', 'nampans.nama') + ->where('nampans.id', $nampanId); + }); } } diff --git a/public/logo.ico b/public/logo.ico new file mode 100644 index 0000000..e8cb3af Binary files /dev/null and b/public/logo.ico differ diff --git a/resources/js/components/DetailPerProduk.vue b/resources/js/components/DetailPerProduk.vue index a567a9b..bca867e 100644 --- a/resources/js/components/DetailPerProduk.vue +++ b/resources/js/components/DetailPerProduk.vue @@ -322,7 +322,7 @@ const fetchNampan = async () => { const nampanData = response.data; opsiNampan.value = [ { label: 'Semua Nampan', value: 0 }, - { label: 'Brankas', value: 0 }, + { label: 'Brankas', value: -1 }, ...nampanData.map(nampan => ({ label: nampan.nama, value: nampan.id, diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php index 0c892ef..37f960c 100644 --- a/resources/views/app.blade.php +++ b/resources/views/app.blade.php @@ -21,7 +21,7 @@ - +