From 2d87c15ba554e6bc07566aba6d39338255c5bf7b Mon Sep 17 00:00:00 2001
From: Yoga Pangestu <ypangestu976@gmail.com>
Date: Sat, 4 Jan 2025 16:25:50 +0700
Subject: [PATCH] fix: memperbaiki penggajian untuk transaksinya diambil dari
 tanggal 1-30/31 bukan diambil dari 1 bulan kebelakang saat ini

---
 .../Controllers/Admin/Finance/PayrollController.php    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/Finance/PayrollController.php b/app/Http/Controllers/Admin/Finance/PayrollController.php
index 1d5fa6d..84d2cb1 100644
--- a/app/Http/Controllers/Admin/Finance/PayrollController.php
+++ b/app/Http/Controllers/Admin/Finance/PayrollController.php
@@ -156,10 +156,18 @@ public function getSalaryEmployee(string $employeeId): JsonResponse
                     ->where('is_paid', '0');
             })
             ->when($latestPayroll, function ($query) use ($latestPayroll, $employee) {
-                $query->whereBetween('created_at', [$latestPayroll->created_at, now()]);
+                $query->whereBetween('created_at', [
+                    $latestPayroll->created_at->startOfMonth(),
+                    $latestPayroll->created_at->endOfMonth(),
+                ]);
                 if ($employee->role_id === 4 && $latestPayroll->created_at->isToday()) {
                     $query->where('is_paid', '0');
                 }
+            }, function ($query) {
+                $query->whereBetween('created_at', [
+                    now()->subMonth()->startOfMonth(),
+                    now()->subMonth()->endOfMonth(),
+                ]);
             })
             ->sum('total');
         $debt = Debt::where('user_id', $employeeId)->where('is_paid', '0')->sum('amount');