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');