fixed advance salary miss calculation issue

Sharifur · May 30, 2024 · 3dc87ad · 3dc87ad
2 parents 58ae68f + 16f1be3
commit 3dc87ad
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/app/Http/Controllers/Admin/EmployeeController.php b/app/Http/Controllers/Admin/EmployeeController.php
@@ -165,7 +165,7 @@ public function attenadance_check_global(){
     public function details($id,Request $request){
         $details =  Employee::with('category')->find($id);
         $details->designation = optional($details->category)->title;
-        //todo
+
         $logs =  AttendanceLog::query()
             ->where(['employee_id' => $id])
             ->where("status",1)
@@ -205,7 +205,7 @@ public function details($id,Request $request){
                 //if found cout/cin then show total office hour
             }
 
-            //todo:: need to work here
+        //todo:: need to work here
         $holidayCount = $logs->where('type','holiday')->count();
         $leaveCount = $logs->where('type','leave')->count();
         $sickLeaveCount = $logs->where('type','sick-leave')->count();
@@ -219,7 +219,10 @@ public function details($id,Request $request){
         }
 
         //advance salary this month
-        $AdvanceSalary = AdvanceSalary::where(['employee_id' => $id])->whereMonth("month",Carbon::parse($request->month))->get()->pluck("amount")->sum();
+        $AdvanceSalary = AdvanceSalary::where(['employee_id' => $id])
+            ->whereMonth("month",Carbon::parse($request->month))
+            ->whereYear('month',Carbon::now()->year)
+            ->get()->pluck("amount")->sum();
 
         return response([
             'details' => $details,