From 31245457cdefbade1975343ba5e40aeea3e03ca7 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 17 Mar 2025 10:58:47 +0700 Subject: [PATCH] feat(laporan-admin-kredit): tambahkan filter tanggal pada laporan admin kredit - Menambahkan input untuk tanggal awal dan tanggal akhir di tampilan laporan. - Memperbarui logika pencarian untuk mendukung filter berdasarkan rentang tanggal. - Menambahkan fungsi untuk menerapkan semua filter secara bersamaan. --- .../LaporanAdminKreditController.php | 28 +++++++---- .../laporan_admin_kredit/index.blade.php | 47 +++++++++++++++++-- 2 files changed, 63 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/LaporanAdminKreditController.php b/app/Http/Controllers/LaporanAdminKreditController.php index d9c970b..4d12acc 100644 --- a/app/Http/Controllers/LaporanAdminKreditController.php +++ b/app/Http/Controllers/LaporanAdminKreditController.php @@ -31,17 +31,29 @@ // Retrieve data from the database $query = LaporanAdminKredit::query(); + if ($request->has('tanggal_awal') && $request->has('tanggal_akhir')) { + $query->whereBetween('tanggal_kunjungan', [$request->tanggal_awal, $request->tanggal_akhir]); + } + // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) { $search = $request->get('search'); - $query->where(function ($q) use ($search) { - $q->where('kode_register_t24', 'LIKE', '%' . $search . '%') - ->orWhere('jenis_agunan', 'LIKE', '%' . $search . '%') - ->orWhere('nama_pemilik', 'LIKE', '%' . $search . '%') - ->orWhereHas('debiture', function ($query) use ($search) { - $query->where('name', 'LIKE', '%' . $search . '%'); - }); - }); + $search_ = json_decode($search); + + if (isset($search_->search)) { + $query->where(function ($q) use ($search_) { + $q->where('kode_register_t24', 'LIKE', '%' . $search_->search . '%') + ->orWhere('jenis_agunan', 'LIKE', '%' . $search_->search . '%') + ->orWhere('nama_pemilik', 'LIKE', '%' . $search_->search . '%') + ->orWhereHas('debiture', function ($query) use ($search_) { + $query->where('name', 'LIKE', '%' . $search_->search . '%'); + }); + }); + } + + if (isset($search_->tanggal_awal) && isset($search_->tanggal_akhir)) { + $query->whereBetween('tanggal_kunjungan', [$search_->tanggal_awal, $search_->tanggal_akhir]); + } } // Apply sorting if provided diff --git a/resources/views/laporan_admin_kredit/index.blade.php b/resources/views/laporan_admin_kredit/index.blade.php index 339c1db..f54455a 100644 --- a/resources/views/laporan_admin_kredit/index.blade.php +++ b/resources/views/laporan_admin_kredit/index.blade.php @@ -12,6 +12,19 @@ Daftar Laporan Admin Kredit
+
+ +
+
+ +
+
+ +