From 0fe6b4018e4ccaf05baa7d137c9d3df645d6a869 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Thu, 15 May 2025 04:42:35 +0000 Subject: [PATCH] hr attendance employee active inactive --- app/Controllers/Monthlypay.php | 2 +- app/Models/Monthlypay_model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Controllers/Monthlypay.php b/app/Controllers/Monthlypay.php index cd54660f..5dfe7175 100755 --- a/app/Controllers/Monthlypay.php +++ b/app/Controllers/Monthlypay.php @@ -201,7 +201,7 @@ class Monthlypay extends BaseController $phpdata = json_decode((string)$jsondata, true); $date = $this->request->getPost('param2'); $NoofDays = $this->request->getPost('param3'); - $Month_Year = format_date($date); + $Month_Year = date('Y-m-d',strtotime($date)); $CreateBy = $this->session->get('userId'); // echo 'from COn' . $date; // print_r($phpdata);die();[Paid Leave diff --git a/app/Models/Monthlypay_model.php b/app/Models/Monthlypay_model.php index d37d8711..e003788a 100755 --- a/app/Models/Monthlypay_model.php +++ b/app/Models/Monthlypay_model.php @@ -190,7 +190,7 @@ class Monthlypay_model extends Model ->where('t_employee_details.DateofJoining <= ', $lastdate) ->where('t_attendance.Month_Year', $current) ->where('t_employee_details.is_driver', 0) - ->where('t_employee_details.IsActive',1) + // ->where('t_employee_details.IsActive',1) ->orderBy('t_attendance.EmpID', 'asc'); $query = $builder->get();