diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 57fb261a..d46c085b 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -3636,10 +3636,14 @@ class EmployeeRestController extends AdminController log_message('error', 'Building query to count employee policies...'); $builder = $db2->table('employees') ->join('employee_polices', 'employees.id = employee_polices.employee_id') + ->join('client_policy cp', 'employee_polices.client_policy_id = cp.id') ->where('employees.is_active', 1) ->whereIn('employees.emp_status', ['draft', 'enrolled']) ->where('employee_polices.is_active', 1) ->whereIn('employee_polices.status', ['draft', 'enrolled']) + ->where('cp.enrolment_visibility', 1) + ->where('cp.open_for_enrollment', 1) + ->whereIn('cp.policy_type_id', [1,2,6,7]) ->where('employees.mobile', $mobile_no) ->groupBy('employee_polices.client_policy_id'); diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php index 1807f9b9..1cc20a2e 100644 --- a/app/Controllers/TicketController.php +++ b/app/Controllers/TicketController.php @@ -1854,7 +1854,7 @@ class TicketController extends BaseController $this->loadLayout("ticket_feedback_list",$data); } - public function getMoreInfo($requestFrom = null , $ticket_id) { + public function getMoreInfo($requestFrom = null , $ticket_id = null) { if($requestFrom == null){ $ticket_id = $this->request->getPost('ticket_id');