update tgl 28 april 2

app/Http/Controllers/LaporanController.php

@@ -9,34 +9,47 @@
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\WithHeadings;
 use Maatwebsite\Excel\Concerns\WithMapping;
+use Carbon\Carbon;
 
 class LaporanController extends Controller
 {
-    public function index()
+    public function index(Request $request)
     {
-        $laporan = LaporanModel::orderBy('Tanggal', 'desc')->get();
+        // Default date range
+        $startDate = $request->input('start_date', Carbon::now()->startOfMonth()->format('Y-m-d'));
+        $endDate = $request->input('end_date', Carbon::now()->endOfMonth()->format('Y-m-d'));
+
+        $laporan = LaporanModel::whereBetween('Tanggal', [$startDate, $endDate])
+            ->orderBy('Tanggal', 'desc')
+            ->get();
         
         // Hitung total uang masuk (termasuk uang_masuk2-5)
-        $totalUangMasuk = LaporanModel::selectRaw('SUM(uang_masuk) + 
+        $totalUangMasuk = LaporanModel::whereBetween('Tanggal', [$startDate, $endDate])
-            COALESCE(SUM(uang_masuk2), 0) + 
+            ->selectRaw('SUM(uang_masuk) + 
-            COALESCE(SUM(uang_masuk3), 0) + 
+                COALESCE(SUM(uang_masuk2), 0) + 
-            COALESCE(SUM(uang_masuk4), 0) + 
+                COALESCE(SUM(uang_masuk3), 0) + 
-            COALESCE(SUM(uang_masuk5), 0) as total')
+                COALESCE(SUM(uang_masuk4), 0) + 
+                COALESCE(SUM(uang_masuk5), 0) as total')
             ->value('total') ?? 0;
     
         // Hitung total uang keluar (termasuk uang_keluar2-5)
-        $totalUangKeluar = LaporanModel::selectRaw('SUM(uang_keluar) + 
+        $totalUangKeluar = LaporanModel::whereBetween('Tanggal', [$startDate, $endDate])
-            COALESCE(SUM(uang_keluar2), 0) + 
+            ->selectRaw('SUM(uang_keluar) + 
-            COALESCE(SUM(uang_keluar3), 0) + 
+                COALESCE(SUM(uang_keluar2), 0) + 
-            COALESCE(SUM(uang_keluar4), 0) + 
+                COALESCE(SUM(uang_keluar3), 0) + 
-            COALESCE(SUM(uang_keluar5), 0) as total')
+                COALESCE(SUM(uang_keluar4), 0) + 
+                COALESCE(SUM(uang_keluar5), 0) as total')
             ->value('total') ?? 0;
     
-        // Tidak ada lagi kolom gaji, jadi kita menghilangkannya
+        $totalKredit = $totalUangKeluar;
-        $totalKredit = $totalUangKeluar; // Hanya menggunakan total uang keluar
         $saldo = $totalUangMasuk - $totalKredit;
         
-        return view('Laporan', compact('laporan', 'totalUangMasuk', 'totalUangKeluar', 'totalKredit', 'saldo'));
+        return view('Laporan', compact('laporan', 'totalUangMasuk', 'totalUangKeluar', 'totalKredit', 'saldo', 'startDate', 'endDate'));
+    }
+
+    public function filter(Request $request)
+    {
+        return $this->index($request);
     }
 
     public function exportExcel()

app/Http/Controllers/NeracasaldoController.php

@@ -4,12 +4,19 @@
 
 use App\Models\NeracasaldoModel;
 use Illuminate\Http\Request;
+use Carbon\Carbon;
 
 class NeracasaldoController extends Controller
 {
-    public function index()
+    public function index(Request $request)
     {
-        $rawTransaksis = NeracasaldoModel::orderBy('kode', 'asc')->get();
+        // Default date range
+        $startDate = $request->input('start_date', Carbon::now()->startOfMonth()->format('Y-m-d'));
+        $endDate = $request->input('end_date', Carbon::now()->endOfMonth()->format('Y-m-d'));
+
+        $rawTransaksis = NeracasaldoModel::whereBetween('Tanggal', [$startDate, $endDate])
+            ->orderBy('kode', 'asc')
+            ->get();
         $totalsPerAkun = [];
 
         foreach ($rawTransaksis as $transaksi) {
@@ -75,7 +82,12 @@ public function index()
         // Konversi ke collection setelah selesai
         $transaksis = collect($finalTransaksis);
         
-        return view('Neracasaldo', compact('transaksis'));
+        return view('Neracasaldo', compact('transaksis', 'startDate', 'endDate'));
+    }
+
+    public function filter(Request $request)
+    {
+        return $this->index($request);
     }
 
     public function create()
@@ -126,4 +138,10 @@ public function destroy($id)
         return redirect()->route('neracasaldo.index')
             ->with('success', 'Data berhasil dihapus');
     }
+
+    public function show($id)
+    {
+        $transaksi = NeracasaldoModel::findOrFail($id);
+        return view('neracasaldo.show', compact('transaksi'));
+    }
 }

app/Http/Controllers/RekeningController.php

@@ -13,18 +13,17 @@ class RekeningController extends Controller
 {
     public function index(Request $request)
     {
-        $query = RekeningModel::query();
+        // Default date range
+        $startDate = $request->input('start_date', Carbon::now()->startOfMonth()->format('Y-m-d'));
+        $endDate = $request->input('end_date', Carbon::now()->endOfMonth()->format('Y-m-d'));
+
+        $query = RekeningModel::whereBetween('Tanggal', [$startDate, $endDate]);
 
         // Filter berdasarkan nama akun jika ada
         if ($request->has('periode')) {
             $query->where('kategori', $request->periode);
         }
 
-        // Filter berdasarkan tanggal jika ada
-        if ($request->has('startDate')) {
-            $query->whereDate('Tanggal', '>=', $request->startDate);
-        }
-
         $laporan = $query->orderBy('Tanggal', 'asc')->get();
         
         // Kelompokkan data berdasarkan kategori
@@ -103,7 +102,12 @@ public function index(Request $request)
             ]);
         }
 
-        return view('Rekening', compact('groupedLaporan', 'totals', 'totalDebit', 'totalKredit', 'saldo'));
+        return view('Rekening', compact('groupedLaporan', 'totals', 'totalDebit', 'totalKredit', 'saldo', 'startDate', 'endDate'));
+    }
+
+    public function filter(Request $request)
+    {
+        return $this->index($request);
     }
 
     private function generateKode($kategori)

resources/views/Laporan.blade.php

@@ -20,6 +20,22 @@
             <div class="mb-4 bg-blue-600 text-white p-4 rounded-lg shadow-md">
                 <h1 class="text-2xl font-bold">Jurnal Umum</h1>
                 <p class="text-sm mt-1">jurnal umum Budivespaendut.</p>
+                <p class="text-sm">Periode: {{ date('F Y', strtotime($startDate)) }}</p>
+            </div>
+
+            <!-- Filter Section -->
+            <div class="mb-4">
+                <form action="{{ route('laporan.filter') }}" method="GET" class="flex items-center gap-4">
+                    <div class="flex items-center gap-2">
+                        <span>Tanggal Awal</span>
+                        <input type="date" name="start_date" class="border rounded px-2 py-1" value="{{ $startDate ?? '' }}">
+                    </div>
+                    <div class="flex items-center gap-2">
+                        <span>Tanggal Akhir</span>
+                        <input type="date" name="end_date" class="border rounded px-2 py-1" value="{{ $endDate ?? '' }}">
+                    </div>
+                    <button type="submit" class="bg-blue-500 text-white px-4 py-1 rounded">Filter</button>
+                </form>
             </div>
 
             <!-- Summary Cards
@@ -54,7 +70,7 @@
             </div> -->
 
             <!-- Enhanced Filter Section -->
-            <div class="flex flex-wrap gap-4 px-6 py-4 border-b border-gray-200">
+            <!-- <div class="flex flex-wrap gap-4 px-6 py-4 border-b border-gray-200">
                 <form id="filterForm" class="flex flex-wrap gap-4 w-full" onsubmit="applyFilter(event)">
                     <div class="flex items-center">
                         <label for="periode" class="mr-2 text-sm font-medium text-gray-600">Periode:</label>
@@ -91,7 +107,7 @@
                         <i class="fas fa-redo mr-2"></i>Reset
                     </button>
                 </form>
-            </div>
+            </div> -->
 
             <!-- Enhanced Table -->
             <div class="overflow-x-auto">

resources/views/Neracasaldo.blade.php

@@ -15,7 +15,22 @@
             <div class="mb-4 bg-blue-600 text-white p-4 rounded-lg shadow-md">
                 <h1 class="text-2xl font-bold">Neraca Saldo Perusahaan Dagang</h1>
                 <p class="text-sm mt-1">Neraca Saldo Budivespaendut</p>
-                <p class="text-sm">Kebun Anggrek</p>
+                <p class="text-sm">Periode: {{ date('F Y', strtotime($startDate)) }}</p>
+            </div>
+
+            <!-- Filter Section -->
+            <div class="mb-4">
+                <form action="{{ route('neracasaldo.filter') }}" method="GET" class="flex items-center gap-4">
+                    <div class="flex items-center gap-2">
+                        <span>Tanggal Awal</span>
+                        <input type="date" name="start_date" class="border rounded px-2 py-1" value="{{ $startDate ?? '' }}">
+                    </div>
+                    <div class="flex items-center gap-2">
+                        <span>Tanggal Akhir</span>
+                        <input type="date" name="end_date" class="border rounded px-2 py-1" value="{{ $endDate ?? '' }}">
+                    </div>
+                    <button type="submit" class="bg-blue-500 text-white px-4 py-1 rounded">Filter</button>
+                </form>
             </div>
 
             <!-- Tabel Transaksi -->

resources/views/Rekening.blade.php

@@ -54,7 +54,22 @@ function calculateBalancePHP($previousBalance, $debit, $kredit, $accountType) {
             <div class="mb-4 bg-blue-600 text-white p-4 rounded-lg shadow-md">
                 <h1 class="text-2xl font-bold">Buku Besar Perusahaan Dagang</h1>
                 <p class="text-sm mt-1">Buku Besar Budivespaendut</p>
-                <p class="text-sm">Kebun Anggrek</p>
+                <p class="text-sm">Periode: {{ date('F Y', strtotime($startDate)) }}</p>
+            </div>
+
+            <!-- Filter Section -->
+            <div class="mb-4">
+                <form action="{{ route('rekening.filter') }}" method="GET" class="flex items-center gap-4">
+                    <div class="flex items-center gap-2">
+                        <span>Tanggal Awal</span>
+                        <input type="date" name="start_date" class="border rounded px-2 py-1" value="{{ $startDate ?? '' }}">
+                    </div>
+                    <div class="flex items-center gap-2">
+                        <span>Tanggal Akhir</span>
+                        <input type="date" name="end_date" class="border rounded px-2 py-1" value="{{ $endDate ?? '' }}">
+                    </div>
+                    <button type="submit" class="bg-blue-500 text-white px-4 py-1 rounded">Filter</button>
+                </form>
             </div>
 
             @foreach($groupedLaporan as $kategori => $items)

routes/web.php

@@ -70,7 +70,16 @@
     Route::delete('/rekening/{id}', [RekeningController::class, 'destroy'])->name('rekening.destroy');
     Route::get('/rekening/export-excel', [RekeningController::class, 'exportExcel'])->name('rekening.export-excel');
     Route::get('/rekening/export-pdf', [RekeningController::class, 'exportPDF'])->name('rekening.export-pdf');
+    Route::get('/rekening/filter', [RekeningController::class, 'filter'])->name('rekening.filter');
+    
+    // Routes untuk Laporan
+    Route::get('/laporan/filter', [LaporanController::class, 'filter'])->name('laporan.filter');
+    
+    // Routes untuk Neraca Saldo
+    Route::get('/neracasaldo/filter', [NeracasaldoController::class, 'filter'])->name('neracasaldo.filter');
     Route::resource('neracasaldo', NeracasaldoController::class);
+    
+    // Routes untuk Laba Rugi
     Route::get('/labarugi', [LabarugiController::class, 'index'])->name('labarugi.index');
     Route::get('/labarugi/filter', [LabarugiController::class, 'filter'])->name('labarugi.filter');
 });