From c1b4718680d52650b87124b8b5caa9dab1f446c5 Mon Sep 17 00:00:00 2001 From: whywdd Date: Wed, 4 Jun 2025 23:59:30 +0700 Subject: [PATCH] update tgl 3 juni --- app/Http/Controllers/HomeController.php | 20 +++++++------------- resources/views/Home.blade.php | 8 +------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 9f828fb..3cd908a 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -79,18 +79,16 @@ private function calculateBalance($previousBalance, $debit, $kredit, $accountTyp public function index(Request $request) { - // Default date range hanya jika ada parameter filter - $startDate = $request->input('start_date'); - $endDate = $request->input('end_date'); + // Default date range untuk bulan ini jika tidak ada parameter + $startDate = $request->input('start_date', Carbon::now()->startOfMonth()->format('Y-m-d')); + $endDate = $request->input('end_date', Carbon::now()->endOfMonth()->format('Y-m-d')); try { // Query dasar $query = DB::table('laporan_transaksis'); - // Terapkan filter tanggal hanya jika ada parameter - if ($startDate && $endDate) { - $query->whereBetween('Tanggal', [$startDate, $endDate]); - } + // Terapkan filter tanggal + $query->whereBetween('Tanggal', [$startDate, $endDate]); // Ambil semua transaksi $transaksis = $query->get(); @@ -445,9 +443,6 @@ public function showAll() ->orderBy('periode') ->get(); - // Debug untuk memastikan data terisi - Log::info('Daily Totals:', ['data' => $monthlyTotals->toArray()]); - // Get category totals for distribution chart $categoryTotals = DB::table('laporan_transaksis') ->select( @@ -466,8 +461,8 @@ public function showAll() ->get(); // Calculate growth percentage - $lastMonthStart = Carbon::parse($startDate)->subMonth()->startOfMonth(); - $lastMonthEnd = Carbon::parse($startDate)->subMonth()->endOfMonth(); + $lastMonthStart = Carbon::now()->subMonth()->startOfMonth(); + $lastMonthEnd = Carbon::now()->subMonth()->endOfMonth(); $lastMonthData = DB::table('laporan_transaksis') ->whereBetween('Tanggal', [$lastMonthStart, $lastMonthEnd]) @@ -507,7 +502,6 @@ public function showAll() // Ambil data neraca saldo untuk pie chart $rawTransaksis = DB::table('laporan_transaksis') - ->whereBetween('Tanggal', [$startDate, $endDate]) ->orderBy('kode', 'asc') ->get(); $totalsPerAkun = []; diff --git a/resources/views/Home.blade.php b/resources/views/Home.blade.php index c6ca9b8..5c77c21 100644 --- a/resources/views/Home.blade.php +++ b/resources/views/Home.blade.php @@ -21,7 +21,7 @@
@@ -321,12 +321,6 @@ class="text-sm font-medium text-gray-500 dark:text-gray-400 hover:text-gray-900
-