update tgl 3 juni

This commit is contained in:
whywdd 2025-06-04 23:59:30 +07:00
parent c29be2538a
commit c1b4718680
2 changed files with 8 additions and 20 deletions

View File

@ -79,18 +79,16 @@ private function calculateBalance($previousBalance, $debit, $kredit, $accountTyp
public function index(Request $request) public function index(Request $request)
{ {
// Default date range hanya jika ada parameter filter // Default date range untuk bulan ini jika tidak ada parameter
$startDate = $request->input('start_date'); $startDate = $request->input('start_date', Carbon::now()->startOfMonth()->format('Y-m-d'));
$endDate = $request->input('end_date'); $endDate = $request->input('end_date', Carbon::now()->endOfMonth()->format('Y-m-d'));
try { try {
// Query dasar // Query dasar
$query = DB::table('laporan_transaksis'); $query = DB::table('laporan_transaksis');
// Terapkan filter tanggal hanya jika ada parameter // Terapkan filter tanggal
if ($startDate && $endDate) { $query->whereBetween('Tanggal', [$startDate, $endDate]);
$query->whereBetween('Tanggal', [$startDate, $endDate]);
}
// Ambil semua transaksi // Ambil semua transaksi
$transaksis = $query->get(); $transaksis = $query->get();
@ -445,9 +443,6 @@ public function showAll()
->orderBy('periode') ->orderBy('periode')
->get(); ->get();
// Debug untuk memastikan data terisi
Log::info('Daily Totals:', ['data' => $monthlyTotals->toArray()]);
// Get category totals for distribution chart // Get category totals for distribution chart
$categoryTotals = DB::table('laporan_transaksis') $categoryTotals = DB::table('laporan_transaksis')
->select( ->select(
@ -466,8 +461,8 @@ public function showAll()
->get(); ->get();
// Calculate growth percentage // Calculate growth percentage
$lastMonthStart = Carbon::parse($startDate)->subMonth()->startOfMonth(); $lastMonthStart = Carbon::now()->subMonth()->startOfMonth();
$lastMonthEnd = Carbon::parse($startDate)->subMonth()->endOfMonth(); $lastMonthEnd = Carbon::now()->subMonth()->endOfMonth();
$lastMonthData = DB::table('laporan_transaksis') $lastMonthData = DB::table('laporan_transaksis')
->whereBetween('Tanggal', [$lastMonthStart, $lastMonthEnd]) ->whereBetween('Tanggal', [$lastMonthStart, $lastMonthEnd])
@ -507,7 +502,6 @@ public function showAll()
// Ambil data neraca saldo untuk pie chart // Ambil data neraca saldo untuk pie chart
$rawTransaksis = DB::table('laporan_transaksis') $rawTransaksis = DB::table('laporan_transaksis')
->whereBetween('Tanggal', [$startDate, $endDate])
->orderBy('kode', 'asc') ->orderBy('kode', 'asc')
->get(); ->get();
$totalsPerAkun = []; $totalsPerAkun = [];

View File

@ -21,7 +21,7 @@
<!-- Switch Toggle --> <!-- Switch Toggle -->
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<label class="relative inline-flex items-center cursor-pointer"> <label class="relative inline-flex items-center cursor-pointer">
<input type="checkbox" id="showAllSwitch" class="sr-only peer" {{ !request('start_date') && !request('end_date') ? 'checked' : '' }}> <input type="checkbox" id="showAllSwitch" class="sr-only peer" {{ request()->routeIs('home.all') ? 'checked' : '' }}>
<div class="w-11 h-6 bg-gray-200 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-indigo-300 dark:peer-focus:ring-indigo-800 rounded-full peer dark:bg-gray-700 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-indigo-600"></div> <div class="w-11 h-6 bg-gray-200 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-indigo-300 dark:peer-focus:ring-indigo-800 rounded-full peer dark:bg-gray-700 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-indigo-600"></div>
<span class="ml-3 text-sm font-medium text-gray-600 dark:text-gray-300">Tampilkan Semua</span> <span class="ml-3 text-sm font-medium text-gray-600 dark:text-gray-300">Tampilkan Semua</span>
</label> </label>
@ -321,12 +321,6 @@ class="text-sm font-medium text-gray-500 dark:text-gray-400 hover:text-gray-900
</ul> </ul>
</div> </div>
</div> </div>
<!-- <a href="#" class="uppercase text-sm font-semibold inline-flex items-center rounded-lg text-blue-600 hover:text-blue-700 dark:hover:text-blue-500 hover:bg-gray-100 dark:hover:bg-gray-700 dark:focus:ring-gray-700 dark:border-gray-700 px-3 py-2">
LAPORAN KATEGORI
<svg class="w-2.5 h-2.5 ms-1.5 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 6 10">
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 9 4-4-4-4"/>
</svg>
</a> -->
</div> </div>
</div> </div>
</div> </div>